From: tomo <tomo>
Date: Fri, 3 Feb 2006 15:04:45 +0000 (+0000)
Subject: Sync up with r21-4-17-chise-0_22-6.
X-Git-Tag: r21-4-17-u2km-0_22-6
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8670d6ad21a0bab10db777f6b1603cc13718e585;p=chise%2Fxemacs-chise.git.1

Sync up with r21-4-17-chise-0_22-6.
---

diff --git a/ChangeLog b/ChangeLog
index db72852..74a5aab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-12-13  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Makefile.in.in (install-arch-indep): Modify code to make the
+	symbolic link for chise-db-directory/db to avoid error in
+	GNU/Linux.
+
+2005-09-21  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* configure.in:
+	- Add new option `--with-concord'.
+	- Add code to detect libconcord.
+	- define `HAVE_CONCORD' if the concord feature is enabled.
+
 2005-03-02  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* Makefile.in.in (install-arch-indep): As the symbolic link for
diff --git a/Makefile.in.in b/Makefile.in.in
index a974bfd..e4bbc74 100644
--- a/Makefile.in.in
+++ b/Makefile.in.in
@@ -538,10 +538,10 @@ install-arch-indep: mkdir info
   (while (and (< i len)\
 	      (eq (aref path i) (aref data-dir i)))\
     (setq i (1+ i)))\
-  (setq data-dir (substring data-dir i)\
-	chise-dir (substring path i))\
-  (setq i 0\
-	len (length chise-dir))\
+  (setq data-dir (substring data-dir i))\
+  (setq chise-dir (substring path i))\
+  (setq i 0)\
+  (setq len (length chise-dir))\
   (while (< i len)\
     (if (eq (aref chise-dir i) ?/)\
 	(setq pre (concat pre \"../\")))\
diff --git a/configure b/configure
index 0027fcd..8ea7848 100755
--- a/configure
+++ b/configure
@@ -350,6 +350,7 @@ while test $# != 0; do
 	with_workshop	| \
 	with_sparcworks | \
 	with_tooltalk	| \
+	with_concord	| \
 	with_ldap	| \
 	with_postgresql	| \
 	with_pop	| \
@@ -854,7 +855,7 @@ echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:858: checking whether ln -s works" >&5
+echo "configure:859: checking whether ln -s works" >&5
 
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
@@ -1119,7 +1120,7 @@ EOF
 
 
 echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:1123: checking "host system type"" >&5
+echo "configure:1124: checking "host system type"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
 canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"`
 configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
@@ -1657,7 +1658,7 @@ xe_save_CFLAGS="$CFLAGS"
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1661: checking for $ac_word" >&5
+echo "configure:1662: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1684,7 +1685,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1688: checking for $ac_word" >&5
+echo "configure:1689: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1732,7 +1733,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1736: checking for $ac_word" >&5
+echo "configure:1737: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1761,7 +1762,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1765: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1766: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1774,12 +1775,12 @@ cross_compiling=no
 
 cat > conftest.$ac_ext << EOF
 
-#line 1778 "configure"
+#line 1779 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1807,19 +1808,19 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1812: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1816: checking whether we are using GNU C" >&5
+echo "configure:1817: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1837,7 +1838,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1841: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1842: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1870,7 +1871,7 @@ if   test "$with_gcc" = "no"  -a "$GCC" = "yes"; then
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1874: checking for $ac_word" >&5
+echo "configure:1875: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1897,7 +1898,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1901: checking for $ac_word" >&5
+echo "configure:1902: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1945,7 +1946,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1949: checking for $ac_word" >&5
+echo "configure:1950: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1974,7 +1975,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1978: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1979: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1987,12 +1988,12 @@ cross_compiling=no
 
 cat > conftest.$ac_ext << EOF
 
-#line 1991 "configure"
+#line 1992 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2020,19 +2021,19 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2024: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2025: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2029: checking whether we are using GNU C" >&5
+echo "configure:2030: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2050,7 +2051,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2054: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2055: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2083,7 +2084,7 @@ elif test "$with_gcc" = "yes" -a "$GCC" != "yes" ; then
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2087: checking for $ac_word" >&5
+echo "configure:2088: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2110,7 +2111,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2114: checking for $ac_word" >&5
+echo "configure:2115: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2158,7 +2159,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2162: checking for $ac_word" >&5
+echo "configure:2163: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2187,7 +2188,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2191: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2192: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -2200,12 +2201,12 @@ cross_compiling=no
 
 cat > conftest.$ac_ext << EOF
 
-#line 2204 "configure"
+#line 2205 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2233,19 +2234,19 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2237: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2238: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2242: checking whether we are using GNU C" >&5
+echo "configure:2243: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2263,7 +2264,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2267: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2268: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2300,7 +2301,7 @@ test -n "$CPP" -a -d "$CPP" && CPP=
 test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2304: checking how to run the C preprocessor" >&5
+echo "configure:2305: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2313,13 +2314,13 @@ if test -z "$CPP"; then
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2317 "configure"
+#line 2318 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2324: \"$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
   :
@@ -2330,13 +2331,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2334 "configure"
+#line 2335 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2341: \"$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
   :
@@ -2347,13 +2348,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2351 "configure"
+#line 2352 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2358: \"$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
   :
@@ -2379,9 +2380,9 @@ echo "$ac_t""$CPP" 1>&6
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2383: checking for AIX" >&5
+echo "configure:2384: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2385 "configure"
+#line 2386 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2408,9 +2409,9 @@ rm -f conftest*
  
 
 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2412: checking for GNU libc" >&5
+echo "configure:2413: checking for GNU libc" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2414 "configure"
+#line 2415 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -2422,7 +2423,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_glibc=yes
 else
@@ -2499,7 +2500,7 @@ EOF
 esac
 
 cat > conftest.$ac_ext <<EOF
-#line 2503 "configure"
+#line 2504 "configure"
 #include "confdefs.h"
 int main () {
 #if defined __SUNPRO_C
@@ -2515,7 +2516,7 @@ return 0;
 #endif
 }
 EOF
-if { (eval echo configure:2519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -2751,17 +2752,17 @@ test "$__DECC" = "yes" && c_switch_site="$c_switch_site -std1" &&  if test "$ext
 
 if test "$__USLC__" = yes; then
   echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6
-echo "configure:2755: checking for whether the -Kalloca compiler flag is needed" >&5
+echo "configure:2756: checking for whether the -Kalloca compiler flag is needed" >&5
   need_kalloca=no
   cat > conftest.$ac_ext <<EOF
-#line 2758 "configure"
+#line 2759 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   :
 else
@@ -2772,14 +2773,14 @@ else
     xe_save_c_switch_system="$c_switch_system"
     c_switch_system="$c_switch_system -Kalloca"
     cat > conftest.$ac_ext <<EOF
-#line 2776 "configure"
+#line 2777 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    need_kalloca=yes 
 else
@@ -2822,7 +2823,7 @@ fi
 
 if test "$GCC" = "yes"; then
 echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
-echo "configure:2826: checking for buggy gcc versions" >&5
+echo "configure:2827: checking for buggy gcc versions" >&5
 GCC_VERSION=`$CC --version`
 case `uname -s`:`uname -m`:$GCC_VERSION in
 		    *:sun4*:2.8.1|*:sun4*:egcs-2.90.*)
@@ -2880,7 +2881,7 @@ fi
 
 if test "$pdump" != "yes"; then
   echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6
-echo "configure:2884: checking for \"-z nocombreloc\" linker flag" >&5
+echo "configure:2885: checking for \"-z nocombreloc\" linker flag" >&5
   case "`ld --help 2>&1`" in
     *-z\ nocombreloc* ) echo "$ac_t""yes" 1>&6
       ld_switch_site="-z nocombreloc $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;;
@@ -2969,7 +2970,7 @@ test "$pdump" = "yes" && extra_objs="$extra_objs dumper.o" &&  if test "$extra_v
  fi
 
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2973: checking for dynodump" >&5
+echo "configure:2974: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
@@ -3006,12 +3007,12 @@ if test "$unexec" = "unexaix.o"; then
   done
   
 echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:3010: checking for terminateAndUnload in -lC" >&5
+echo "configure:3011: checking for terminateAndUnload in -lC" >&5
 ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lC "
 cat > conftest.$ac_ext <<EOF
-#line 3015 "configure"
+#line 3016 "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
@@ -3022,7 +3023,7 @@ int main() {
 terminateAndUnload()
 ; return 0; }
 EOF
-if { (eval echo configure:3026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3027: \"$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
@@ -3130,7 +3131,7 @@ fi
 
 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:3134: checking "for runtime libraries flag"" >&5
+echo "configure:3135: checking "for runtime libraries flag"" >&5
   case "$opsys" in
     sol2 ) dash_r="-R" ;;
     decosf* | linux* | irix*) dash_r="-rpath " ;;
@@ -3152,14 +3153,14 @@ if test "$GCC" = "yes"; then
   done
 fi
         cat > conftest.$ac_ext <<EOF
-#line 3156 "configure"
+#line 3157 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -3260,10 +3261,10 @@ else
 fi
 after_morecore_hook_exists=yes
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3264: checking for malloc_set_state" >&5
+echo "configure:3265: checking for malloc_set_state" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3267 "configure"
+#line 3268 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -3286,7 +3287,7 @@ malloc_set_state();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_set_state=yes"
 else
@@ -3306,16 +3307,16 @@ doug_lea_malloc=no
 fi
 
 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3310: checking whether __after_morecore_hook exists" >&5
+echo "configure:3311: checking whether __after_morecore_hook exists" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3312 "configure"
+#line 3313 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:3319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -3371,7 +3372,7 @@ fi
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3375: checking for $ac_word" >&5
+echo "configure:3376: checking for $ac_word" >&5
 
 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3426,7 +3427,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3430: checking for a BSD compatible install" >&5
+echo "configure:3431: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 
   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -3480,7 +3481,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3484: checking for $ac_word" >&5
+echo "configure:3485: checking for $ac_word" >&5
 
 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3512,15 +3513,15 @@ for ac_hdr in   a.out.h   elf.h   cygwin/version.h   fcntl.h   inttypes.h   libg
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3516: checking for $ac_hdr" >&5
+echo "configure:3517: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3519 "configure"
+#line 3520 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3525: \"$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*
@@ -3550,10 +3551,10 @@ fi
 done
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3554: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3555: checking for sys/wait.h that is POSIX.1 compatible" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3557 "configure"
+#line 3558 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3569,7 +3570,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3593,10 +3594,10 @@ EOF
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3597: checking for ANSI C header files" >&5
+echo "configure:3598: checking for ANSI C header files" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3600 "configure"
+#line 3601 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3604,7 +3605,7 @@ cat > conftest.$ac_ext <<EOF
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3609: \"$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*
@@ -3621,7 +3622,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3625 "configure"
+#line 3626 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3639,7 +3640,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3643 "configure"
+#line 3644 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3657,7 +3658,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 cat > conftest.$ac_ext <<EOF
-#line 3661 "configure"
+#line 3662 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3668,7 +3669,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:3672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -3694,10 +3695,10 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3698: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3699: checking whether time.h and sys/time.h may both be included" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3701 "configure"
+#line 3702 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3706,7 +3707,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3730,10 +3731,10 @@ EOF
 fi
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3734: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:3735: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3737 "configure"
+#line 3738 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3745,7 +3746,7 @@ int main() {
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -3771,9 +3772,9 @@ fi
 
 
 echo $ac_n "checking for utime""... $ac_c" 1>&6
-echo "configure:3775: checking for utime" >&5
+echo "configure:3776: checking for utime" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3777 "configure"
+#line 3778 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <utime.h>
@@ -3781,7 +3782,7 @@ int main() {
 struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
 ; return 0; }
 EOF
-if { (eval echo configure:3785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3786: \"$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
@@ -3800,10 +3801,10 @@ else
       for ac_func in utimes
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3804: checking for $ac_func" >&5
+echo "configure:3805: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3807 "configure"
+#line 3808 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3826,7 +3827,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3831: \"$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
@@ -3858,10 +3859,10 @@ rm -f conftest*
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3862: checking return type of signal handlers" >&5
+echo "configure:3863: checking return type of signal handlers" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3865 "configure"
+#line 3866 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3878,7 +3879,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3900,10 +3901,10 @@ EOF
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3904: checking for size_t" >&5
+echo "configure:3905: checking for size_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3907 "configure"
+#line 3908 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3934,10 +3935,10 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3938: checking for pid_t" >&5
+echo "configure:3939: checking for pid_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3941 "configure"
+#line 3942 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3968,10 +3969,10 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3972: checking for uid_t in sys/types.h" >&5
+echo "configure:3973: checking for uid_t in sys/types.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3975 "configure"
+#line 3976 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -4007,10 +4008,10 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:4011: checking for mode_t" >&5
+echo "configure:4012: checking for mode_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4014 "configure"
+#line 4015 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4041,10 +4042,10 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4045: checking for off_t" >&5
+echo "configure:4046: checking for off_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4048 "configure"
+#line 4049 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4075,10 +4076,10 @@ EOF
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4079: checking for ssize_t" >&5
+echo "configure:4080: checking for ssize_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4082 "configure"
+#line 4083 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4110,9 +4111,9 @@ fi
 
 
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:4114: checking for socklen_t" >&5
+echo "configure:4115: checking for socklen_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4116 "configure"
+#line 4117 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -4122,7 +4123,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -4131,7 +4132,7 @@ else
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 4135 "configure"
+#line 4136 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -4141,7 +4142,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 echo "$ac_t""size_t" 1>&6
@@ -4173,9 +4174,9 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:4177: checking for struct timeval" >&5
+echo "configure:4178: checking for struct timeval" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4179 "configure"
+#line 4180 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4191,7 +4192,7 @@ int main() {
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:4195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -4213,10 +4214,10 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:4217: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4218: checking whether struct tm is in sys/time.h or time.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4220 "configure"
+#line 4221 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4224,7 +4225,7 @@ int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:4228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -4248,10 +4249,10 @@ EOF
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4252: checking for tm_zone in struct tm" >&5
+echo "configure:4253: checking for tm_zone in struct tm" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4255 "configure"
+#line 4256 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -4259,7 +4260,7 @@ int main() {
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:4263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -4282,10 +4283,10 @@ EOF
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4286: checking for tzname" >&5
+echo "configure:4287: checking for tzname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4289 "configure"
+#line 4290 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -4295,7 +4296,7 @@ int main() {
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:4299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -4321,10 +4322,10 @@ fi
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4325: checking for working const" >&5
+echo "configure:4326: checking for working const" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4328 "configure"
+#line 4329 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4373,7 +4374,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:4377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4398,7 +4399,7 @@ fi
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4402: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4403: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 
 cat > conftestmake <<\EOF
@@ -4423,12 +4424,12 @@ fi
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4427: checking whether byte ordering is bigendian" >&5
+echo "configure:4428: checking whether byte ordering is bigendian" >&5
 
 ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 4432 "configure"
+#line 4433 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4439,11 +4440,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 4447 "configure"
+#line 4448 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4454,7 +4455,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -4471,7 +4472,7 @@ fi
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 4475 "configure"
+#line 4476 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -4484,7 +4485,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:4488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -4511,10 +4512,10 @@ fi
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4515: checking size of short" >&5
+echo "configure:4516: checking size of short" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4518 "configure"
+#line 4519 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4525,7 +4526,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -4553,10 +4554,10 @@ if test "$ac_cv_sizeof_short" = 0; then
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4557: checking size of int" >&5
+echo "configure:4558: checking size of int" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4560 "configure"
+#line 4561 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4567,7 +4568,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4589,10 +4590,10 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4593: checking size of long" >&5
+echo "configure:4594: checking size of long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4596 "configure"
+#line 4597 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4603,7 +4604,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4625,10 +4626,10 @@ EOF
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4629: checking size of long long" >&5
+echo "configure:4630: checking size of long long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4632 "configure"
+#line 4633 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4639,7 +4640,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4644: \"$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
@@ -4661,10 +4662,10 @@ EOF
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4665: checking size of void *" >&5
+echo "configure:4666: checking size of void *" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4668 "configure"
+#line 4669 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4675,7 +4676,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4680: \"$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
@@ -4699,7 +4700,7 @@ EOF
 
 case $opsys in
   cygwin* ) cat > conftest.$ac_ext <<EOF
-#line 4703 "configure"
+#line 4704 "configure"
 #include "confdefs.h"
 #include <cygwin/types.h>
 EOF
@@ -4724,7 +4725,7 @@ rm -f conftest*
 esac
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4728: checking for long file names" >&5
+echo "configure:4729: 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:
@@ -4770,10 +4771,10 @@ fi
 
 
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4774: checking for sin" >&5
+echo "configure:4775: checking for sin" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4777 "configure"
+#line 4778 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4796,7 +4797,7 @@ sin();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4801: \"$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
@@ -4814,12 +4815,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4818: checking for sin in -lm" >&5
+echo "configure:4819: 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 4823 "configure"
+#line 4824 "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
@@ -4830,7 +4831,7 @@ int main() {
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4835: \"$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
@@ -4874,14 +4875,14 @@ EOF
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4878 "configure"
+#line 4879 "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:4885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4886: \"$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
@@ -4898,14 +4899,14 @@ fi
 rm -f conftest*
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:4902: checking type of mail spool file locking" >&5
+echo "configure:4903: 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:4906: checking for $ac_func" >&5
+echo "configure:4907: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4909 "configure"
+#line 4910 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4928,7 +4929,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4933: \"$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
@@ -5010,12 +5011,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:5014: checking for cma_open in -lpthreads" >&5
+echo "configure:5015: 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 5019 "configure"
+#line 5020 "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
@@ -5026,7 +5027,7 @@ int main() {
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:5030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5031: \"$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
@@ -5063,7 +5064,7 @@ esac
 
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:5067: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:5068: 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;
@@ -5075,7 +5076,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:5079: checking for \"-z ignore\" linker flag" >&5
+echo "configure:5080: 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 ;;
@@ -5086,7 +5087,7 @@ fi
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:5090: checking "for specified window system"" >&5
+echo "configure:5091: checking "for specified window system"" >&5
 
 
 GNOME_CONFIG=no
@@ -5094,7 +5095,7 @@ GTK_CONFIG=no
 
 if test "$with_gnome" != "no"; then
    echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5098: checking for GNOME configuration script" >&5
+echo "configure:5099: checking for GNOME configuration script" >&5
    for possible in gnome-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5125,7 +5126,7 @@ fi
 
 if test "$with_gtk" != "no";then
    echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5129: checking for GTK configuration script" >&5
+echo "configure:5130: checking for GTK configuration script" >&5
    for possible in gtk12-config gtk14-config gtk-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5147,18 +5148,18 @@ fi
 
 if test "${GTK_CONFIG}" != "no"; then
       echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5151: checking gtk version" >&5
+echo "configure:5152: 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:5156: checking gtk libs" >&5
+echo "configure:5157: 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:5162: checking gtk cflags" >&5
+echo "configure:5163: checking gtk cflags" >&5
       GTK_CFLAGS=`${GTK_CONFIG} --cflags`
       if test "$GCC" = "yes"; then
       	GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
@@ -5168,19 +5169,19 @@ echo "configure:5162: checking gtk cflags" >&5
 
       
 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5172: checking for main in -lgdk_imlib" >&5
+echo "configure:5173: 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 5177 "configure"
+#line 5178 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5185: \"$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
@@ -5202,12 +5203,12 @@ fi
 
       
 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5206: checking for Imlib_init in -lImlib" >&5
+echo "configure:5207: 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 5211 "configure"
+#line 5212 "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
@@ -5218,7 +5219,7 @@ int main() {
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5223: \"$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
@@ -5241,10 +5242,10 @@ fi
       for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5245: checking for $ac_func" >&5
+echo "configure:5246: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5248 "configure"
+#line 5249 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5267,7 +5268,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5272: \"$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
@@ -5346,15 +5347,15 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5350: checking for $ac_hdr" >&5
+echo "configure:5351: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5353 "configure"
+#line 5354 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5359: \"$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*
@@ -5385,19 +5386,19 @@ done
 
       
 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5389: checking for main in -lxml" >&5
+echo "configure:5390: 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 5394 "configure"
+#line 5395 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5402: \"$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
@@ -5419,19 +5420,19 @@ fi
 
       
 echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5423: checking for main in -lglade" >&5
+echo "configure:5424: 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 5428 "configure"
+#line 5429 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5436: \"$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
@@ -5453,19 +5454,19 @@ fi
 
       
 echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5457: checking for main in -lglade-gnome" >&5
+echo "configure:5458: 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 5462 "configure"
+#line 5463 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5470: \"$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
@@ -5486,7 +5487,7 @@ fi
 
 
       cat > conftest.$ac_ext <<EOF
-#line 5490 "configure"
+#line 5491 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
@@ -5545,7 +5546,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:5549: checking for X" >&5
+echo "configure:5550: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5605,12 +5606,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5609 "configure"
+#line 5610 "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:5614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5615: \"$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*
@@ -5679,14 +5680,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 5683 "configure"
+#line 5684 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5691: \"$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.
@@ -5795,17 +5796,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:5799: checking whether -R must be followed by a space" >&5
+echo "configure:5800: 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 5802 "configure"
+#line 5803 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5821,14 +5822,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5825 "configure"
+#line 5826 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5864,12 +5865,12 @@ ac_cv_lib_dnet_dnet_ntoa=no
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5868: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5869: 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 5873 "configure"
+#line 5874 "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
@@ -5880,7 +5881,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5885: \"$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
@@ -5904,12 +5905,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:5908: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5909: 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 5913 "configure"
+#line 5914 "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
@@ -5920,7 +5921,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5925: \"$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
@@ -5949,10 +5950,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:5953: checking for gethostbyname" >&5
+echo "configure:5954: checking for gethostbyname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5956 "configure"
+#line 5957 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -5975,7 +5976,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5980: \"$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
@@ -5996,12 +5997,12 @@ fi
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6000: checking for gethostbyname in -lnsl" >&5
+echo "configure:6001: 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 6005 "configure"
+#line 6006 "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
@@ -6012,7 +6013,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:6016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6017: \"$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
@@ -6042,10 +6043,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:6046: checking for connect" >&5
+echo "configure:6047: checking for connect" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6049 "configure"
+#line 6050 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -6068,7 +6069,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6073: \"$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
@@ -6091,12 +6092,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:6095: checking "$xe_msg_checking"" >&5
+echo "configure:6096: 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 6100 "configure"
+#line 6101 "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
@@ -6107,7 +6108,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:6111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6112: \"$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
@@ -6131,10 +6132,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:6135: checking for remove" >&5
+echo "configure:6136: checking for remove" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6138 "configure"
+#line 6139 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -6157,7 +6158,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6162: \"$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
@@ -6178,12 +6179,12 @@ fi
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6182: checking for remove in -lposix" >&5
+echo "configure:6183: 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 6187 "configure"
+#line 6188 "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
@@ -6194,7 +6195,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:6198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6199: \"$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
@@ -6218,10 +6219,10 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6222: checking for shmat" >&5
+echo "configure:6223: checking for shmat" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6225 "configure"
+#line 6226 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -6244,7 +6245,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6249: \"$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
@@ -6265,12 +6266,12 @@ fi
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6269: checking for shmat in -lipc" >&5
+echo "configure:6270: 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 6274 "configure"
+#line 6275 "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
@@ -6281,7 +6282,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:6285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6286: \"$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
@@ -6317,12 +6318,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:6321: checking "$xe_msg_checking"" >&5
+echo "configure:6322: 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 6326 "configure"
+#line 6327 "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
@@ -6333,7 +6334,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:6337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6338: \"$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
@@ -6379,15 +6380,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:6383: checking for Xm/Xm.h" >&5
+echo "configure:6384: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6386 "configure"
+#line 6387 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6392: \"$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*
@@ -6404,12 +6405,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:6408: checking for XmStringFree in -lXm" >&5
+echo "configure:6409: 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 6413 "configure"
+#line 6414 "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
@@ -6420,7 +6421,7 @@ int main() {
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:6424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6425: \"$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
@@ -6572,7 +6573,7 @@ EOF
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6576: checking for X defines extracted by xmkmf" >&5
+echo "configure:6577: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -6621,15 +6622,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:6625: checking for X11/Intrinsic.h" >&5
+echo "configure:6626: checking for X11/Intrinsic.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6628 "configure"
+#line 6629 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6634: \"$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*
@@ -6653,12 +6654,12 @@ fi
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6657: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6658: 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 6662 "configure"
+#line 6663 "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
@@ -6669,7 +6670,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6674: \"$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
@@ -6694,12 +6695,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:6698: checking "$xe_msg_checking"" >&5
+echo "configure:6699: 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 6703 "configure"
+#line 6704 "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
@@ -6710,7 +6711,7 @@ int main() {
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6715: \"$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
@@ -6737,12 +6738,12 @@ fi
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6741: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6742: 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 6746 "configure"
+#line 6747 "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
@@ -6753,7 +6754,7 @@ int main() {
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6758: \"$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
@@ -6776,12 +6777,12 @@ fi
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6780: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6781: 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 6785 "configure"
+#line 6786 "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
@@ -6792,7 +6793,7 @@ int main() {
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6797: \"$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
@@ -6815,14 +6816,14 @@ fi
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6819: checking the version of X11 being used" >&5
+echo "configure:6820: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6821 "configure"
+#line 6822 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6853,10 +6854,10 @@ EOF
   for ac_func in XConvertCase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6857: checking for $ac_func" >&5
+echo "configure:6858: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6860 "configure"
+#line 6861 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6879,7 +6880,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6884: \"$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
@@ -6911,15 +6912,15 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6915: checking for $ac_hdr" >&5
+echo "configure:6916: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6918 "configure"
+#line 6919 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6924: \"$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*
@@ -6952,10 +6953,10 @@ done
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6956: checking for $ac_func" >&5
+echo "configure:6957: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6959 "configure"
+#line 6960 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6978,7 +6979,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6983: \"$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
@@ -7006,9 +7007,9 @@ fi
 done
 
   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:7010: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:7011: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 7012 "configure"
+#line 7013 "configure"
 #include "confdefs.h"
 
 #define NeedFunctionPrototypes 1
@@ -7020,7 +7021,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:7024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -7041,12 +7042,12 @@ rm -f conftest*
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:7045: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:7046: 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 7050 "configure"
+#line 7051 "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
@@ -7057,7 +7058,7 @@ int main() {
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:7061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7062: \"$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
@@ -7096,19 +7097,19 @@ EOF
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:7100: checking for main in -lXbsd" >&5
+echo "configure:7101: 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 7105 "configure"
+#line 7106 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7113: \"$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
@@ -7132,7 +7133,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:7136: checking for name of AIX gcc threads option" >&5
+echo "configure:7137: checking for name of AIX gcc threads option" >&5
       case `$CC -v --help 2>&1` in
         *-mthreads*) aix_threads=-mthreads ;;
                   *) aix_threads=-pthread  ;;
@@ -7146,10 +7147,10 @@ echo "configure:7136: 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:7150: checking size of short" >&5
+echo "configure:7151: checking size of short" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7153 "configure"
+#line 7154 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -7160,7 +7161,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:7164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -7189,22 +7190,22 @@ EOF
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:7193: checking for MS-Windows" >&5
+echo "configure:7194: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:7196: checking for main in -lgdi32" >&5
+echo "configure:7197: 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 7201 "configure"
+#line 7202 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7209: \"$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
@@ -7277,12 +7278,12 @@ EOF
  fi
     fi
         cat > conftest.$ac_ext <<EOF
-#line 7281 "configure"
+#line 7282 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7287: \"$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
@@ -7346,15 +7347,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:7350: checking for X11/extensions/shape.h" >&5
+echo "configure:7351: checking for X11/extensions/shape.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7353 "configure"
+#line 7354 "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:7358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7359: \"$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*
@@ -7406,7 +7407,7 @@ case "$x_libraries" in *X11R4* )
 esac
 
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7410: checking for WM_COMMAND option" >&5;
+echo "configure:7411: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -7421,15 +7422,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:7425: checking for X11/Xauth.h" >&5
+echo "configure:7426: checking for X11/Xauth.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7428 "configure"
+#line 7429 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7434: \"$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*
@@ -7452,12 +7453,12 @@ fi
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7456: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7457: 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 7461 "configure"
+#line 7462 "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
@@ -7468,7 +7469,7 @@ int main() {
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:7472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7473: \"$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
@@ -7513,15 +7514,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:7517: checking for ${dir}tt_c.h" >&5
+echo "configure:7518: checking for ${dir}tt_c.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7520 "configure"
+#line 7521 "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:7525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7526: \"$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*
@@ -7557,12 +7558,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:7561: checking "$xe_msg_checking"" >&5
+echo "configure:7562: 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 7566 "configure"
+#line 7567 "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
@@ -7573,7 +7574,7 @@ int main() {
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:7577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7578: \"$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
@@ -7630,15 +7631,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:7634: checking for Dt/Dt.h" >&5
+echo "configure:7635: checking for Dt/Dt.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7637 "configure"
+#line 7638 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7643: \"$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*
@@ -7661,12 +7662,12 @@ fi
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:7665: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:7666: 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 7670 "configure"
+#line 7671 "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
@@ -7677,7 +7678,7 @@ int main() {
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7682: \"$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
@@ -7750,7 +7751,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:7754: checking if drag and drop API is needed" >&5
+echo "configure:7755: 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
@@ -7770,18 +7771,18 @@ EOF
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:7774: checking for LDAP" >&5
+echo "configure:7775: 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:7777: checking for ldap.h" >&5
+echo "configure:7778: checking for ldap.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7780 "configure"
+#line 7781 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7786: \"$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*
@@ -7804,15 +7805,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:7808: checking for lber.h" >&5
+echo "configure:7809: checking for lber.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7811 "configure"
+#line 7812 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7817: \"$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*
@@ -7836,12 +7837,12 @@ fi
 if test "$with_ldap" != "no"; then
   
 echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:7840: checking for ldap_search in -lldap" >&5
+echo "configure:7841: checking for ldap_search in -lldap" >&5
 ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap "
 cat > conftest.$ac_ext <<EOF
-#line 7845 "configure"
+#line 7846 "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
@@ -7852,7 +7853,7 @@ int main() {
 ldap_search()
 ; return 0; }
 EOF
-if { (eval echo configure:7856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7857: \"$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
@@ -7876,12 +7877,12 @@ fi
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7880: checking "$xe_msg_checking"" >&5
+echo "configure:7881: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber"
 cat > conftest.$ac_ext <<EOF
-#line 7885 "configure"
+#line 7886 "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
@@ -7892,7 +7893,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7897: \"$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
@@ -7916,12 +7917,12 @@ fi
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7920: checking "$xe_msg_checking"" >&5
+echo "configure:7921: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber -lkrb"
 cat > conftest.$ac_ext <<EOF
-#line 7925 "configure"
+#line 7926 "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
@@ -7932,7 +7933,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7937: \"$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
@@ -7956,12 +7957,12 @@ fi
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7960: checking "$xe_msg_checking"" >&5
+echo "configure:7961: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber -lkrb -ldes"
 cat > conftest.$ac_ext <<EOF
-#line 7965 "configure"
+#line 7966 "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
@@ -7972,7 +7973,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7977: \"$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
@@ -7994,12 +7995,12 @@ fi
  }
               test "$with_ldap_lber" != "yes" && { 
 echo $ac_n "checking for ber_pvt_opt_on in -llber""... $ac_c" 1>&6
-echo "configure:7998: checking for ber_pvt_opt_on in -llber" >&5
+echo "configure:7999: checking for ber_pvt_opt_on in -llber" >&5
 ac_lib_var=`echo lber'_'ber_pvt_opt_on | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -llber "
 cat > conftest.$ac_ext <<EOF
-#line 8003 "configure"
+#line 8004 "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
@@ -8010,7 +8011,7 @@ int main() {
 ber_pvt_opt_on()
 ; return 0; }
 EOF
-if { (eval echo configure:8014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8015: \"$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
@@ -8056,10 +8057,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:8060: checking for $ac_func" >&5
+echo "configure:8061: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8063 "configure"
+#line 8064 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8082,7 +8083,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8087: \"$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
@@ -8113,20 +8114,20 @@ fi
 
 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:8117: checking for PostgreSQL" >&5
+echo "configure:8118: 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:8122: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:8123: checking for ${header_dir}libpq-fe.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8125 "configure"
+#line 8126 "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:8130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8131: \"$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*
@@ -8150,12 +8151,12 @@ fi
 
   test -n "$libpq_fe_h_file" && { 
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:8154: checking for PQconnectdb in -lpq" >&5
+echo "configure:8155: 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 8159 "configure"
+#line 8160 "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
@@ -8166,7 +8167,7 @@ int main() {
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:8170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8171: \"$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
@@ -8199,12 +8200,12 @@ EOF
 
     
 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:8203: checking for PQconnectStart in -lpq" >&5
+echo "configure:8204: 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 8208 "configure"
+#line 8209 "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
@@ -8215,7 +8216,7 @@ int main() {
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:8219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8220: \"$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
@@ -8263,7 +8264,7 @@ fi
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:8267: checking for graphics libraries" >&5
+echo "configure:8268: checking for graphics libraries" >&5
 
       libpath_xpm=
   incpath_xpm=
@@ -8289,10 +8290,10 @@ echo "configure:8267: 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:8293: checking for Xpm - no older than 3.4f" >&5
+echo "configure:8294: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8296 "configure"
+#line 8297 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -8301,7 +8302,7 @@ echo "configure:8293: checking for Xpm - no older than 3.4f" >&5
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8306: \"$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
@@ -8345,17 +8346,17 @@ EOF
     libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" 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:8349: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:8350: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8352 "configure"
+#line 8353 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:8359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -8381,15 +8382,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:8385: checking for compface.h" >&5
+echo "configure:8386: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8388 "configure"
+#line 8389 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8394: \"$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*
@@ -8412,12 +8413,12 @@ fi
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8416: checking for UnGenFace in -lcompface" >&5
+echo "configure:8417: 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 8421 "configure"
+#line 8422 "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
@@ -8428,7 +8429,7 @@ int main() {
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8433: \"$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
@@ -8480,12 +8481,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:8484: checking for inflate in -lc" >&5
+echo "configure:8485: 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 8489 "configure"
+#line 8490 "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
@@ -8496,7 +8497,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8501: \"$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
@@ -8515,12 +8516,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:8519: checking for inflate in -lz" >&5
+echo "configure:8520: 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 8524 "configure"
+#line 8525 "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
@@ -8531,7 +8532,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8536: \"$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
@@ -8550,12 +8551,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:8554: checking for inflate in -lgz" >&5
+echo "configure:8555: 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 8559 "configure"
+#line 8560 "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
@@ -8566,7 +8567,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8571: \"$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
@@ -8596,15 +8597,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:8600: checking for jpeglib.h" >&5
+echo "configure:8601: checking for jpeglib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8603 "configure"
+#line 8604 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8609: \"$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*
@@ -8627,12 +8628,12 @@ fi
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:8631: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:8632: 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 8636 "configure"
+#line 8637 "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
@@ -8643,7 +8644,7 @@ int main() {
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:8647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8648: \"$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
@@ -8679,10 +8680,10 @@ EOF
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:8683: checking for pow" >&5
+echo "configure:8684: checking for pow" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8686 "configure"
+#line 8687 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -8705,7 +8706,7 @@ pow();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8710: \"$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
@@ -8726,15 +8727,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:8730: checking for png.h" >&5
+echo "configure:8731: checking for png.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8733 "configure"
+#line 8734 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8739: \"$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*
@@ -8757,12 +8758,12 @@ fi
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8761: checking for png_read_image in -lpng" >&5
+echo "configure:8762: 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 8766 "configure"
+#line 8767 "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
@@ -8773,7 +8774,7 @@ int main() {
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:8777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8778: \"$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
@@ -8796,10 +8797,10 @@ fi
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8800: checking for workable png version information" >&5
+echo "configure:8801: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 8803 "configure"
+#line 8804 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -8807,7 +8808,7 @@ echo "configure:8800: 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:8811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8812: \"$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
@@ -8850,15 +8851,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:8854: checking for tiffio.h" >&5
+echo "configure:8855: checking for tiffio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8857 "configure"
+#line 8858 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8863: \"$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*
@@ -8881,12 +8882,12 @@ fi
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8885: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:8886: 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 8890 "configure"
+#line 8891 "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
@@ -8897,7 +8898,7 @@ int main() {
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8902: \"$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
@@ -8936,15 +8937,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:8940: checking for compface.h" >&5
+echo "configure:8941: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8943 "configure"
+#line 8944 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8949: \"$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*
@@ -8967,12 +8968,12 @@ fi
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8971: checking for UnGenFace in -lcompface" >&5
+echo "configure:8972: 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 8976 "configure"
+#line 8977 "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
@@ -8983,7 +8984,7 @@ int main() {
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8988: \"$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
@@ -9022,12 +9023,12 @@ fi
 
 if test "$with_x11" = "yes"; then
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:9026: checking for X11 graphics libraries" >&5
+echo "configure:9027: checking for X11 graphics libraries" >&5
 fi
 
 if test "$with_x11" = "yes"; then
   echo "checking for the Athena widgets" 1>&6
-echo "configure:9031: checking for the Athena widgets" >&5
+echo "configure:9032: checking for the Athena widgets" >&5
 
     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -9043,12 +9044,12 @@ echo "configure:9031: 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:9047: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:9048: 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 9052 "configure"
+#line 9053 "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
@@ -9059,7 +9060,7 @@ int main() {
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:9063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9064: \"$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
@@ -9075,12 +9076,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:9079: checking for $athena_3d_function in -l$athena_variant" >&5
+echo "configure:9080: 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 9084 "configure"
+#line 9085 "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
@@ -9091,7 +9092,7 @@ int main() {
 $athena_3d_function()
 ; return 0; }
 EOF
-if { (eval echo configure:9095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9096: \"$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
@@ -9122,12 +9123,12 @@ fi
   else
         
 echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9126: checking for $athena_3d_function in -l$athena_variant" >&5
+echo "configure:9127: 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 9131 "configure"
+#line 9132 "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
@@ -9138,7 +9139,7 @@ int main() {
 $athena_3d_function()
 ; return 0; }
 EOF
-if { (eval echo configure:9142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9143: \"$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
@@ -9156,12 +9157,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:9160: checking for $athena_3d_function in -lXaw" >&5
+echo "configure:9161: 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 9165 "configure"
+#line 9166 "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
@@ -9172,7 +9173,7 @@ int main() {
 $athena_3d_function()
 ; return 0; }
 EOF
-if { (eval echo configure:9176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9177: \"$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
@@ -9203,15 +9204,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:9207: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9208: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9210 "configure"
+#line 9211 "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:9215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9216: \"$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*
@@ -9231,15 +9232,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:9235: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:9236: checking for X11/Xaw/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9238 "configure"
+#line 9239 "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:9243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9244: \"$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*
@@ -9265,15 +9266,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:9269: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:9270: checking for X11/$athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9272 "configure"
+#line 9273 "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:9277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9278: \"$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*
@@ -9290,15 +9291,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:9294: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:9295: checking for X11/$athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9297 "configure"
+#line 9298 "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:9302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9303: \"$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*
@@ -9326,15 +9327,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:9330: checking for $athena_variant/XawInit.h" >&5
+echo "configure:9331: checking for $athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9333 "configure"
+#line 9334 "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:9338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9339: \"$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*
@@ -9351,15 +9352,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:9355: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:9356: checking for $athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9358 "configure"
+#line 9359 "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:9363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9364: \"$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*
@@ -9388,15 +9389,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:9392: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:9393: checking for X11/Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9395 "configure"
+#line 9396 "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:9400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9401: \"$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*
@@ -9413,15 +9414,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:9417: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:9418: checking for X11/Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9420 "configure"
+#line 9421 "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:9425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9426: \"$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*
@@ -9453,15 +9454,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:9457: checking for Xaw3d/XawInit.h" >&5
+echo "configure:9458: checking for Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9460 "configure"
+#line 9461 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9466: \"$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*
@@ -9478,15 +9479,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:9482: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:9483: checking for Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9485 "configure"
+#line 9486 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9491: \"$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*
@@ -9518,15 +9519,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:9522: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9523: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9525 "configure"
+#line 9526 "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:9530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9531: \"$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*
@@ -9565,15 +9566,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:9569: checking for Xm/Xm.h" >&5
+echo "configure:9570: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9572 "configure"
+#line 9573 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9578: \"$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*
@@ -9590,12 +9591,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:9594: checking for XmStringFree in -lXm" >&5
+echo "configure:9595: 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 9599 "configure"
+#line 9600 "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
@@ -9606,7 +9607,7 @@ int main() {
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:9610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9611: \"$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
@@ -9635,9 +9636,9 @@ fi
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:9639: checking for Lesstif" >&5
+echo "configure:9640: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 9641 "configure"
+#line 9642 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -10081,6 +10082,96 @@ EOF
  fi
 fi
 
+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:10090: checking for concord.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10093 "configure"
+#include "confdefs.h"
+#include <concord.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10098: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_concord=no
+fi
+
+fi
+if test "$concord_includes_found" = "no" -a "$with_concord" != "no" -a \
+   -d "/usr/local/concord/include"; then
+  save_c_switch_site="$c_switch_site"
+  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:10126: checking for concord.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10129 "configure"
+#include "confdefs.h"
+#include <concord.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10134: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  concord_includes_found=yes
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  if test "$concord_includes_found" != "yes"; then
+    c_switch_site="$save_c_switch_site"
+    with_concord="no"
+  fi
+fi
+
+test -z "$with_concord" && with_concord=yes
+if test "$with_concord" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_CONCORD
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_CONCORD 1
+EOF
+}
+
+  libs_x="-lconcord $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lconcord\" to \$libs_x"; fi
+  extra_objs="$extra_objs concord.o" &&  if test "$extra_verbose" = "yes"; then
+   echo "    xemacs will be linked with \"concord.o\""
+ fi
+fi
+
 test -z "$with_chise" && with_chise=yes
 if test "$with_chise" = "yes"; then
     with_mule=yes
@@ -10090,7 +10181,7 @@ fi
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:10094: checking for Mule-related features" >&5
+echo "configure:10185: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -10104,15 +10195,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:10108: checking for chise.h" >&5
+echo "configure:10199: checking for chise.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10111 "configure"
+#line 10202 "configure"
 #include "confdefs.h"
 #include <chise.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10207: \"$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*
@@ -10140,15 +10231,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:10144: checking for chise.h" >&5
+echo "configure:10235: checking for chise.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10147 "configure"
+#line 10238 "configure"
 #include "confdefs.h"
 #include <chise.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10243: \"$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*
@@ -10227,15 +10318,15 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10231: checking for $ac_hdr" >&5
+echo "configure:10322: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10234 "configure"
+#line 10325 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10330: \"$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*
@@ -10266,12 +10357,12 @@ done
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:10270: checking for strerror in -lintl" >&5
+echo "configure:10361: 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 10275 "configure"
+#line 10366 "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
@@ -10282,7 +10373,7 @@ int main() {
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:10286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10377: \"$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
@@ -10336,18 +10427,18 @@ EOF
   fi
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:10340: checking for Mule input methods" >&5
+echo "configure:10431: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:10343: checking for XIM" >&5
+echo "configure:10434: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:10346: checking for XOpenIM in -lX11" >&5
+echo "configure:10437: 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 10351 "configure"
+#line 10442 "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
@@ -10358,7 +10449,7 @@ int main() {
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:10362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10453: \"$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
@@ -10382,12 +10473,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:10386: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10477: 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 10391 "configure"
+#line 10482 "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
@@ -10398,7 +10489,7 @@ int main() {
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10493: \"$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
@@ -10421,12 +10512,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:10425: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10516: 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 10430 "configure"
+#line 10521 "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
@@ -10437,7 +10528,7 @@ int main() {
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10532: \"$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
@@ -10502,15 +10593,15 @@ EOF
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:10506: checking for XFontSet" >&5
+echo "configure:10597: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:10509: checking for XmbDrawString in -lX11" >&5
+echo "configure:10600: 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 10514 "configure"
+#line 10605 "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
@@ -10521,7 +10612,7 @@ int main() {
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:10525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10616: \"$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
@@ -10561,15 +10652,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:10565: checking for wnn/jllib.h" >&5
+echo "configure:10656: checking for wnn/jllib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10568 "configure"
+#line 10659 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10573: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10664: \"$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*
@@ -10592,15 +10683,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:10596: checking for wnn/commonhd.h" >&5
+echo "configure:10687: checking for wnn/commonhd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10599 "configure"
+#line 10690 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10695: \"$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*
@@ -10625,10 +10716,10 @@ fi
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10629: checking for $ac_func" >&5
+echo "configure:10720: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10632 "configure"
+#line 10723 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10651,7 +10742,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10746: \"$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
@@ -10680,12 +10771,12 @@ done
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:10684: checking for crypt in -lcrypt" >&5
+echo "configure:10775: 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 10689 "configure"
+#line 10780 "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
@@ -10696,7 +10787,7 @@ int main() {
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:10700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10791: \"$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
@@ -10731,12 +10822,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:10735: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:10826: 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 10740 "configure"
+#line 10831 "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
@@ -10747,7 +10838,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10842: \"$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,12 +10856,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:10769: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:10860: 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 10774 "configure"
+#line 10865 "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
@@ -10781,7 +10872,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10876: \"$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
@@ -10799,12 +10890,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:10803: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:10894: 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 10808 "configure"
+#line 10899 "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
@@ -10815,7 +10906,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10910: \"$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
@@ -10833,12 +10924,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:10837: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:10928: 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 10842 "configure"
+#line 10933 "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
@@ -10849,7 +10940,7 @@ int main() {
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10944: \"$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
@@ -10897,12 +10988,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:10901: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:10992: 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 10906 "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
@@ -10913,7 +11004,7 @@ int main() {
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:10917: \"$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
@@ -10948,15 +11039,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:10952: checking for canna/jrkanji.h" >&5
+echo "configure:11043: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10955 "configure"
+#line 11046 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11051: \"$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*
@@ -10983,15 +11074,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:10987: checking for canna/jrkanji.h" >&5
+echo "configure:11078: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10990 "configure"
+#line 11081 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11086: \"$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*
@@ -11019,15 +11110,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:11023: checking for canna/RK.h" >&5
+echo "configure:11114: checking for canna/RK.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11026 "configure"
+#line 11117 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11122: \"$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*
@@ -11050,12 +11141,12 @@ fi
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:11054: checking for RkBgnBun in -lRKC" >&5
+echo "configure:11145: 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 11059 "configure"
+#line 11150 "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
@@ -11066,7 +11157,7 @@ int main() {
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:11070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11161: \"$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
@@ -11089,12 +11180,12 @@ fi
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:11093: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:11184: 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 11098 "configure"
+#line 11189 "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
@@ -11105,7 +11196,7 @@ int main() {
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:11109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11200: \"$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
@@ -11154,12 +11245,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:11158: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:11249: 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 11163 "configure"
+#line 11254 "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
@@ -11170,7 +11261,7 @@ int main() {
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:11174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11265: \"$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
@@ -11257,10 +11348,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:11261: checking for $ac_func" >&5
+echo "configure:11352: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11264 "configure"
+#line 11355 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11283,7 +11374,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11378: \"$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
@@ -11324,10 +11415,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:11328: checking for $ac_func" >&5
+echo "configure:11419: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11331 "configure"
+#line 11422 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11350,7 +11441,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11445: \"$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
@@ -11379,10 +11470,10 @@ done
 
 
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:11383: checking for openpty" >&5
+echo "configure:11474: checking for openpty" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11386 "configure"
+#line 11477 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -11405,7 +11496,7 @@ openpty();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11500: \"$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
@@ -11424,12 +11515,12 @@ else
 
   
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:11428: checking for openpty in -lutil" >&5
+echo "configure:11519: 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 11433 "configure"
+#line 11524 "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
@@ -11440,7 +11531,7 @@ int main() {
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:11444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11535: \"$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
@@ -11475,15 +11566,15 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11479: checking for $ac_hdr" >&5
+echo "configure:11570: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11482 "configure"
+#line 11573 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11578: \"$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*
@@ -11519,15 +11610,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:11523: checking for $ac_hdr" >&5
+echo "configure:11614: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11526 "configure"
+#line 11617 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11622: \"$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*
@@ -11560,10 +11651,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:11564: checking for $ac_func" >&5
+echo "configure:11655: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11567 "configure"
+#line 11658 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11586,7 +11677,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11681: \"$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
@@ -11617,15 +11708,15 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11621: checking for $ac_hdr" >&5
+echo "configure:11712: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11624 "configure"
+#line 11715 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11720: \"$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*
@@ -11662,10 +11753,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:11666: checking for $ac_func" >&5
+echo "configure:11757: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11669 "configure"
+#line 11760 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11688,7 +11779,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11783: \"$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
@@ -11721,15 +11812,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:11725: checking for $ac_hdr" >&5
+echo "configure:11816: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11728 "configure"
+#line 11819 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11824: \"$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*
@@ -11765,12 +11856,12 @@ else
 
     
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:11769: checking for kstat_open in -lkstat" >&5
+echo "configure:11860: 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 11774 "configure"
+#line 11865 "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
@@ -11781,7 +11872,7 @@ int main() {
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:11785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11876: \"$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
@@ -11816,15 +11907,15 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11820: checking for $ac_hdr" >&5
+echo "configure:11911: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11823 "configure"
+#line 11914 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11919: \"$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*
@@ -11856,12 +11947,12 @@ done
 
     
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:11860: checking for kvm_read in -lkvm" >&5
+echo "configure:11951: 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 11865 "configure"
+#line 11956 "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
@@ -11872,7 +11963,7 @@ int main() {
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:11876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11967: \"$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
@@ -11906,16 +11997,16 @@ fi
 fi
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:11910: checking whether netdb declares h_errno" >&5
+echo "configure:12001: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11912 "configure"
+#line 12003 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:11919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12010: \"$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
@@ -11935,16 +12026,16 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:11939: checking for sigsetjmp" >&5
+echo "configure:12030: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11941 "configure"
+#line 12032 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:11948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12039: \"$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
@@ -11964,11 +12055,11 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:11968: checking whether localtime caches TZ" >&5
+echo "configure:12059: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 11972 "configure"
+#line 12063 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -12003,7 +12094,7 @@ main()
   exit (0);
 }
 EOF
-if { (eval echo configure:12007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -12033,9 +12124,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:12037: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:12128: checking whether gettimeofday accepts one or two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12039 "configure"
+#line 12130 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -12056,7 +12147,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:12060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12151: \"$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
@@ -12078,19 +12169,19 @@ fi
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:12082: checking for inline" >&5
+echo "configure:12173: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 12087 "configure"
+#line 12178 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:12094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -12131,17 +12222,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:12135: checking for working alloca.h" >&5
+echo "configure:12226: checking for working alloca.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12138 "configure"
+#line 12229 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:12145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12236: \"$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
@@ -12165,10 +12256,10 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:12169: checking for alloca" >&5
+echo "configure:12260: checking for alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12172 "configure"
+#line 12263 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -12196,7 +12287,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:12200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12291: \"$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
@@ -12235,10 +12326,10 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:12239: checking whether alloca needs Cray hooks" >&5
+echo "configure:12330: checking whether alloca needs Cray hooks" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12242 "configure"
+#line 12333 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -12262,10 +12353,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:12266: checking for $ac_func" >&5
+echo "configure:12357: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12269 "configure"
+#line 12360 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12288,7 +12379,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12383: \"$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
@@ -12318,10 +12409,10 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:12322: checking stack direction for C alloca" >&5
+echo "configure:12413: checking stack direction for C alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12325 "configure"
+#line 12416 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -12340,7 +12431,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:12344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -12370,15 +12461,15 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:12374: checking for vfork.h" >&5
+echo "configure:12465: checking for vfork.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12377 "configure"
+#line 12468 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12473: \"$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*
@@ -12406,10 +12497,10 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:12410: checking for working vfork" >&5
+echo "configure:12501: checking for working vfork" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12413 "configure"
+#line 12504 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -12504,7 +12595,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:12508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -12530,10 +12621,10 @@ fi
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:12534: checking for working strcoll" >&5
+echo "configure:12625: checking for working strcoll" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12537 "configure"
+#line 12628 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -12543,7 +12634,7 @@ main ()
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:12547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -12571,10 +12662,10 @@ fi
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12575: checking for $ac_func" >&5
+echo "configure:12666: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12578 "configure"
+#line 12669 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12597,7 +12688,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12692: \"$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
@@ -12625,10 +12716,10 @@ fi
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:12629: checking whether getpgrp takes no argument" >&5
+echo "configure:12720: checking whether getpgrp takes no argument" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12632 "configure"
+#line 12723 "configure"
 #include "confdefs.h"
 
 /*
@@ -12683,7 +12774,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:12687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -12710,10 +12801,10 @@ fi
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:12714: checking for working mmap" >&5
+echo "configure:12805: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 12717 "configure"
+#line 12808 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -12746,7 +12837,7 @@ int main (int argc, char *argv[])
   return 1;
 }
 EOF
-if { (eval echo configure:12750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -12775,9 +12866,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:12779: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:12870: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 12781 "configure"
+#line 12872 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -12789,7 +12880,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:12793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -12814,15 +12905,15 @@ EOF
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:12818: checking for termios.h" >&5
+echo "configure:12909: checking for termios.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12821 "configure"
+#line 12912 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12917: \"$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*
@@ -12865,15 +12956,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:12869: checking for termio.h" >&5
+echo "configure:12960: checking for termio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12872 "configure"
+#line 12963 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12968: \"$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*
@@ -12905,10 +12996,10 @@ fi
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:12909: checking for socket" >&5
+echo "configure:13000: checking for socket" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12912 "configure"
+#line 13003 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -12931,7 +13022,7 @@ socket();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13026: \"$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
@@ -12946,15 +13037,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:12950: checking for netinet/in.h" >&5
+echo "configure:13041: checking for netinet/in.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12953 "configure"
+#line 13044 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13049: \"$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*
@@ -12971,15 +13062,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:12975: checking for arpa/inet.h" >&5
+echo "configure:13066: checking for arpa/inet.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12978 "configure"
+#line 13069 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13074: \"$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*
@@ -13004,9 +13095,9 @@ EOF
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:13008: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:13099: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 13010 "configure"
+#line 13101 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13017,7 +13108,7 @@ int main() {
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:13021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13112: \"$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
@@ -13035,9 +13126,9 @@ else
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:13039: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:13130: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 13041 "configure"
+#line 13132 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13047,7 +13138,7 @@ int main() {
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:13051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13142: \"$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
@@ -13078,10 +13169,10 @@ fi
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:13082: checking for msgget" >&5
+echo "configure:13173: checking for msgget" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13085 "configure"
+#line 13176 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -13104,7 +13195,7 @@ msgget();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13199: \"$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
@@ -13119,15 +13210,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:13123: checking for sys/ipc.h" >&5
+echo "configure:13214: checking for sys/ipc.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13126 "configure"
+#line 13217 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13222: \"$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*
@@ -13144,15 +13235,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:13148: checking for sys/msg.h" >&5
+echo "configure:13239: checking for sys/msg.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13151 "configure"
+#line 13242 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13247: \"$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*
@@ -13190,15 +13281,15 @@ fi
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:13194: checking for dirent.h" >&5
+echo "configure:13285: checking for dirent.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13197 "configure"
+#line 13288 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13293: \"$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*
@@ -13225,15 +13316,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:13229: checking for sys/dir.h" >&5
+echo "configure:13320: checking for sys/dir.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13232 "configure"
+#line 13323 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13328: \"$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*
@@ -13266,15 +13357,15 @@ fi
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:13270: checking for nlist.h" >&5
+echo "configure:13361: checking for nlist.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13273 "configure"
+#line 13364 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13369: \"$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*
@@ -13304,22 +13395,22 @@ fi
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:13308: checking "for sound support"" >&5
+echo "configure:13399: 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:13315: checking for multimedia/audio_device.h" >&5
+echo "configure:13406: checking for multimedia/audio_device.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13318 "configure"
+#line 13409 "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:13323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13414: \"$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*
@@ -13375,12 +13466,12 @@ fi
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:13379: checking for ALopenport in -laudio" >&5
+echo "configure:13470: 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 13384 "configure"
+#line 13475 "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
@@ -13391,7 +13482,7 @@ int main() {
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:13395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13486: \"$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
@@ -13422,12 +13513,12 @@ fi
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:13426: checking for AOpenAudio in -lAlib" >&5
+echo "configure:13517: 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 13431 "configure"
+#line 13522 "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
@@ -13438,7 +13529,7 @@ int main() {
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:13442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13533: \"$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
@@ -13483,15 +13574,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:13487: checking for ${dir}/soundcard.h" >&5
+echo "configure:13578: checking for ${dir}/soundcard.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13490 "configure"
+#line 13581 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13586: \"$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*
@@ -13545,15 +13636,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:13549: checking for audio/audiolib.h" >&5
+echo "configure:13640: checking for audio/audiolib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13552 "configure"
+#line 13643 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13648: \"$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*
@@ -13571,12 +13662,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:13575: checking for AuOpenServer in -laudio" >&5
+echo "configure:13666: 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 13580 "configure"
+#line 13671 "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
@@ -13587,7 +13678,7 @@ int main() {
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:13591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13682: \"$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
@@ -13626,7 +13717,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 13630 "configure"
+#line 13721 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -13657,7 +13748,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:13661: checking for $ac_word" >&5
+echo "configure:13752: 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.
@@ -13686,10 +13777,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:13690: checking for esd_play_stream" >&5
+echo "configure:13781: checking for esd_play_stream" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13693 "configure"
+#line 13784 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -13712,7 +13803,7 @@ esd_play_stream();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13807: \"$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
@@ -13763,7 +13854,7 @@ test -z "$with_tty" && with_tty=yes
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:13767: checking for TTY-related features" >&5
+echo "configure:13858: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -13779,12 +13870,12 @@ EOF
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:13783: checking for tgetent in -lncurses" >&5
+echo "configure:13874: 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 13788 "configure"
+#line 13879 "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
@@ -13795,7 +13886,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13890: \"$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
@@ -13828,15 +13919,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:13832: checking for ncurses/curses.h" >&5
+echo "configure:13923: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13835 "configure"
+#line 13926 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13931: \"$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*
@@ -13858,15 +13949,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:13862: checking for ncurses/term.h" >&5
+echo "configure:13953: checking for ncurses/term.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13865 "configure"
+#line 13956 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13961: \"$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*
@@ -13896,15 +13987,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:13900: checking for ncurses/curses.h" >&5
+echo "configure:13991: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13903 "configure"
+#line 13994 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13999: \"$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*
@@ -13939,12 +14030,12 @@ fi
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:13943: checking for tgetent in -l$lib" >&5
+echo "configure:14034: 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 13948 "configure"
+#line 14039 "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
@@ -13955,7 +14046,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14050: \"$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
@@ -13980,12 +14071,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:13984: checking for tgoto in -ltermcap" >&5
+echo "configure:14075: 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 13989 "configure"
+#line 14080 "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
@@ -13996,7 +14087,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:14000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14091: \"$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
@@ -14041,12 +14132,12 @@ fi
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:14045: checking for tgetent in -lcurses" >&5
+echo "configure:14136: 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 14050 "configure"
+#line 14141 "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
@@ -14057,7 +14148,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14152: \"$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
@@ -14075,12 +14166,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:14079: checking for tgetent in -ltermcap" >&5
+echo "configure:14170: 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 14084 "configure"
+#line 14175 "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
@@ -14091,7 +14182,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14186: \"$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
@@ -14140,15 +14231,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:14144: checking for gpm.h" >&5
+echo "configure:14235: checking for gpm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14147 "configure"
+#line 14238 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14243: \"$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*
@@ -14166,12 +14257,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:14170: checking for Gpm_Open in -lgpm" >&5
+echo "configure:14261: 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 14175 "configure"
+#line 14266 "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
@@ -14182,7 +14273,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:14186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14277: \"$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
@@ -14241,20 +14332,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:14245: checking for database support" >&5
+echo "configure:14336: 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:14250: checking for ndbm.h" >&5
+echo "configure:14341: checking for ndbm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14253 "configure"
+#line 14344 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14349: \"$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*
@@ -14284,12 +14375,12 @@ fi
 if test "$with_database_gdbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:14288: checking for dbm_open in -lgdbm" >&5
+echo "configure:14379: 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 14293 "configure"
+#line 14384 "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
@@ -14300,7 +14391,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:14304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14395: \"$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
@@ -14328,10 +14419,10 @@ fi
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:14332: checking for dbm_open" >&5
+echo "configure:14423: checking for dbm_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14335 "configure"
+#line 14426 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -14354,7 +14445,7 @@ dbm_open();
 
 ; 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:14449: \"$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
@@ -14373,12 +14464,12 @@ else
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:14377: checking for dbm_open in -ldbm" >&5
+echo "configure:14468: 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 14382 "configure"
+#line 14473 "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
@@ -14389,7 +14480,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:14393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14484: \"$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
@@ -14430,12 +14521,12 @@ EOF
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:14434: checking for Berkeley db.h" >&5
+echo "configure:14525: 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 14439 "configure"
+#line 14530 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14451,7 +14542,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:14455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -14462,7 +14553,7 @@ rm -f conftest*
         ;;
         *)
     cat > conftest.$ac_ext <<EOF
-#line 14466 "configure"
+#line 14557 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14484,7 +14575,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:14488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -14502,9 +14593,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:14506: checking for Berkeley DB version" >&5
+echo "configure:14597: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 14508 "configure"
+#line 14599 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -14516,7 +14607,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 14520 "configure"
+#line 14611 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -14543,10 +14634,10 @@ fi
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:14547: checking for $dbfunc" >&5
+echo "configure:14638: checking for $dbfunc" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14550 "configure"
+#line 14641 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -14569,7 +14660,7 @@ $dbfunc();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14664: \"$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
@@ -14588,12 +14679,12 @@ else
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:14592: checking for $dbfunc in -ldb" >&5
+echo "configure:14683: 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 14597 "configure"
+#line 14688 "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
@@ -14604,7 +14695,7 @@ int main() {
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:14608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14699: \"$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
@@ -14678,12 +14769,12 @@ fi
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:14682: checking for SOCKSinit in -lsocks" >&5
+echo "configure:14773: 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 14687 "configure"
+#line 14778 "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
@@ -14694,7 +14785,7 @@ int main() {
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:14698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14789: \"$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
@@ -14749,7 +14840,7 @@ fi
 
 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:14753: checking for module support" >&5
+echo "configure:14844: checking for module support" >&5
 
     if test "$with_msw" = "yes"; then
     have_dl=yes;
@@ -14765,15 +14856,15 @@ EOF
  ;;
       *)          ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:14769: checking for dlfcn.h" >&5
+echo "configure:14860: checking for dlfcn.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14772 "configure"
+#line 14863 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14868: \"$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*
@@ -14790,16 +14881,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:14794: checking for dlopen in -lc" >&5
+echo "configure:14885: checking for dlopen in -lc" >&5
            cat > conftest.$ac_ext <<EOF
-#line 14796 "configure"
+#line 14887 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	      dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14808,18 +14899,18 @@ else
   rm -rf conftest*
   
                echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:14812: checking for dlopen in -ldl" >&5
+echo "configure:14903: checking for dlopen in -ldl" >&5
                ac_save_LIBS="$LIBS"
                LIBS="-ldl $LIBS"
                cat > conftest.$ac_ext <<EOF
-#line 14816 "configure"
+#line 14907 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	         dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14848,12 +14939,12 @@ EOF
         else
            
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:14852: checking for shl_load in -ldld" >&5
+echo "configure:14943: 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 14857 "configure"
+#line 14948 "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
@@ -14864,7 +14955,7 @@ int main() {
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:14868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14959: \"$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
@@ -14891,12 +14982,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:14895: checking for dld_init in -ldld" >&5
+echo "configure:14986: 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 14900 "configure"
+#line 14991 "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
@@ -14907,7 +14998,7 @@ int main() {
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:14911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15002: \"$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
@@ -14954,7 +15045,7 @@ xehost=$canonical
 xealias=$internal_configuration
 
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:14958: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:15049: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -14982,9 +15073,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:14986: checking checking whether we are using GNU C" >&5
+echo "configure:15077: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 14988 "configure"
+#line 15079 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -15006,7 +15097,7 @@ rm -f conftest*
 fi
 
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:15010: checking how to produce PIC code" >&5
+echo "configure:15101: checking how to produce PIC code" >&5
 wl=
 
 can_build_shared=yes
@@ -15107,18 +15198,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:15111: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:15202: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 15115 "configure"
+#line 15206 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:15122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15213: \"$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
@@ -15149,7 +15240,7 @@ cc_produces_so=no
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:15153: checking if C compiler can produce shared libraries" >&5
+echo "configure:15244: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes -o "$__ICC" = yes; then
   xcldf="-shared"
   xldf="-shared"
@@ -15200,14 +15291,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 15204 "configure"
+#line 15295 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:15211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -15232,7 +15323,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:15236: checking for ld used by GCC" >&5
+echo "configure:15327: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
@@ -15258,7 +15349,7 @@ echo "configure:15236: checking for ld used by GCC" >&5
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:15262: checking for GNU ld" >&5
+echo "configure:15353: checking for GNU ld" >&5
   fi
 
   if test -z "$LTLD"; then
@@ -15296,7 +15387,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:15300: checking if the linker is GNU ld" >&5
+echo "configure:15391: 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
@@ -15324,7 +15415,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:15328: checking whether the linker supports shared libraries" >&5
+echo "configure:15419: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -15535,10 +15626,10 @@ EOF
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15539: checking for $ac_func" >&5
+echo "configure:15630: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 15542 "configure"
+#line 15633 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -15561,7 +15652,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15656: \"$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
@@ -15600,11 +15691,11 @@ done
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 15604 "configure"
+#line 15695 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:15608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:15699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -16476,6 +16567,9 @@ if test "$with_postgresql" = yes; then
   echo "    - Using PostgreSQL header file:  $libpq_fe_h_file"
   test "$with_postgresqlv7" = yes && echo "    - Using PostgreSQL V7 bindings."
 fi
+if test "$with_concord" = yes; then
+  echo "  Compiling in support for CONCORD."
+fi
 
 echo "
 Multiscriptization / Multilingualization / Internationalization:"
diff --git a/configure.in b/configure.in
index 04d718c..32fc373 100644
--- a/configure.in
+++ b/configure.in
@@ -504,6 +504,7 @@ while test $# != 0; do
 	with_workshop	| \
 	with_sparcworks | \
 	with_tooltalk	| \
+	with_concord	| \
 	with_ldap	| \
 	with_postgresql	| \
 	with_pop	| \
@@ -3764,6 +3765,29 @@ if test "$with_file_coding" = "yes" && test "$with_mule" = "no"; then
   XE_ADD_OBJS(file-coding.o)
 fi
 
+dnl Autodetect concord
+concord_includes_found=no
+if test "$with_concord" != "no"; then
+   AC_CHECK_HEADER(concord.h, ,with_concord=no)
+fi
+if test "$concord_includes_found" = "no" -a "$with_concord" != "no" -a \
+   -d "/usr/local/concord/include"; then
+  save_c_switch_site="$c_switch_site"
+  c_switch_site="$c_switch_site -I/usr/local/concord/include"
+  AC_CHECK_HEADER(concord.h,concord_includes_found=yes)
+  if test "$concord_includes_found" != "yes"; then
+    c_switch_site="$save_c_switch_site"
+    with_concord="no"
+  fi
+fi
+
+test -z "$with_concord" && with_concord=yes
+if test "$with_concord" = "yes"; then
+  AC_DEFINE(HAVE_CONCORD)
+  XE_PREPEND(-lconcord, libs_x)
+  XE_ADD_OBJS(concord.o)
+fi
+
 test -z "$with_chise" && with_chise=yes
 if test "$with_chise" = "yes"; then
     with_mule=yes
@@ -5319,6 +5343,9 @@ if test "$with_postgresql" = yes; then
   echo "    - Using PostgreSQL header file:  $libpq_fe_h_file"
   test "$with_postgresqlv7" = yes && echo "    - Using PostgreSQL V7 bindings."
 fi
+if test "$with_concord" = yes; then
+  echo "  Compiling in support for CONCORD."
+fi
 
 echo "
 Multiscriptization / Multilingualization / Internationalization:"
diff --git a/etc/char-data/ChangeLog b/etc/char-data/ChangeLog
index 183013c..755d312 100644
--- a/etc/char-data/ChangeLog
+++ b/etc/char-data/ChangeLog
@@ -1,3 +1,50 @@
+2006-01-21  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* JC3-to-UCS.txt (JC3-49B5): Map to U+59F8 instead of U+598D.
+
+2006-01-17  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* JC3-to-UCS.txt (JC3-6BFD): Map to U+FA68 instead of U+96E3.
+
+2006-01-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* JX1-to-UCS.txt (JX1-7D5D): Delete mapping for U+9686.
+
+2005-12-30  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+	* JC3-to-UCS.txt (JC3-63AB): Map to U+F936 instead of U+865C.
+	(JC3-63EE): Map to U+FA60 instead of U+8910.
+
+	* JX1-to-UCS.txt (JX1-7B4F): Don't map to U+865C.
+
+2005-12-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* JC3-to-UCS.txt (JC3-66AF): Map to U+FA65 instead of U+8D08.
+
+2005-11-18  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* JC3-to-UCS.txt (JC3-70D8): Map to U-0002F914 instead of U+701E.
+
+2005-11-13  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* JC3-to-UCS.txt (JC3-52AD): Revert to map to U-0002F8D8.
+
+2005-11-09  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* JX1-to-UCS.txt (JX1-754E): Delete mapping for U-0002F8D8.
+
+2005-11-08  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* JC3-to-UCS.txt (JC3-52AD): Map to U+F929 instead of U-0002F8D8.
+
+2005-11-07  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* JC3-to-UCS.txt (JC3-8DF4): Map to U+65F4 instead of U+65F0.
+
+2005-10-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* JC3-to-UCS.txt (JC3-44D4): Map to U+FA76 instead of U+52C7.
+
 2005-09-03  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* JC3-to-UCS.txt (JC3-67A3): Map to U+FA66 instead of U+2ECC.
diff --git a/etc/char-data/JC3-to-UCS.txt b/etc/char-data/JC3-to-UCS.txt
index 4f75a64..4a0443d 100644
--- a/etc/char-data/JC3-to-UCS.txt
+++ b/etc/char-data/JC3-to-UCS.txt
@@ -280,7 +280,7 @@ JC3-44CF	U+5271
 JC3-44D0	U+5265
 JC3-44D2	U+52A6
 JC3-44D3	U+52BD
-JC3-44D4	U+52C7
+JC3-44D4	U+FA76
 JC3-44D5	U+52E5
 JC3-44D6	U+52F6
 JC3-44D7	U+3513
@@ -679,7 +679,7 @@ JC3-49B1	U+59E4
 JC3-49B2	U+59EC
 JC3-49B3	U+59EF
 JC3-49B4	U+59F2
-JC3-49B5	U+598D
+JC3-49B5	U+59F8
 JC3-49B6	U+5A0C
 JC3-49B7	U+5A0D
 JC3-49B8	U+5A12
@@ -2772,7 +2772,7 @@ JC3-63A7	U+8656
 JC3-63A8	U+8657
 JC3-63A9	U+8658
 JC3-63AA	U+865B
-JC3-63AB	U+865C
+JC3-63AB	U+F936
 JC3-63AC	U+865E
 JC3-63AD	U+8653
 JC3-63AE	U+458E
@@ -2832,7 +2832,7 @@ JC3-63EA	U+885C
 JC3-63EB	U+885F
 JC3-63EC	U-0002F9C3
 JC3-63ED	U+4618
-JC3-63EE	U+8910
+JC3-63EE	U+FA60
 JC3-63EF	U+8956
 JC3-63F0	U+8864
 JC3-63F1	U+88CA
@@ -3025,7 +3025,7 @@ JC3-66AB	U+8CF0
 JC3-66AC	U+8CFC
 JC3-66AD	U+8CFF
 JC3-66AE	U+8D03
-JC3-66AF	U+8D08
+JC3-66AF	U+FA65
 JC3-66B0	U+8D0E
 JC3-66B1	U+8D1C
 JC3-66B2	U+8CED
@@ -3517,7 +3517,7 @@ JC3-6BF9	U+49F6
 JC3-6BFA	U+96BA
 JC3-6BFB	U+96C7
 JC3-6BFC	U+96DE
-JC3-6BFD	U+96E3
+JC3-6BFD	U+FA68
 JC3-6BFE	U+8000
 JC3-6CA3	U+96EA
 JC3-6CA4	U+96EF
@@ -3833,7 +3833,7 @@ JC3-70D4	U+6C72
 JC3-70D5	U+7026
 JC3-70D6	U+6EBA
 JC3-70D7	U+6D9C
-JC3-70D8	U+701E
+JC3-70D8	U-0002F914
 JC3-70D9	U+7058
 JC3-70DA	U+6E8C
 JC3-70DB	U+7015
@@ -4582,7 +4582,7 @@ JC3-8DD2	U+7F6D
 JC3-8DD3	U+6F4F
 JC3-8DD5	U+625C
 JC3-8DEC	U+4F22
-JC3-8DF4	U+65F0
+JC3-8DF4	U+65F4
 JC3-8DFA	U+6AEB
 JC3-8DFB	U+921A
 JC3-8DFC	U+76EC
diff --git a/etc/char-data/JX1-to-UCS.txt b/etc/char-data/JX1-to-UCS.txt
index cc6693e..0ce55e0 100644
--- a/etc/char-data/JX1-to-UCS.txt
+++ b/etc/char-data/JX1-to-UCS.txt
@@ -990,7 +990,7 @@ JX1-754A	 U+66DB
 JX1-754B	 U+66E8
 JX1-754C	 U+66FA
 JX1-754D	 U+6713
-JX1-754E	JU+F929	U-0002F8D8
+JX1-754E	 U+F929
 JX1-754F	 U+6733
 JX1-7550	 U+6766
 JX1-7551	 U+6747
@@ -1555,7 +1555,7 @@ JX1-7B4B	 U+8629
 JX1-7B4C	 U+8638
 JX1-7B4D	 U+8657
 JX1-7B4E	 U+865B
-JX1-7B4F	JU+F936	U+865C
+JX1-7B4F	 U+F936
 JX1-7B50	 U+8662
 JX1-7B51	 U+459D
 JX1-7B52	 U+866C
@@ -1757,7 +1757,7 @@ JX1-7D59	 U+95DA
 JX1-7D5A	 U+95DE
 JX1-7D5B	 U+9658
 JX1-7D5C	 U+9684
-JX1-7D5D	JU+F9DC	U+9686
+JX1-7D5D	 U+F9DC
 JX1-7D5E	 U+969D
 JX1-7D5F	 U+96A4
 JX1-7D60	 U+96A5
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a9df40d..6c0efb8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2006-01-17  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-coding.el (coded-charset-entity-reference-alist): Add
+	settings for `=jis-x0208@1978/i1'.
+
+2005-11-24  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-conf.el (=jis-x0208@1978/i-4): New coded-charset for
+	XEmacs CHISE.
+
+2005-10-24  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-conf.el (=adobe-japan1-[0..6]): New coded-charset for
+	XEmacs CHISE.
+
 2005-07-14  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* mule/mule-conf.el (=jis-x0208@1978/i1): New coded-charset for
diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el
index 509cd7d..118f675 100644
--- a/lisp/mule/mule-coding.el
+++ b/lisp/mule/mule-coding.el
@@ -4,7 +4,7 @@
 ;; Licensed to the Free Software Foundation.
 ;; Copyright (C) 1995 Amdahl Corporation.
 ;; Copyright (C) 1995 Sun Microsystems.
-;; Copyright (C) 1997,1999,2002,2003,2004,2005 MORIOKA Tomohiko
+;; Copyright (C) 1997,1999,2002,2003,2004,2005,2006 MORIOKA Tomohiko
 
 ;; This file is part of XEmacs.
 
@@ -313,6 +313,7 @@
 	  ( =ucs@ks	                    	  "KU+" 4 X)
 	  ( =ucs@ks	                    	  "KU-" 8 X)
 	  ( =jis-x0208@1997                      "J97-" 4 X)
+	  ( =jis-x0208@1978/i1                 "J78i1-" 4 X)
 	  ))
 
   (make-coding-system
diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 0a3073b..c06421b 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -192,6 +192,15 @@
 	      mother =jis-x0208@1978
 	      ;; final ?@
 	      graphic 0))
+  (make-charset
+   '=jis-x0208@1978/i-4
+   "The second and third impressions of JIS X 0208:1978."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978
+	      ;; final ?@
+	      graphic 0))
 
   (make-charset '=big5-cdp
 		"Big5 with CDP extension"
@@ -724,6 +733,83 @@
 	       mother =ucs@iso
 	       min-code #x20000 max-code #x2A6D6
 	       code-offset #x20000))
+
+  (make-charset
+   '=adobe-japan1-0
+   "Adobe-Japan1-0 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-0"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "AdobeJapan1-0$"))
+  (make-charset
+   '=adobe-japan1-1
+   "Adobe-Japan1-1 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-1"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =adobe-japan1-0
+	       registry "AdobeJapan1-1$"))
+  (make-charset
+   '=adobe-japan1-2
+   "Adobe-Japan1-2 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-2"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =adobe-japan1-1
+	       registry "AdobeJapan1-2$"))
+  (make-charset
+   '=adobe-japan1-3
+   "Adobe-Japan1-3 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-3"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =adobe-japan1-2
+	       registry "AdobeJapan1-3$"))
+  (make-charset
+   '=adobe-japan1-4
+   "Adobe-Japan1-4 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-4"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =adobe-japan1-3
+	       registry "AdobeJapan1-4$"))
+  (make-charset
+   '=adobe-japan1-5
+   "Adobe-Japan1-5 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-5"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =adobe-japan1-4
+	       registry "AdobeJapan1-5$"))
+  (make-charset
+   '=adobe-japan1-6
+   "Adobe-Japan1-6 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-6"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =adobe-japan1-5
+	       registry "AdobeJapan1-6$"))
   )
 
 ;;; mule-conf.el ends here
diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index be46353..4398c73 100644
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,2451 @@
+2006-02-01  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R057-Bow.el (M-09742): Unify U-000223C3 and H3-CABA.
+	(M-09743): Unify U-000223C4 and H3-CABE.  (M-09744): Unify
+	U-000223C2 and H3-CAB8.  (BC-8B7D): New character.  (U+5F21): Use
+	`->subsumptive'.  (U+38AE): Use `->subsumptive'.  (U+5F22): Use
+	`->subsumptive'.
+
+	* Ideograph-R066-Rap.el (U-00025626): Delete `=>daikanwa'.
+	(U-00022F20): Use `->subsumptive'; integrate M-13181; use
+	`{ideographic|total}-strokes@{ucs|cns}' instead of
+	`{ideographic|total}-strokes'; add
+	`ideographic-strokes@ucs*sources'.
+
+	* Ideograph-R149-Speech.el (U+8B50): Use `->denotational' and
+	`->subsumptive'.
+	(U-00027B0B): Use `->subsumptive'; integrate M-35960.
+	(U+8B51): Use `->subsumptive'.
+	(U+8B52): Use `->subsumptive'.
+	(U-00027B0C): Use `->denotational' and `->subsumptive'.
+	(U+8B53): Use `->subsumptive'.
+	(RUI6-E01F): New character.
+	(U+8B4D): Use `->subsumptive'.
+	(C7-5033): Use `->denotational' and `->subsumptive'; map to
+	U-00027B12; integrate GT-48359 and H10-EE7E.
+	(U+8B5D): Use `->subsumptive'.
+	(U+4712): Use `->denotational' and `->subsumptive'.
+	(U+8B5E): Use `->subsumptive'.
+	(U+4713): Use `->denotational' and `->subsumptive'.
+	(U+4714): Use `->denotational'.
+	(U-00027B12): Use `->subsumptive'; integrate C7-5033 and GT-48359.
+
+2006-01-31  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R130-Meat.el (U+8163): Use `->subsumptive'.
+	(U+440F): Likewise.
+	(U-00026760): Use `->subsumptive'; integrate BC-8ADA.
+	(U-00023386): Copied from Ideograph-R074-Moon.el.
+	(CB12237): New character; add `<-denotational' for U-00026760.
+	(U+4410): Use `->subsumptive'.
+
+	* Ideograph-R120-Silk.el (U+7E6D): Use `->denotational' instead of
+	`->subsumptive'.
+
+	* Ideograph-R085-Water.el (U-00023D15): Use `->subsumptive';
+	integrate M-17420.
+	(U-00023D0E): New character.
+
+	* Ideograph-R029-Again.el (BC-8BA1): New character; add
+	`<-denotational' for U-00020B1B.
+
+	* Ideograph-R113-Spirit.el (CB-11755): New character.
+	(BC-8C6A): Likewise.
+
+	* Ideograph-R168-Long.el (U+9578): Unify BC-8D72.
+
+	* Ideograph-R164-Wine.el (G0-4775): Unify JC3-43E9.
+
+	* Ideograph-R138-Stopping.el (BC-8B7C): New character.
+
+	* Ideograph-R123-Sheep.el (U-00023D0E): New character.
+
+	* Ideograph-R104-Sickness.el (RUI6-24F08): New character.
+	(U+766C): Use `->subsumptive'.
+
+	* Ideograph-R101-Use.el (C6-395D): Unify BC-8C73.
+
+	* Ideograph-R079-Weapon.el (RUI6-E01E): New character.
+	(U+6BBE): Use `->denotational' and `->subsumptive'.
+
+	* Ideograph-R069-Axe.el (M-13549): Unify U+3ABD and H5-F6BC.
+	(RUI6-E00B): Copied from ruimoku6.el.
+	(M-13551): Unify U-0002309D and H5-F6C3.
+	(M-13552): Unify U-0002309C and H5-F6C2.
+	(JC3-8FCF): Map to U-0002309C and M-13552.
+	(U-000230A0): Unify M-13553; use
+	`{ideographic|total}-strokes@{daikanwa|cns}'.
+	(U+3ABF): Add `morohashi-daikanwa' for M-13553'.
+
+	* Ideograph-R044-Corpse.el (U-00021C52): Unify BC-8DBE.
+
+2006-01-30  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R037-Big.el (U+3694): Unify RUI6-E01C.
+
+	* Ideograph-R030-Mouth.el (U-00020E04): Use `->denotational' and
+	`->subsumptive'; integrate RUI6-E01A.
+
+	* Ideograph-R027-Cliff.el (RUI-E022): New character.
+
+	* ruimoku6.el (RUI6-E00B): Add `ideographic-{radical|strokes}',
+	`total-strokes' and `ideographic-structure'.
+	(RUI6-{E010|...|E024}): New characters.
+
+2006-01-30  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R169-Gate.el (RUI6-E01D): New character.
+
+	* Ideograph-R074-Moon.el (U-00023386): New character.
+
+2006-01-29  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R185-Head.el (C6-3C79): Unify U-00029810.
+	(<CJK RADICAL HEAD>): Copied from
+	u02E00-CJK-Radical-Supplement.el.
+
+	* Ideograph-R170-Mound.el (C6-2E45): Unify U-00028E0F.
+	(<CJK RADICAL MOUND ONE>): Copied from
+	u02E00-CJK-Radical-Supplement.el.
+
+2006-01-27  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R210-Even.el (U-0002A5C5): Use `->subsumptive'.
+	(U-0002A5C6): Use `->subsumptive'.
+	(U+4D93): Use `->subsumptive'.
+	(U+9F4B): Use `->subsumptive'.
+	(U+4D92): Use `->subsumptive'.
+	(U+9F4C): Use `->subsumptive'.
+
+2006-01-27  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R038-Woman.el: Use `->subsumptive' for some character
+	definitions.
+	(U+5986): Use `->subsumptive'; delete `morohashi-daikanwa'.
+	(G0-5731): Use `<-subsumptive' for U+5986; add `<-simplified@CN'
+	for G1-5731.
+	(U-000216B4): New character.
+	(U+598D): Use `->subsumptive'; add `<-denotational' for J97-552B.
+	(J97-552B): New abstract character.
+	(U+5992): Use `->denotational' and `->subsumptive'.
+	(U+36AB): Use `->denotational' and `->subsumptive'.
+	(U+599B): Use `->denotational' and `->subsumptive'.
+	(J0-562C): Add `<-denotational' for U+599B; add
+	`<-error@jis-x0208' for JX1-4F63; add `<-unknown' for JSP-397B.
+	(U+59AA): Delete `morohashi-daikanwa'; add `<-simplified@CN' for
+	G1-657D.
+	(U+59AD): Use `->denotational' and `->subsumptive'.
+	(U+59F8): Add `<-denotational' for J97-552B.
+	(K0-6641): Unify JC3-49B5.
+	(U-00021769): Use `->denotational' and `->subsumptive'.
+	(U+5ADA): Use `->denotational' instead of `->subsumptive'.
+
+2006-01-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R203-Black.el (U+9ED1): Unify JC3-6FD6.
+	(U+4D61): Use `->subsumptive'.
+	(U+9ED7): Use `->subsumptive'.
+	(U+9ED8): Use `->subsumptive'.
+	(U+9ED9): Use `->denotational'.
+	(J90-4263): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-4263.
+	(U+9EDC): Use `->subsumptive'.
+
+2006-01-25  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R211-Tooth.el (U+9F60): Use `->denotational' and
+	`->subsumptive'.
+	(GT-66395): Use `<-denotational' for U+9F60; fix `total-strokes';
+	add `<-simplified@JP/misc' for GT-66454.
+	(U+9F61): Use `->subsumptive'.
+	(U+9F62): Use `->subsumptive'.
+	(U-0002A5F2): Use `->subsumptive'.
+
+	* Ideograph-R061-Heart.el (U+61B2): Use `->denotational' and
+	`->subsumptive'.
+
+2006-01-24  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R191-Fight.el (U+4C17): Use `->denotational' and
+	`->subsumptive'.
+	(U+9B2A): Use `->subsumptive'.
+	(U+4C18): Use `->denotational' and `->subsumptive'.
+	(U+9B2B): Use `->denotational' and `->subsumptive'.
+	(U+9B2D): Use `->subsumptive'.
+	(U+9B2C): Use `->subsumptive'.
+
+	* u00180-Latin-Extended-B.el (JX1-2B45): Add `=decomposition'.
+
+2006-01-24  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R046-Mountain.el (U-000216B4): Copied from
+	Ideograph-R038-Woman.el.
+
+	* Ideograph-R040-Roof.el (RUI6-E009): Add `ideographic-structure'.
+	(H12-ECD1): Likewise.
+
+2006-01-23  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* ruimoku6.el (RUI6-E009): Add `ideographic-structure'.
+
+2006-01-23  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R213-Turtle.el (C7-2C3A): Use `zhengzitong' instead of
+	`zhengzi-tong' in `<-original*sources'.
+	(U-0002A6BC): Copied from Ideograph-R115-Grain.el.
+
+	* Ideograph-R205-Frog.el (U-0002FA18): Use `zhengzitong' instead
+	of `zhengzi-tong' in `<-vulgar*sources'.
+
+	* Ideograph-R212-Dragon.el (U+9F97): Add
+	`sound@ja/{kun|on|on/name}'.
+
+	* Ideograph-R196-Bird.el (U+9D2C): Use `<-simplified@JP/jis'
+	instead of `<-simplified@JP' for J78-3229.
+	(U+9D8E): Use `->subsumptive'.
+	(J90-7337): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J0-7336.
+	(U+9DD7): Use `->denotational' instead of `->subsumptive'.
+	(U+4CFC): Likewise.
+
+	* Ideograph-R195-Fish.el (U+9BF5): Use `<-simplified@JP/jis'
+	instead of `<-simplified@JP' for J78-3033.
+	(U+9C3B): Use `->denotational'.
+	(U+9C3C): Use `->denotational' and `->subsumptive'.
+
+	* Ideograph-R197-Salt.el (U+9E78): Use `<-simplified@JP/jis'
+	instead of `<-simplified@JP' for U+9E7C.
+
+2006-01-21  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R187-Horse.el (J90-424D): Use `<-simplified@JP/jis'
+	instead of `<-simplified@JP'.
+	(U+9A53): Use `->denotational' instead of `->subsumptive'.
+	(U+9A54): Likewise.
+
+2006-01-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R188-Bone.el (U+9AC4): Use `->denotational'.
+
+	* Ideograph-R186-Fragrant.el (U+999A): Use `->subsumptive'.
+	(M-44522): Unify U-0002983D.
+	(M-44523): Map to U-0002983E.
+	(U+999B): Use `->denotational'.
+	(U+999C): Use `->subsumptive'.
+
+2006-01-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R184-Eat.el (U+98E7): Use `->subsumptive'.
+	(J90-303B): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-303B.
+	(U+4B2E): Use `->denotational' instead of `->subsumptive'.
+	(J90-4C5F): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-4C5F.
+	(J90-3142): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP' for M-44146; add `<-simplified@JP/jis' for
+	J78-3142.
+	(U-000296CF): Use `->denotational' and `->subsumptive'.
+
+	* Ideograph-R169-Gate.el: Use `->subsumptive' for some character
+	definitions.
+	(U-00028CDB): Use `->denotational' instead of `->subsumptive'.
+	(U-00028CDD): Use `->subsumptive'.
+	(U+95BB): Use `->subsumptive'; add `<-denotational' for J97-6F65.
+	(J97-6F65): New abstract character.
+	(J78i1-6F65): New character.
+	(U+95CD): Use `->denotational' and `->subsumptive'.
+
+	* Ideograph-R167-Gold.el (U+91D2): Use
+	`<-same@component/connect-right' instead of `<-formed@component'
+	for U+91D1.
+	(U+91EE): Use `->subsumptive'.
+	(U+91EF): Use `->subsumptive'.
+	(U+91F0): Use `->denotational'; add `<-denotational' for J97-6E5F.
+	(J97-6E5F): New abstract character.
+	(U+91FC): Use `->subsumptive'; add `<-denotational' for J97-6E5F.
+	(U+922C): Use `<-simplified@JP/jis' for J0-4278 instead of
+	`<-simplified' for U+9438.
+	(U+9242): Use `->subsumptive'.
+	(U+9243): Use `->subsumptive'.
+	(U+9245): Use `->subsumptive'.
+	(U+9247): Likewise.
+	(U+92AD): Use `->subsumptive'.
+	(U+92F3): Use `->subsumptive'.
+	(U+9303): Use `->subsumptive'.
+	(U+9304): Use `->subsumptive'; add `<-denotational' for J97-4F3F.
+	(J97-4F3F): New abstract character.
+	(U+9332): Use `->subsumptive'; add `<-denotational' for J97-4F3F.
+	(U-000289E7): Use `->subsumptive'.
+	(U-000289E8): Use `->subsumptive'.
+	(J90-3B2C): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-3B2C.
+	(U+932D): Use `->denotational'.
+	(U-00028A89): Use `->subsumptive'.
+	(U+4940): Use `->denotational'.
+	(U+9399): Use `->subsumptive'.
+	(U-00028A8A): Use `->subsumptive'.
+	(J90-444A): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-444A.
+	(U-00028A8B): Use `->denotational'.
+	(U-00028A8C): Use `->subsumptive'.
+	(U+939B): Use `->subsumptive'.
+	(U+4941): Likewise.
+	(U+939C): Likewise.
+	(U+939D): Use `->denotational'.
+	(U+939E): Use `->subsumptive'.
+	(U+4942): Likewise.
+	(U+939F): Use `->subsumptive'.
+	(U+93AD): Use `->denotational'.
+	(U+93AE): Use `->denotational' and `->subsumptive'.
+	(J90-4C7A): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-4C7A.
+
+2006-01-19  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R182-Wind.el (U+4AF8): Use `->subsumptive'.
+
+	* Ideograph-R181-Leaf.el (M-24824): Use `zhengzitong' instead of
+	`zhengzi-tong' in `<-vulgar*sources'.
+	(J0-3150): Add S1-5660; add `<-vulgar' for J0-314F.
+	(U+4AC3): Use `->subsumptive'.
+	(U-000294AE): Likewise.
+	(U+4AC4): Use `->denotational'.
+	(U+982C): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for U+9830.
+	(U+9831): Use `->denotational' instead of `->subsumptive'.
+	(U+985B): Use `->denotational' instead of `->subsumptive'.
+	(U-00029520): Use `->subsumptive'.
+
+2006-01-18  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R172-Short-Tailed-Bird.el (U+96BA): Use
+	`->subsumptive'.
+	(U+96BB): Use `->subsumptive'.
+	(M-41956): Map to U-00028F8C.
+	(GT-56364): Delete `=>daikanwa' for M-42120.
+	(U-00028F92): Use `->subsumptive'.
+	(U+96D1): Use `->denotational' and `->subsumptive'.
+	(U-00028FBB): Use `->subsumptive'.
+	(U+96DA): Use `->denotational' instead of `->subsumptive'.
+	(JX1-7D63): Move U+FA68 to parent.
+
+	* Ideograph-R113-Spirit.el (J0-3150): Add S1-5660; add `<-vulgar'
+	for J0-314F.
+
+2006-01-17  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R115-Grain.el (J0-314F): Add S1-5659.
+
+	* Ideograph-R180-Sound.el (U+97FF): Add J97-3641.
+	(U+9800): Use `->denotational' instead of `->subsumptive'.
+
+2006-01-17  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R177-Leather.el (J90-3F59): Use `<-simplified@JP/misc'
+	instead of `<-simplified@JP' for J78-7057.
+	(U+4A52): Unify M-42721.
+	(U+9772): Use `->subsumptive'.
+
+	* Ideograph-R170-Mound.el (U+9686): Use `->denotational'.
+	(U+F9DC): Use `->subsumptive'; add `<-denotational' for U+9686.
+	(U+9687): Use `->subsumptive'.
+	(U-00028EF5): Use `->subsumptive'.
+	(J78-3764): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'.
+	(U+96A0): Use `->denotational'.
+	(U+96B1): Use `->denotational'.
+
+2006-01-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R164-Wine.el (U+9159): Use `->subsumptive'.
+	(U-00028807): Likewise.
+	(U+9154): Likewise.
+	(U+915A): Use `->subsumptive'.
+	(U+915B): Use `->subsumptive'.
+	(U+48ED): Likewise.
+	(U+48FE): Use `->subsumptive'.
+	(U+9189): Likewise.
+	(U+918A): Use `->subsumptive'.
+	(U+91B8): Use `->subsumptive'.
+	(U-000288E6): Use `->subsumptive'.
+	(U+4913): Use `->denotational' and `->subsumptive'.
+	(U-000288E7): Use `->subsumptive'.
+	(U+4914): Use `->subsumptive'.
+	(U+91B9): Use `->subsumptive'.
+
+2006-01-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R173-Rain.el (U-000290D2): Use `->denotational'.
+
+2006-01-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-6E4D and J90-4F3F.
+
+2006-01-15  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-3F6C.
+
+	* Ideograph-R162-Walk.el (U-00028485): Use `->denotational'
+	instead of `->subsumptive'.
+	(U-0002848D): Likewise.
+	(U+8FEC): Use `->denotational'.
+	(K0-7277): Unify JC3-67B5.
+	(U+8FEF): Use `->denotational'.
+	(K0-627B): Unify JC3-67B7.
+	(U-0002849A): Use `->denotational'.
+	(U+8FF2): Use `->denotational'.
+	(U-000284C1): Use `->denotational' instead of `->subsumptive'.
+	(U+9008): Use `->denotational'.
+	(U-000284C8): Likewise.
+	(U+9018): Use `->denotational'.
+	(U-000284EC): Use `->denotational' instead of `->subsumptive'.
+	(U+9030): Likewise.
+	(U+9037): Use `->denotational'.
+	(U-00028522): Likewise.
+	(U+9046): Use `->denotational'.
+	(U-0002852F): Use `->denotational' instead of `->subsumptive'.
+	(J90-4D5A): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-4D5A.
+	(U+905A): Use `->denotational'.
+	(U+905B): Likewise.
+	(U+905F): Likewise.
+	(U+9063): Use `->denotational'.
+	(U-00028567): Use `->denotational' instead of `->subsumptive'.
+	(U+48A5): Use `->denotational'.
+	(U+9066): Use `->denotational'.
+	(U+48A6): Use `->denotational'.
+	(U+906D): Use `->denotational'.
+	(U-0002858B): Use `->denotational'.
+	(U-0002858C): Use `->denotational' instead of `->subsumptive'.
+	(U-0002858D): Use `->denotational'.
+	(U-0002858F): Use `->denotational' instead of `->subsumptive'.
+	(U-00028590): Use `->denotational'.
+	(U+48A9): Use `->denotational'.
+	(U-000285AE): Use `->denotational' instead of `->subsumptive'.
+	(U-000285B9): Use `->denotational' instead of `->subsumptive'.
+	(U+9079): Use `->denotational'.
+	(U+48AA): Use `->denotational'.
+	(U-000285D2): Use `->denotational'.
+	(U-0002F9E0): Add `<-denotational' for U-000285D2.
+	(U+48AB): Use `->denotational'.
+	(U+48AC): Use `->denotational'.
+	(K0-792D): Unify JC3-67ED.
+	(U+48AE): Use `->denotational' instead of `->subsumptive'.
+	(U+48B0): Use `->denotational'.
+	(U-00028609): Use `->denotational'.
+	(U+9088): Use `->denotational'.
+	(U+908A): Use `->denotational'.
+	(U+908D): Use `->denotational'.
+	(U-00028640): Use `->denotational' instead of `->subsumptive'.
+	(U-00028642): Use `->denotational'.
+	(U+908E): Use `->denotational' instead of `->subsumptive'.
+	(U-00028652): Likewise.
+	(U+908F): Use `->denotational'.
+	(U+9090): Use `->denotational'.
+
+2006-01-14  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R163-City.el (U+48C0): Use `->subsumptive'.
+	(U+90C4): Unify JC3-68A1.
+	(U+90CE): Use `->subsumptive'; add `<-denotational' for J97-4F3A.
+	(J97-4F3A): New abstract character.
+	(U+90DE): Use `->subsumptive'; add `<-denotational' for J97-4F3A.
+	(U+90ED): Use `->subsumptive'.
+	(U+48CF): Unify CB07051.
+	(U+90F7): Add `<-denotational' for J97-363F.
+	(J97-363F): New abstract character.
+	(U+9115): Use `->denotational' instead of `->subsumptive'; add
+	`<-denotational' for B-B66D.
+	(B-B66D): Changed to abstract character; add `<-denotational' for
+	J97-363F.
+	(U+9109): Move B-B66D to parent; add `<-denotational' for B-B66D.
+	(JX1-7C6C): Use `<-denotational' for U+9115.
+
+2006-01-14  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R165-Distinguish.el (GT-53949): Use `=>ucs' instead of
+	`<-denotational' for U+91C8.
+	(J0-3C61): Unify U+91C8.
+	(U+91C9): Use `->denotational' instead of `->subsumptive'.
+
+2006-01-11  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R159-Cart.el (U+484E): Use `->denotational'.
+	(U+8EEE): Use `->subsumptive'.
+	(U+8EEF): Use `->denotational'.
+
+2006-01-11  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R157-Foot.el (U+8DF1): Use `->denotational'.
+	(U+8DF4): Use `->subsumptive'.
+	(U+8DF5): Use `->denotational'.
+	(U+47F5): Use `->subsumptive'.
+	(U+8E04): Likewise.
+	(U+4808): Likewise.
+	(U+8E22): Likewise.
+
+	* Ideograph-R145-Clothes.el (M-34094): Use `zhengzitong' instead
+	of `zhengzi-tong' in `<-original*sources'.
+	(U+88C5): Use `->subsumptive'.
+	(U-000276DA): Likewise.
+	(U+8910): Use `->denotational' and `->subsumptive'.
+	(U+8911): Use `->denotational'.
+	(U+8912): Use `->subsumptive'.
+	(U+8913): Likewise.
+	(U+8914): Use `->subsumptive'.
+	(U+8944): Use `->subsumptive'.
+	(U+465C): Use `->denotational'.
+	(Parent of J90-3228): Unify JC3-63EF.
+	(J90-3228): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-3228.
+
+	* Ideograph-R161-Morning.el (U+8FB1): Use `->denotational'.
+
+	* Ideograph-R160-Bitter.el (GT-K02585): Use
+	`<-formed@component/connect-right' for J0-3F49 instead of
+	`<-ideographic-component-forms' for U+8F9B.
+	(J0-3C2D): Use `<-vulgar@zhengzitong' instead of
+	`<-vulgar@zhengzi-tong' for J0-6D66; use `zhengzitong' instead of
+	`zhengzi-tong' in `<-vulgar@zhengzitong*sources'.
+	(U-00028414): Use `->subsumptive'.
+
+	* Ideograph-R156-Run.el (U+47AC): Use `->subsumptive'.
+	(U-00027EF1): Likewise.
+
+	* Ideograph-R149-Speech.el: Use `->subsumptive' for character
+	definitions.
+	(U+46E2): Use `->denotational' and `->subsumptive'; integrate
+	M-35524.
+	(U+8B01): Use `->denotational'.
+	(U+8AF8): Use `->subsumptive'; add `<-denotational' for J97-3D74.
+	(J97-3D74): New abstract character.
+	(<CJK COMPATIBILITY IDEOGRAPH-FA22>): Add `<-denotational' for
+	J97-3D74.
+	(U+46FD): Use `->subsumptive'; integrate M-35755.
+	(U+8B00): Use `->subsumptive'.
+	(U+FA62): Use `->subsumptive'; add `<-denotational' for U+8B01;
+	add `=>ucs@jis' for JU+FA62; add `=>ucs@ks' for KU+8B01.
+	(U+8B21): Use `->denotational'.
+	(U+4701): Use `->subsumptive'; integrate M-35774.
+	(U+8B04): Use `->denotational' and `->subsumptive'.
+	(U+8B0A): Use `->denotational' and `->subsumptive'.
+	(U+8B39): Use `->denotational'.
+	(U+4700): Use `->denotational' and `->subsumptive'.
+	(J90-4935): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-4935.
+	(U+FA63): Use `->subsumptive'; add `<-denotational' for U+8B39.
+	(U+9FBB): Use `<-identical@component/connect-below' instead of
+	`<-ideographic-component-forms' for U+470C.
+
+2005-12-31  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+	* Ideograph-R141-Tiger.el (K0-5249): Move <CJK COMPATIBILITY
+	IDEOGRAPH-F936> to grand mother.
+	(U+4590): Use `->denotational' instead of `->subsumptive'.
+	(U+4591): Likewise.
+	(C4-404F): Move U-0002F9B4 to parent.
+
+2005-12-29  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R146-West.el (<CJK RADICAL WEST ONE>): Use
+	`<-identical@component/connect-below' instead of
+	`<-identical@component'.
+	(U+8987): Use `->denotational' and `->subsumptive'.
+
+	* Ideograph-R142-Insect.el (U+86EE): Use `->subsumptive'.
+	(U-000272A5): Use `->denotational'.
+	(J90-3F2A): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-3F2A.
+	(J90-4768): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-4768.
+	(J90-4066): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-4066.
+	(U+874B): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-4F39.
+	(U+86CE): Use `<-simplified@JP/misc' instead of `<-simplified@JP'
+	for C1-7B24; add `<-simplified@JP/jis' for J90-695A.
+
+	* Ideograph-R140-Grass.el (J90-6769): Use `<-simplified@JP/misc'
+	instead of `<-simplified@JP' for M-30674; add
+	`<-simplified@JP/jis' for J78-6769.
+	(J90-6772): Unify JC3-63A5; use `<-simplified@JP/misc' instead of
+	`<-simplified@JP' for M-30776; add `<-simplified@JP/jis' for
+	J78-6772.
+	(U+8332): Use `->denotational'.
+	(U+8345): Likewise.
+	(C2-3869): Unify JC3-70E6.
+	(J90-683B): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP' for C2-3869; add `<-simplified@JP/jis' for
+	J78-683B.
+	(U+44C6): Use `->denotational'.
+	(U+8377): Use `->denotational'.
+	(U+83D0): Use `->subsumptive'.
+	(J90-4D69): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP' for C1-6162; add `<-simplified@JP/jis' for
+	J78-4D69.
+	(M-31322): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-original*sources'.
+	(J90-336B): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP' for M-31420; add `<-simplified@JP/jis' for
+	J78-336B.
+	(J90-4B29): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP' for M-31720; add `<-simplified@JP/jis' for
+	J78-4B29.
+	(J90-4F21): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP' for M-31722; add `<-simplified@JP/jis' for
+	J78-4F21.
+	(J90-3E55): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP' for M-31820; add `<-simplified@JP/jis' for
+	J78-3E55.
+	(U+85A8): Use `->denotational' and `->subsumptive'.
+	(U+85AA): Likewise.
+	(U-00026F50): Use `->subsumptive'.
+	(U+85AB): Use `->denotational'.
+	(U+85AC): Use `->denotational'.
+	(U+85AE): Use `<-simplified@JP/misc' instead of `<-simplified@JP'
+	for M-32348; add `<-simplified@JP/jis' for J78-4C79.
+	(M-32190): Map to U-00026F2D; use `->subsumptive'.
+	(K0-6023): Unify J78-3D72.
+	(J90-3D72): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP' for M-32191; add `<-simplified@JP/jis' for
+	J78-3D72.
+	(M-32410): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'.
+	(U+862D): Use `->denotational' and `->subsumptive'.
+	(M-49656): Don't map to U+4572 and C4-6436.
+	(U+4572): Use `->denotational'.
+
+	* Ideograph-R137-Boat.el (J90-6764): Unify JC3-60FE.
+
+	* Ideograph-R154-Shell.el (U+8CA0): Use `->denotational'.
+	(U+8CAA): Use `->subsumptive'.
+	(U+476F): Use `->subsumptive'; integrate JC3-66A2.
+	(U+8CC1): Add `<-denotational' for J97-6C4C; use `->subsumptive'.
+	(J97-6C4C): New abstract character.
+	(C6-585C): Add `<-denotational' for J97-6C4C.
+	(U+8CCE): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J90-6C4D.
+	(U+8CD4): Use `->subsumptive'.
+	(M-36839): Unify U-00027DA9.
+	(J90-3958): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP' for GT-49385; move it to the parent.
+	(U+8D08): Use `->denotational'.
+	(U+FA65): Add `<-denotational' for U+8D08; unify JC3-66AF.
+	(C1-7925): Use `<-denotational' for U+8D08; use `=>daikanwa'
+	instead of `morohashi-daikanwa' for M-36929; add `=>ucs@jis' for
+	U+FA65.
+
+	* Ideograph-R144-Walk-Enclosure.el (J78-3152): Add S1-7331.
+	(U+885E): Add S1-7332.
+
+2005-12-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R124-Feather.el (GT-K01762): Use
+	`<-same@component/connect-below' instead of
+	`<-ideographic-component-forms'.
+	(U-00026407): Use `->denotational'.
+	(J90-344D): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-344D.
+	(U+7FFC): Add B-C16C.
+	(U+4397): Use `->denotational' and `->subsumptive'.
+	(U-00026493): Likewise.
+	(U+7FFB): Use `->denotational'.
+	(M-28818): Use `<-denotational' for U+7FFC; add
+	`ideographic-structure'.
+	(K0-6C4F): Likewise; move B-C16C to U+7FFC; use `=>daikanwa'
+	instead of `morohashi-daikanwa' for M-28818.
+
+	* Ideograph-R122-Net.el (U-000262DA): Use `->subsumptive'.
+	(U-000262D9): Separate M-28309; use `->subsumptive'.
+	(U-000262D7): Use `->subsumptive'.
+	(U-000262D8): Likewise.
+	(U+7F72): Add J97-3D70.
+	(M-28313): Add `total-strokes'.
+	(U-000262DE): Use `->denotational' instead of `->subsumptive'.
+
+	* Ideograph-R151-Bean.el (GT-K02620): Use
+	`<-formed@component/connect-right' instead of
+	`<-ideographic-component-forms' for U+8C46.
+
+2005-12-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R152-Pig.el (U+8C6B): Use `->subsumptive'.
+
+	* Ideograph-R137-Boat.el (GT-K00606): Use `<-formed@component'
+	instead of `<-ideographic-component-forms'.
+	(GT-K00607): Likewise.
+	(U-00026A07): Use `->subsumptive'.
+	(U-000200A8): Copied from Ideograph-R004-Slash.el.
+	(M-30352): Add `<-subsumptive' for U-000200A8; unify H1-ABE2.
+	(J90-6764): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-6764.
+
+	* Ideograph-R049-Oneself.el (U-000200AC): Use
+	`ideographic-{radical|strokes}@{ucs|cns}' instead of
+	`ideographic-'; add `ideographic-radical@cns*sources'.
+
+	* Ideograph-R004-Slash.el (U-000200AC): Use
+	`ideographic-{radical|strokes}@{ucs|cns}' instead of
+	`ideographic-'; add `ideographic-radical@cns*sources'.
+	(U-000200A8): Use `ideographic-{radical|strokes}@ucs' instead of
+	`ideographic-{radical|strokes}'; add
+	`ideographic-{radical|strokes}@daikanwa'; use `->subsumptive';
+	integrate M-30352.
+
+	* Ideograph-R135-Tongue.el (M-30307): Use `<-vulgar@zhengzitong'
+	instead of `<-vulgar@zhengzi-tong'.
+
+2005-12-27  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R134-Mortar.el (UU+820B): Move B-F4B5 to the parent.
+
+2005-12-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R118-Bamboo.el (U+41F6): Use `->denotational'; map to
+	M-26038.
+	(U+41F7): Use `->denotational'; map to M-26039.
+	(U+41F8): Use `->denotational'; map to M-26043.
+	(U+7B65): Use `->denotational' instead of `->subsumptive'.
+	(U+41FB): Use `->subsumptive'; map to M-26055.
+	(U-00025B85): Use `->subsumptive'.
+	(U-00025B77): Use `->denotational'.
+	(U+4201): Unify M-26106.
+	(U+7B89): Use `->denotational' instead of `->subsumptive'.
+	(U+7B8B): Use `->subsumptive'.
+	(U+4206): Use `->denotational'; map to M-26125.
+	(U+4208): Use `->subsumptive'; map to M-26131.
+	(U+4209): Use `->subsumptive'; map to M-26137.
+	(J90-6439): Use `<-simplified@JP/jis' instead of
+	`<-simplified@JP'.
+	(U+7BA0): Use `->denotational' instead of `->subsumptive'.
+	(U+420A): Use `->denotational' and `->subsumptive'; map to
+	M-26161.
+	(U+7BA2): Use `->subsumptive'.
+	(U+5284): Use `guangyun' instead of `kouin' in `<-same*sources'.
+	(U-00025BF9): Use `->subsumptive'.
+	(U+4225): Use `->denotational'.
+	(U+4226): Use `->denotational'.
+	(U-00025BFA): Use `->subsumptive'.
+	(U-00025BFD): Use `->subsumptive'.
+	(G0-736C): Separate JC3-5EC2.
+	(J90-433D): Unify JC3-5EC2; use `<-simplified@JP/jis' instead of
+	`<-simplified@JP'.
+	(U+7C1F): Use `->denotational' instead of `->subsumptive'.
+	(U+424D): Use `->subsumptive'.
+
+2005-12-25  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R128-Ear.el (J90-416F): Use `<-simplified@JP/misc'
+	instead of `<-simplified@JP'.
+	(J83-6660): Use `<-simplified@JP/jis' instead of
+	`<-simplified@JP'.
+
+2005-12-23  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R130-Meat.el (U-0002666B): Use `->subsumptive'.
+	(U+80C6): Likewise.
+	(U+43DF): Likewise.
+	(U-000266B9): Use `ideographic-{radical|strokes}@{ucs|cns}' and
+	`ideographic-radical@cns*sources' instead of `ideographic-'; use
+	`->subsumptive'.
+	(U+81A4): Use `->denotational'.
+
+	* Ideograph-R123-Sheep.el (<CJK RADICAL SHEEP>): Copied from
+	u02E00-CJK-Radical-Supplement.el; add
+	`ideographic-{radical|strokes}' and `total-strokes'.
+	(U+7F8B): Use `->denotational'.
+	(U+7F8C): Likewise.
+
+2005-12-22  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R129-Brush.el (J0-4825): Use `<-simplified@JP/misc'
+	instead of `<-simplified@JP'.
+
+	* Ideograph-R132-Self.el (M-30104): Unify U-00026901 and H8-CDCE.
+
+2005-12-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R121-Jar.el (GT-K01231): Use `<-formed@component'
+	instead of `<-ideographic-component-forms'.
+	(GT-36228): Likewise.
+	(M-28139): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-original*sources'.
+
+2005-12-19  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R120-Silk.el (U+42D4): Use `->subsumptive'; integrate
+	M-27393.
+	(J90-6546): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-6546.
+	(U+7DD2): Add `<-denotational' for J97-3D6F.
+	(J97-3D6F): New abstract character.
+	(U+7DD6): Add `<-denotational' for J97-3D6F.
+	(U+430A): Use `->denotational' instead of `->subsumptive'.
+	(J90-3752): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-3752.
+	(M-28007): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-original*sources'.
+
+	* Ideograph-R115-Grain.el (U-0002577C): Unify M-24974.
+	(U-00025780): Use `->subsumptive'; integrate M-24979.
+	(U+79DA): Use `->denotational' instead of `->subsumptive'.
+	(U+4136): Unify M-24984.
+	(U+4173): Use `->subsumptive'; integrate M-25206.
+	(U+7A37): Use `->denotational' instead of `->subsumptive'.
+	(U+7A43): Use `->subsumptive'.
+	(U-00025900): Use `->subsumptive'; integrate M-25376.
+	(U-00025901): Use `->subsumptive'; integrate M-25377.
+	(U+418A): Use `->subsumptive'; integrate M-25378.
+	(U-00025902): Use `->subsumptive'; integrate M-25379.
+	(U+418D): Use `->subsumptive'; integrate M-25382.
+	(U-0002A6BC): Use `ideographic-{radical|strokes}@cns' instead of
+	`ideographic-{radical|strokes}'; add
+	`ideographic-{radical|strokes}@ucs' and
+	`ideographic-radical@ucs*sources'; use `->subsumptive'; integrate
+	M-48870.
+
+2005-12-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R104-Sickness.el:
+	- Use `->denotational' and/or `->subsumptive' for some character
+	  definitions.
+	- Add some mappings to Daikanwa numbers.
+
+	* Ideograph-R112-Stone.el (U+7809): Use `->denotational'.
+	(U+409A): Use `->subsumptive'; map to M-24057.
+	(U+780A): Use `->subsumptive'.
+	(U+409C): Use `->denotational'; map to M-24060.
+	(U+7812): Use `->subsumptive'.
+	(U+7813): Likewise.
+	(U+409D): Use `->subsumptive'; map to M-24074.
+	(U+7814): Add `<-denotational' for J97-3826; separate B-ACE3.
+	(J97-3826): New abstract character; add B-ACE3.
+	(U+40AE): Use `->subsumptive'.
+	(U+784F): Use `->denotational'; add `<-denotational' for J97-3826.
+	(K0-665A): Delete BC-ACE3.
+
+2005-12-13  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R116-Cave.el (U+4193): Use `->denotational' instead of
+	`->subsumptive'; integrate M-25430.
+
+	* Ideograph-R111-Arrow.el (GT-K01013): Use
+	`<-formed@component/connect-right' instead of
+	`<-ideographic-component-forms' for U+77E2.
+	(U-000253A9): Use `->subsumptive'.
+	(U-00020170): Use `ideographic-{radical|strokes}@cns' instead of
+	`ideographic-{radical|strokes}'; add
+	`ideographic-radical@cns*sources' and
+	`ideographic-{radical|strokes}@ucs'; use `->subsumptive'.
+	(U-000253D9): Use `->denotational'.
+	(U+4094): Use `->subsumptive'.
+	(U-000253DA): Likewise.
+	(M-23994): New character; map to U-000253DF.
+	(U-000253DF): Map to M-23994.
+	(U+77EE): Use `->subsumptive'.
+
+2005-12-13  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R075-Tree.el (JSP-4466): Add `ideographic-structure'.
+	(U+4CB7): Use `->denotational'.
+	(U-00023664): Use `->subsumptive'; integrate M-15460.
+	(U-0002362D): Use `->subsumptive'; integrate M-15462.
+	(U+6A26): Use `->denotational'.
+	(U-0002362E): Use `->denotational'; integrate M-15465.
+	(U-0002362F): Use `->denotational'; integrate M-15466.
+	(U-00023633): Use `->denotational'; integrate M-15471.
+	(U-00023672): Use `->denotational'; integrate M-15477.
+	(U-0002365B): Use `->subsumptive'; integrate M-15482.
+
+	* Ideograph-R113-Spirit.el (M-24824): Use `zhengzitong' instead of
+	`zhengzi-tong' in `<-vulgar*sources'.
+
+	* Ideograph-R105-Dotted-Tent.el (U+7676): Use `->subsumptive'.
+	(M-22659): Map to U-00024F26; integrate H7-E671.
+	(U+7678): Use `->subsumptive'.
+	(U-00024F2C): Likewise.
+	(M-22666): Unify U-00024F2E and H7-E679.
+	(U+767B): Use `->subsumptive'.
+	(U+767C): Likewise.
+	(U-00024F31): Use `->denotational'.
+	(M-22672): Map to U-00024F33; integrate H7-E6F2.
+	(M-22673): Unify U-00024F34 and H7-E6F3.
+	(M-22674): Unify U-00024F36 and H7-E6F5.
+
+2005-12-12  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R109-Eye.el (BC-8BB2): Use `<-formed@component'
+	instead of `<-ideographic-component-forms'.
+	(U+76F7): Use `->denotational' and `->subsumptive'.
+	(U+7701): Use `->subsumptive'.
+	(U+771E): Likewise.
+	(U+771F): Use `->denotational' and `->subsumptive'.
+	(M-23237): Map to U-0002F947; add `<-original' for J0-6243; add
+	`<-simplified' for J0-6243.
+
+2005-12-07  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R106-White.el (U+7697): Use `->denotational' instead
+	of `->subsumptive'.
+	(U-00024F7A): Use `->denotational'.
+	(U+7698): Use `->denotational' instead of `->subsumptive'.
+
+2005-12-07  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R102-Field.el (U+3F55): Use `->subsumptive'; integrate
+	M-21733.
+	(U+3540): Use `->subsumptive'.
+	(U+753B): Use `->denotational'.
+	(U+755F): Use `->denotational' instead of `->subsumptive'.
+	(U+7562): Use `->denotational' and `->subsumptive'.
+	(U+3F5F): Unify M-21857.
+	(U+756A): Use `->subsumptive'.
+	(U+7572): Use `->subsumptive'.
+	(U-00024C7C): Unify M-21863.
+	(U+756F): Use `->denotational' instead of `->subsumptive'.
+	(U-00024C83): Use `=>daikanwa' instead of `morohashi-daikanwa' for
+	M-49335.
+	(U-00024C84): Use `->subsumptive'.
+	(U+7574): Use `->subsumptive'.
+
+	* Ideograph-R094-Dog.el: Use `->denotational' and/or
+	`->subsumptive' for some character definitions.
+	(M-20252): Unify U-0002472E and H4-BA6C.
+	(M-20254): Unify U-00024727 and H4-BA4C.
+	(M-20255): Unify U-00024729.
+	(U+72B6): Add S1-4762; add `<-simplified@CN' for K0-5F52; add
+	`<-simplified@ucs' for U+72C0.
+	(J0-603F): Add S1-4767.
+	(M-20398): Unify U-0002478D.
+	(M-20399): Map to U-0002478E.
+	(M-20400): Map to U-00024789; integrate CB06088.
+	(M-20402): Unify U-0002478B and H4-BCB5.
+	(M-20403): Unify CB06343; map to U-0002478C; integrate H4-BCF8.
+	(M-20404): Unify U-0002478A and H4-BC79.
+	(U+72EC): Add `<-simplified@CN' for U+7368; add `<-simplified@ucs'
+	for U+7368.
+	(U+72ED): Add `<-simplified@CN' for U+72F9; add `<-simplified@ucs'
+	for U+72F9.
+	(U+732E): Use `<-simplified@CN' for U+4F57; add `<-simplified@ucs'
+	for U+737B.
+	(M-20712): Unify H4-C1A8; map to U-00024884.
+	(M-20713): Unify U-00024880 and H4-C16C.
+	(U+7376): Use `->denotational' instead of `->subsumptive'.
+	(M-20776): Map to U-000248BC.
+	(M-20781): Map to U-000248C6; integrate H4-C366.
+	(M-20786): Unify U-000248CC and H4-C3A9; add `total-strokes'.
+
+	* Ideograph-R076-Lack.el:
+	- Use `->denotational' and/or `->subsumptive' for some character
+	  definitions.
+	- Add some mappings to Daikanwa numbers.
+	(U+6B27): Use `->denotational'; add `<-simplified@ucs' for U+6B50.
+
+	* Ideograph-R103-Bolt-Of-Cloth.el (U+7591): Use `->subsumptive'.
+	(M-22009): Unify U-00024D1F, C5-5563, H7-E4CF and CB08514; fix
+	strokes.
+	(U-00024D20): Use `->denotational'.
+	(M-22012): Map to U-00024D22.
+	(M-22013): Map to U-00024D23.
+	(U-00024D24): Use `->subsumptive'.
+
+	* Ideograph-R075-Tree.el:
+	- Use `->denotational' and/or `->subsumptive' for some character
+	  definitions.
+	- Add some mappings to Daikanwa numbers.
+	(GT-K02598): Use `<-formed@component/connect-right' instead of
+	`<-ideographic-component-forms'.
+	(U+6802): Add S1-3581.
+	(J90-466A): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP'.
+	(J90-4F31): Likewise.
+	(U+69C5): Use `->denotational' instead of `->subsumptive'.
+	(G0-6933): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP'.
+	(J90-3A67): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP'.
+
+2005-12-06  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R093-Cow.el (U+727D): Use `->subsumptive'.
+	(U+3E3D): Unify M-20026.
+	(U-0002465E): Use `->subsumptive'; integrate M-20027.
+	(U+3E3E): Use `->subsumptive'; integrate M-20029.
+	(U-00024660): Use `->subsumptive'; integrate M-20031.
+	(U-00024662): Use `->denotational'; integrate M-20034.
+	(U-00024664): Use `->denotational'.
+	(U-0002466B): Use `->subsumptive'.
+	(U+7280): Use `->subsumptive'.
+	(U+7283): Use `->subsumptive'.
+	(U+7289): Use `->subsumptive'.
+	(U-0002468A): Use `->subsumptive'; integrate M-20065.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-492D.
+
+2005-12-01  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R095-Profound.el (U+7384): Use `->subsumptive'.
+	(U+7385): Likewise.
+	(U+7386): Likewise.
+	(U+7387): Use `->denotational' and `->subsumptive'.
+	(U+7388): Use `->subsumptive'.
+	(U-000248E7): Likewise.
+	(U-000248E8): Likewise.
+
+2005-11-30  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R101-Use.el (U-000200F0): Use `->subsumptive'; don't
+	use `ideographic-'.
+	(U-00024C07): Use `->denotational' and `->subsumptive'.
+	(U-00020CEB): Copied from Ideograph-R030-Mouth.el.
+	(C6-395E): Use `<-subsumptive' for U-00020CEB; separate M-21715.
+
+	* Ideograph-R099-Sweet.el (U-00024BBC): Use `->subsumptive'.
+	(U+751A): Use `->denotational'.
+	(M-21649): Unify U-00024BC2 and H6-F2F6.
+	(M-21651): Unify U-00024BC4 and H6-F2F7.
+	(M-21653): Unify U-00024BC5 and H6-F2F9.
+
+	* Ideograph-R096-Jade.el (U+73CE): Use `->denotational' instead of
+	`->subsumptive'.
+	(J90-6076): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP'.
+	(U-000249EB): Use `->denotational'.
+	(U+7465): Use `->denotational'.
+	(U+7488): Use `->denotational' instead of `->subsumptive'.
+
+2005-11-30  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R018-Knife.el (BC-8DC9): New character; map to
+	U-000206A3; add `<-formed@component' for U-000206A3, U+5200 and
+	U+52FA.
+
+2005-11-29  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R087-Claw.el (U-000244EF): Use `->subsumptive';
+	integrate M-19654.
+	(U-000244F1): Unify M-19656.
+	(U-000244F2): Use `->denotational' and `->subsumptive'; integrate
+	M-19657.
+	(M-19658): New character; map to U-000244F3.
+	(U-000244F3): Map to M-19658.
+	(U-000244FD): Use `->denotational'; integrate M-19667.
+	(U-000244FE): Use `->subsumptive'; integrate M-19668.
+	(U+722F): Use `->denotational'.
+	(U+7230): Likewise.
+	(M-19673): New character; map to U-00024500.
+	(U-00024500): Use `->subsumptive'; map to M-19673.
+	(M-19674): New character; map to U-00024501.
+	(U-00024501): Use `->subsumptive'; map to M-19674.
+	(U-00024510): Use `->subsumptive'.
+	(U-00024511): Unify M-19683.
+	(M-19684): New character; map to U-00024512.
+	(U-00024512): Map to M-19684.
+	(U-00024514): Use `->denotational' instead of `->subsumptive'.
+	(U-00024515): Likewise.
+
+2005-11-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R086-Fire.el: Use `->subsumptive' for some characters.
+	(U+706F): Use `->subsumptive'; add `<-simplified@ucs' for U+71C8.
+	(U+7089): Use `->denotational' and `->subsumptive'; add
+	`<-simplified@ucs' for U+7210.
+	(C6-3248): Move U-0002F91A to parent.
+	(U+70B9): Add `<-simplified@CN' for U+9EDE; add `<-simplified@ucs'
+	for U+9EDE.
+	(U-000241C7): Use `->denotational' and `->subsumptive'.
+	(J90-4079): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP' for J78-4079.
+	(J90-407A): Use `<-simplified@JP/misc' instead of
+	`<-simplified@JP' for K0-6043.
+	(U+71D6): Use `->denotational' instead of `->subsumptive'.
+	(U+71D7): Add `<-denotational' for J97-5F73.
+	(J97-5F73): New abstract character.
+	(U-000243D0): Add `<-denotational' for J97-5F73.
+
+2005-11-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R030-Mouth.el (U+53F0): Add S1-949; add
+	`<-simplified@CN' for G1-4C28, U+6AAF and U+98B1; add
+	`<-simplified@ucs' for U+81FA.
+	(U+53F7): Add S1-939; add `<-simplified@CN' for G1-3A45; add
+	`<-simplified@ucs' for U+865F.
+	(U-00020BD3): Unify M-03351.
+	(U+5434): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'.
+	(U+543F): Add `<-denotational' for J97-3970.
+	(J97-3970): New abstract character; unify B-A769.
+	(U+544A): Add `<-denotational' for J97-3970; separate B-A769.
+	(U-00020BD8): Use `->denotational'.
+	(U+3571): Use `->subsumptive'.
+	(U-00020BD9): Use `->subsumptive'.
+	(M-03419): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-wrong*sources'.
+	(U+5467): Use `->denotational' instead of `->subsumptive'.
+	(U+5471): Use `->denotational' and `->subsumptive'.
+	(U+54EA): Use `->denotational' instead of `->subsumptive'.
+	(U-00020CB4): Use `->subsumptive'.
+	(U+5503): Use `->denotational' instead of `->subsumptive'.
+	(U+5519): Use `->subsumptive'.
+	(U+551A): Use `->denotational'.
+	(U-00020CF9): Use `->subsumptive'.
+	(U-00020CEB): Use `->subsumptive'; integrate C6-395E and M-21715;
+	use `ideographic-{radical|strokes}@ucs' instead of
+	`ideographic-{radical|strokes}'; add
+	`ideographic-{radical|strokes}@cns'; don't use `<-same' for
+	C6-395E.
+	(U-00020CFD): Use `->denotational' and `->subsumptive'.
+	(U-00020D2C): Use `->subsumptive'.
+	(U+5534): Use `->denotational'.
+	(U+5535): Use `->subsumptive'.
+	(U+5537): Likewise.
+	(U+554C): Use `->denotational'.
+	(U+554D): Use `->subsumptive'.
+	(U+35A8): Use `->denotational' and `->subsumptive'.
+	(U+557E): Use `->subsumptive'.
+	(U-00020DD8): Likewise.
+	(U+557F): Use `->denotational'.
+	(U+35B8): Use `->subsumptive'.
+	(M-03897): Unify H2-DAC9; add `<-subsumptive' for U-00020DB9.
+	(U+558B): Use `->subsumptive'.
+	(U+35BC): Likewise.
+	(U+5592): Use `->denotational' instead of `->subsumptive'.
+	(U+35C2): Use `->subsumptive'.
+	(U-00020DC9): Use `->denotational'.
+	(U+5599): Use `->subsumptive'.
+	(U+559A): Use `->denotational' instead of `->subsumptive'.
+	(U+35C8): Use `->subsumptive'.
+	(U+55A6): Add `->mistakable' for U+5D52.
+	(J0-3776): Add S1-1155.
+	(U-00020DCF): Use `->subsumptive'.
+	(U-00020DD5): Likewise.
+	(U-00020048): Use `->denotational'; use
+	`ideographic-{radical|strokes}@{ucs|cns}' instead of
+	`ideographic-'; add `ideographic-radical@cns*sources'; don't use
+	`<-same' for C6-472D.
+	(U-00020E50): Use `->denotational' and `->subsumptive'.
+	(U+35D7): Use `->denotational' instead of `->subsumptive'.
+	(U+55DE): Use `->denotational'.
+	(U+35DC): Use `->subsumptive'.
+	(U+35DA): Likewise.
+	(CB06695): New character; add `<-denotational' for U+55E4.
+	(U-00020E62): Use `->subsumptive'.
+	(U-00020ED5): Likewise.
+	(U+55F7): Modify hierarchy.
+	(U+55F8): Use `->denotational' and `->subsumptive'.
+	(U+5600): Use `->subsumptive'.
+	(U+5602): Likewise.
+	(U+5603): Use `->subsumptive'.
+	(U+5604): Use `->subsumptive'.
+	(U-00020EE0): Likewise.
+	(U+5607): Use `->subsumptive'.
+	(U+35E5): Use `->subsumptive'.
+	(U-00020EE1): Likewise.
+	(U-00020EEB): Likewise.
+	(U-00020EEC): Unify M-04209.
+	(U-00020EED): Use `->subsumptive'.
+	(U+5631): Add S1-1237; add `<-simplified@CN' for C1-7C5D; add
+	`<-simplified@ucs' for U+56D1.
+	(U+35F5): Use `->subsumptive'.
+	(U+5646): Use `->denotational' and `->subsumptive'.
+	(U+5647): Use `->subsumptive'.
+	(U+564A): Use `->denotational' instead of `->subsumptive'.
+	(U+564B): Use `->subsumptive'.
+	(U-00020F7D): Likewise.
+	(G0-6061): Separate JC3-70B8.
+	(J83-4139): Unify JC3-70B8.
+	(U+35F6): Use `->subsumptive'.
+	(U+564D): Likewise.
+	(U-00020F81): Likewise.
+	(U+5657): Likewise.
+	(U+5659): Use `->denotational' and `->subsumptive'.
+	(U+565A): Use `->denotational'.
+	(U+5662): Use `->denotational' and `->subsumptive'.
+	(U-00021099): Use `->denotational' and `->subsumptive'.
+	(U-00021117): Use `->subsumptive'.
+	(U+56B5): Likewise.
+	(U+56B6): Use `->subsumptive'.
+	(U-00021118): Use `->subsumptive'.
+	(U-0002111A): Use `->denotational'.
+	(M-04599): Map to U-00021122.
+	(U-00021159): Use `->subsumptive'.
+	(J0-5376): Add S1-1238.
+	(U-00020DB9): Use `->subsumptive' to integrate M-03897.
+	(U-00021122): Use `->subsumptive' to integrate M-04599.
+
+2005-11-24  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R004-Slash.el (U-000200A0): Use `->subsumptive'.
+
+	* Ideograph-R090-Half-Tree-Trunk.el (U-00024593): Use
+	`->subsumptive'.
+	(U+7245): Likewise.
+	(U-00024595): Use `->subsumptive'.
+	(U-00024596): Use `->denotational'.
+
+2005-11-23  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R040-Roof.el (U+5B90): Use `->denotational'.
+	(U+5B98): Use `->subsumptive'.
+	(U+5B99): Likewise.
+	(U+5B9A): Likewise.
+	(U+5B9B): Likewise.
+	(U+5B9C): Likewise.
+	(U+3752): Likewise.
+
+2005-11-22  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R038-Woman.el: Use `->subsumptive' for some
+	characters.
+	(U+5A3D): Use `->denotational'.
+
+	* Ideograph-R031-Enclosure.el (U+5709): Use `->subsumptive'.
+	(U-000211F5): Use `->subsumptive'.
+
+2005-11-21  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* char-db-util.el (char-db-insert-ccs-feature): Format each value
+	of `=adobe-*' as a digit value.
+
+	* Ideograph-R066-Rap.el (U+6556): Use `->denotational' and
+	`->subsumptive'.
+	(U-00022F40): Use `->subsumptive'.
+	(U-00022F41): Use `->denotational'.
+	(U-00022F42): Use `->subsumptive'.
+
+	* Ideograph-R053-Dotted-Cliff.el: Use `->subsumptive' for some
+	characters.
+	(U-00022241): Use `->denotational'.
+	(M-09385): Map to U-00022247.
+	(U-0002225A): Use `->denotational'.
+	(M-09390): Map to U-00022257.
+	(M-09391): Map to U-00022251.
+	(M-09392): Map to U-00022253.
+	(U-00022246): Use `->subsumptive'; fix `ideographic-strokes' and
+	`total-strokes'.
+
+	* Ideograph-R050-Turban.el (U+3865): Use `->denotational' instead
+	of `->subsumptive'.
+
+2005-11-21  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R009-Man.el: Use `->subsumptive' for some characters.
+	(U+4F4E): Use `->denotational'.
+	(U+4F4F): Likewise.
+	(U+345A): Use `->denotational' instead of `->subsumptive'.
+	(U-00020266): Complete `ideographic-structure'.
+	(U+5025): Use `->denotational'.
+	(U+5026): Use `->denotational' instead of `->subsumptive'.
+	(U+5030): Likewise.
+	(U+5050): Use `->denotational'.
+	(U+5061): Use `->denotational' instead of `->subsumptive'.
+	(U-000202B3): Complete `ideographic-structure'.
+	(U-000202DC): Use `->denotational' to integrate M-00915.
+	(M-00916): Map to U+48CF; add `ideographic-structure'; add
+	`<-unknown' for U+48CF.
+	(M-00919): Unify U-000202DE and H1-CDB7.
+	(U+507A): Use `->denotational' instead of `->subsumptive'.
+	(U+508B): Use `->denotational'.
+	(U+5094): Likewise.
+	(U+509D): Likewise.
+	(U-00020300): Use `->denotational' instead of `->subsumptive'.
+	(U+50B2): Use `->denotational' and `->subsumptive'.
+	(U-0002032F): Likewise.
+	(U+50C8): Use `->denotational'.
+	(U-0002F80A): Use `=>daikanwa' instead of `morohashi-daikanwa'.
+	(U+50D0): Use `->denotational' instead of `->subsumptive'.
+	(U+3486): Likewise.
+	(U+50E7): Use `->subsumptive'.
+	(U+3488): Use `->denotational' instead of `->subsumptive'.
+	(U-00020375): Unify M-01121; use `ideographic-strokes@ucs' and
+	`total-strokes@ucs' instead of `ideographic-strokes' and
+	`total-strokes'; add `ideographic-strokes@cns' and
+	`total-strokes@cns'.
+	(U+50EA): Use `->denotational' instead of `->subsumptive'.
+	(U+50ED): Likewise.
+	(U-000203BB): Use `->denotational'.
+	(U-00020409): Use `->denotational' and `->subsumptive'.
+	(U-0002040E): Use `->denotational'.
+	(M-01266): Unify U-00020420 and H1-D6B0.
+	(U+5130): Use `->denotational'.
+	(U-0002043E): Modify `ideographic-structure'.
+	(U+5136): Use `->denotational' instead of `->subsumptive'.
+	(U+34A7): Likewise.
+
+2005-11-19  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R085-Water.el (GT-K02519): Use
+	`<-formed@component/connect-right' instead of
+	`<-ideographic-component-forms'.
+	(U+6C97): Use `->denotational'.
+	(U+6C98): Use `->subsumptive'.
+	(U+6C99): Likewise.
+	(U+6CA1): Likewise.
+	(U+6CE0): Likewise.
+	(M-17428): Use `zhengzitong' instead of `zhengzi-tong' in
+	`->vulgar*sources'.
+	(U+6D5D): Use `->denotational' and `->subsumptive'.
+	(U+6D99): Use `->denotational'.
+	(U-00023D69): Use `->subsumptive'.
+	(U-00023D68): Likewise.
+	(U+6DEC): Use `->subsumptive'.
+	(U+6DF7): Likewise.
+	(U+6DF9): Likewise.
+	(U+6DFB): Use `->denotational'.
+	(U+6E08): Use `->subsumptive'.
+	(U+6E09): Likewise.
+	(U+6E13): Delete `morohashi-daikanwa'.
+	(U+6E1F): Use `->subsumptive'.
+	(U+6E20): Use `->subsumptive'.
+	(U+6E26): Use `->denotational'.
+	(U+6E27): Use `->subsumptive'.
+	(U+6EAA): Use `->denotational'.
+	(U+6EDD): Use `->subsumptive'.
+	(U+6EDE): Use `->denotational'; add `<-simplified@ucs' for U+6EEF.
+	(U-0002F914): Moved to parent; use `<-denotational' for U+701E.
+	(J83-4654): Use `<-subsumptive' for U-0002F914.
+	(C4-565D): Separate U-0002F914; use `<-subsumptive' for
+	U-0002F914.
+	(U+6FEB): Use `->denotational'.
+	(U+7016): Simplify hierarchy.
+
+2005-11-18  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R061-Heart.el (U+60A2): Use `->subsumptive'.
+	(U-00022685): Likewise.
+	(U+60A4): Use `->denotational'.
+	(U+6182): Use `->denotational' and `->subsumptive'.
+	(U+6183): Use `->subsumptive'.
+	(U+6184): Use `->denotational'.
+
+	* Ideograph-R081-Compare.el (U+6BD4): Use `->subsumptive'.
+	(U-000200B1): Use `ideographic-{radical|strokes}@cns' instead of
+	`ideographic-{radical|strokes}@daikanwa'; add
+	`ideographic-radical@cns*sources'.
+	(U-00023B03): Use `->subsumptive'.
+	(U-00023B02): Likewise.
+	(U-00023B10): Likewise.
+	(U-00023B11): Likewise.
+	(U-00023B12): Likewise.
+	(U-00023B13): Use `->subsumptive'.
+	(U-00023B15): Use `->subsumptive'.
+	(U-00023B14): Use `->subsumptive'.
+	(U+6BDA): Likewise.
+
+	* Ideograph-R079-Weapon.el (U+3C7C): Use `->subsumptive'.
+	(U+3C7D): Use `->subsumptive'.
+	(U-00023A82): Use `->denotational'.
+	(M-16617): Map to U-00023A84.
+	(U-00023A83): Use `->subsumptive'.
+	(U+6BB4): Use `->denotational' and `->subsumptive'.
+	(U+6BB5): Use `->subsumptive'.
+	(U-00023A85): Use `->subsumptive'.
+	(U-00023A86): Likewise.
+	(U+6BB6): Use `->denotational'.
+	(M-16623): Map to U-00023A87.
+	(U-00023A88): Use `->subsumptive'.
+	(U+6BBD): Simplify hierarchy.
+
+	* Ideograph-R062-Halberd.el (U-000229FE): Use `->subsumptive'.
+	(U-000229FA): Use `->subsumptive'.
+	(U-00022A0A): Likewise.
+	(U-00022A0C): Use `->subsumptive'.
+	(U-00022A0D): Use `->subsumptive'.
+	(U-00022A0E): Use `->subsumptive'.
+	(M-11677): Map to U-00022A0F.
+	(U-00022A13): Use `->denotational'.
+	(U+39BD): Use `->subsumptive'.
+	(U+6232): Likewise.
+	(M-11682): Unify U-00022A16.
+	(M-11683): Map to U-00022A17.
+	(U+6233): Use `->denotational' and `->subsumptive'.
+	(U-00022A19): Use `->subsumptive'.
+	(U-00022A1B): Use `->subsumptive'.
+	(M-11687): Unify U-00022A1C.
+	(M-11688): Map to U-00022A1D.
+	(U-00022A1E): Use `->denotational'.
+
+2005-11-18  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R046-Mountain.el (U+5D29): Use `->denotational'.
+	(U+5D52): Add `->mistakable' for U+55A6.
+	(RUI6-E008): Use J0-3123 instead of U+96A0 in
+	`ideographic-structure'.
+	(U+3825): Use `->subsumptive'.
+
+	* Ideograph-R080-Do-Not.el (U+6BD1): Use `->subsumptive'.
+	(U+6BD2): Use `->denotational'.
+	(U-00023AEF): Use `->denotational'.
+	(M-16732): Unify U-00023AF1 and H6-ECC1.
+	(U-00023AF0): Fix `ideographic-strokes'.
+	(U-00021E46): Use `->denotational'.
+	(M-16735): Unify U-00023AF3 and H6-ECC3.
+	(U-00023AF4): Use `->denotational'.
+	(M-16737): Unify U-00023AF5 and H6-ECE1.
+	(M-16738): Map to U-00023AF6.
+	(U-00023AF9): Use `->denotational'.
+	(U+6BD3): Use `->subsumptive'.
+	(M-16741): Map to U-00023AFB.
+	(U-00023AFA): Use `->denotational' and `->subsumptive'.
+
+2005-11-17  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R026-Seal.el (J0-524B): Delete `=ucs@big5'.
+
+2005-11-17  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R077-Stop.el (GT-K00439): Use
+	`<-formed@component/connect-right' instead of
+	`<-ideographic-component-forms' for U+6B62.
+	(BC-8960): Use `<-formed@component' instead of
+	`<-ideographic-component-forms' for U+6B62.
+	(U+9FB0): Use `<-formed@component/connect-above' instead of
+	`<-ideographic-component-forms' for U+6B62.
+	(U-00023942): Use `->subsumptive'.
+	(U+6B63): Add S1-3948.
+	(U+6B65): Use `->subsumptive'.
+	(U-0002394A): Likewise.
+	(U-00023949): Add `morohashi-daikanwa' for M-16283'.
+	(U+6B69): Use `->subsumptive'.
+	(U-00023960): Likewise.
+	(M-16306): Unify U-00023977 and H4-D360.
+	(U-00023979): Unify M-16307.
+	(U+3C55): Use `->denotational' instead of `->subsumptive'.
+	(U+3C56): Use `->subsumptive'.
+	(U-00023985): Likewise.
+	(U-0002398F): Unify M-09684; use `ideographic-radical@ucs' instead
+	of `ideographic-radical'; add `ideographic-strokes@ucs',
+	`ideographic-{radical|strokes}@daikanwa' and `total-strokes'.
+	(U-00023987): Use `->denotational' and `->subsumptive'.
+	(U-00023988): Use `->subsumptive'.
+	(U-00023989): Likewise.
+	(M-16330): Unify U-0002469C.
+	(M-16331): Map to U-0002398C.
+	(M-16333): Unify U-00023990 and H4-D3B7.
+	(M-16334): Unify U-00023991 and H4-D3B9.
+	(U+6B74): Use `->subsumptive'.
+	(U+6B77): Use `->subsumptive'.
+	(U-0002398C): Use `->subsumptive' to integrate M-16331.
+
+	* Ideograph-R066-Rap.el (U-00022F22): Use `->denotational'.
+	(M-13185): Unify U-00022F24 and H4-D5F8.
+	(U+6548): Use `->subsumptive'.
+	(U-00022F2D): Use `=>daikanwa' instead of `morohashi-daikanwa';
+	add `<-unknown' for U-00022F26.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-4337.
+
+	* Ideograph-R012-Eight.el (U-00020510): Use `->subsumptive'.
+	(U-00020511): Use `->subsumptive'; integrate M-01476.
+
+	* Ideograph-R057-Bow.el (GT-12408): Unify U-0002241A and H3-CCAD.
+	(U+5F45): Use `->denotational'.
+
+	* Ideograph-R018-Knife.el (U+526A): Use `->denotational' and
+	`->subsumptive'.
+
+2005-11-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R048-Work.el (U+5DEE): Use `->denotational'.
+
+	* Ideograph-R014-Cover.el (U+51A2): Use `->subsumptive'.
+	(U+51A5): Use `->subsumptive'.
+	(U-0002058C): Use `->subsumptive'.
+
+	* Ideograph-R138-Stopping.el (BC-8C42): Use
+	`<-simplified@component' instead of
+	`<-ideographic-component-forms' and `<-simplified' for J0-4E49.
+
+	* Ideograph-R100-Life.el (U+9FB6): Use
+	`<-formed@component/connect-below' instead of
+	`<-ideographic-component-forms' for U+751F.
+	(GT-K00587): Use `<-denotational' for U+9FB6; use
+	`<-formed@component/connect-right' for U+9FB6 instead of
+	`<-ideographic-component-forms' for U+751F and U+9FB6.
+	(U+7522): Use `->subsumptive'; add `<-denotational' for J97-3B3A.
+	(J97-3B3A): New abstract character.
+	(U+7523): Use `->subsumptive'; add `<-denotational' for J97-3B3A.
+
+	* Ideograph-R070-Square.el (M-13621): Unify BC-8A7E and CB08182.
+	(CB09247): New character.
+	(U-000230D8): Map to M-13623.
+	(U-000230D9): Map to M-13624.
+	(U+65BA): Use `->subsumptive'.
+	(U+65BB): Use `=>daikanwa' instead of `morohashi-daikanwa'; add
+	`<-same' for M-13626; use `->subsumptive'.
+	(U+3AC4): Use `->subsumptive'.
+	(U-000230DD): Map to M-13631; use `->subsumptive'.
+	(U+65BF): Use `->subsumptive'.
+	(U-000230DE): Use `->subsumptive' to integrate M-13633.
+	(U-000230DF): Map to M-13634; use `->denotational' and
+	`->subsumptive'.
+	(M-13635): New character; map to U-000230E2.
+	(U-000230E2): Map to M-13635; add `<-unknown' for M-13635.
+	(U+65C1): Use `->subsumptive'.
+	(U+65C2): Likewise.
+	(U-000230E6): Use `->subsumptive' to integrate M-13639.
+	(U+65C3): Use `->denotational'.
+	(U-000230EF): Use `->subsumptive' to integrate M-13641.
+	(U+65C4): Use `->subsumptive'.
+	(K0-5569): Unify GT-17246 and GT-K06560.
+	(U-000230E8): Use `->subsumptive' to integrate M-13645.
+	(U+3AC5): Use `->subsumptive' to integrate M-13647.
+	(U-000230E9): Use `->subsumptive' to integrate M-13648.
+	(U-000230EA): Use `->denotational' and `->subsumptive'; map to
+	M-13649.
+	(U+65C7): Use `->subsumptive'.
+	(U+65C8): Likewise.
+	(U+65C9): Likewise.
+	(U+65CA): Use `->subsumptive'.
+	(U+65CB): Use `->subsumptive'.
+	(U+3ACA): Use `->subsumptive' to integrate M-13657.
+	(U+65CC): Use `->subsumptive'.
+
+2005-11-15  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-343F.
+
+	* Ideograph-R066-Rap.el (U+655E): Use `->denotational'.
+	(U-00022F5D): Use `->subsumptive'.
+	(U-00022F5E): Use `->subsumptive'.
+	(U+3A96): Use `->denotational'.
+	(U+6566): Use `->subsumptive'.
+	(M-13277): Separate B-D977.
+	(U+6568): Unify B-D977; use `->same' for M-13277; use
+	`->subsumptive'.
+	(U-00022F92): Use `->subsumptive'.
+	(U-00022F93): Likewise.
+	(U-00022F94): Use `->subsumptive'.
+	(U+3A9F): Use `->subsumptive'.
+
+	* Ideograph-R073-Say.el (U+66FD): Add `<-simplified@JP/misc' for
+	J0-413D; delete `morohashi-daikanwa'.
+	(U+66FE): Use `->denotational'.
+	(U+66FF): Use `->subsumptive'.
+	(U+6701): Use `->denotational' and `->subsumptive'.
+	(U-0002333D): Use `->subsumptive'.
+	(C6-5D5B): Map to U-0002F8D5.
+	(U-00023346): Use `->subsumptive'.
+	(U-00023347): Use `->subsumptive'.
+	(U-00023348): Likewise.
+	(U+3B31): Use `->subsumptive'.
+	(U+6706): Use `->denotational'.
+	(U-0002334F): Use `->subsumptive'.
+	(U+3B32): Use `->denotational' and `->subsumptive'.
+
+2005-11-15  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R074-Moon.el (J97-4A7E): Unify U+670B.
+	(J0-4A7E): Move U+670B to J97-4A7E.
+	(U-00023365): Use `->subsumptive' to integrate M-14349.
+	(U-00023366): Use `->subsumptive' to integrate M-14350.
+	(U-0002336C): Use `->subsumptive' to integrate M-14354.
+	(U+3B34): Use `->subsumptive' to integrate M-14355.
+	(U+6712): Use `->subsumptive'.
+	(U-000266B9): Use `ideographic-{radical|strokes}@{ucs|cns}' and
+	`ideographic-radical@cns*sources' instead of `ideographic-'; use
+	`->subsumptive' to integrate M-14357.
+	(U+6713): Use `->subsumptive'.
+	(U+6714): Likewise.
+	(U-0002336E): Use `->subsumptive' to integrate M-14360.
+	(U+6715): Use `->denotational' and `->subsumptive'.
+	(U+3B35): Use `->subsumptive'.
+	(U+6717): Use `->denotational' and `->subsumptive'.
+	(U+6716): Use `->subsumptive'.
+	(U-0002F8D8): Use `->subsumptive'; use `<-denotational' for
+	U+6717.
+	(U+6718): Use `->denotational' instead of `->subsumptive'.
+	(U+6719): Likewise.
+	(U+671A): Use `->subsumptive'.
+	(U+671B): Use `->denotational' and `->subsumptive'.
+
+	* Ideograph-R040-Roof.el (U+5BB2): Use `->denotational' and
+	`->subsumptive'.
+	(U+5BB3): Use `->denotational' and `->subsumptive'.
+	(U+5BB4): Use `->subsumptive'.
+	(U-00021A05): Use `->subsumptive'.
+	(U+5BB5): Use `->denotational'.
+	(U+5BB6): Use `->subsumptive'.
+	(U+5BB7): Likewise.
+
+	* Ideograph-R018-Knife.el (U+5260): Use `->subsumptive'.
+	(U-00020759): Use `->subsumptive'.
+	(U-0002075A): Use `->subsumptive'.
+	(M-02074): Map to U-0002075C.
+	(U-0002075C): New character; map to M-02074.
+	(M-02075): Map to U-00020751.
+	(U-0002074B): New character; map to M-02075.
+	(U+34F8): Use `->subsumptive'.
+	(U+5280): Use `->denotational' instead of `->subsumptive'.
+	(U+5281): Use `->subsumptive'.
+	(U-000207C4): Use `->subsumptive'.
+	(U+3506): Use `->denotational' and `->subsumptive'.
+	(U+3507): Use `->subsumptive'.
+
+	* Ideograph-R061-Heart.el (U+5FFC): Use `->subsumptive'.
+	(U+390A): Use `->subsumptive'.
+	(U+616E): Use `->subsumptive'.
+	(U-000227EC): Use `->subsumptive'.
+	(U+6170): Use `->subsumptive'.
+	(M-11136): Unify GT-13957.
+	(U-00022820): Use `=>daikanwa' instead of `morohashi-daikanwa' for
+	M-11136.
+	(U+6172): Use `->subsumptive'.
+	(U-000227EE): Use `->denotational' and `->subsumptive'.
+	(U+3983): Use `->denotational' and `->subsumptive'.
+	(U+3984): Use `->denotational' and `->subsumptive'.
+	(U+6174): Use `->denotational' and `->subsumptive'.
+	(U+6175): Use `->subsumptive'.
+	(U+6176): Use `->denotational' and `->subsumptive'.
+	(U+6177): Use `->subsumptive'.
+
+2005-11-14  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R119-Rice.el (Gt-K01687): Use
+	`<-formed@component/connect-right' instead of
+	`<-ideographic-component-forms'.
+	(U+7C8B): Add S1-5902.
+	(J0-646F): Add S1-5903.
+
+2005-11-14  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R133-Arrive.el (U+4453): Add S1-951; add `<-vulgar'
+	for U+81FA.
+	(U+81FA): Add S1-950.
+
+2005-11-13  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R038-Woman.el (U+5A73): Use `->subsumptive'.
+	(U+5A74): Add `<-simplified@CN' for U+5B30; delete
+	`morohashi-daikanwa'.
+	(U+5A77): Use `->subsumptive'.
+	(U+5A78): Use `->subsumptive'.
+	(U-0002179C): Use `->denotational'.
+	(U-000218D4): Use `->subsumptive'.
+	(U+5B2F): Use `->subsumptive'.
+	(U+5B30): Use `->subsumptive'.
+	(U-000218CB): Likewise.
+	(U+5B31): Use `->subsumptive'.
+	(U+5B32): Likewise.
+	(U+5B33): Use `->denotational' and `->subsumptive'.
+	(U-000218CC): Likewise.
+
+	* Ideograph-R072-Sun.el (U-0002314D): Copied from
+	Ideograph-R031-Enclosure.el.
+	(U+65F0): Separate JC3-8DF4.
+	(U+65F4): Unify JC3-8DF4.
+	(U+663C): Add `<-simplified@CN' for G1-5667; add
+	`<-simplified@ucs' for U+665D.
+	(U+6667): Use `->denotational'.
+	(U+6681): Use `->subsumptive'.
+
+2005-11-11  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R027-Cliff.el (U-00020A87): Use `->subsumptive'.
+	(U-00020A9B): Likewise.
+	(U+3550): Use `->denotational'.
+
+2005-11-11  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R053-Dotted-Cliff.el: Use `->subsumptive' for some
+	characters.
+	(M-09225): Add S1-1810; add `<-ancient' for J0-4270.
+	(M-09317): Unify CB10989; map to U-00022213.
+	(M-09318): Map to U-00022212.
+	(U+5EAC): Use `->denotational' instead of `->subsumptive'; add
+	B-D178.
+	(M-09333): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'; separate S1-879, JSP-3C4A and JX2-2C25.
+	(C2-2E7A): Separate B-D178 and UU+5EAC.
+	(U+3890): Use `->denotational'.
+	(U-0002226D): Use `->denotational' instead of
+	`morohashi-daikanwa'.
+	(M-09424): Map to U-00022275.
+
+	* Ideograph-R037-Big.el (U-0002160F): Use `->subsumptive'.
+	(U+594F): Use `->denotational' and `->subsumptive'.
+	(U+5950): Use `->denotational'.
+
+	* Ideograph-R020-Wrap.el (U-000208F8): Use `->denotational'.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-3647.
+
+	* Ideograph-R043-Lame.el (J0-3D22): Separate M-07599.
+
+	* Ideograph-R013-Down-Box.el (U+5193): Use `->denotational'
+	instead of `->subsumptive'.
+
+	* Ideograph-R006-Hook.el (U-00020112): Use `->subsumptive'.
+
+2005-11-10  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R117-Stand.el (GT-K01019): Use
+	`<-formed@component/connect-right' instead of
+	`<-ideographic-component-forms' for J0-4E29.
+	(BC-8BAE): Use `<-simplified@component' instead of `<-simplified'
+	for J0-3E4F.
+	(J0-636D): Add S1-5733.
+
+2005-11-09  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* char-db-util.el (char-db-coded-charset-priority-list): Prefer
+	`=jis-x0208@1990' to `chinese-cns11643-1'.
+
+2005-11-09  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R093-Cow.el (U+725C): Use
+	`<-formed@component/connect-right' instead of
+	`<-ideographic-component-forms' for U+725B.
+
+2005-11-08  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R078-Death.el (U+6B8A): Add S1-3974.
+	(U+6B8B): Add `<-simplified@ucs' for U+6B98.
+	(J0-3B44): Add S1-3972.
+	(G0-3250): Add `<-simplified@CN' for G1-3250.
+	(U+6B98): Add S1-3973.
+
+	* Ideograph-R004-Slash.el (U-000200B1): Use
+	`ideographic-{radical|strokes}@cns' instead of
+	`ideographic-{radical|strokes}@daikanwa'; add
+	`ideographic-radical@cns*sources'.
+
+2005-11-07  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R061-Heart.el (U+5FDB): Use `->denotational'.
+	(M-10345): Unify U-000225BF and H6-D5BD.
+	(M-10346): Unify U-000225C0.
+	(U+5FDC): Use `->subsumptive'.
+	(U+5FF3): Likewise.
+	(U+5FF4): Use `->subsumptive'.
+	(U+5FF5): Use `->subsumptive'.
+	(M-10536): Map to U-00022639.
+	(U+604B): Use `->denotational' and `->subsumptive'; add
+	`<-simplified@ucs' for U+6200.
+	(U+6072): Use `->subsumptive'.
+	(U-0002264E): Use `->subsumptive'.
+	(M-10615): Unify U-0002266F and H6-D9CE.
+	(U+6074): Use `->subsumptive'.
+	(U+60E8): Use `->denotational'; add `<-simplified@ucs' for U+6158.
+	(U-00022797): Use `->subsumptive'.
+	(U+6139): Use `->subsumptive'.
+	(U+613A): Use `->denotational'.
+	(U-00022799): Use `->subsumptive'.
+	(U+613B): Use `->subsumptive'.
+	(U+613C): Use `->subsumptive'.
+	(U+614E): Use `->denotational'.
+	(U+3972): Likewise.
+	(U+3980): Use `->denotational'.
+	(M-11188): Map to U-0002284C.
+	(U+618E): Use `->denotational'; add J97-417E.
+	(U-0002F8AB): Add `<-denotational' for U+618E.
+	(B-BCA8): Use `<-denotational' for U+618E; use `->denotational'.
+	(U+FA3F): Use `<-denotational' for B-BCA8.
+	(G0-5477): Likewise.
+	(U+398C): Use `->subsumptive'.
+	(M-11350): Unify U-000228B9.
+	(U+61D0): Use `->subsumptive'.
+	(U-000228B1): Use `->denotational'.
+	(U-00022928): Use `->subsumptive'.
+	(U-00022929): Likewise.
+	(U+39A4): Likewise.
+
+2005-11-07  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R019-Power.el (U+52D8): Use `->denotational' instead
+	of `->subsumptive'.
+
+	* Ideograph-R011-Enter.el (U+516A): Use `->denotational' and
+	`->subsumptive'.
+
+2005-11-07  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R040-Roof.el (U+3753): Use `->subsumptive'.
+	(U-000219EA): Use `->subsumptive'.
+	(U+5BA2): Likewise.
+
+2005-11-06  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R037-Big.el (U+5951): Use `->denotational' and
+	`->subsumptive'.
+
+2005-11-03  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R073-Say.el (C1-5E32): Use `zhengzitong' instead of
+	`zhengzi-tong' in `<-original*sources'.
+
+	* Ideograph-R038-Woman.el (U+36B2): Use `->subsumptive'.
+	(U+59BE): Use `->subsumptive'.
+
+	* Ideograph-R066-Rap.el (U-00022F2C): Use `->subsumptive'.
+	(M-13196): Unify U-00022F37 and H4-D67A.
+	(M-13197): Map to U-00022F32.
+	(M-13199): Unify U-00022F31.
+	(M-13200): Map to U-00022F35.
+	(M-13201): Unify U-00022F30 and H4-D5E7.
+	(U-00022F57): Unify M-13202; use
+	`ideographic-strokes@{daikanwa|cns}' and
+	`total-strokes@{daikanwa|cns}'.
+	(U+6570): Add `<-simplified@ucs' for U+6578; use `->subsumptive'.
+	(U+3AA5): Use `->subsumptive'.
+	(U+6575): Use `->denotational' and `->subsumptive'.
+	(M-13355): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-original*sources'.
+	(U+3AA6): Use `->subsumptive'.
+	(U-00022FD0): Use `->subsumptive'.
+	(U+6578): Use `->subsumptive'.
+	(U+6585): Add S1-1784; add `<-original' for U+5B78.
+	(U+6586): Use `=>daikanwa' instead of `morohashi-daikanwa'.
+
+2005-11-02  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R064-Hand.el (C6-2328): Use `zhengzitong' instead of
+	`zhengzi-tong' in `<-original*sources'.
+	(U+62C4): Use `->denotational'.
+	(U+39D6): Use `->denotational'.
+	(U+62C6): Use `->subsumptive'.
+	(U+62C7): Add S1-2888.
+	(U+62C8): Add S1-2880.
+	(U+62DB): Add S1-2865.
+	(U+62DC): Use `->subsumptive'.
+	(U+62DD): Add S1-2881.
+	(U+62E0): Use `->subsumptive'.
+	(U+62E1): Likewise.
+	(U+6318): Use `->subsumptive'.
+	(U+631F): Add `<-simplified@CN' for G1-502E; add
+	`<-simplified@ucs' for U+633E.
+	(U+633F): Add S1-3013; add `<-vulgar' for U+63D2.
+	(U+6358): Use `->denotational' instead of `->subsumptive'.
+	(M-12163): Map to U-00022B47.
+	(U-00022B52): Use `->subsumptive'.
+	(U-00022B47): Use `<-denotational'.
+	(U+63D2): Use `->subsumptive'.
+	(U-00022C98): Use `->subsumptive'.
+	(U+3A3F): Use `->subsumptive'.
+	(U+6483): Likewise.
+	(U-00022D00): Likewise.
+	(U+3A40): Use `->denotational' and `->subsumptive'; integrate
+	M-49134.
+
+	* Ideograph-R042-Small.el (U+5C18): Use `->subsumptive'.
+	(C6-244B): Map to U-0002F874.
+	(U-00021B5D): Use `->subsumptive'.
+	(U-00021B5E): Use `->subsumptive'.
+	(U-00021B5F): Use `->subsumptive'.
+	(U-00021B60): Likewise.
+
+2005-11-02  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R062-Halberd.el (M-11533): Map to U-0002298C.
+	(M-11534): Map to U-0002298D.
+	(U+620B): Don't separate G0-6A27 and BC-89DC.
+	(U+620E): Use `->subsumptive'.
+	(M-11541): Map to U-00022991.
+	(GT-K02180): Use `<-identical@component/connect-left' instead of
+	`<-ideographic-component-forms' for U+39AE.
+	(U-000229DC): Use `->subsumptive'.
+	(M-11660): Unify U-000229FD.
+	(M-11661): Unify U-00022A02.
+	(M-11662): Unify U-00022A01.
+	(U-000229FF): Use `->subsumptive'.
+	(U+622F): Likewise.
+	(U+6232): Add S1-2786.
+
+	* Ideograph-R056-Shoot.el (U-0002237F): Use `->subsumptive'.
+	(U-00022380): Use `->subsumptive'.
+	(M-09669): Unify U-00022382.
+	(M-09671): Map to U-00022385.
+	(U-00022386): Use `->subsumptive'.
+	(U+38A5): Use `->subsumptive'.
+	(M-09676): Unify U-00022388.
+	(M-09677): Unify U-00022389.
+	(M-09678): Unify U-0002238B and H2-C2EF.
+	(U+5F11): Use `->denotational'; add `<-denotational' for J97-5736.
+	(J97-5736): New abstract character.
+	(U-0002238E): Use `->subsumptive'.
+	(U+38A6): Use `->denotational'.
+	(M-09684): Unify U-0002398F and H2-C342; use
+	`ideographic-{radical|strokes}@daikanwa' instead of
+	`ideographic-{radical|strokes}'; add
+	`ideographic-{radical|strokes}@ucs'.
+	(U+5F12): Use `->subsumptive'; add `<-denotational' for J97-5736.
+
+	* Ideograph-R049-Oneself.el (U+5DFB): Use `->subsumptive'.
+
+	* Ideograph-R040-Roof.el (U+5B8B): Use `->subsumptive'.
+	(U+5B8C): Likewise.
+	(U-000219CB): Likewise.
+
+	* Ideograph-R026-Seal.el (U+5377): Use `->denotational'.
+
+2005-11-01  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R069-Axe.el (U+65AD): Add S1-3228.
+	(U+65B7): Add S1-3229.
+	(M-13613): Map to U-000230CE.
+	(M-13616): Unify U-000230D2.
+	(U-000230D4): Use `->subsumptive'.
+	(U-000230D6): Likewise.
+	(U+65B8): Likewise.
+
+	* Ideograph-R024-Ten.el (U-00024C1E): Use `->denotational' and
+	`->subsumptive'.
+	(U+5352): Use `->subsumptive'.
+
+	* Ideograph-R019-Power.el (M-02457): Map to U-000208B5.
+
+	* Ideograph-R070-Square.el (U-00023B35): Use `->subsumptive'.
+	(U+65BD): Use `->subsumptive'.
+
+	* Ideograph-R060-Step.el (M-10079): Unify U-000224D9.
+	(U-000224D8): Use `->subsumptive'.
+	(U+5F84): Add `<-simplified@ucs'; use `->denotational'.
+	(U+38E0): Use `->subsumptive'.
+	(M-10128): Map to U-000224FB.
+	(U-000224FD): Use `->subsumptive'.
+	(M-10131): Unify U-000224FF.
+	(U-000224FC): Use `->subsumptive'.
+	(U-00022538): Likewise.
+	(M-10209): Unify U-00022539.
+	(U-0002255F): Use `->denotational'.
+	(M-10236): Map to U-00022566.
+	(U-00022567): Use `->subsumptive'.
+	(U+5FB3): Use `->subsumptive'.
+	(M-10238): Map to U-00022568.
+	(U+5FB4): Use `->subsumptive'; add `<-denotational' for J97-4427.
+	(J97-4427): New abstract character.
+	(U+5FB5): Use `->subsumptive' and `->subsumptive'; add
+	`<-denotational' for J97-4427.
+	(U+5FBD): Add J97-352B.
+
+	* Ideograph-R046-Mountain.el (U+5CB3): Add S1-1962.
+	(U+5CE0): Use `->subsumptive'.
+	(U+5CE1): Add `<-simplified@ucs' for U+5CFD; use `->subsumptive'.
+	(U+5CFD): Use `->subsumptive'.
+	(U-00021E1C): Use `->denotational'.
+	(U+5D12): Use `->subsumptive'.
+	(U+5D13): Likewise.
+	(U+5D14): Likewise.
+	(U+5D15): Likewise.
+	(U+5D16): Add S1-1993.
+	(U+5D5C): Use `->subsumptive'.
+	(U+5D5B): Use `->subsumptive'.
+	(U-00021F3D): Use `->denotational' and `->subsumptive'.
+	(U+5DA9): Use `->subsumptive'.
+	(U+5DAB): Use `->subsumptive'.
+	(U+5DBD): Likewise.
+	(U+5DBE): Use `->denotational'.
+	(U-00021F78): Likewise.
+
+	* Ideograph-R035-Go-Slowly.el (U-00020B76): Use `->denotational'
+	and `->subsumptive'.
+
+2005-10-31  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R040-Roof.el (U-000219B9): Use `->subsumptive'.
+	(U+5B81): Likewise.
+	(U+5B82): Use `->denotational' and `->subsumptive'.
+	(U+5B83): Use `->subsumptive'.
+	(U+5B84): Likewise.
+	(U+374A): Likewise.
+	(U+374B): Likewise.
+	(U+5B85): Likewise.
+	(U+374C): Likewise.
+
+	* Ideograph-R032-Earth.el (U-000213B7): Use `->subsumptive'.
+	(U+5862): Add S1-8916.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-5A4B.
+
+2005-10-30  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R067-Script.el (M-13460): Add S1-5547; add `<-vulgar'
+	for J0-6337.
+	(M-13483): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-original*sources'.
+
+	* Ideograph-R059-Bristle.el (U-0002F89A): Use `->subsumptive'; add
+	`<-denotational' for J97-4426.
+	(J97-4426): New abstract character; unify B-B16E.
+	(U+5F6B): Add `<-denotational' for J97-4426; separate B-B16E.
+
+	* Ideograph-R031-Enclosure.el (U-00020064): Use `->subsumptive';
+	use `ideographic-{radical|strokes}@cns' instead
+	`ideographic-{radical|strokes}'; add
+	`ideographic-{radical|strokes}@ucs' and
+	`ideographic-radical@cns*sources'.
+	(U+56E2): Separate M-04701.
+	(M-04702): Unify U-000211B1 and H2-E4E0.
+	(M-04703): Unify U-000211AF and H2-E4DD.
+	(U-000211B4): Use `->subsumptive'.
+	(U+56EF): Add S1-1321; add `<-vulgar' for U+570B.
+	(U+56F0): Use `->subsumptive'.
+	(U-000211B6): Use `->denotational' and `->subsumptive'.
+	(U-000211C6): Use `->subsumptive'.
+	(U-000211C7): Likewise.
+	(M-04731): Unify U-0002314D; use
+	`ideographic-{radical|strokes}@daikanwa' instead of
+	`ideographic-{radical|strokes}'; add
+	`ideographic-{radical|strokes}@ucs'.
+	(M-04732): Map to U-000211C2.
+	(M-04733): Map to U-000211C0.
+	(M-04734): Map to U-000211BD.
+	(U-000211C5): Use `->subsumptive'.
+	(U+56F5): Use `CN Simplified' instead of `C-Simplified' in
+	`script'; use `<-simplified@CN' instead of `<-simplified' for
+	U+5707.
+	(U+56FD): Add S1-1318; add `<-simplified@CN' for G1-397A; add
+	`<-simplified@ucs' for U+570B.
+	(U-000211D2): Use `->subsumptive'.
+	(U+56FF): Use `->subsumptive'.
+	(U-000211D4): Likewise.
+	(U-000211D5): Likewise.
+	(U+5700): Use `->denotational' and `->subsumptive'.
+	(U+570B): Add S1-1319.
+	(U-000211FD): Use `->subsumptive'.
+	(U-000211FE): Likewise.
+
+2005-10-30  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* char-db-util.el (char-db-make-char-spec): Add `=jis-x0208@1997'
+	if a character has the code-point of it and the character does not
+	have a code-point of `=ucs'.
+
+	* Ideograph-R063-Door.el (U+623A): Use `->denotational'.
+	(U+39BE): Use `->denotational' instead of `->subsumptive'.
+	(C3-2628): Use `zhengzitong' instead of `zhengzi-tong' in
+	`->mistakable*sources'.
+	(U+623C): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-original*sources'.
+	(U-00022A2E): Use `->denotational'.
+
+	* Ideograph-R038-Woman.el (U+59BB): Use `->subsumptive'.
+	(U+59D3): Use `->subsumptive'.
+	(U-000216E1): Use `->subsumptive'.
+	(U+36B9): Use `->subsumptive'.
+	(U+59D4): Use `->subsumptive'.
+	(U+36BA): Use `->subsumptive'.
+	(U+59D5): Use `->subsumptive'.
+	(U-000216E2): Likewise.
+	(U+59D6): Use `->subsumptive'.
+	(U+36BB): Likewise.
+	(U+36BC): Likewise.
+	(U+36C1): Use `->denotational' and `->subsumptive'.
+	(U-00021701): Use `->subsumptive'.
+	(U+36BD): Use `->subsumptive'.
+	(U-000216FE): Use `->subsumptive'.
+	(U+36BE): Use `->subsumptive'.
+	(U+5B22): Use `->subsumptive'.
+
+	* Ideograph-R039-Child.el (U-00021946): Use `->denotational' and
+	`->subsumptive'.
+	(U+5B5A): Use `->denotational'.
+
+2005-10-29  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R015-Ice.el (U-000205DA): Use `->subsumptive'.
+	(U+51CB): Use `->denotational' instead of `->subsumptive'.
+	(U+51CC): Use `->denotational' and `->subsumptive'.
+	(U-000205FD): Likewise.
+
+2005-10-27  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R058-Snout.el (G0-3969): Add `<-simplified@CN' for
+	U+6B78.
+	(U-00022451): Use `->subsumptive'.
+	(U+5F53): Add `<-simplified@CN' for U+7576 and U+5679; add
+	`<-simplified@ucs' for U+7576.
+	(U-00022453): Use `->subsumptive'.
+	(U-00022454): Likewise.
+
+	* Ideograph-R033-Scholar.el (U-0002138E): Use `->subsumptive'.
+
+	* Ideograph-R057-Bow.el (U-000223A4): Use `->subsumptive'.
+	(U-0002240A): Use `->subsumptive'.
+	(U+5F3F): Use `->subsumptive'.
+
+2005-10-27  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R044-Corpse.el (U+5C3D): Add S1-5256; add
+	`<-simplified@CN' for U+76E1 and U+5118; add `<-simplified@ucs'
+	for U+76E1.
+	(U+5C46): Use `->denotational'.
+	(U+5C4A): Add S1-1927.
+	(U+5C48): Add S1-1930.
+	(U+5C4F): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'.
+	(U+663C): Add `<-simplified@CN' for U+665D; add `<-simplified@ucs'
+	for U+665D.
+	(U+5C5E): Add `<-simplified@CN' for G1-4A74; add
+	`<-simplified@ucs' for U+5C6C.
+	(U+5C61): Add `<-simplified@ucs' for U+5C62.
+	(G0-4245): Add S1-1949; add `<-simplified@CN' for G1-4245.
+	(C3-3544): Use `total-strokes@cns' instead of `cns-total-strokes'.
+	(J78-3C48): Add S1-1948.
+
+	* Ideograph-R052-Short-Thread.el (BC-895C): Use
+	`<-simplified@component' instead of `<-simplified' for U+5E7A.
+	(M-09199): Map to U-000221BA.
+
+	* Ideograph-R037-Big.el (U-000215F1): Use `->subsumptive'.
+	(U+5943): Use `->denotational'.
+	(U+5944): Use `->subsumptive'.
+	(U-0000215FA): Use `->subsumptive'.
+	(U+5955): Likewise.
+	(M-05923): Map to U-00021619.
+	(M-05924): Unify U-0002161B and H2-BEFA.
+	(M-05925): Map to U-00021621.
+	(U-0002161A): Use `->subsumptive'.
+	(U-00021621): Use `->denotational'; integrate M-05925.
+	(U-0002165A): Use `->subsumptive'.
+	(U-0002164E): Use `->subsumptive'.
+	(U+5965): Use `->subsumptive'.
+	(U-0002164C): Use `->subsumptive'.
+	(U-00021655): Use `->subsumptive'.
+	(U+5967): Use `->subsumptive'.
+	(M-05990): Map to U-00021664.
+	(U+5968): Use `->subsumptive'.
+	(U-00021619): Use `->denotational'; integrate M-05923.
+	(U-00021664): Use `->denotational'; integrate M-05990.
+
+	* Ideograph-R032-Earth.el (U+571F): Add S1-1337.
+	(GT-K00199): Use `<-formed@component/connect-right' instead of
+	`<-ideographic-component-forms' for U+571F.
+	(U+5728): Add S1-1347.
+	(U-0002128F): Use `->denotational' to integrate C6-2641 and
+	M-48957.
+	(U-0002F855): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-original*sources'.
+	(UU+5829): Unify U-00021377 and C4-3673.
+	(U-00021390): Use `->denotational' and `->subsumptive'.
+	(U+3657): Unify H2-AF69.
+	(U+5815): Add `<-simplified@CN' for U+58AE; add `<-simplified@ucs'
+	for U+58AE.
+	(U+5842): Use `->denotational'.
+	(U+5859): Use `->subsumptive'.
+	(U+5869): Add S1-9769.
+	(U+588C): Use `->subsumptive' and `->denotational'.
+	(U+588D): Add `<-denotational' for B-D8A7; use `->subsumptive'.
+	(B-D8A7): Use `->denotational'.
+	(JC3-47D8): Add `<-denotational' for B-D8A7.
+	(U+5848): Add `<-denotational' for B-D8A7; use `->subsumptive'.
+	(U-000213F2): Use `->subsumptive'.
+	(U-00021414): Likewise.
+	(M-05482): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-same*sources'.
+	(U+58B0): Use `->denotational'.
+	(U-00021485): Use `->subsumptive'.
+
+	* Ideograph-R040-Roof.el (U+5B9D): Use `->subsumptive'.
+	(U+5B9E): Likewise.
+	(U+5B9F): Likewise.
+	(GT-K07616): Use `<-denotational' for BC-8D7C; use
+	`<-formed@component/connect-below' instead of
+	`<-ideographic-component-forms' for U+5BB7; put BC-8D7C into
+	`<-formed@component/connect-below'.
+	(BC-8D7C): Use `<-formed@component' instead of
+	`<-ideographic-component-forms' for U+5BB7.
+	(J83-5563): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'.
+	(J0-3432): Add S1-1854.
+	(U+5BDD): Add `<-simplified@ucs' for U+5BE2.
+	(G0-475E): Add `<-simplified@CN' for G1-475E.
+	(U+5BE4): Use `->subsumptive'.
+	(U+5BE5): Use `->denotational' and `->subsumptive'.
+	(U-00021A7E): Use `->denotational' and `->subsumptive'.
+	(U+5BE6): Use `->subsumptive'.
+	(U+5BEC): Use `->denotational' instead of `->subsumptive'.
+	(U-00021AA2): Use `->subsumptive'.
+	(U+5BED): Use `->subsumptive'.
+	(U+5BEE): Use `->subsumptive'.
+	(U+5BF5): Use `->subsumptive'.
+
+	* Ideograph-R055-Two-Hands.el (U+5F01): Add S1-2244.
+
+2005-10-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R043-Lame.el (M-07542): Use `wuyinjiyun' instead of
+	`goon-shuuin' in `<-same*sources'.
+	(U-00021BED): Use `->subsumptive'.
+
+	* Ideograph-R042-Small.el (G0-367B): Add `<-simplified@CN' for
+	G1-367B.
+	(GT-K05014): Use `<-formed@component/connect-below' instead of
+	`<-ideographic-component-forms'.
+
+	* Ideograph-R041-Inch.el (U+5BF9): Add S1-1882; add `<-vulgar' for
+	U+5C0D.
+	(U+5BFD): Use `->denotational' instead of `->subsumptive'.
+	(J0-4250): Add S1-1880.
+	(U+5BFF): Use `->subsumptive'.
+	(J0-3C4D): Add S1-1888.
+	(U+5C06): Add `<-simplified@ucs' for U+5C07.
+	(G0-3D2B): Add `<-simplified@CN' for G1-3D2B.
+	(J0-3E2D): Add S1-1889.
+	(J0-5572): Add S1-1890.
+	(U+5C0D): Add S1-1881.
+	(U-00021B4E): Use `->denotational'.
+	(U-00021B52): Use `->denotational' instead of `->subsumptive'.
+
+2005-10-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* isolated-char.el: Fix code to read etc/char-data/GT-RS.txt.
+
+	* Ideograph-R047-River.el (U+5DDE): Use `->denotational'.
+	(U-00021FEB): Use `->subsumptive'.
+
+	* Ideograph-R018-Knife.el (M-02104): Unify U-00020772.
+	(M-02105): Map to U-00020773.
+	(U+34FC): Use `->subsumptive'.
+
+	* Ideograph-R027-Cliff.el (U+53A6): Use `->denotational' instead
+	of `->subsumptive'.
+	(M-03003): Unify U-00020A90 and H1-B3B7.
+	(M-03031): Use `<-subsumptive' for U-00020AA7 to integrate
+	U-00020AA7 and H1-B476.
+	(M-03032): Unify U-00020AA3 and H1-B3DC.
+	(U+53B0): Use `->denotational' instead of `->subsumptive'.
+	(U-00020ABC): Use `->subsumptive'.
+	(U+53B3): Use `->denotational' instead of `->subsumptive'.
+	(U-00020AA7): Use `->subsumptive' to integrate M-03031.
+
+	* Ideograph-R026-Seal.el (U+3541): Use `zhengzitong' instead of
+	`zhengzi-tong' in `<-vulgar*sources'.
+	(U-00020A1B): Use `->subsumptive'.
+	(U-00020A1E): Use `->subsumptive'.
+	(J78-362A): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-same*sources'.
+
+	* Ideograph-R019-Power.el (U+52B1): Add `CN Simplified' into
+	`script'; add `<-simplified@CN' for G1-4078; add
+	`<-simplified@ucs' for U+52F5.
+	(U+52B3): Add `<-simplified@CN' for G1-404D.
+	(J0-387A): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'.
+	(U+52C5): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources' and `->synonyms*sources'.
+	(U+FA76): Unify JC3-44D4.
+	(J0-4D26): Separate JC3-44D4.
+	(M-02432): Map to U-0002089A.
+
+	* Ideograph-R012-Eight.el (GT-K00059): Use
+	`<-formed@component/connect-above' instead of
+	`<-ideographic-component-forms' for U+516B.
+	(U-00020500): Use `->subsumptive'.
+	(U-00020502): Use `->denotational' and `->subsumptive'.
+	(U+517C): Use `->denotational'.
+
+	* Ideograph-R050-Turban.el (U+5E2F): Add S1-2108.
+	(U+5E36): Add S1-2109.
+
+2005-10-25  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R015-Ice.el (U+34D0): Use `->denotational' instead of
+	`->subsumptive'.
+
+	* Ideograph-R039-Child.el (U+5B66): Add S1-1782; add
+	`<-simplified@CN' for G1-5127; add `<-simplified@ucs' for U+5B78.
+	(U+5B6A): Use `->subsumptive'.
+
+2005-10-25  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R045-Sprout.el (U-00021D18): Use `zhengzitong' instead
+	of `zhengzi-tong' in `<-original*sources'.
+
+2005-10-24  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R029-Again.el (GT-K00064): Use `<-formed@component'
+	instead of `<-ideographic-component-forms' for U+53C8.
+	(GT-K00255): Use `<-formed@component' instead of
+	`<-ideographic-component-forms' for U+53C9.
+	(U+53CC): Add `CN Simplified'; add `<-simplified@CN' for G1-4B2B.
+	(M-03140): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-original*sources'.
+	(U+53D9): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'.
+	(C1-5E32): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-original*sources'.
+
+	* Ideograph-R028-Private.el (U-00020AE3): Use `->denotational'.
+	(U-0002128F): Copied from Ideograph-R032-Earth.el.
+	(C6-2641): Use `<-denotational' for U-0002128F.
+
+	* Ideograph-R014-Cover.el (U+5199): Add `<-simplified@ucs' for
+	U+5BEB.
+	(G0-5034): Add `<-simplified@CN' for G1-5034.
+	(U+51A8): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'.
+	(C1-5E32): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-original*sources'.
+
+2005-10-24  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R008-Lid.el (M-00332): Modify `ideographic-structure'.
+	(H1-E25A): Likewise.
+	(C7-2124): Likewise.
+
+	* Ideograph-R001-One.el (U+4E07): Add `<-simplified@ucs' for
+	U+842C.
+	(U+4E0E): Add `<-simplified@ucs' for U+8207.
+	(BC-88C7): Use `<-formed@component/connect-right' instead of
+	`<-ideographic-component-forms'.
+	(U-00020029): Use `->subsumptive'; use
+	`ideographic-{radical|strokes}@{ucs|cns}' instead of
+	`ideographic-'; add `ideographic-radical@cns*sources'.
+	(U-00020048): Use `->denotational'; use
+	`ideographic-{radical|strokes}@{ucs|cns}' instead of
+	`ideographic-'; add `ideographic-radical@cns*sources'.
+
+	* Ideograph-R036-Evening.el (U+591B): Use `zhengzitong' instead of
+	`zhengzi-tong' in `<-vulgar*sources'.
+	(U-0002158A): Use `->subsumptive'.
+
+	* Ideograph-R018-Knife.el (J0-5163): Use `zhengzitong' instead of
+	`zhengzi-tong'.
+	(U+5226): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-same*sources'.
+	(U+5227): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-same*sources'.
+	(C3-2B43): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'.
+	(U+5264): Use `->subsumptive'.
+	(U+5266): Use `->subsumptive'.
+	(U+5270): Use `->denotational' and `->subsumptive'.
+	(U+5271): Likewise.
+	(U+5284): Use `guangyun' instead of `kouin' in `<-same*sources'.
+
+	* Ideograph-R035-Go-Slowly.el (GT-K00218): Use
+	`<-identical@component/connect-below' instead of
+	`<-ideographic-component-forms' for J0-546A.
+
+2005-10-23  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R033-Scholar.el (U+58EE): Add `<-simplified@CN' for
+	G1-5733; add `<-simplified@ucs' for U+58EF.
+	(J0-5463): Add S1-1527.
+	(U+58F0): Add S1-6398; add `<-simplified@CN' for G1-4979; add
+	`<-simplified@ucs' for U+8072.
+	(U-0002151E): Use `->denotational' and `->subsumptive'.
+	(U+58F1): Add S1-1528.
+	(U+58F9): Add S1-1529.
+
+	* Ideograph-R008-Lid.el (parent of BC-8BAA): Use
+	`<-simplified@component/connect-below' instead of `<-simplified'
+	for J0-3962.
+	(BC-8C4D): Likewise.
+	(GT-K04733): New character.
+	(M-00316): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'.
+	(U-00020170): Use `->subsumptive' to integrate M-23981 and
+	C6-4C2D; use `ideographic-{radical|strokes}@ucs' instead of
+	`ideographic-{radical|strokes}'; add
+	`ideographic-{radical|strokes}@cns' and
+	`ideographic-radical@cns*sources'.
+
+	* Ideograph-R028-Private.el (U+53BA): Use `zhengzitong' instead of
+	`zhengzi-tong' in `<-original*sources'.
+	(U+53C2): Use `JP Jouyou' instead of `JP-Jouyou' in `script'; put
+	`CN Simplified' into `script'; add `<-simplified@CN' for G1-324E;
+	add `<-simplified@ucs' for U+53C3.
+	(U-00020AFF): Use `->subsumptive'.
+
+2005-10-22  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R023-Hiding-Enclosure.el (U+533A): Add
+	`<-simplified@ucs' for U+5340.
+	(J0-3668): Add `CN Simplified' into `script'; add
+	`<-simplified@CN' for G1-4778.
+	(U+533B): Use `->denotational'; add `<-simplified@ucs' for U+91AB.
+	(J0-3065): Use `<-denotational' for U+91AB; add `<-simplified@CN'
+	for G1-523D.
+
+	* Ideograph-R024-Ten.el (GT-K01097): Use
+	`<-formed@component/connect-right' instead of
+	`<-ideographic-component-forms' for U+534A.
+	(U-00020983): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-original*sources'.
+	(U-00024C1E): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'.
+	(U+9FBA): Use `<-identical@component/connect-right' instead of
+	`<-ideographic-component-forms' for U-0002099D.
+
+	* Ideograph-R013-Down-Box.el (C1-5E32): Use `zhengzitong' instead
+	of `zhengzi-tong' in `<-original*sources'.
+
+2005-10-22  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R015-Ice.el (U+51B0): Use `zhengzitong' instead of
+	`zhengzi-tong' in `->vulgar*sources'.
+	(U-000205B1): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'.
+	(U+51C8): Use `->denotational' instead of `->subsumptive'.
+	(J0-5245): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'.
+	(U-0002060D): Use `->subsumptive'.
+
+	* Ideograph-R006-Hook.el (U+4E89): Add `<-simplified@CN' for
+	G1-5579; add `<-simplified@ucs' for U+722D.
+	(U-00020029): Use `->subsumptive'; use
+	`ideographic-{radical|strokes}@{ucs|cns}' instead of
+	`ideographic-'; add `ideographic-radical@cns*sources'.
+
+	* Ideograph-R005-Second.el (U+4E77): Use `->subsumptive'.
+	(U-000200F0): Use `->subsumptive'; use
+	`ideographic-{radical|strokes}@{ucs|cns}' instead of
+	`ideographic-'; add `ideographic-radical@cns*sources'; don't use
+	`<-same' for M-21712.
+
+	* Ideograph-R003-Dot.el (BC-87D2): Add `=>daikanwa' for M-02840.
+	(GT-K04581): Use `<-formed@component/connect-below' instead of
+	`<-ideographic-component-forms' for C3-2740.
+
+	* Ideograph-R002-Line.el (U-00020064): Use `->subsumptive'; use
+	`ideographic-{radical|strokes}@{ucs|cns}' instead of
+	`ideographic-'; add `ideographic-radical@cns*sources'; don't use
+	`<-same' for M-04684.
+
+2005-10-21  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R022-Right-Open-Box.el (U+5332): Use `zhengzitong'
+	instead of `zhengzi-tong' in `<-vulgar*sources'.
+
+	* Ideograph-R021-Spoon.el (BC-895F): Use `<-formed@component'
+	instead of `<-ideographic-component-forms'.
+
+	* Ideograph-R020-Wrap.el (JSP-337B): Use `zhengzitong' instead of
+	`zhengzi-tong' in `<-vulgar*sources'.
+
+	* Ideograph-R017-Open-Box.el (U+51FE): Use `zhengzitong' instead
+	of `zhengzi-tong' in `<-vulgar*sources'.
+
+	* Ideograph-R016-Table.el (U+51E2): Use `zhengzitong' instead of
+	`zhengzi-tong' in `<-vulgar*sources'.
+
+	* Ideograph-R011-Enter.el (M-01416): Use `zhengzitong' instead of
+	`zhengzi-tong' in `<-wrong*sources'.
+
+	* Ideograph-R007-Two.el (GT-K00083): Use `<-formed@component'
+	instead of `<-ideographic-component-forms'.
+	(GT-K00327): Use `<-formed@component/connect-left' instead of
+	`<-ideographic-component-forms'.
+	(U+4E8F): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-original*sources'.
+
+2005-10-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R004-Slash.el (U+4E46): Use `zhengzitong' instead of
+	`zhengzi-tong' in `<-wrong*sources'.
+	(U+51E2): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-vulgar*sources'.
+	(U-0002008B): Use `<-formed@component' instead of
+	`<-ideographic-component-forms'.
+	(U-00021D18): Use `zhengzitong' instead of `zhengzi-tong' in
+	`<-original*sources'.
+
+	* char-db-util.el (char-attribute-name<): Put `<-FOO' (except
+	`<-simplified' and `<-denotational') into the last place before
+	`<-BAR'.
+
 2005-10-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* Ideograph-R140-Grass.el: Add some mappings between CNS 11643-6
diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index e1863e9..1866fad 100644
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -265,15 +265,6 @@
     (ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (<-simplified@CN
-     ((=jis-x0208	  . #x685F)	; &GT-41264; [72-63]
-      (=ks-x1001	  . #x583F)	; &I-K0-583F; [56-31]
-      (=gb12345		  . #x4D72)	; &GT-41264; [45-82]
-      ))
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x685F)	; &GT-41264; [72-63]
-      (=ks-x1001	  . #x583F)	; &I-K0-583F; [56-31]
-      ))
     (hanyu-dazidian	1 9 3)
     (shinjigen-1	. 12)
     (shinjigen-2	. 12)
@@ -292,6 +283,18 @@
     (=gt-pj-1		. #x4B7C)	; &I-GT-00021; [43-92]
     (=daikanwa		. 00010)	; &I-M-00010;
     (mojikyo		. 000010)	; &MCS-6000000A;
+    (<-simplified@CN
+     ((=jis-x0208	  . #x685F)	; &GT-41264; [72-63]
+      (=ks-x1001	  . #x583F)	; &I-K0-583F; [56-31]
+      (=gb12345		  . #x4D72)	; &GT-41264; [45-82]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x685F)	; &GT-41264; [72-63]
+      (=ks-x1001	  . #x583F)	; &I-K0-583F; [56-31]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x842C)	; 萬
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -462,12 +465,12 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (<-unknown
-     ((=ucs		  . #x624D)	; 才
-      ))
     (=gt		. 00010)	; &GT-00010;
     (=gt-k		. 00176)	; &I-GT-K00176;
     (=gt-pj-9		. #x4A2B)	; &GT-00010; [42-11]
+    (<-unknown
+     ((=ucs		  . #x624D)	; 才
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -524,6 +527,9 @@
     (sound@ja/kun	"ata-H+eru" "kumi+suru" "azuka+r5")
     (sound@ja/on	"yo")
     (=ucs		. #x4E0E)	; 与
+    (<-simplified@ucs
+     ((=ucs		  . #x8207)	; 與
+      ))
     ))
 (define-char
   '((<-denotational
@@ -542,10 +548,7 @@
     (=big5		. #xC94F)	; &B-C94F;
     (=ucs@big5		. #x4E0E)	; &B-C94F;
     (->subsumptive
-     ((<-simplified@CN
-       ((=gb12345	    . #x536B)	; &GT-39084; [51-75]
-	))
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
 	(=ucs		    . #x2FF9)	; ⿹
 	)
@@ -562,6 +565,9 @@
       (=jef-china3	  . #x82A6)	; &I-JC3-82A6;
       (=ucs@unicode	  . #x4E0E)	; &GT-00023;
       (mojikyo		  . 000020)	; &MCS-60000014;
+      (<-simplified@CN
+       ((=gb12345	    . #x536B)	; &GT-39084; [51-75]
+	))
       (->synonyms
        ((=daikanwa	    . 30212)	; &I-M-30212;
 	))
@@ -576,11 +582,6 @@
     (ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6750)	; &GT-39084; [71-48]
-      (=ks-x1001	  . #x6628)	; &I-K0-6628; [70-08]
-      (=daikanwa	  . 30212)	; &I-M-30212;
-      ))
     (shinjigen-1	. 6625)
     (shinjigen-2	. 6625)
     (=jis-x0208		. #x4D3F)	; &GT-00024; [45-31]
@@ -588,6 +589,11 @@
     (=gt-k		. 00208)	; &I-GT-K00208;
     (=gt-pj-1		. #x4D3F)	; &I-GT-00024; [45-31]
     (=ucs@jis		. #x4E0E)	; &GT-00024;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6750)	; &GT-39084; [71-48]
+      (=ks-x1001	  . #x6628)	; &I-K0-6628; [70-08]
+      (=daikanwa	  . 30212)	; &I-M-30212;
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -661,6 +667,12 @@
     (ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (shinjigen-1	. 17)
+    (=gb2312		. #x3373)	; &GT-00035; [19-83]
+    (=big5-cdp		. #x89D2)	; &I-CDP-89D2;
+    (=gt		. 00035)	; &I-GT-00035;
+    (=gt-pj-9		. #x4B23)	; &I-GT-00035; [43-03]
+    (=ucs@unicode	. #x4E11)	; &GT-00035;
     (<-simplified@CN
      ((=gb12345		  . #x3373)	; &UU+919C; [19-83]
       ))
@@ -673,12 +685,6 @@
       ))
     (<-vulgar*sources
      shinjigen-1)
-    (shinjigen-1	. 17)
-    (=gb2312		. #x3373)	; &GT-00035; [19-83]
-    (=big5-cdp		. #x89D2)	; &I-CDP-89D2;
-    (=gt		. 00035)	; &I-GT-00035;
-    (=gt-pj-9		. #x4B23)	; &I-GT-00035; [43-03]
-    (=ucs@unicode	. #x4E11)	; &GT-00035;
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -711,20 +717,12 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (=ucs		. #x2000B)	; 𠀋
     (<-vulgar
      ((=ucs		  . #x4E08)	; 丈
       ))
-    (=ucs		. #x2000B)	; 𠀋
     (->subsumptive
-     ((<-vulgar
-       ((=jis-x0208@1978    . #x3E66)	; &GT-00018; [30-70]
-	(=jis-x0208@1983    . #x3E66)	; &I-J83-3E66; [30-70]
-	(=ks-x1001	    . #x6D5B)	; &I-K0-6D5B; [77-59]
-	(=daikanwa	    . 00011)	; &I-M-00011;
-	))
-      (<-vulgar*sources
-       daikanwa)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
 	(=ucs		    . #x2FFA)	; ⿺
 	)
@@ -740,18 +738,18 @@
       (=gt-pj-2		  . #x3030)	; &I-GT-00031; [16-16]
       (=daikanwa	  . 00026)	; &I-M-00026;
       (=ucs@jis		  . #x2000B)	; &GT-00031;
+      (<-vulgar
+       ((=jis-x0208@1978    . #x3E66)	; &GT-00018; [30-70]
+	(=jis-x0208@1983    . #x3E66)	; &I-J83-3E66; [30-70]
+	(=ks-x1001	    . #x6D5B)	; &I-K0-6D5B; [77-59]
+	(=daikanwa	    . 00011)	; &I-M-00011;
+	))
+      (<-vulgar*sources
+       daikanwa)
       )
      ((mojikyo		  . 000026)	; &MCS-6000001A;
       )
-     ((<-vulgar
-       ((shinjigen-1	    . 9)
-	(=gb2312	    . #x5549)	; &GT-00020; [53-41]
-	(=jis-x0208@1990    . #x3E66)	; &I-J90-3E66; [30-70]
-	(=cns11643-1	    . #x4437)	; &I-C1-4437; [36-23]
-	))
-      (<-vulgar*sources
-       shinjigen-1)
-      (hanyu-dazidian	  1 12 5)
+     ((hanyu-dazidian	  1 12 5)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
 	(=ucs		    . #x2FFA)	; ⿺
@@ -766,6 +764,14 @@
       (=gt-pj-9		  . #x4B24)	; &I-GT-00032; [43-04]
       (=hanziku-1	  . #xA6AC)	; &I-HZK01-A6AC;
       (=ucs@iso		  . #x2000B)	; &GT-00032;
+      (<-vulgar
+       ((shinjigen-1	    . 9)
+	(=gb2312	    . #x5549)	; &GT-00020; [53-41]
+	(=jis-x0208@1990    . #x3E66)	; &I-J90-3E66; [30-70]
+	(=cns11643-1	    . #x4437)	; &I-C1-4437; [36-23]
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       ))
     ))
 (define-char
@@ -812,6 +818,12 @@
     (ideographic-radical@daikanwa . 1)	; ⼀
     (ideographic-strokes@daikanwa . 3)
     (total-strokes	 . 4)
+    (hanyu-dazidian	1 241 5)
+    (shinjigen-1	. 492)
+    (=ucs		. #x20503)	; 𠔃
+    (=cns11643-6	. #x2141)	; &I-C6-2141; [01-33]
+    (=daikanwa		. 48904)	; &I-M-48904;
+    (=hanziku-1		. #xD7D7)	; &I-HZK01-D7D7;
     (<-vulgar
      ((shinjigen-1	  . 491)
       (=jis-x0208	  . #x5142)	; &GT-01891; [49-34]
@@ -820,25 +832,19 @@
       ))
     (<-vulgar*sources
      daikanwa shinjigen-1)
-    (hanyu-dazidian	1 241 5)
-    (shinjigen-1	. 492)
-    (=ucs		. #x20503)	; 𠔃
-    (=cns11643-6	. #x2141)	; &I-C6-2141; [01-33]
-    (=daikanwa		. 48904)	; &I-M-48904;
-    (=hanziku-1		. #xD7D7)	; &I-HZK01-D7D7;
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (<-simplified@CN
-     ((=gb12345		  . #x5728)	; &GT-09367; [55-08]
-      ))
     (hanyu-dazidian	1 10 5)
     (=ucs		. #x4E13)	; 专
     (=gb2312		. #x5728)	; &I-G0-5728; [55-08]
     (=big5-cdp		. #x89F9)	; &I-CDP-89F9;
     (=jef-china3	. #x81D9)	; &I-JC3-81D9;
+    (<-simplified@CN
+     ((=gb12345		  . #x5728)	; &GT-09367; [55-08]
+      ))
     ))
 (define-char
   '((=>ucs		. #x5187)	; 冇
@@ -885,15 +891,15 @@
     (ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (<-ideographic-component-forms
+    (hanyu-dazidian	1 11 2)
+    (=big5-cdp		. #x88C7)	; &CDP-88C7;
+    (<-formed@component/connect-right
      ((=cns11643-6	  . #x2227)	; &GT-31487; [02-07]
       (=daikanwa	  . 24624)	; &I-M-24624;
       )
      ((=cns11643-1	  . #x467C)	; &M-24623; [38-92]
       (=daikanwa	  . 24623)	; &I-M-24623;
       ))
-    (hanyu-dazidian	1 11 2)
-    (=big5-cdp		. #x88C7)	; &CDP-88C7;
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1225,21 +1231,18 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (<-simplified@CN
-     ((=gb12345		  . #x5235)	; &GT-19258; [50-21]
-      ))
     (hanyu-dazidian	1 15 4)
     (=ucs		. #x4E1A)	; 业
     (=gb2312		. #x5235)	; &I-G0-5235; [50-21]
     (=big5-cdp		. #x8B60)	; &I-CDP-8B60;
+    (<-simplified@CN
+     ((=gb12345		  . #x5235)	; &GT-19258; [50-21]
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (<-simplified@CN
-     ((=gb12345		  . #x3454)	; &UU+53E2; [20-52]
-      ))
     (hanyu-dazidian	1 17 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1252,17 +1255,20 @@
     (=ucs		. #x4E1B)	; 丛
     (=gb2312		. #x3454)	; &I-G0-3454; [20-52]
     (=hanziku-1		. #xA7AD)	; &I-HZK01-A7AD;
+    (<-simplified@CN
+     ((=gb12345		  . #x3454)	; &UU+53E2; [20-52]
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
+    (=ucs		. #x4E1C)	; 东
+    (=gb2312		. #x362B)	; &I-G0-362B; [22-11]
     (<-simplified@CN
      ((=ucs		  . #x6771)	; 東
       (=gb12345		  . #x362B)	; 東 [22-11]
       ))
-    (=ucs		. #x4E1C)	; 东
-    (=gb2312		. #x362B)	; &I-G0-362B; [22-11]
     ))
 (define-char
   '((=>ucs		. #x4E1C)	; 东
@@ -1276,9 +1282,6 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (<-simplified@CN
-     ((=gb12345		  . #x4B3F)	; &UU+7D72; [43-31]
-      ))
     (hanyu-dazidian	1 17 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1298,6 +1301,9 @@
     (=ucs		. #x4E1D)	; 丝
     (=gb2312		. #x4B3F)	; &I-G0-4B3F; [43-31]
     (=hanziku-1		. #xA7B2)	; &I-HZK01-A7B2;
+    (<-simplified@CN
+     ((=gb12345		  . #x4B3F)	; &UU+7D72; [43-31]
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1556,11 +1562,6 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5140)	; &GT-01871; [49-32]
-      (=ks-x1001	  . #x5557)	; &I-K0-5557; [53-55]
-      (=daikanwa	  . 01436)	; &I-M-01436;
-      ))
     (hanyu-dazidian	1 19 1)
     (shinjigen-1	. 483)
     (shinjigen-2	. 483)
@@ -1573,6 +1574,11 @@
     (=gt-pj-1		. #x4E3E)	; &I-GT-00065; [46-30]
     (=daikanwa		. 00046)	; &I-M-00046;
     (mojikyo		. 000046)	; &MCS-6000002E;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5140)	; &GT-01871; [49-32]
+      (=ks-x1001	  . #x5557)	; &I-K0-5557; [53-55]
+      (=daikanwa	  . 01436)	; &I-M-01436;
+      ))
     ))
 (define-char
   '((ideographic-radical@ucs . 1)	; ⼀
@@ -1812,11 +1818,6 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (<-ancient
-     ((=daikanwa	  . 39763)	; &M-39763;
-      ))
-    (<-ancient*sources
-     daikanwa)
     (hanyu-dazidian	1 21 6)
     (=ucs		. #x4E23)	; 丣
     (=jis-x0212		. #x3027)	; &I-JSP-3027; [16-07]
@@ -1826,6 +1827,11 @@
     (=gt-pj-2		. #x3041)	; &I-GT-00076; [16-33]
     (=daikanwa		. 00048)	; &I-M-00048;
     (mojikyo		. 000048)	; &MCS-60000030;
+    (<-ancient
+     ((=daikanwa	  . 39763)	; &M-39763;
+      ))
+    (<-ancient*sources
+     daikanwa)
     (->mistakable
      ((=ucs		  . #x623C)	; 戼
       (=daikanwa	  . 11708)	; &I-M-11708;
@@ -1878,9 +1884,6 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (<-simplified@CN
-     ((=gb12345		  . #x413D)	; &C1-4C25; [33-29]
-      ))
     (hanyu-dazidian	1 21 2)
     (=ucs		. #x4E24)	; 两
     (=gb2312		. #x413D)	; &I-G0-413D; [33-29]
@@ -1892,6 +1895,9 @@
     (=daikanwa		. 00051)	; &I-M-00051;
     (=jef-china3	. #x41A3)	; &I-JC3-41A3;
     (mojikyo		. 000051)	; &MCS-60000033;
+    (<-simplified@CN
+     ((=gb12345		  . #x413D)	; &C1-4C25; [33-29]
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1905,29 +1911,35 @@
     (mojikyo		. 000052)	; &MCS-60000034;
     ))
 (define-char
-  '((ideographic-	(:radical	1 ; ⼀
-			 :strokes	6)
-			(:radical	6 ; ⼅
-			 :strokes	6))
+  '((ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 6)
+    (ideographic-radical@cns . 6)	; ⼅
+    (ideographic-strokes@cns . 6)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 553 5)
     (=ucs		. #x20029)	; 𠀩
-    (=cns11643-6	. #x2563)	; &I-C6-2563; [05-67]
-    (=daikanwa		. 00239)	; &I-M-00239;
-    (=hanziku-2		. #xC1C0)	; &I-HZK02-C1C0;
-    (mojikyo		. 000239)	; &MCS-600000EF;
+    (->subsumptive
+     ((=cns11643-6	  . #x2563)	; &M-00239; [05-67]
+      (=daikanwa	  . 00239)	; &I-M-00239;
+      (=ucs@iso		  . #x20029)	; &M-00239;
+      )
+     ((hanyu-dazidian	  1 553 5)
+      (=hanziku-2	  . #xC1C0)	; &HZK02-C1C0;
+      (mojikyo		  . 000239)	; &MCS-600000EF;
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (<-simplified@CN
-     ((=gb12345		  . #x514F)	; &UU+56B4; [49-47]
-      ))
     (hanyu-dazidian	1 19 10)
     (=ucs		. #x4E25)	; 严
     (=gb2312		. #x514F)	; &I-G0-514F; [49-47]
     (=big5-cdp		. #x8A6C)	; &I-CDP-8A6C;
+    (<-simplified@CN
+     ((=gb12345		  . #x514F)	; &UU+56B4; [49-47]
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -2013,11 +2025,6 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x636D)	; &GT-33217; [67-77]
-      (=ks-x1001	  . #x5C3D)	; &I-K0-5C3D; [60-29]
-      (=daikanwa	  . 25752)	; &I-M-25752;
-      ))
     (hanyu-dazidian	1 246 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -2041,6 +2048,11 @@
     (=gt-pj-1		. #x4A42)	; &I-GT-00084; [42-34]
     (=daikanwa		. 00054)	; &I-M-00054;
     (mojikyo		. 000054)	; &MCS-60000036;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x636D)	; &GT-33217; [67-77]
+      (=ks-x1001	  . #x5C3D)	; &I-K0-5C3D; [60-29]
+      (=daikanwa	  . 25752)	; &I-M-25752;
+      ))
     ))
 (define-char
   '((=>ucs		. #x2160B)	; 𡘋
@@ -2148,18 +2160,6 @@
     (ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
-    (<-ancient
-     ((=jis-x0208@1978	  . #x4E6F)	; &GT-64844; [46-79]
-      (=jis-x0208@1983	  . #x4E6F)	; &I-J83-4E6F; [46-79]
-      (=ks-x1001	  . #x5572)	; &I-K0-5572; [53-82]
-      (=daikanwa	  . 47663)	; &I-M-47663;
-      ))
-    (<-ancient*sources
-     daikanwa)
-    (<-same
-     ((=cns11643-3	  . #x2740)	; &GT-00145; [07-32]
-      (=daikanwa	  . 00104)	; &I-M-00104;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -2173,6 +2173,18 @@
     (=gt-pj-2		. #x304B)	; &I-GT-00087; [16-43]
     (=daikanwa		. 00059)	; &I-M-00059;
     (mojikyo		. 000059)	; &MCS-6000003B;
+    (<-ancient
+     ((=jis-x0208@1978	  . #x4E6F)	; &GT-64844; [46-79]
+      (=jis-x0208@1983	  . #x4E6F)	; &I-J83-4E6F; [46-79]
+      (=ks-x1001	  . #x5572)	; &I-K0-5572; [53-82]
+      (=daikanwa	  . 47663)	; &I-M-47663;
+      ))
+    (<-ancient*sources
+     daikanwa)
+    (<-same
+     ((=cns11643-3	  . #x2740)	; &GT-00145; [07-32]
+      (=daikanwa	  . 00104)	; &I-M-00104;
+      ))
     ))
 (define-char
   '((ideographic-radical@cns . 55)	; ⼶
@@ -2213,18 +2225,6 @@
     (ideographic-radical@cns*sources
      cns11643)
     (total-strokes	 . 8)
-    (<-ancient
-     ((=jis-x0208@1978	  . #x4E6F)	; &GT-64844; [46-79]
-      (=jis-x0208@1983	  . #x4E6F)	; &I-J83-4E6F; [46-79]
-      (=ks-x1001	  . #x5572)	; &I-K0-5572; [53-82]
-      (=daikanwa	  . 47663)	; &I-M-47663;
-      ))
-    (<-ancient*sources
-     daikanwa)
-    (<-same
-     ((=cns11643-6	  . #x2936)	; &GT-00087; [09-22]
-      (=daikanwa	  . 00059)	; &I-M-00059;
-      ))
     (hanyu-dazidian	1 24 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -2241,6 +2241,18 @@
     (=daikanwa		. 00104)	; &I-M-00104;
     (=ucs@cns		. #x4E3D)	; &GT-00145;
     (mojikyo		. 000104)	; &MCS-60000068;
+    (<-ancient
+     ((=jis-x0208@1978	  . #x4E6F)	; &GT-64844; [46-79]
+      (=jis-x0208@1983	  . #x4E6F)	; &I-J83-4E6F; [46-79]
+      (=ks-x1001	  . #x5572)	; &I-K0-5572; [53-82]
+      (=daikanwa	  . 47663)	; &I-M-47663;
+      ))
+    (<-ancient*sources
+     daikanwa)
+    (<-same
+     ((=cns11643-6	  . #x2936)	; &GT-00087; [09-22]
+      (=daikanwa	  . 00059)	; &I-M-00059;
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -2281,10 +2293,6 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
-    (<-simplified@CN
-     ((=ucs		  . #x55AA)	; 喪
-      (=gb12345		  . #x4925)	; 喪 [41-05]
-      ))
     (hanyu-dazidian	1 22 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -2297,6 +2305,10 @@
     (=ucs		. #x4E27)	; 丧
     (=gb2312		. #x4925)	; &I-G0-4925; [41-05]
     (=hanziku-1		. #xA8AE)	; &I-HZK01-A8AE;
+    (<-simplified@CN
+     ((=ucs		  . #x55AA)	; 喪
+      (=gb12345		  . #x4925)	; 喪 [41-05]
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -2586,14 +2598,26 @@
     (=gt-pj-11		. #x487D)	; &GT-00093; [40-93]
     ))
 (define-char
-  '((ideographic-	(:radical	30 ; ⼝
-			 :strokes	9)
-			(:radical	1 ; ⼀
-			 :strokes	11))
+  '((ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 11)
+    (ideographic-radical@cns . 30)	; ⼝
+    (ideographic-strokes@cns . 9)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 12)
-    (<-same
-     ((=cns11643-6	  . #x472D)	; &C6-472D; [39-13]
+    (=ucs		. #x20048)	; 𠁈
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20048)	; 𠁈
       ))
+    (ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 11)
+    (ideographic-radical@cns . 30)	; ⼝
+    (ideographic-strokes@cns . 9)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (total-strokes	 . 12)
     (hanyu-dazidian	1 26 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -2618,9 +2642,9 @@
 	  ))
 	))
       ))
-    (=ucs		. #x20048)	; 𠁈
-    (=daikanwa		. 04020)	; &I-M-04020;
+    (=daikanwa		. 04020)	; &M-04020;
     (=hanziku-1		. #xA979)	; &I-HZK01-A979;
+    (=ucs@iso		. #x20048)	; &M-04020;
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
diff --git a/lisp/utf-2000/Ideograph-R002-Line.el b/lisp/utf-2000/Ideograph-R002-Line.el
index 881cadd..56cfd7d 100644
--- a/lisp/utf-2000/Ideograph-R002-Line.el
+++ b/lisp/utf-2000/Ideograph-R002-Line.el
@@ -42,18 +42,18 @@
     ))
 (define-char
   '((total-strokes	 . 2)
-    (<-ancient
-     ((=ucs		  . #x535C)	; 卜
-      (=daikanwa	  . 02774)	; &I-M-02774;
-      ))
-    (<-ancient*sources
-     shuowen daikanwa)
     (hanyu-dazidian	1 28 4)
     (=ucs		. #x20061)	; 𠁡
     (=cns11643-6	. #x212C)	; &I-C6-212C; [01-12]
     (=big5-cdp		. #x87B1)	; &I-CDP-87B1;
     (=gt		. 00103)	; &I-GT-00103;
     (=gt-pj-2		. #x3055)	; &I-GT-00103; [16-53]
+    (<-ancient
+     ((=ucs		  . #x535C)	; 卜
+      (=daikanwa	  . 02774)	; &I-M-02774;
+      ))
+    (<-ancient*sources
+     shuowen daikanwa)
     (->subsumptive
      ((ideographic-radical . 2)	; ⼁
       (ideographic-strokes . 1)
@@ -77,10 +77,6 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (<-simplified@CN
-     ((=ucs		  . #x500B)	; 個
-      (=gb12345		  . #x3876)	; 個 [24-86]
-      ))
     (hanyu-dazidian	1 103 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -106,6 +102,10 @@
     (=daikanwa		. 00070)	; &I-M-00070;
     (=cbeta		. 00286)	; &I-CB00286;
     (mojikyo		. 000070)	; &MCS-60000046;
+    (<-simplified@CN
+     ((=ucs		  . #x500B)	; 個
+      (=gb12345		  . #x3876)	; 個 [24-86]
+      ))
     ))
 (define-char
   '((ideographic-radical . 2)	; ⼁
@@ -225,11 +225,7 @@
     (total-strokes	 . 4)
     (=ucs		. #x4E30)	; 丰
     (->subsumptive
-     ((<-simplified@CN
-       ((=ucs		    . #x8C50)	; 豐
-	(=gb12345	    . #x3761)	; 豐 [23-65]
-	))
-      (shinjigen-1	  . 35)
+     ((shinjigen-1	  . 35)
       (shinjigen-2	  . 35)
       (=gb2312		  . #x3761)	; &GT-00110; [23-65]
       (=jis-x0212	  . #x302D)	; &I-JSP-302D; [16-13]
@@ -241,6 +237,10 @@
       (=jef-china3	  . #x81FE)	; &I-JC3-81FE;
       (=ucs@unicode	  . #x4E30)	; &GT-00110;
       (mojikyo		  . 000076)	; &MCS-6000004C;
+      (<-simplified@CN
+       ((=ucs		    . #x8C50)	; 豐
+	(=gb12345	    . #x3761)	; 豐 [23-65]
+	))
       )
      ((hanyu-dazidian	  1 28 7)
       (=cns11643-1	  . #x4464)	; &C1-4464; [36-68]
@@ -294,19 +294,24 @@
     (mojikyo		. 000078)	; &MCS-6000004E;
     ))
 (define-char
-  '((morohashi-daikanwa	4684 0 0)
-    (ideographic-	(:radical	31 ; ⼞
-			 :strokes	2)
-			(:radical	2 ; ⼁
-			 :strokes	4))
+  '((ideographic-radical@ucs . 2)	; ⼁
+    (ideographic-strokes@ucs . 4)
+    (ideographic-radical@cns . 31)	; ⼞
+    (ideographic-strokes@cns . 2)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 5)
-    (<-same
-     ((=daikanwa	  . 04684)	; &M-04684;
-      ))
     (hanyu-dazidian	1 29 3)
     (=ucs		. #x20064)	; 𠁤
-    (=cns11643-6	. #x225F)	; &I-C6-225F; [02-63]
-    (=big5-cdp		. #x87E5)	; &I-CDP-87E5;
+    (->subsumptive
+     ((ideographic-radical . 31)	; ⼞
+      (ideographic-strokes . 2)
+      (=daikanwa	  . 04684)	; &M-04684;
+      )
+     ((=cns11643-6	  . #x225F)	; &CDP-87E5; [02-63]
+      (=big5-cdp	  . #x87E5)	; &I-CDP-87E5;
+      (=ucs@iso		  . #x20064)	; &CDP-87E5;
+      ))
     ))
 (define-char
   '((ideographic-radical . 2)	; ⼁
@@ -456,10 +461,10 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
+    (=big5-cdp		. #x89CD)	; &CDP-89CD;
     (<-simplified
      ((=ucs		  . #x23D92)	; 𣶒
       ))
-    (=big5-cdp		. #x89CD)	; &CDP-89CD;
     ))
 (define-char
   '((ideographic-radical . 2)	; ⼁
@@ -548,9 +553,6 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 8)
     (total-strokes	 . 9)
-    (<-simplified@CN
-     ((=gb12345		  . #x4159)	; &GT-38930; [33-57]
-      ))
     (hanyu-dazidian	1 30 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -571,6 +573,9 @@
     (=gb2312		. #x4159)	; &I-G0-4159; [33-57]
     (=hanziku-1		. #xAA56)	; &I-HZK01-AA56;
     (=jef-china3	. #x82AF)	; &I-JC3-82AF;
+    (<-simplified@CN
+     ((=gb12345		  . #x4159)	; &GT-38930; [33-57]
+      ))
     ))
 (define-char
   '((ideographic-radical . 2)	; ⼁
diff --git a/lisp/utf-2000/Ideograph-R003-Dot.el b/lisp/utf-2000/Ideograph-R003-Dot.el
index baf502f..abe40f7 100644
--- a/lisp/utf-2000/Ideograph-R003-Dot.el
+++ b/lisp/utf-2000/Ideograph-R003-Dot.el
@@ -126,6 +126,15 @@
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
+    (hanyu-dazidian	1 276 4)
+    (shinjigen-1	. 40)
+    (=ucs		. #x2007D)	; 𠁽
+    (=cns11643-6	. #x2132)	; &I-C6-2132; [01-18]
+    (=big5-cdp		. #x87B9)	; &I-CDP-87B9;
+    (=gt		. 00133)	; &I-GT-00133;
+    (=gt-pj-2		. #x306B)	; &I-GT-00133; [16-75]
+    (=daikanwa		. 00096)	; &I-M-00096;
+    (mojikyo		. 000096)	; &MCS-60000060;
     (<-original
      ((shinjigen-1	  . 39)
       (=jis-x0208	  . #x345D)	; &GT-00131; [20-61]
@@ -136,15 +145,6 @@
       ))
     (<-original*sources
      zhonghua-dazidian daikanwa shinjigen-1)
-    (hanyu-dazidian	1 276 4)
-    (shinjigen-1	. 40)
-    (=ucs		. #x2007D)	; 𠁽
-    (=cns11643-6	. #x2132)	; &I-C6-2132; [01-18]
-    (=big5-cdp		. #x87B9)	; &I-CDP-87B9;
-    (=gt		. 00133)	; &I-GT-00133;
-    (=gt-pj-2		. #x306B)	; &I-GT-00133; [16-75]
-    (=daikanwa		. 00096)	; &I-M-00096;
-    (mojikyo		. 000096)	; &MCS-60000060;
     ))
 (define-char
   '((name		. "IDEOGRAPHIC ITERATION MARK")
@@ -193,6 +193,18 @@
     (=daikanwa		. 02840)	; &I-M-02840;
     ))
 (define-char
+  '((=>ucs		. #x2007E)	; 𠁾
+    (=>daikanwa		. 02840)	; 𠁾
+    (ideographic-radical . 3)	; ⼂
+    (ideographic-strokes . 3)
+    (total-strokes	 . 4)
+    (hanyu-dazidian	1 52 1)
+    (=big5-cdp		. #x87D2)	; &CDP-87D2;
+    (<-same
+     ((=ucs		  . #x2007E)	; 𠁾
+      ))
+    ))
+(define-char
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
@@ -247,24 +259,13 @@
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (<-simplified@CN
-     ((=gb12345		  . #x4E2A)	; &GT-25271; [46-10]
-      ))
     (hanyu-dazidian	1 44 2)
     (=ucs		. #x4E3A)	; 为
     (=gb2312		. #x4E2A)	; &I-G0-4E2A; [46-10]
     (=big5-cdp		. #x89D0)	; &I-CDP-89D0;
-    ))
-(define-char
-  '((=>ucs		. #x2007E)	; 𠁾
-    (ideographic-radical . 3)	; ⼂
-    (ideographic-strokes . 3)
-    (total-strokes	 . 4)
-    (<-same
-     ((=ucs		  . #x2007E)	; 𠁾
+    (<-simplified@CN
+     ((=gb12345		  . #x4E2A)	; &GT-25271; [46-10]
       ))
-    (hanyu-dazidian	1 52 1)
-    (=big5-cdp		. #x87D2)	; &CDP-87D2;
     ))
 (define-char
   '((=>daikanwa		. 00100)	; &GT-00137;
@@ -425,18 +426,6 @@
     (ideographic-radical@cns*sources
      cns11643)
     (total-strokes	 . 8)
-    (<-ancient
-     ((=jis-x0208@1978	  . #x4E6F)	; &GT-64844; [46-79]
-      (=jis-x0208@1983	  . #x4E6F)	; &I-J83-4E6F; [46-79]
-      (=ks-x1001	  . #x5572)	; &I-K0-5572; [53-82]
-      (=daikanwa	  . 47663)	; &I-M-47663;
-      ))
-    (<-ancient*sources
-     daikanwa)
-    (<-same
-     ((=cns11643-6	  . #x2936)	; &GT-00087; [09-22]
-      (=daikanwa	  . 00059)	; &I-M-00059;
-      ))
     (hanyu-dazidian	1 24 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -453,6 +442,18 @@
     (=daikanwa		. 00104)	; &I-M-00104;
     (=ucs@cns		. #x4E3D)	; &GT-00145;
     (mojikyo		. 000104)	; &MCS-60000068;
+    (<-ancient
+     ((=jis-x0208@1978	  . #x4E6F)	; &GT-64844; [46-79]
+      (=jis-x0208@1983	  . #x4E6F)	; &I-J83-4E6F; [46-79]
+      (=ks-x1001	  . #x5572)	; &I-K0-5572; [53-82]
+      (=daikanwa	  . 47663)	; &I-M-47663;
+      ))
+    (<-ancient*sources
+     daikanwa)
+    (<-same
+     ((=cns11643-6	  . #x2936)	; &GT-00087; [09-22]
+      (=daikanwa	  . 00059)	; &I-M-00059;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -461,9 +462,6 @@
     (ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (<-simplified@CN
-     ((=gb12345		  . #x4076)	; &UU+9E97; [32-86]
-      ))
     (hanyu-dazidian	1 21 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -497,6 +495,9 @@
     (=gb2312		. #x4076)	; &HZK01-A86E; [32-86]
     (=hanziku-1		. #xA86E)	; &I-HZK01-A86E;
     (=ucs@unicode	. #x4E3D)	; &HZK01-A86E;
+    (<-simplified@CN
+     ((=gb12345		  . #x4076)	; &UU+9E97; [32-86]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -505,12 +506,12 @@
     (ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (<-ideographic-component-forms
+    (=gt-k		. 04581)	; &GT-K04581;
+    (=gt-pj-k1		. #x325C)	; &GT-K04581; [18-60]
+    (<-formed@component/connect-below
      ((=cns11643-3	  . #x2740)	; &GT-00145; [07-32]
       (=daikanwa	  . 00104)	; &I-M-00104;
       ))
-    (=gt-k		. 04581)	; &GT-K04581;
-    (=gt-pj-k1		. #x325C)	; &GT-K04581; [18-60]
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
@@ -543,9 +544,6 @@
   '((ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 8)
     (total-strokes	 . 9)
-    (<-simplified@CN
-     ((=gb12345		  . #x3E59)	; &GT-39114; [30-57]
-      ))
     (hanyu-dazidian	1 47 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
@@ -567,6 +565,9 @@
     (=ucs		. #x4E3E)	; 举
     (=gb2312		. #x3E59)	; &I-G0-3E59; [30-57]
     (=hanziku-1		. #xADBF)	; &I-HZK01-ADBF;
+    (<-simplified@CN
+     ((=gb12345		  . #x3E59)	; &GT-39114; [30-57]
+      ))
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
diff --git a/lisp/utf-2000/Ideograph-R004-Slash.el b/lisp/utf-2000/Ideograph-R004-Slash.el
index 0a91de6..19c6710 100644
--- a/lisp/utf-2000/Ideograph-R004-Slash.el
+++ b/lisp/utf-2000/Ideograph-R004-Slash.el
@@ -87,6 +87,11 @@
   '((ideographic-radical . 4)	; ⼃
     (ideographic-strokes . 0)
     (total-strokes	 . 1)
+    (=cns11643-6	. #x2121)	; &GT-00149; [01-01]
+    (=gt		. 00149)	; &I-GT-00149;
+    (=gt-pj-2		. #x3076)	; &I-GT-00149; [16-86]
+    (=daikanwa		. 00110)	; &I-M-00110;
+    (mojikyo		. 000110)	; &MCS-6000006E;
     (<-ancient
      ((=ks-x1001	  . #x5060)	; &M-03118; [48-64]
       (=cns11643-1	  . #x452F)	; &I-C1-452F; [37-15]
@@ -94,11 +99,6 @@
       ))
     (<-ancient*sources
      daikanwa)
-    (=cns11643-6	. #x2121)	; &GT-00149; [01-01]
-    (=gt		. 00149)	; &I-GT-00149;
-    (=gt-pj-2		. #x3076)	; &I-GT-00149; [16-86]
-    (=daikanwa		. 00110)	; &I-M-00110;
-    (mojikyo		. 000110)	; &MCS-6000006E;
     ))
 (define-char
   '((ideographic-radical . 4)	; ⼃
@@ -199,12 +199,6 @@
   '((ideographic-radical . 4)	; ⼃
     (ideographic-strokes . 1)
     (total-strokes	 . 2)
-    (<-ancient
-     ((=ucs		  . #x4E94)	; 五
-      (=daikanwa	  . 00257)	; &I-M-00257;
-      ))
-    (<-ancient*sources
-     daikanwa)
     (hanyu-dazidian	1 31 4)
     (=ucs		. #x3405)	; 㐅
     (=cns11643-6	. #x2123)	; &I-C6-2123; [01-03]
@@ -214,6 +208,12 @@
     (=gt-pj-2		. #x3079)	; &I-GT-00155; [16-89]
     (=daikanwa		. 00115)	; &I-M-00115;
     (mojikyo		. 000115)	; &MCS-60000073;
+    (<-ancient
+     ((=ucs		  . #x4E94)	; 五
+      (=daikanwa	  . 00257)	; &I-M-00257;
+      ))
+    (<-ancient*sources
+     daikanwa)
     (->Bopomofo
      ((name		  . "BOPOMOFO LETTER U")
       (=ucs		  . #x3128)	; ㄨ
@@ -294,6 +294,16 @@
   '((ideographic-radical . 4)	; ⼃
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
+    (hanyu-dazidian	1 51 2)
+    (shinjigen-1	. 48)
+    (=ucs		. #x4E46)	; 乆
+    (=cns11643-3	. #x2130)	; &I-C3-2130; [01-16]
+    (=big5-cdp		. #x88A8)	; &I-CDP-88A8;
+    (=gt		. 00162)	; &I-GT-00162;
+    (=gt-k		. 00237)	; &I-GT-K00237;
+    (=gt-pj-2		. #x307C)	; &I-GT-00162; [16-92]
+    (=daikanwa		. 00119)	; &I-M-00119;
+    (mojikyo		. 000119)	; &MCS-60000077;
     (<-vulgar
      ((shinjigen-1	  . 47)
       (=ucs		  . #x4E45)	; 久
@@ -306,17 +316,7 @@
       (=daikanwa	  . 00118)	; &I-M-00118;
       ))
     (<-wrong*sources
-     zhengzi-tong daikanwa)
-    (hanyu-dazidian	1 51 2)
-    (shinjigen-1	. 48)
-    (=ucs		. #x4E46)	; 乆
-    (=cns11643-3	. #x2130)	; &I-C3-2130; [01-16]
-    (=big5-cdp		. #x88A8)	; &I-CDP-88A8;
-    (=gt		. 00162)	; &I-GT-00162;
-    (=gt-k		. 00237)	; &I-GT-K00237;
-    (=gt-pj-2		. #x307C)	; &I-GT-00162; [16-92]
-    (=daikanwa		. 00119)	; &I-M-00119;
-    (mojikyo		. 000119)	; &MCS-60000077;
+     zhengzitong daikanwa)
     ))
 (define-char
   '((ideographic-radical . 4)	; ⼃
@@ -392,15 +392,6 @@
     ))
 (define-char
   '((total-strokes	 . 3)
-    (<-vulgar
-     ((=jis-x0208	  . #x4B5E)	; &GT-02286; [43-62]
-      (=gb2312		  . #x3732)	; &I-G0-3732; [23-18]
-      (=ks-x1001	  . #x5B6D)	; &I-K0-5B6D; [59-77]
-      (=cns11643-1	  . #x443B)	; &I-C1-443B; [36-27]
-      (=daikanwa	  . 01739)	; &I-M-01739;
-      ))
-    (<-vulgar*sources
-     zhengzi-tong daikanwa)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -415,6 +406,15 @@
     (=jis-x0213-1-2000	. #x2E58)	; &I-JX1-2E58; [14-56]
     (=hanziku-1		. #xDEE9)	; &I-HZK01-DEE9;
     (=jef-china3	. #x41B8)	; &I-JC3-41B8;
+    (<-vulgar
+     ((=jis-x0208	  . #x4B5E)	; &GT-02286; [43-62]
+      (=gb2312		  . #x3732)	; &I-G0-3732; [23-18]
+      (=ks-x1001	  . #x5B6D)	; &I-K0-5B6D; [59-77]
+      (=cns11643-1	  . #x443B)	; &I-C1-443B; [36-27]
+      (=daikanwa	  . 01739)	; &I-M-01739;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa)
     (->subsumptive
      ((ideographic-radical . 4)	; ⼃
       (ideographic-strokes . 2)
@@ -441,17 +441,17 @@
       )
      ((mojikyo		  . 000124)	; &MCS-6000007C;
       )
-     ((<-simplified@CN
-       ((=ucs		    . #x7FA9)	; 義
-	(=gb12345	    . #x5265)	; 義 [50-69]
-	))
-      (hanyu-dazidian	  1 42 10)
+     ((hanyu-dazidian	  1 42 10)
       (=gb2312		  . #x5265)	; &GT-00165; [50-69]
       (=cns11643-3	  . #x212E)	; &I-C3-212E; [01-14]
       (=big5-cdp	  . #x8AEE)	; &I-CDP-8AEE;
       (=gt		  . 00165)	; &I-GT-00165;
       (=gt-pj-9		  . #x4A2A)	; &I-GT-00165; [42-10]
       (=ucs@unicode	  . #x4E49)	; &GT-00165;
+      (<-simplified@CN
+       ((=ucs		    . #x7FA9)	; 義
+	(=gb12345	    . #x5265)	; 義 [50-69]
+	))
       ))
     ))
 (define-char
@@ -524,12 +524,12 @@
   '((ideographic-radical . 4)	; ⼃
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (<-ideographic-component-forms
+    (=ucs		. #x2008B)	; 𠂋
+    (<-formed@component
      ((=ucs		  . #x4EBA)	; 人
       )
      ((=ucs		  . #x5C38)	; å°¸
       ))
-    (=ucs		. #x2008B)	; 𠂋
     ))
 (define-char
   '((ideographic-radical . 4)	; ⼃
@@ -641,15 +641,15 @@
     (ideographic-radical . 4)	; ⼃
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (=gt		. 00176)	; &GT-00176;
+    (=gt-pj-11		. #x527B)	; &GT-00176; [50-91]
+    (=daikanwa		. 00129)	; &I-M-00129;
     (<-same
      ((=ucs		  . #x5301)	; 匁
       (=daikanwa	  . 02502)	; &I-M-02502;
       ))
     (<-same*sources
      daikanwa)
-    (=gt		. 00176)	; &GT-00176;
-    (=gt-pj-11		. #x527B)	; &GT-00176; [50-91]
-    (=daikanwa		. 00129)	; &I-M-00129;
     ))
 (define-char
   '((ideographic-radical@ucs . 44)	; ⼫
@@ -676,10 +676,6 @@
   '((ideographic-radical . 4)	; ⼃
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (<-simplified@CN
-     ((=ucs		  . #x70CF)	; 烏
-      (=gb12345		  . #x4E5A)	; 烏 [46-58]
-      ))
     (hanyu-dazidian	1 34 10)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
@@ -692,6 +688,10 @@
     (=ucs		. #x4E4C)	; 乌
     (=gb2312		. #x4E5A)	; &I-G0-4E5A; [46-58]
     (=hanziku-1		. #xAAFD)	; &I-HZK01-AAFD;
+    (<-simplified@CN
+     ((=ucs		  . #x70CF)	; 烏
+      (=gb12345		  . #x4E5A)	; 烏 [46-58]
+      ))
     ))
 (define-char
   '((ideographic-radical . 4)	; ⼃
@@ -917,28 +917,39 @@
     ))
 (define-char
   '((ideographic-radical . 4)	; ⼃
-    (ideographic-strokes . 4)
-    (total-strokes	 . 5)
     (hanyu-dazidian	1 37 2)
     (=ucs		. #x200A0)	; 𠂠
-    (=cns11643-6	. #x222E)	; &I-C6-222E; [02-14]
-    (=big5-cdp		. #x8674)	; &I-CDP-8674;
-    (=gt		. 00184)	; &I-GT-00184;
-    (=gt-pj-2		. #x312B)	; &I-GT-00184; [17-11]
-    (=daikanwa		. 48906)	; &I-M-48906;
+    (->subsumptive
+     ((ideographic-strokes . 4)
+      (total-strokes	   . 5)
+      (=big5-cdp	  . #x8674)	; &GT-00184;
+      (=gt		  . 00184)	; &I-GT-00184;
+      (=gt-pj-2		  . #x312B)	; &I-GT-00184; [17-11]
+      (=daikanwa	  . 48906)	; &I-M-48906;
+      )
+     ((ideographic-strokes . 4)
+      (total-strokes	   . 5)
+      (=cns11643-6	  . #x222E)	; &C6-222E; [02-14]
+      )
+     ((ideographic-strokes . 5)
+      (total-strokes	   . 6)
+      (=ucs@iso		  . #x200A0)	; &U-000200A0;
+      ))
     ))
 (define-char
   '((ideographic-radical . 4)	; ⼃
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (<-simplified@CN
-     ((=ucs		  . #x6A02)	; 樂
-      (=gb12345		  . #x4056)	; 樂 [32-54]
-      ))
     (hanyu-dazidian	1 37 5)
     (=ucs		. #x4E50)	; 乐
     (=gb2312		. #x4056)	; &I-G0-4056; [32-54]
     (=big5-cdp		. #x89F1)	; &I-CDP-89F1;
+    (<-simplified@CN
+     ((=jis-x0208	  . #x5C5B)	; &GT-19659; [60-59]
+      (=ks-x1001	  . #x6445)	; &I-K0-6445; [68-37]
+      (=gb12345		  . #x4056)	; &GT-19659; [32-54]
+      (=daikanwa	  . 15399)	; &I-M-15399;
+      ))
     ))
 (define-char
   '((ideographic-radical@ucs . 96)	; ⽟
@@ -1209,11 +1220,7 @@
     (->subsumptive
      ((=daikanwa	  . 05860)	; &M-05860;
       )
-     ((<-simplified@CN
-       ((=ucs		    . #x55AC)	; 喬
-	(=gb12345	    . #x4747)	; 喬 [39-39]
-	))
-      (hanyu-dazidian	  1 38 1)
+     ((hanyu-dazidian	  1 38 1)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
@@ -1226,13 +1233,19 @@
       (=cns11643-3	  . #x2345)	; &I-C3-2345; [03-37]
       (=hanziku-1	  . #xABD7)	; &I-HZK01-ABD7;
       (=ucs@unicode	  . #x4E54)	; &HZK01-ABD7;
+      (<-simplified@CN
+       ((=ucs		    . #x55AC)	; 喬
+	(=gb12345	    . #x4747)	; 喬 [39-39]
+	))
       ))
     ))
 (define-char
-  '((ideographic-	(:radical	49 ; â¼°
-			 :strokes	3)
-			(:radical	4 ; ⼃
-			 :strokes	5))
+  '((ideographic-radical@ucs . 4)	; ⼃
+    (ideographic-strokes@ucs . 5)
+    (ideographic-radical@cns . 49)	; â¼°
+    (ideographic-strokes@cns . 3)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 6)
     (hanyu-dazidian	1 69 21)
     (=ucs		. #x200AC)	; 𠂬
@@ -1241,6 +1254,30 @@
     (=hanziku-1		. #xB25E)	; &I-HZK01-B25E;
     ))
 (define-char
+  '((ideographic-radical@ucs . 4)	; ⼃
+    (ideographic-strokes@ucs . 5)
+    (ideographic-radical@daikanwa . 137)	; ⾈
+    (ideographic-strokes@daikanwa . 1)
+    (total-strokes	 . 6)
+    (=ucs		. #x200A8)	; 𠂨
+    (->subsumptive
+     ((hanyu-dazidian	  1 38 12)
+      (=daikanwa	  . 30352)	; &M-30352;
+      (=hanziku-1	  . #xABE2)	; &I-HZK01-ABE2;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E3F)	; 丿
+	)
+       ((=ucs		    . #x518A)	; 冊
+	))
+      (=cns11643-6	  . #x2343)	; &C6-2343; [03-35]
+      (=ucs@iso		  . #x200A8)	; &C6-2343;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 4)	; ⼃
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
@@ -1275,23 +1312,6 @@
   '((ideographic-radical . 4)	; ⼃
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (hanyu-dazidian	1 38 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4E3F)	; 丿
-      )
-     ((=ucs		  . #x518A)	; 冊
-      ))
-    (=ucs		. #x200A8)	; 𠂨
-    (=cns11643-6	. #x2343)	; &I-C6-2343; [03-35]
-    (=hanziku-1		. #xABE2)	; &I-HZK01-ABE2;
-    ))
-(define-char
-  '((ideographic-radical . 4)	; ⼃
-    (ideographic-strokes . 5)
-    (total-strokes	 . 6)
     (=gt		. 00187)	; &GT-00187;
     (=gt-pj-9		. #x423A)	; &GT-00187; [34-26]
     ))
@@ -1453,11 +1473,12 @@
     (mojikyo		. 000150)	; &MCS-60000096;
     ))
 (define-char
-  '((=>daikanwa		. 16744)	; &M-16744;
-    (ideographic-radical@ucs . 4)	; ⼃
+  '((ideographic-radical@ucs . 4)	; ⼃
     (ideographic-strokes@ucs . 7)
-    (ideographic-radical@daikanwa . 81)	; ⽐
-    (ideographic-strokes@daikanwa . 3)
+    (ideographic-radical@cns . 81)	; ⽐
+    (ideographic-strokes@cns . 3)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 8)
     (=ucs		. #x200B1)	; 𠂱
     (->subsumptive
@@ -1616,11 +1637,7 @@
     (sound@ja/on/go	"zyou")
     (=ucs		. #x4E57)	; 乗
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=ucs		    . #x4E58)	; 乘
-	(=jis-x0208	    . #x502B)	; &I-J90-502B; [48-11]
-	))
-      (shinjigen-1	  . 54)
+     ((shinjigen-1	  . 54)
       (shinjigen-2	  . 54)
       (=jis-x0208	  . #x3E68)	; &GT-00208; [30-72]
       (=big5-cdp	  . #x8A46)	; &I-CDP-8A46;
@@ -1630,6 +1647,10 @@
       (=daikanwa	  . 00153)	; &I-M-00153;
       (=ucs@unicode	  . #x4E57)	; &GT-00208;
       (mojikyo		  . 000153)	; &MCS-60000099;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x4E58)	; 乘
+	(=jis-x0208	    . #x502B)	; &I-J90-502B; [48-11]
+	))
       )
      ((=cns11643-3	  . #x2B22)	; &C3-2B22; [11-02]
       (=ucs@cns		  . #x4E57)	; &C3-2B22;
@@ -1730,17 +1751,17 @@
     ))
 (define-char
   '((total-strokes	 . 10)
+    (hanyu-dazidian	2 1022 17)
+    (=ucs		. #x21D18)	; 𡴘
+    (=cns11643-6	. #x3528)	; &I-C6-3528; [21-08]
+    (=hanziku-3		. #xD0D4)	; &I-HZK03-D0D4;
     (<-original
      ((=jis-x0208	  . #x392C)	; &GT-11561; [25-12]
       (=ks-x1001	  . #x7A39)	; &I-K0-7A39; [90-25]
       (=daikanwa	  . 09176)	; &I-M-09176;
       ))
     (<-original*sources
-     zhengzi-tong zhonghua-dazidian daikanwa)
-    (hanyu-dazidian	2 1022 17)
-    (=ucs		. #x21D18)	; 𡴘
-    (=cns11643-6	. #x3528)	; &I-C6-3528; [21-08]
-    (=hanziku-3		. #xD0D4)	; &I-HZK03-D0D4;
+     zhengzitong zhonghua-dazidian daikanwa)
     (->subsumptive
      ((ideographic-radical . 4)	; ⼃
       (ideographic-strokes . 9)
diff --git a/lisp/utf-2000/Ideograph-R005-Second.el b/lisp/utf-2000/Ideograph-R005-Second.el
index 8cebf56..be152c7 100644
--- a/lisp/utf-2000/Ideograph-R005-Second.el
+++ b/lisp/utf-2000/Ideograph-R005-Second.el
@@ -330,26 +330,26 @@
   '((ideographic-radical . 5)	; ⼄
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (<-simplified@CN
-     ((=gb12345		  . #x4F30)	; &UU+7FD2; [47-16]
-      ))
     (hanyu-dazidian	1 51 3)
     (=ucs		. #x4E60)	; ä¹ 
     (=gb2312		. #x4F30)	; &I-G0-4F30; [47-16]
     (=big5-cdp		. #x8973)	; &I-CDP-8973;
     (=jef-china3	. #x81C9)	; &I-JC3-81C9;
+    (<-simplified@CN
+     ((=gb12345		  . #x4F30)	; &UU+7FD2; [47-16]
+      ))
     ))
 (define-char
   '((ideographic-radical . 5)	; ⼄
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (<-simplified@CN
-     ((=gb12345		  . #x4F67)	; 鄉 [47-71]
-      ))
     (hanyu-dazidian	1 51 5)
     (=ucs		. #x4E61)	; 乡
     (=gb2312		. #x4F67)	; &I-G0-4F67; [47-71]
     (=big5-cdp		. #x8C51)	; &I-CDP-8C51;
+    (<-simplified@CN
+     ((=gb12345		  . #x4F67)	; 鄉 [47-71]
+      ))
     ))
 (define-char
   '((ideographic-radical . 5)	; ⼄
@@ -484,15 +484,15 @@
   '((ideographic-radical . 5)	; ⼄
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (<-simplified@CN
-     ((=ucs		  . #x66F8)	; 書
-      (=gb12345		  . #x4A69)	; 書 [42-73]
-      ))
     (hanyu-dazidian	1 52 5)
     (=ucs		. #x4E66)	; 书
     (=gb2312		. #x4A69)	; &I-G0-4A69; [42-73]
     (=big5-cdp		. #x8A4C)	; &I-CDP-8A4C;
     (=jef-china3	. #x81CD)	; &I-JC3-81CD;
+    (<-simplified@CN
+     ((=ucs		  . #x66F8)	; 書
+      (=gb12345		  . #x4A69)	; 書 [42-73]
+      ))
     ))
 (define-char
   '((ideographic-radical . 5)	; ⼄
@@ -922,10 +922,6 @@
   '((ideographic-radical . 5)	; ⼄
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (<-simplified@CN
-     ((=ucs		  . #x8CB7)	; è²·
-      (=gb12345		  . #x4272)	; è²· [34-82]
-      ))
     (hanyu-dazidian	1 53 10)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -939,6 +935,10 @@
     (=gb2312		. #x4272)	; &I-G0-4272; [34-82]
     (=hanziku-1		. #xAEE9)	; &I-HZK01-AEE9;
     (=jef-china3	. #x81ED)	; &I-JC3-81ED;
+    (<-simplified@CN
+     ((=ucs		  . #x8CB7)	; è²·
+      (=gb12345		  . #x4272)	; è²· [34-82]
+      ))
     ))
 (define-char
   '((ideographic-radical . 5)	; ⼄
@@ -968,16 +968,6 @@
   '((ideographic-radical . 5)	; ⼄
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (<-simplified
-     ((=ucs		  . #x4E82)	; 亂
-      ))
-    (<-simplified@CN
-     ((=gb12345		  . #x4252)	; &GT-00286; [34-50]
-      ))
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x502C)	; &GT-00285; [48-12]
-      (=daikanwa	  . 00214)	; &I-M-00214;
-      ))
     (hanyu-dazidian	1 53 17)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -1001,6 +991,16 @@
     (=daikanwa		. 00187)	; &I-M-00187;
     (=hanziku-1		. #xAEF0)	; &I-HZK01-AEF0;
     (mojikyo		. 000187)	; &MCS-600000BB;
+    (<-simplified
+     ((=ucs		  . #x4E82)	; 亂
+      ))
+    (<-simplified@CN
+     ((=gb12345		  . #x4252)	; &GT-00286; [34-50]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x502C)	; &GT-00285; [48-12]
+      (=daikanwa	  . 00214)	; &I-M-00214;
+      ))
     ))
 (define-char
   '((ideographic-radical . 5)	; ⼄
@@ -1163,7 +1163,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@unicode	  . #x5B5A)	; &UU+5B5A;
+     ((=gb2312		  . #x665A)	; &C1-4977; [70-58]
+      (=cns11643-1	  . #x4977)	; &I-C1-4977; [41-87]
       )
      ((=ucs		  . #x4E5A)	; 乚
       ))
@@ -1326,36 +1327,6 @@
     (=hanziku-1		. #xAF42)	; &I-HZK01-AF42;
     ))
 (define-char
-  '((morohashi-daikanwa	21712 0 1)
-    (ideographic-	(:radical	101 ; ⽤
-			 :strokes	3)
-			(:radical	5 ; ⼄
-			 :strokes	7))
-    (total-strokes	 . 8)
-    (<-same
-     ((=daikanwa	  . 21712)	; &M-21712;
-      ))
-    (hanyu-dazidian	1 55 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=big5-cdp	    . #x89C2)	; &CDP-89C2;
-	)
-       ((=big5-cdp	    . #x89C7)	; &CDP-89C7;
-	))
-      )
-     ((=ucs		  . #x7528)	; 用
-      ))
-    (=ucs		. #x200F0)	; 𠃰
-    (=cns11643-6	. #x2D2C)	; &I-C6-2D2C; [13-12]
-    (=hanziku-1		. #xAF63)	; &I-HZK01-AF63;
-    ))
-(define-char
   '((ideographic-radical . 5)	; ⼄
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
@@ -1375,16 +1346,67 @@
   '((ideographic-radical . 5)	; ⼄
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
+    (=ucs		. #x4E77)	; ä¹·
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=jis-x0208	    . #x3A3B)	; &GT-21980; [26-27]
+	(=ks-x1001	    . #x5E5E)	; &I-K0-5E5E; [62-62]
+	(=daikanwa	    . 17212)	; &I-M-17212;
+	)
+       ((=ucs		    . #x4E59)	; 乙
+	))
+      (=ks-x1001	  . #x5F2D)	; &K0-5F2D; [63-13]
       )
-     ((=ucs		  . #x6C99)	; 沙
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=gb2312	    . #x4933)	; &C1-4A67; [41-19]
+	(=cns11643-1	    . #x4A67)	; &I-C1-4A67; [42-71]
+	)
+       ((=ucs		    . #x4E59)	; 乙
+	))
+      (=ucs@unicode	  . #x4E77)	; &UU+4E77;
+      ))
+    ))
+(define-char
+  '((ideographic-radical@ucs . 5)	; ⼄
+    (ideographic-strokes@ucs . 7)
+    (ideographic-radical@cns . 101)	; ⽤
+    (ideographic-strokes@cns . 3)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (total-strokes	 . 8)
+    (=ucs		. #x200F0)	; 𠃰
+    (->subsumptive
+     ((ideographic-radical . 101)	; ⽤
+      (ideographic-strokes . 3)
+      (=daikanwa	  . 21712)	; &M-21712;
+      (mojikyo		  . 021712)	; &MCS-600054D0;
       )
-     ((=ucs		  . #x4E59)	; 乙
+     ((hanyu-dazidian	  1 55 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((=big5-cdp	      . #x89C2)	; &CDP-89C2;
+	  )
+	 ((=big5-cdp	      . #x89C7)	; &CDP-89C7;
+	  ))
+	)
+       ((=ucs		    . #x7528)	; 用
+	))
+      (=cns11643-6	  . #x2D2C)	; &HZK01-AF63; [13-12]
+      (=hanziku-1	  . #xAF63)	; &I-HZK01-AF63;
+      (=ucs@iso		  . #x200F0)	; &HZK01-AF63;
       ))
-    (=ucs		. #x4E77)	; ä¹·
-    (=ks-x1001		. #x5F2D)	; &I-K0-5F2D; [63-13]
     ))
 (define-char
   '((ideographic-radical . 5)	; ⼄
@@ -1953,7 +1975,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs@unicode	    . #x7FC1)	; &GT-36866;
+       ((=gb2312	    . #x4E4C)	; &GT-36866; [46-44]
 	)
        ((=ucs		    . #x4E5A)	; 乚
 	))
@@ -2001,13 +2023,6 @@
     (ideographic-radical@cns*sources
      shinjigen-1 cns11643 gt)
     (total-strokes	 . 11)
-    (<-vulgar
-     ((=jis-x0208@1983	  . #x737D)	; &M-48847; [83-93]
-      (=ks-x1001	  . #x4F4F)	; &I-K0-4F4F; [47-47]
-      (=daikanwa	  . 48847)	; &I-M-48847;
-      ))
-    (<-vulgar*sources
-     daikanwa)
     (hanyu-dazidian	8 10 19)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -2030,6 +2045,13 @@
     (=daikanwa		. 00210)	; &I-M-00210;
     (=hanziku-12	. #xEBBD)	; &I-HZK12-EBBD;
     (mojikyo		. 000210)	; &MCS-600000D2;
+    (<-vulgar
+     ((=jis-x0208@1983	  . #x737D)	; &M-48847; [83-93]
+      (=ks-x1001	  . #x4F4F)	; &I-K0-4F4F; [47-47]
+      (=daikanwa	  . 48847)	; &I-M-48847;
+      ))
+    (<-vulgar*sources
+     daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -2039,10 +2061,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EF2)	; ⻲
     (<-identical@component
      ((=ucs		  . #x4E80)	; 亀
       ))
-    (=ucs		. #x2EF2)	; ⻲
     ))
 (define-char
   '((ideographic-radical . 5)	; ⼄
@@ -2316,7 +2338,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs@unicode	    . #x7CA6)	; &CDP-8CB9;
+       ((=iso-ir165	    . #x2F7B)	; &CDP-8CB9; [15-91]
+	(=daikanwa	    . 26939)	; &I-M-26939;
 	)
        ((=ucs		    . #x4E5A)	; 乚
 	))
diff --git a/lisp/utf-2000/Ideograph-R006-Hook.el b/lisp/utf-2000/Ideograph-R006-Hook.el
index 44e4394..8ea0a14 100644
--- a/lisp/utf-2000/Ideograph-R006-Hook.el
+++ b/lisp/utf-2000/Ideograph-R006-Hook.el
@@ -175,10 +175,6 @@
   '((ideographic-radical . 6)	; ⼅
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x8C6B)	; 豫
-      (=jis-x0208	  . #x502E)	; &I-J90-502E; [48-14]
-      ))
     (hanyu-dazidian	1 52 2)
     (shinjigen-1	. 67)
     (shinjigen-2	. 67)
@@ -195,24 +191,42 @@
     (=gt-pj-1		. #x4D3D)	; &I-GT-00312; [45-29]
     (=daikanwa		. 00231)	; &I-M-00231;
     (mojikyo		. 000231)	; &MCS-600000E7;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x502E)	; &GT-48859; [48-14]
+      (=ks-x1001	  . #x6763)	; &I-K0-6763; [71-67]
+      (=daikanwa	  . 36425)	; &I-M-36425;
+      ))
     ))
 (define-char
   '((ideographic-radical . 6)	; ⼅
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (hanyu-dazidian	1 33 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4E3F)	; 丿
+    (=ucs		. #x20112)	; 𠄒
+    (->subsumptive
+     ((hanyu-dazidian	  1 33 4)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E3F)	; 丿
+	)
+       ((=gb2312	    . #x3245)	; &C1-445F; [18-37]
+	(=cns11643-1	    . #x445F)	; &I-C1-445F; [36-63]
+	))
+      (=daikanwa	  . 00232)	; &M-00232;
+      (=hanziku-1	  . #xAAD7)	; &I-HZK01-AAD7;
+      (=ucs@iso		  . #x20112)	; &M-00232;
       )
-     ((=ucs		  . #x624D)	; 才
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E3F)	; 丿
+	)
+       ((=gt		    . 00010)	; &GT-00010;
+	))
+      (=cns11643-6	  . #x2147)	; &C6-2147; [01-39]
       ))
-    (=ucs		. #x20112)	; 𠄒
-    (=cns11643-6	. #x2147)	; &I-C6-2147; [01-39]
-    (=daikanwa		. 00232)	; &I-M-00232;
-    (=hanziku-1		. #xAAD7)	; &I-HZK01-AAD7;
     ))
 (define-char
   '((morohashi-daikanwa	232 0 1)
@@ -288,11 +302,6 @@
   '((ideographic-radical . 6)	; ⼅
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6027)	; &GT-25238; [64-07]
-      (=ks-x1001	  . #x6E33)	; &I-K0-6E33; [78-19]
-      (=daikanwa	  . 19663)	; &I-M-19663;
-      ))
     (hanyu-dazidian	1 324 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -316,6 +325,17 @@
     (=daikanwa		. 00236)	; &I-M-00236;
     (=hanziku-1		. #xE8D1)	; &I-HZK01-E8D1;
     (mojikyo		. 000236)	; &MCS-600000EC;
+    (<-simplified@CN
+     ((=gb12345		  . #x5579)	; &C1-4E68; [53-89]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6027)	; &GT-25238; [64-07]
+      (=ks-x1001	  . #x6E33)	; &I-K0-6E33; [78-19]
+      (=daikanwa	  . 19663)	; &I-M-19663;
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x722D)	; 爭
+      ))
     ))
 (define-char
   '((=>daikanwa		. 00237)	; &M-00237;
@@ -372,31 +392,29 @@
     (mojikyo		. 000238)	; &MCS-600000EE;
     ))
 (define-char
-  '((ideographic-	(:radical	1 ; ⼀
-			 :strokes	6)
-			(:radical	6 ; ⼅
-			 :strokes	6))
+  '((ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 6)
+    (ideographic-radical@cns . 6)	; ⼅
+    (ideographic-strokes@cns . 6)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 553 5)
     (=ucs		. #x20029)	; 𠀩
-    (=cns11643-6	. #x2563)	; &I-C6-2563; [05-67]
-    (=daikanwa		. 00239)	; &I-M-00239;
-    (=hanziku-2		. #xC1C0)	; &I-HZK02-C1C0;
-    (mojikyo		. 000239)	; &MCS-600000EF;
+    (->subsumptive
+     ((=cns11643-6	  . #x2563)	; &M-00239; [05-67]
+      (=daikanwa	  . 00239)	; &I-M-00239;
+      (=ucs@iso		  . #x20029)	; &M-00239;
+      )
+     ((hanyu-dazidian	  1 553 5)
+      (=hanziku-2	  . #xC1C0)	; &HZK02-C1C0;
+      (mojikyo		  . 000239)	; &MCS-600000EF;
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	ho 7)
     (ideographic-radical . 6)	; ⼅
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (<-vulgar
-     ((shinjigen-1	  . 69)
-      (=ucs		  . #x4E8B)	; 事
-      (=jis-x0208	  . #x3B76)	; &I-J90-3B76; [27-86]
-      (=daikanwa	  . 00241)	; &I-M-00241;
-      ))
-    (<-vulgar*sources
-     songyuan-yilai-suzipu daikanwa shinjigen-1)
     (shinjigen-1	. 71)
     (shinjigen-2	. 71)
     (sound@ja/kun	"koto")
@@ -406,6 +424,14 @@
     (=gt		. 00315)	; &I-GT-00315;
     (=gt-pj-1		. #x502F)	; &I-GT-00315; [48-15]
     (mojikyo		. 054501)	; &MCS-6000D4E5;
+    (<-vulgar
+     ((shinjigen-1	  . 69)
+      (=ucs		  . #x4E8B)	; 事
+      (=jis-x0208	  . #x3B76)	; &I-J90-3B76; [27-86]
+      (=daikanwa	  . 00241)	; &I-M-00241;
+      ))
+    (<-vulgar*sources
+     songyuan-yilai-suzipu daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 6)	; ⼅
diff --git a/lisp/utf-2000/Ideograph-R007-Two.el b/lisp/utf-2000/Ideograph-R007-Two.el
index cf09625..1b9cf7b 100644
--- a/lisp/utf-2000/Ideograph-R007-Two.el
+++ b/lisp/utf-2000/Ideograph-R007-Two.el
@@ -27,22 +27,16 @@
     (ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x4E8C)	; 二
-      ))
     (=gt-k		. 00083)	; &GT-K00083;
     (=gt-pj-k1		. #x3B78)	; &GT-K00083; [27-88]
+    (<-formed@component
+     ((=ucs		  . #x4E8C)	; 二
+      ))
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (<-ancient
-     ((=ucs		  . #x4E0A)	; 上
-      (=daikanwa	  . 00013)	; &I-M-00013;
-      ))
-    (<-ancient*sources
-     zhengzitong daikanwa)
     (hanyu-dazidian	1 2 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -58,17 +52,17 @@
     (=gt-pj-2		. #x322C)	; &I-GT-00328; [18-12]
     (=daikanwa		. 00248)	; &I-M-00248;
     (mojikyo		. 000248)	; &MCS-600000F8;
+    (<-ancient
+     ((=ucs		  . #x4E0A)	; 上
+      (=daikanwa	  . 00013)	; &I-M-00013;
+      ))
+    (<-ancient*sources
+     zhengzitong daikanwa)
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (<-ancient
-     ((=ucs		  . #x4E0B)	; 下
-      (=daikanwa	  . 00014)	; &I-M-00014;
-      ))
-    (<-ancient*sources
-     zhengzitong daikanwa)
     (hanyu-dazidian	1 2 3)
     (=ucs		. #x2011F)	; 𠄟
     (=cns11643-6	. #x2128)	; &I-C6-2128; [01-08]
@@ -78,6 +72,12 @@
     (=gt-pj-2		. #x322D)	; &I-GT-00327; [18-13]
     (=daikanwa		. 00249)	; &I-M-00249;
     (mojikyo		. 000249)	; &MCS-600000F9;
+    (<-ancient
+     ((=ucs		  . #x4E0B)	; 下
+      (=daikanwa	  . 00014)	; &I-M-00014;
+      ))
+    (<-ancient*sources
+     zhengzitong daikanwa)
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -124,11 +124,11 @@
     (ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x4E8D)	; 亍
-      ))
     (=gt-k		. 00327)	; &GT-K00327;
     (=gt-pj-k1		. #x3B38)	; &GT-K00327; [27-24]
+    (<-formed@component/connect-left
+     ((=ucs		  . #x4E8D)	; 亍
+      ))
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -154,14 +154,6 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (<-original
-     ((shinjigen-1	  . 75)
-      (=ucs		  . #x4E8E)	; 于
-      (=jis-x0208	  . #x5032)	; &I-J90-5032; [48-18]
-      (=daikanwa	  . 00252)	; &I-M-00252;
-      ))
-    (<-original*sources
-     zhengzi-tong daikanwa shinjigen-1)
     (hanyu-dazidian	1 5 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -180,18 +172,19 @@
     (=gt-pj-2		. #x3230)	; &I-GT-00332; [18-16]
     (=daikanwa		. 00253)	; &I-M-00253;
     (mojikyo		. 000253)	; &MCS-600000FD;
+    (<-original
+     ((shinjigen-1	  . 75)
+      (=ucs		  . #x4E8E)	; 于
+      (=jis-x0208	  . #x5032)	; &I-J90-5032; [48-18]
+      (=daikanwa	  . 00252)	; &I-M-00252;
+      ))
+    (<-original*sources
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (<-formed
-     ((shinjigen-1	  . 75)
-      (=ucs		  . #x4E8E)	; 于
-      (=jis-x0208	  . #x5032)	; &I-J90-5032; [48-18]
-      ))
-    (<-formed*sources
-     shinjigen-1)
     (hanyu-dazidian	1 5 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -207,6 +200,13 @@
     (=big5-cdp		. #x8A42)	; &I-CDP-8A42;
     (=gt		. 00333)	; &I-GT-00333;
     (=gt-pj-9		. #x4B26)	; &I-GT-00333; [43-06]
+    (<-formed
+     ((shinjigen-1	  . 75)
+      (=ucs		  . #x4E8E)	; 于
+      (=jis-x0208	  . #x5032)	; &I-J90-5032; [48-18]
+      ))
+    (<-formed*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -698,10 +698,6 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x4E9E)	; 亞
-      (=jis-x0208	  . #x5033)	; &I-J90-5033; [48-19]
-      ))
     (hanyu-dazidian	1 21 1)
     (shinjigen-1	. 84)
     (shinjigen-2	. 84)
@@ -715,6 +711,10 @@
     (=gt-pj-1		. #x3021)	; &I-GT-00350; [16-01]
     (=daikanwa		. 00272)	; &I-M-00272;
     (mojikyo		. 000272)	; &MCS-60000110;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x4E9E)	; 亞
+      (=jis-x0208	  . #x5033)	; &I-J90-5033; [48-19]
+      ))
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -745,9 +745,6 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (<-formed
-     ((=daikanwa	  . 38945)	; &M-38945;
-      ))
     (hanyu-dazidian	1 23 2)
     (shinjigen-1	. 85)
     (shinjigen-2	. 85)
@@ -763,6 +760,9 @@
     (=gt-pj-1		. #x5033)	; &I-GT-00357; [48-19]
     (=daikanwa		. 00274)	; &I-M-00274;
     (mojikyo		. 000274)	; &MCS-60000112;
+    (<-formed
+     ((=daikanwa	  . 38945)	; &M-38945;
+      ))
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el
index bd3f4a0..c4f379c 100644
--- a/lisp/utf-2000/Ideograph-R008-Lid.el
+++ b/lisp/utf-2000/Ideograph-R008-Lid.el
@@ -169,11 +169,6 @@
   '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (<-simplified
-     ((=jis-x0208	  . #x3962)	; &GT-60968; [25-66]
-      (=ks-x1001	  . #x4D54)	; &I-K0-4D54; [45-52]
-      (=daikanwa	  . 45313)	; &I-M-45313;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -182,6 +177,11 @@
       )
      ((=ucs		  . #x53E3)	; 口
       ))
+    (<-simplified@component/connect-below
+     ((=jis-x0208	  . #x3962)	; &GT-60968; [25-66]
+      (=ks-x1001	  . #x4D54)	; &I-K0-4D54; [45-52]
+      (=daikanwa	  . 45313)	; &I-M-45313;
+      ))
     (->subsumptive
      ((=big5-cdp	  . #x8BAA)	; &CDP-8BAA;
       (mojikyo		  . 070255)	; &MCS-6001126F;
@@ -657,11 +657,6 @@
   '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-simplified
-     ((=jis-x0208	  . #x3962)	; &GT-60968; [25-66]
-      (=ks-x1001	  . #x4D54)	; &I-K0-4D54; [45-52]
-      (=daikanwa	  . 45313)	; &I-M-45313;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (=ucs		  . #x2FF3)	; ⿳
@@ -674,6 +669,11 @@
       ))
     (=big5-cdp		. #x8C4D)	; &CDP-8C4D;
     (mojikyo		. 070256)	; &MCS-60011270;
+    (<-simplified@component/connect-below
+     ((=jis-x0208	  . #x3962)	; &GT-60968; [25-66]
+      (=ks-x1001	  . #x4D54)	; &I-K0-4D54; [45-52]
+      (=daikanwa	  . 45313)	; &I-M-45313;
+      ))
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
@@ -852,6 +852,34 @@
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
+    (ideographic-strokes . 6)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=jis-x0208	  . #x5035)	; &GT-00376; [48-21]
+      )
+     ((=big5-cdp	  . #x89CC)	; &CDP-89CC;
+      )
+     ((=ucs		  . #x5196)	; 冖
+      ))
+    (=gt-k		. 04733)	; &GT-K04733;
+    (=gt-pj-k1		. #x393A)	; &GT-K04733; [25-26]
+    (<-simplified@component/connect-below
+     ((=daikanwa	  . 45314)	; &M-45314;
+      ))
+    (<-vulgar@component
+     ((=big5-cdp	  . #x8C4D)	; &CDP-8C4D;
+      ))
+    (<-vulgar@component/connect-below
+     ((=jis-x0208	  . #x3962)	; &GT-60968; [25-66]
+      (=ks-x1001	  . #x4D54)	; &I-K0-4D54; [45-52]
+      (=daikanwa	  . 45313)	; &I-M-45313;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 8)	; ⼇
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
     (sound@ja/on/kan	"tei")
@@ -1059,15 +1087,7 @@
     (sound@ja/on/go	"kyAu")
     (=ucs		. #x4EB0)	; 亰
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 102)
-	(=jis-x0208	    . #x357E)	; &GT-00397; [21-94]
-	(=ks-x1001	    . #x4C48)	; &I-K0-4C48; [44-40]
-	(=daikanwa	    . 00299)	; &I-M-00299;
-	))
-      (<-vulgar*sources
-       shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
@@ -1084,6 +1104,14 @@
       (=daikanwa	  . 00307)	; &I-M-00307;
       (=ucs@jis		  . #x4EB0)	; &GT-00402;
       (mojikyo		  . 000307)	; &MCS-60000133;
+      (<-vulgar
+       ((shinjigen-1	    . 102)
+	(=jis-x0208	    . #x357E)	; &GT-00397; [21-94]
+	(=ks-x1001	    . #x4C48)	; &I-K0-4C48; [44-40]
+	(=daikanwa	    . 00299)	; &I-M-00299;
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       )
      ((hanyu-dazidian	  1 285 4)
       (ideographic-structure
@@ -1236,7 +1264,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs@unicode	    . #x7ACB)	; &C1-4721;
+       ((=gb2312	    . #x4122)	; &C1-4721; [33-02]
+	(=cns11643-1	    . #x4721)	; &I-C1-4721; [39-01]
 	)
        ((=ucs		    . #x6729)	; 朩
 	))
@@ -1407,28 +1436,11 @@
     (total-strokes	 . 10)
     (=ucs		. #x20158)	; 𠅘
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 104)
-	(=jis-x0208	    . #x4462)	; &GT-00406; [36-66]
-	(=ks-x1001	    . #x6F4D)	; &I-K0-6F4D; [79-45]
-	(=daikanwa	    . 00303)	; &I-M-00303;
-	))
-      (<-vulgar*sources
-       zhengzi-tong daikanwa shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-	  (=ucs		      . #x2FF3)	; ⿳
-	  )
-	 ((=jis-x0208	      . #x5035)	; &GT-00376; [48-21]
-	  )
-	 ((=big5-cdp	      . #x89CC)	; &CDP-89CC;
-	  )
-	 ((=ucs		      . #x5196)	; 冖
-	  ))
+       ((=gt-k		    . 04733)	; &GT-K04733;
 	)
        ((=ucs		    . #x4E01)	; 丁
 	))
@@ -1436,6 +1448,14 @@
       (shinjigen-2	  . 105)
       (=daikanwa	  . 00316)	; &M-00316;
       (mojikyo		  . 000316)	; &MCS-6000013C;
+      (<-vulgar
+       ((shinjigen-1	    . 104)
+	(=jis-x0208	    . #x4462)	; &GT-00406; [36-66]
+	(=ks-x1001	    . #x6F4D)	; &I-K0-6F4D; [79-45]
+	(=daikanwa	    . 00303)	; &I-M-00303;
+	))
+      (<-vulgar*sources
+       zhengzitong daikanwa shinjigen-1)
       )
      ((hanyu-dazidian	  1 287 6)
       (ideographic-structure
@@ -1446,7 +1466,8 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	  (=ucs		      . #x2FF3)	; ⿳
 	  )
-	 ((=ucs		      . #x4EA0)	; 亠
+	 ((=gb2312	      . #x596F)	; &GT-00375; [57-79]
+	  (=daikanwa	      . 00286)	; &I-M-00286;
 	  )
 	 ((=big5-cdp	      . #x89CC)	; &CDP-89CC;
 	  )
@@ -1466,28 +1487,11 @@
     (total-strokes	 . 10)
     (=ucs		. #x20159)	; 𠅙
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 106)
-	(=jis-x0208	    . #x4E3C)	; &GT-00408; [46-28]
-	(=ks-x1001	    . #x5555)	; &I-K0-5555; [53-53]
-	(=daikanwa	    . 00304)	; &I-M-00304;
-	))
-      (<-vulgar*sources
-       daikanwa shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-	  (=ucs		      . #x2FF3)	; ⿳
-	  )
-	 ((=jis-x0208	      . #x5035)	; &GT-00376; [48-21]
-	  )
-	 ((=big5-cdp	      . #x89CC)	; &CDP-89CC;
-	  )
-	 ((=ucs		      . #x5196)	; 冖
-	  ))
+       ((=gt-k		    . 04733)	; &GT-K04733;
 	)
        ((=ucs		    . #x513F)	; 儿
 	))
@@ -1495,6 +1499,14 @@
       (shinjigen-2	  . 108)
       (=daikanwa	  . 00317)	; &M-00317;
       (mojikyo		  . 000317)	; &MCS-6000013D;
+      (<-vulgar
+       ((shinjigen-1	    . 106)
+	(=jis-x0208	    . #x4E3C)	; &GT-00408; [46-28]
+	(=ks-x1001	    . #x5555)	; &I-K0-5555; [53-53]
+	(=daikanwa	    . 00304)	; &I-M-00304;
+	))
+      (<-vulgar*sources
+       daikanwa shinjigen-1)
       )
      ((hanyu-dazidian	  1 287 7)
       (ideographic-structure
@@ -1505,7 +1517,8 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	  (=ucs		      . #x2FF3)	; ⿳
 	  )
-	 ((=ucs		      . #x4EA0)	; 亠
+	 ((=gb2312	      . #x596F)	; &GT-00375; [57-79]
+	  (=daikanwa	      . 00286)	; &I-M-00286;
 	  )
 	 ((=big5-cdp	      . #x89CC)	; &CDP-89CC;
 	  )
@@ -1516,7 +1529,7 @@
 	))
       (=cns11643-6	  . #x3530)	; &HZK01-E155; [21-16]
       (=hanziku-1	  . #xE155)	; &I-HZK01-E155;
-      (=ucs@unicode	  . #x20159)	; &HZK01-E155;
+      (=ucs@iso		  . #x20159)	; &HZK01-E155;
       ))
     ))
 (define-char
@@ -2072,32 +2085,64 @@
     (=hanziku-1		. #xE1D2)	; &I-HZK01-E1D2;
     ))
 (define-char
-  '((ideographic-radical . 8)	; ⼇
-    (ideographic-strokes . 10)
+  '((ideographic-radical@ucs . 8)	; ⼇
+    (ideographic-strokes@ucs . 10)
+    (ideographic-radical@cns . 111)	; â½®
+    (ideographic-strokes@cns . 7)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 12)
-    (<-same
-     ((=daikanwa	  . 23981)	; &M-23981;
-      ))
-    (hanyu-dazidian	1 290 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4EA0)	; 亠
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
-	(=ucs		    . #x2FF2)	; ⿲
+    (=ucs		. #x20170)	; 𠅰
+    (->subsumptive
+     ((ideographic-radical . 111)	; â½®
+      (ideographic-strokes . 7)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x571F)	; 土
+       ((=jis-x0208	    . #x5035)	; &GT-00376; [48-21]
 	)
-       ((=ucs		    . #x77E2)	; 矢
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+	  (=ucs		      . #x2FF2)	; ⿲
+	  )
+	 ((=gt-k	      . 00199)	; &GT-K00199;
+	  )
+	 ((=gt-k	      . 01013)	; &GT-K01013;
+	  )
+	 ((=ucs		      . #x5315)	; 匕
+	  ))
+	))
+      (=daikanwa	  . 23981)	; &M-23981;
+      )
+     ((ideographic-radical . 8)	; ⼇
+      (ideographic-strokes . 10)
+      (hanyu-dazidian	  1 290 1)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x5315)	; 匕
+       ((=gb2312	    . #x596F)	; &GT-00375; [57-79]
+	(=daikanwa	    . 00286)	; &I-M-00286;
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+	  (=ucs		      . #x2FF2)	; ⿲
+	  )
+	 ((=gt-k	      . 00199)	; &GT-K00199;
+	  )
+	 ((=gt-k	      . 01013)	; &GT-K01013;
+	  )
+	 ((=ucs		      . #x5315)	; 匕
+	  ))
 	))
+      (=hanziku-1	  . #xE1D1)	; &HZK01-E1D1;
+      (=ucs@iso		  . #x20170)	; &HZK01-E1D1;
+      )
+     ((ideographic-radical . 111)	; â½®
+      (ideographic-strokes . 7)
+      (=cns11643-6	  . #x4C2D)	; &C6-4C2D; [44-13]
       ))
-    (=ucs		. #x20170)	; 𠅰
-    (=hanziku-1		. #xE1D1)	; &I-HZK01-E1D1;
     ))
 (define-char
   '((ideographic-radical . 8)	; ⼇
@@ -2515,7 +2560,9 @@
 	)
        ((=jis-x0208	    . #x5035)	; &GT-00376; [48-21]
 	)
-       ((=ucs		    . #x5967)	; 奧
+       ((=jis-x0208	    . #x547C)	; &GT-07553; [52-92]
+	(=ks-x1001	    . #x6773)	; &I-K0-6773; [71-83]
+	(=daikanwa	    . 05985)	; &I-M-05985;
 	))
       (=daikanwa	  . 00332)	; &M-00332;
       (mojikyo		  . 000332)	; &MCS-6000014C;
@@ -2525,9 +2572,12 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x4EA0)	; 亠
+       ((=gb2312	    . #x596F)	; &GT-00375; [57-79]
+	(=daikanwa	    . 00286)	; &I-M-00286;
 	)
-       ((=ucs		    . #x5967)	; 奧
+       ((=jis-x0208	    . #x547C)	; &GT-07553; [52-92]
+	(=ks-x1001	    . #x6773)	; &I-K0-6773; [71-83]
+	(=daikanwa	    . 05985)	; &I-M-05985;
 	))
       (=hanziku-1	  . #xE25A)	; &HZK01-E25A;
       )
@@ -2535,7 +2585,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x4EA0)	; 亠
+       ((=gb2312	    . #x596F)	; &GT-00375; [57-79]
+	(=daikanwa	    . 00286)	; &I-M-00286;
 	)
        ((=cns11643-1	    . #x635F)	; &C1-635F; [67-63]
 	))
@@ -3380,7 +3431,7 @@
 	)
        ((=jis-x0208	    . #x5035)	; &GT-00376; [48-21]
 	)
-       ((=ucs@unicode	    . #x820B)	; &B-F4B5;
+       ((=ucs@unicode	    . #x820B)	; &UU+820B;
 	))
       (shinjigen-2	  . 112)
       (=jis-x0212	  . #x3042)	; &M-00342; [16-34]
@@ -3397,7 +3448,7 @@
        ((=gb2312	    . #x596F)	; &GT-00375; [57-79]
 	(=daikanwa	    . 00286)	; &I-M-00286;
 	)
-       ((=ucs@unicode	    . #x820B)	; &B-F4B5;
+       ((=ucs@unicode	    . #x820B)	; &UU+820B;
 	))
       (=cns11643-2	  . #x6D44)	; &C2-6D44; [77-36]
       (=ucs@unicode	  . #x4EB9)	; &C2-6D44;
diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el
index 067aa34..b588924 100644
--- a/lisp/utf-2000/Ideograph-R009-Man.el
+++ b/lisp/utf-2000/Ideograph-R009-Man.el
@@ -25,11 +25,11 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
+    (=gt-k		. 00049)	; &GT-K00049;
+    (=gt-pj-k1		. #x3357)	; &GT-K00049; [19-55]
     (<-formed@component
      ((=ucs		  . #x4EBA)	; 人
       ))
-    (=gt-k		. 00049)	; &GT-K00049;
-    (=gt-pj-k1		. #x3357)	; &GT-K00049; [19-55]
     ))
 (define-char
   '((<-denotational
@@ -39,11 +39,11 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
+    (=gt-k		. 00058)	; &GT-K00058;
+    (=gt-pj-k1		. #x3C53)	; &GT-K00058; [28-51]
     (<-formed@component/connect-below
      ((=ucs		  . #x4EBA)	; 人
       ))
-    (=gt-k		. 00058)	; &GT-K00058;
-    (=gt-pj-k1		. #x3C53)	; &GT-K00058; [28-51]
     ))
 (define-char
   '((<-denotational
@@ -53,15 +53,15 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (<-formed@component/connect-below
-     ((=ucs		  . #x4EBA)	; 人
-      ))
     (=big5-cdp		. #x8B5D)	; &GT-00458;
     (=gt		. 00458)	; &I-GT-00458;
     (=gt-k		. 00057)	; &I-GT-K00057;
     (=gt-pj-9		. #x4D4C)	; &I-GT-00458; [45-44]
     (=jef-china3	. #x71FA)	; &I-JC3-71FA;
     (mojikyo		. 050926)	; &MCS-6000C6EE;
+    (<-formed@component/connect-below
+     ((=ucs		  . #x4EBA)	; 人
+      ))
     ))
 (define-char
   '((<-denotational
@@ -72,18 +72,15 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (total-strokes	 . 2)
+    (=ucs		. #x2E85)	; ⺅
     (<-identical@component/connect-right
      ((=ucs		  . #x4EBB)	; 亻
       ))
-    (=ucs		. #x2E85)	; ⺅
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (<-formed@component/connect-right
-     ((=ucs		  . #x4EBA)	; 人
-      ))
     (=ucs		. #x4EBB)	; 亻
     (=gb2312		. #x5869)	; &I-G0-5869; [56-73]
     (=jis-x0213-2-2000	. #x2135)	; &I-JX2-2135; [01-21]
@@ -94,6 +91,9 @@
     (=cbeta		. 04768)	; &I-CB04768;
     (=jef-china3	. #x71FB)	; &I-JC3-71FB;
     (mojikyo		. 050927)	; &MCS-6000C6EF;
+    (<-formed@component/connect-right
+     ((=ucs		  . #x4EBA)	; 人
+      ))
     ))
 (define-char
   '((name*		. "ideographic component person for top")
@@ -559,48 +559,44 @@
     (mojikyo		. 000357)	; &MCS-60000165;
     ))
 (define-char
-  '((=>ucs		. #x4ECA)	; 今
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=big5-cdp	  . #x8AFC)	; &CDP-8AFC;
-      )
-     ((=big5-cdp	  . #x8BA2)	; &CDP-8BA2;
-      ))
-    (shinjigen-1	. 118)
-    (shinjigen-2	. 118)
-    (=jis-x0208		. #x3A23)	; &GT-00467; [26-03]
-    (=ks-x1001		. #x5051)	; &I-K0-5051; [48-49]
-    (=cns11643-1	. #x4474)	; &I-C1-4474; [36-84]
+    (=ucs		. #x4ECA)	; 今
     (=big5		. #xA4B5)	; &I-B-A4B5;
-    (=gt		. 00467)	; &I-GT-00467;
-    (=gt-k		. 00435)	; &I-GT-K00435;
-    (=gt-pj-1		. #x3A23)	; &I-GT-00467; [26-03]
-    (=daikanwa		. 00358)	; &I-M-00358;
-    (=ucs@jis		. #x4ECA)	; &GT-00467;
-    (=ucs@big5		. #x4ECA)	; &GT-00467;
-    (mojikyo		. 000358)	; &MCS-60000166;
-    ))
-(define-char
-  '((morohashi-daikanwa	358 0 2)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 2)
-    (total-strokes	 . 4)
-    (hanyu-dazidian	1 105 5)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4EBD)	; 亽
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=big5-cdp	    . #x8AFC)	; &CDP-8AFC;
+	)
+       ((=big5-cdp	    . #x8BA2)	; &CDP-8BA2;
+	))
+      (shinjigen-1	  . 118)
+      (shinjigen-2	  . 118)
+      (=jis-x0208	  . #x3A23)	; &GT-00467; [26-03]
+      (=ks-x1001	  . #x5051)	; &I-K0-5051; [48-49]
+      (=cns11643-1	  . #x4474)	; &I-C1-4474; [36-84]
+      (=gt		  . 00467)	; &I-GT-00467;
+      (=gt-k		  . 00435)	; &I-GT-K00435;
+      (=gt-pj-1		  . #x3A23)	; &I-GT-00467; [26-03]
+      (=daikanwa	  . 00358)	; &I-M-00358;
+      (=ucs@jis		  . #x4ECA)	; &GT-00467;
+      (mojikyo		  . 000358)	; &MCS-60000166;
       )
-     ((=big5-cdp	  . #x8BA2)	; &CDP-8BA2;
+     ((hanyu-dazidian	  1 105 5)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4EBD)	; 亽
+	)
+       ((=big5-cdp	    . #x8BA2)	; &CDP-8BA2;
+	))
+      (=gb2312		  . #x3D71)	; &G0-3D71; [29-81]
+      (=ucs@unicode	  . #x4ECA)	; &G0-3D71;
       ))
-    (=ucs		. #x4ECA)	; 今
-    (=gb2312		. #x3D71)	; &I-G0-3D71; [29-81]
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -634,12 +630,6 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (<-original
-     ((=ucs		  . #x51B0)	; 冰
-      (=daikanwa	  . 01612)	; &I-M-01612;
-      ))
-    (<-original*sources
-     shuowen shuowen-tongxun-dingsheng daikanwa)
     (=ucs		. #x4ECC)	; 仌
     (->subsumptive
      ((ideographic-structure
@@ -655,6 +645,12 @@
       (=cbeta		  . 08093)	; &I-CB08093;
       (=ucs@cns		  . #x4ECC)	; &M-00360;
       (mojikyo		  . 000360)	; &MCS-60000168;
+      (<-original
+       ((=ucs		    . #x51B0)	; 冰
+	(=daikanwa	    . 01612)	; &I-M-01612;
+	))
+      (<-original*sources
+       shuowen shuowen-tongxun-dingsheng daikanwa)
       )
      ((=>ucs*		  . #x4ECC)	; 仌
       (ideographic-radical@cns . 15)	; ⼎
@@ -773,10 +769,6 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x4F5B)	; 佛
-      (=jis-x0208	  . #x5047)	; &I-J90-5047; [48-39]
-      ))
     (hanyu-dazidian	1 110 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -796,6 +788,10 @@
     (=daikanwa		. 00364)	; &I-M-00364;
     (=hanziku-1		. #xBAA8)	; &I-HZK01-BAA8;
     (mojikyo		. 000364)	; &MCS-6000016C;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x4F5B)	; 佛
+      (=jis-x0208	  . #x5047)	; &I-J90-5047; [48-39]
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -860,13 +856,13 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (=cns11643-3	. #x2148)	; &C3-2148; [01-40]
+    (=ucs@cns		. #x5185)	; &C3-2148;
     (<-same
      ((=daikanwa	  . 01418)	; &I-M-01418;
       ))
     (<-same*sources
      daikanwa)
-    (=cns11643-3	. #x2148)	; &C3-2148; [01-40]
-    (=ucs@cns		. #x5185)	; &C3-2148;
     ))
 (define-char
   '((ideographic-radical@ucs . 13)	; ⼌
@@ -1673,13 +1669,13 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (->subsumptive
-     ((<-ancient
+     ((=daikanwa	  . 00395)	; &M-00395;
+      (<-ancient
        ((=ucs		    . #xFA30)	; 侮
 	(=daikanwa	    . 00630)	; &I-M-00630;
 	))
       (<-ancient*sources
        daikanwa)
-      (=daikanwa	  . 00395)	; &M-00395;
       (->mistakable
        ((=daikanwa	    . 06040)	; &M-06040;
 	))
@@ -1689,39 +1685,37 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x201B2)	; 𠆲
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 3)
-    (total-strokes	 . 5)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=jis-x0208	  . #x5678)	; &GT-11620; [54-88]
-      (=daikanwa	  . 09221)	; &I-M-09221;
-      ))
-    (=daikanwa		. 00396)	; &M-00396;
-    (mojikyo		. 000396)	; &MCS-6000018C;
-    ))
-(define-char
-  '((morohashi-daikanwa	396 0 0)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (hanyu-dazidian	1 115 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x201B2)	; 𠆲
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x5678)	; &GT-11620; [54-88]
+	(=daikanwa	    . 09221)	; &I-M-09221;
+	))
+      (=daikanwa	  . 00396)	; &M-00396;
+      (mojikyo		  . 000396)	; &MCS-6000018C;
       )
-     ((=ucs		  . #x5E7F)	; 广
+     ((hanyu-dazidian	  1 115 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x3963)	; &C3-213E; [25-67]
+	(=cns11643-3	    . #x213E)	; &I-C3-213E; [01-30]
+	))
+      (=cns11643-4	  . #x2158)	; &HZK01-BBA9; [01-56]
+      (=hanziku-1	  . #xBBA9)	; &I-HZK01-BBA9;
+      (=ucs@iso		  . #x201B2)	; &HZK01-BBA9;
       ))
-    (=ucs		. #x201B2)	; 𠆲
-    (=cns11643-4	. #x2158)	; &I-C4-2158; [01-56]
-    (=hanziku-1		. #xBBA9)	; &I-HZK01-BBA9;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -1972,10 +1966,6 @@
   '((<-denotational
      ((=ucs		  . #x4EEE)	; ä»®
       ))
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5047)	; 假
-      (=jis-x0208	  . #x5071)	; &I-J90-5071; [48-81]
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -1997,19 +1987,15 @@
     (=ucs@cns		. #x4EEE)	; &GT-00526;
     (=ucs@jis		. #x4EEE)	; &GT-00526;
     (mojikyo		. 000398)	; &MCS-6000018E;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x5047)	; 假
+      (=jis-x0208	  . #x5071)	; &I-J90-5071; [48-81]
+      ))
     ))
 (define-char
   '((<-denotational
      ((=ucs		  . #x4EEE)	; ä»®
       ))
-    (<-vulgar
-     ((shinjigen-1	  . 144)
-      (=jis-x0208	  . #x323E)	; &GT-00526; [18-30]
-      (=cns11643-3	  . #x226F)	; &I-C3-226F; [02-79]
-      (=daikanwa	  . 00398)	; &I-M-00398;
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (hanyu-dazidian	1 124 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -2017,49 +2003,55 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x53CD)	; 反
+     ((=gb2312		  . #x3734)	; &GT-K00476; [23-20]
       ))
     (shinjigen-1	. 146)
     (=hanziku-1		. #xBD6F)	; &HZK01-BD6F;
     (=ucs@unicode	. #x4EEE)	; &HZK01-BD6F;
-    ))
-(define-char
-  '((=>ucs		. #x4EEF)	; 仯
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 4)
-    (total-strokes	 . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=jis-x0208	  . #x3E2F)	; &GT-09425; [30-15]
-      (=ks-x1001	  . #x6134)	; &I-K0-6134; [65-20]
-      (=daikanwa	  . 07475)	; &I-M-07475;
+    (<-vulgar
+     ((shinjigen-1	  . 144)
+      (=jis-x0208	  . #x323E)	; &GT-00526; [18-30]
+      (=cns11643-3	  . #x226F)	; &I-C3-226F; [02-79]
+      (=daikanwa	  . 00398)	; &I-M-00398;
       ))
-    (=jis-x0212		. #x304B)	; &M-00399; [16-43]
-    (=daikanwa		. 00399)	; &I-M-00399;
-    (=ucs@jis		. #x4EEF)	; &M-00399;
-    (mojikyo		. 000399)	; &MCS-6000018F;
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
-  '((morohashi-daikanwa	399 0 1)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian	1 121 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x4EEF)	; 仯
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x3E2F)	; &GT-09425; [30-15]
+	(=ks-x1001	    . #x6134)	; &I-K0-6134; [65-20]
+	(=daikanwa	    . 07475)	; &I-M-07475;
+	))
+      (=jis-x0212	  . #x304B)	; &M-00399; [16-43]
+      (=daikanwa	  . 00399)	; &I-M-00399;
+      (=ucs@jis		  . #x4EEF)	; &M-00399;
+      (mojikyo		  . 000399)	; &MCS-6000018F;
       )
-     ((=ucs		  . #x5C11)	; 少
+     ((hanyu-dazidian	  1 121 6)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x4959)	; &C1-4537; [41-57]
+	(=cns11643-1	    . #x4537)	; &I-C1-4537; [37-23]
+	))
+      (=cns11643-3	  . #x2268)	; &HZK01-BCCF; [02-72]
+      (=hanziku-1	  . #xBCCF)	; &I-HZK01-BCCF;
+      (=ucs@unicode	  . #x4EEF)	; &HZK01-BCCF;
       ))
-    (=ucs		. #x4EEF)	; 仯
-    (=cns11643-3	. #x2268)	; &I-C3-2268; [02-72]
-    (=hanziku-1		. #xBCCF)	; &I-HZK01-BCCF;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -2122,7 +2114,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x4ECA)	; &UU+4ECA;
+       ((=gb2312	    . #x3D71)	; &G0-3D71; [29-81]
 	))
       (=ucs@unicode	  . #x4EF1)	; &UU+4EF1;
       ))
@@ -2131,21 +2123,36 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian	1 125 2)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x3438)	; 㐸
+    (->subsumptive
+     ((hanyu-dazidian	  1 125 2)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x4737)	; &G0-4737; [39-23]
+	))
+      (=daikanwa	  . 00402)	; &M-00402;
+      (=hanziku-1	  . #xBDAE)	; &I-HZK01-BDAE;
+      (=cbeta		  . 03259)	; &I-CB03259;
+      (=ucs@unicode	  . #x3438)	; &M-00402;
+      (mojikyo		  . 000402)	; &MCS-60000192;
       )
-     ((=ucs		  . #x6B20)	; 欠
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x3767)	; &GT-20571; [23-71]
+	(=ks-x1001	    . #x7D62)	; &I-K0-7D62; [93-66]
+	(=cns11643-1	    . #x454E)	; &I-C1-454E; [37-46]
+	(=daikanwa	    . 15991)	; &I-M-15991;
+	))
+      (=cns11643-6	  . #x234E)	; &C6-234E; [03-46]
       ))
-    (=ucs		. #x3438)	; 㐸
-    (=cns11643-6	. #x234E)	; &I-C6-234E; [03-46]
-    (=daikanwa		. 00402)	; &I-M-00402;
-    (=hanziku-1		. #xBDAE)	; &I-HZK01-BDAE;
-    (=cbeta		. 03259)	; &I-CB03259;
-    (mojikyo		. 000402)	; &MCS-60000192;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -2178,24 +2185,41 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (hanyu-dazidian	1 121 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x6BD4)	; 比
-      ))
-    (shinjigen-1	. 165)
     (=ucs		. #x4EF3)	; 仳
-    (=gb2312		. #x5872)	; &I-G0-5872; [56-82]
-    (=jis-x0212		. #x304D)	; &I-JSP-304D; [16-45]
-    (=cns11643-1	. #x4738)	; &I-C1-4738; [39-24]
     (=big5		. #xA5F6)	; &I-B-A5F6;
-    (=daikanwa		. 00404)	; &I-M-00404;
-    (=jef-china3	. #x41EB)	; &I-JC3-41EB;
-    (mojikyo		. 000404)	; &MCS-60000194;
+    (->subsumptive
+     ((hanyu-dazidian	  1 121 1)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((name		    . "CJK RADICAL PERSON")
+	(=ucs		    . #x2E85)	; ⺅
+	)
+       ((=jis-x0208	    . #x4866)	; &GT-21460; [40-70]
+	(=gb2312	    . #x3148)	; &I-G0-3148; [17-40]
+	(=ks-x1001	    . #x5D6F)	; &I-K0-5D6F; [61-79]
+	(=daikanwa	    . 16743)	; &I-M-16743;
+	))
+      (shinjigen-1	  . 165)
+      (=gb2312		  . #x5872)	; &M-00404; [56-82]
+      (=jis-x0212	  . #x304D)	; &I-JSP-304D; [16-45]
+      (=daikanwa	  . 00404)	; &I-M-00404;
+      (=jef-china3	  . #x41EB)	; &I-JC3-41EB;
+      (=ucs@unicode	  . #x4EF3)	; &M-00404;
+      (mojikyo		  . 000404)	; &MCS-60000194;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((name		    . "CJK RADICAL PERSON")
+	(=ucs		    . #x2E85)	; ⺅
+	)
+       ((=cns11643-1	    . #x4552)	; &C1-4552; [37-50]
+	))
+      (=cns11643-1	  . #x4738)	; &C1-4738; [39-24]
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -2674,7 +2698,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x516C)	; &GT-01893;
+       ((=gb2312	    . #x392B)	; &GT-01893; [25-11]
 	))
       (=ucs@unicode	  . #x4F00)	; &UU+4F00;
       ))
@@ -3674,10 +3698,6 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6703)	; 會
-      (=jis-x0208	  . #x5072)	; &I-J90-5072; [48-82]
-      ))
     (hanyu-dazidian	1 116 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -3700,6 +3720,16 @@
     (=daikanwa		. 00460)	; &I-M-00460;
     (=hanziku-1		. #xBBC9)	; &I-HZK01-BBC9;
     (mojikyo		. 000460)	; &MCS-600001CC;
+    (<-simplified@CN
+     ((=gb12345		  . #x3B61)	; 會 [27-65]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x6703)	; 會
+      (=jis-x0208	  . #x5072)	; &I-J90-5072; [48-82]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x6703)	; 會
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -3721,7 +3751,8 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x533A)	; &GT-03327;
+     ((=jis-x0208	  . #x3668)	; &GT-03327; [22-72]
+      (=gb2312		  . #x4778)	; &I-G0-4778; [39-88]
       ))
     (=gb2312		. #x5871)	; &M-00461; [56-81]
     (=daikanwa		. 00461)	; &I-M-00461;
@@ -3777,10 +3808,6 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x50B3)	; 傳
-      (=jis-x0208	  . #x5123)	; &I-J90-5123; [49-03]
-      ))
     (hanyu-dazidian	1 117 16)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -3799,6 +3826,10 @@
     (=gt		. 00577)	; &I-GT-00577;
     (=gt-pj-1		. #x4541)	; &I-GT-00577; [37-33]
     (mojikyo		. 050101)	; &MCS-6000C3B5;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x50B3)	; 傳
+      (=jis-x0208	  . #x5123)	; &I-J90-5123; [49-03]
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -3820,7 +3851,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x52FB)	; &M-02496;
+       ((=jis-x0213-1-2000  . #x2E6A)	; &M-02496; [14-74]
+	(=daikanwa	    . 02496)	; &I-M-02496;
 	))
       (=daikanwa	  . 48916)	; &M-48916;
       )
@@ -3851,7 +3883,8 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x5300)	; &C3-2156;
+     ((=gb2312		  . #x5448)	; &C3-2156; [52-40]
+      (=cns11643-3	  . #x2156)	; &I-C3-2156; [01-54]
       ))
     (=hanziku-1		. #xBD7A)	; &HZK01-BD7A;
     (=ucs@unicode	. #x4F28)	; &HZK01-BD7A;
@@ -4273,7 +4306,8 @@
        ((name		    . "CJK RADICAL PERSON")
 	(=ucs		    . #x2E85)	; ⺅
 	)
-       ((=ucs@unicode	    . #x7384)	; &UU+7384;
+       ((=gb2312	    . #x507E)	; &C1-4668; [48-94]
+	(=cns11643-1	    . #x4668)	; &I-C1-4668; [38-72]
 	))
       (=cns11643-2	  . #x2328)	; &C2-2328; [03-08]
       (=ucs@unicode	  . #x4F2D)	; &C2-2328;
@@ -4292,7 +4326,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x5974)	; &GT-07627;
+       ((=jis-x0208	    . #x455B)	; &GT-07627; [37-59]
+	(=gb2312	    . #x452B)	; &I-G0-452B; [37-11]
+	(=ks-x1001	    . #x523F)	; &I-K0-523F; [50-31]
+	(=daikanwa	    . 06039)	; &I-M-06039;
 	))
       (=jis-x0212	  . #x305D)	; &M-00464; [16-61]
       (=daikanwa	  . 00464)	; &I-M-00464;
@@ -4508,7 +4545,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x5C3C)	; &GT-09625;
+       ((=jis-x0208	    . #x4674)	; &GT-09625; [38-84]
+	(=gb2312	    . #x4461)	; &I-G0-4461; [36-65]
+	(=ks-x1001	    . #x5279)	; &I-K0-5279; [50-89]
+	(=daikanwa	    . 07635)	; &I-M-07635;
 	))
       (=gb2312		  . #x5923)	; &M-00473; [57-03]
       (=daikanwa	  . 00473)	; &I-M-00473;
@@ -5287,7 +5327,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x6B64)	; &GT-20888;
+       ((=jis-x0208	    . #x3A21)	; &GT-20888; [26-01]
+	(=gb2312	    . #x344B)	; &I-G0-344B; [20-43]
+	(=ks-x1001	    . #x732E)	; &I-K0-732E; [83-14]
+	(=daikanwa	    . 16259)	; &I-M-16259;
 	))
       (shinjigen-1	  . 178)
       (=jis-x0212	  . #x306B)	; &M-00502; [16-75]
@@ -5311,57 +5354,62 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x4F4D)	; 位
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x4F4D)	; 位
+    (=big5		. #xA6EC)	; &I-B-A6EC;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x4E29)	; &GT-33181; [46-09]
+	(=ks-x1001	    . #x5821)	; &I-K0-5821; [56-01]
+	(=daikanwa	    . 25721)	; &I-M-25721;
+	))
+      (shinjigen-1	  . 168)
+      (shinjigen-2	  . 168)
+      (=jis-x0208	  . #x304C)	; &GT-00602; [16-44]
+      (=ks-x1001	  . #x6A48)	; &I-K0-6A48; [74-40]
+      (=gt		  . 00602)	; &I-GT-00602;
+      (=gt-k		  . 02501)	; &I-GT-K02501;
+      (=gt-pj-1		  . #x304C)	; &I-GT-00602; [16-44]
+      (=daikanwa	  . 00503)	; &I-M-00503;
+      (=ucs@jis		  . #x4F4D)	; &GT-00602;
+      (mojikyo		  . 000503)	; &MCS-600001F7;
       )
-     ((=jis-x0208	  . #x4E29)	; &GT-33181; [46-09]
-      (=ks-x1001	  . #x5821)	; &I-K0-5821; [56-01]
-      (=daikanwa	  . 25721)	; &I-M-25721;
+     ((hanyu-dazidian	  1 138 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x4122)	; &C1-4721; [33-02]
+	(=cns11643-1	    . #x4721)	; &I-C1-4721; [39-01]
+	))
+      (=gb2312		  . #x4E3B)	; &C1-486D; [46-27]
+      (=cns11643-1	  . #x486D)	; &I-C1-486D; [40-77]
+      (=ucs@unicode	  . #x4F4D)	; &C1-486D;
       ))
-    (shinjigen-1	. 168)
-    (shinjigen-2	. 168)
-    (=jis-x0208		. #x304C)	; &GT-00602; [16-44]
-    (=ks-x1001		. #x6A48)	; &I-K0-6A48; [74-40]
-    (=big5		. #xA6EC)	; &I-B-A6EC;
-    (=gt		. 00602)	; &I-GT-00602;
-    (=gt-k		. 02501)	; &I-GT-K02501;
-    (=gt-pj-1		. #x304C)	; &I-GT-00602; [16-44]
-    (=daikanwa		. 00503)	; &I-M-00503;
-    (=ucs@jis		. #x4F4D)	; &GT-00602;
-    (=ucs@big5		. #x4F4D)	; &GT-00602;
-    (mojikyo		. 000503)	; &MCS-600001F7;
     ))
 (define-char
-  '((morohashi-daikanwa	503 0 0)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 138 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x7ACB)	; 立
-      ))
-    (=ucs		. #x4F4D)	; 位
-    (=gb2312		. #x4E3B)	; &I-G0-4E3B; [46-27]
-    (=cns11643-1	. #x486D)	; &I-C1-486D; [40-77]
+    (hanyu-dazidian	1 137 4)
+    (=ucs		. #x4F4E)	; 低
     ))
 (define-char
-  '((=>ucs		. #x4F4E)	; 低
+  '((<-denotational
+     ((=ucs		  . #x4F4E)	; 低
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 137 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -5388,26 +5436,33 @@
     (mojikyo		. 000504)	; &MCS-600001F8;
     ))
 (define-char
-  '((morohashi-daikanwa	504 0 2)
+  '((<-denotational
+     ((=ucs		  . #x4F4E)	; 低
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 137)
-    (hanyu-dazidian-char . 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x6C10)	; 氐
+     ((=gb2312		  . #x5835)	; &G0-5835; [56-21]
       ))
-    (=ucs		. #x4F4E)	; 低
-    (=gb2312		. #x354D)	; &I-G0-354D; [21-45]
+    (=gb2312		. #x354D)	; &G0-354D; [21-45]
+    (=ucs@unicode	. #x4F4E)	; &G0-354D;
     ))
 (define-char
-  '((=>ucs		. #x4F4F)	; 住
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (=ucs		. #x4F4F)	; 住
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4F4F)	; 住
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
@@ -5427,7 +5482,9 @@
     (mojikyo		. 000505)	; &MCS-600001F9;
     ))
 (define-char
-  '((morohashi-daikanwa	505 0 1)
+  '((<-denotational
+     ((=ucs		  . #x4F4F)	; 住
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
@@ -5438,12 +5495,14 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x4E3B)	; 主
+     ((=jis-x0208	  . #x3C67)	; &GT-00138; [28-71]
+      (=gb2312		  . #x5677)	; &I-G0-5677; [54-87]
+      (=ks-x1001	  . #x712B)	; &I-K0-712B; [81-11]
+      (=cns11643-1	  . #x4564)	; &I-C1-4564; [37-68]
       ))
     (shinjigen-1	. 181)
     (shinjigen-2	. 181)
-    (=ucs		. #x4F4F)	; 住
-    (=jis-x0208		. #x3D3B)	; &I-J90-3D3B; [29-27]
+    (=jis-x0208		. #x3D3B)	; &GT-00649; [29-27]
     (=gb2312		. #x5721)	; &I-G0-5721; [55-01]
     (=ks-x1001		. #x712C)	; &I-K0-712C; [81-12]
     (=cns11643-1	. #x486E)	; &I-C1-486E; [40-78]
@@ -5451,6 +5510,7 @@
     (=gt		. 00649)	; &I-GT-00649;
     (=gt-k		. 02572)	; &I-GT-K02572;
     (=gt-pj-1		. #x3D3B)	; &I-GT-00649; [29-27]
+    (=ucs@unicode	. #x4F4F)	; &GT-00649;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -5535,11 +5595,6 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x7173)	; &GT-60937; [81-83]
-      (=ks-x1001	  . #x7477)	; &I-K0-7477; [84-87]
-      (=daikanwa	  . 45291)	; &I-M-45291;
-      ))
     (hanyu-dazidian	1 130 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -5560,6 +5615,17 @@
     (=gt-pj-1		. #x424E)	; &I-GT-00660; [34-46]
     (=daikanwa		. 00509)	; &I-M-00509;
     (mojikyo		. 000509)	; &MCS-600001FD;
+    (<-simplified@CN
+     ((=gb12345		  . #x4C65)	; 體 [44-69]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x7173)	; &GT-60937; [81-83]
+      (=ks-x1001	  . #x7477)	; &I-K0-7477; [84-87]
+      (=daikanwa	  . 45291)	; &I-M-45291;
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x9AD4)	; 體
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -5708,11 +5774,6 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x7131)	; &GT-59417; [81-17]
-      (=ks-x1001	  . #x662E)	; &I-K0-662E; [70-14]
-      (=daikanwa	  . 44185)	; &I-M-44185;
-      ))
     (hanyu-dazidian	1 128 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -5735,6 +5796,11 @@
     (=gt-pj-1		. #x4D3E)	; &I-GT-00693; [45-30]
     (=daikanwa		. 00515)	; &I-M-00515;
     (mojikyo		. 000515)	; &MCS-60000203;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x7131)	; &GT-59417; [81-17]
+      (=ks-x1001	  . #x662E)	; &I-K0-662E; [70-14]
+      (=daikanwa	  . 44185)	; &I-M-44185;
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -6691,7 +6757,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x8001)	; &GT-37307;
+       ((=jis-x0208	    . #x4F37)	; &GT-37307; [47-23]
+	(=gb2312	    . #x404F)	; &I-G0-404F; [32-47]
+	(=ks-x1001	    . #x5655)	; &I-K0-5655; [54-53]
+	(=daikanwa	    . 28842)	; &I-M-28842;
 	))
       (=gb2312		  . #x4050)	; &M-00548; [32-48]
       (=jis-x0212	  . #x3073)	; &I-JSP-3073; [16-83]
@@ -6726,7 +6795,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x5905)	; &M-05695;
+       ((=daikanwa	    . 05695)	; &M-05695;
 	))
       (=daikanwa	  . 00549)	; &M-00549;
       (=hanziku-1	  . #xC2E0)	; &I-HZK01-C2E0;
@@ -7049,10 +7118,6 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5002)	; 倂
-      (=jis-x0213-1-2000  . #x2E3C)	; &I-JX1-2E3C; [14-28]
-      ))
     (hanyu-dazidian	1 153 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -7072,6 +7137,10 @@
     (=gt-pj-1		. #x4A3B)	; &I-GT-00791; [42-27]
     (=daikanwa		. 00561)	; &I-M-00561;
     (mojikyo		. 000561)	; &MCS-60000231;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x5002)	; 倂
+      (=jis-x0213-1-2000  . #x2E3C)	; &I-JX1-2E3C; [14-28]
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -7665,15 +7734,6 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (<-ancient
-     ((shinjigen-1	  . 211)
-      (=jis-x0208	  . #x3426)	; &GT-00718; [20-06]
-      (=gb2312		  . #x5929)	; &I-G0-5929; [57-09]
-      (=ks-x1001	  . #x4A49)	; &I-K0-4A49; [42-41]
-      (=daikanwa	  . 00577)	; &I-M-00577;
-      ))
-    (<-ancient*sources
-     shinjigen-1)
     (hanyu-dazidian	1 148 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -7696,6 +7756,15 @@
     (=daikanwa		. 00578)	; &I-M-00578;
     (=hanziku-1		. #xC25D)	; &I-HZK01-C25D;
     (mojikyo		. 000578)	; &MCS-60000242;
+    (<-ancient
+     ((shinjigen-1	  . 211)
+      (=jis-x0208	  . #x3426)	; &GT-00718; [20-06]
+      (=gb2312		  . #x5929)	; &I-G0-5929; [57-09]
+      (=ks-x1001	  . #x4A49)	; &I-K0-4A49; [42-41]
+      (=daikanwa	  . 00577)	; &I-M-00577;
+      ))
+    (<-ancient*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -7944,7 +8013,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs@unicode	    . #x4ECA)	; &UU+4ECA;
+       ((=gb2312	    . #x3D71)	; &G0-3D71; [29-81]
 	)
        ((=ucs		    . #x4E91)	; 云
 	))
@@ -8026,7 +8095,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x7C73)	; &GT-34594;
+       ((=jis-x0208	    . #x4A46)	; &GT-34594; [42-38]
+	(=gb2312	    . #x4357)	; &I-G0-4357; [35-55]
+	(=ks-x1001	    . #x5A37)	; &I-K0-5A37; [58-23]
+	(=daikanwa	    . 26832)	; &I-M-26832;
 	))
       (=jis-x0212	  . #x3125)	; &M-00591; [17-05]
       (=daikanwa	  . 00591)	; &I-M-00591;
@@ -8515,7 +8587,9 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x620E)	; &UU+620E;
+       ((=gb2312	    . #x4856)	; &GT-14554; [40-54]
+	(=ks-x1001	    . #x6B54)	; &I-K0-6B54; [75-52]
+	(=daikanwa	    . 11539)	; &I-M-11539;
 	))
       (=daikanwa	  . 00609)	; &M-00609;
       (=hanziku-1	  . #xC165)	; &I-HZK01-C165;
@@ -8932,7 +9006,8 @@
      ((name		  . "CJK RADICAL PERSON")
       (=ucs		  . #x2E85)	; ⺅
       )
-     ((=ucs@unicode	  . #x5173)	; &GT-07389;
+     ((=gb2312		  . #x3958)	; &GT-07389; [25-56]
+      (=jis-x0213-2-2000  . #x2328)	; &I-JX2-2328; [03-08]
       ))
     (=cns11643-5	. #x2524)	; &C5-2524; [05-04]
     (=ucs@iso		. #x2022A)	; &C5-2524;
@@ -8962,10 +9037,6 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x50F9)	; 價
-      (=jis-x0208	  . #x512B)	; &I-J90-512B; [49-11]
-      ))
     (hanyu-dazidian	1 146 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -8984,6 +9055,10 @@
     (=gt-pj-1		. #x3241)	; &I-GT-00709; [18-33]
     (=hanziku-1		. #xC1D9)	; &I-HZK01-C1D9;
     (mojikyo		. 050102)	; &MCS-6000C3B6;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x50F9)	; 價
+      (=jis-x0208	  . #x512B)	; &I-J90-512B; [49-11]
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -9025,7 +9100,11 @@
      ((name		  . "CJK RADICAL PERSON")
       (=ucs		  . #x2E85)	; ⺅
       )
-     ((=ucs@unicode	  . #x518D)	; &GT-02000;
+     ((=jis-x0208	  . #x3A46)	; &GT-02000; [26-38]
+      (=gb2312		  . #x5459)	; &I-G0-5459; [52-57]
+      (=ks-x1001	  . #x6E22)	; &I-K0-6E22; [78-02]
+      (=cns11643-1	  . #x4742)	; &I-C1-4742; [39-34]
+      (=daikanwa	  . 48933)	; &I-M-48933;
       ))
     (=iso-ir165		. #x2E26)	; &EGB-2E26; [14-06]
     (=ucs@unicode	. #x4FA2)	; &EGB-2E26;
@@ -9043,10 +9122,6 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA30)	; 侮
-      (=jis-x0213-1-2000  . #x2E38)	; &I-JX1-2E38; [14-24]
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -9064,6 +9139,10 @@
     (=gt-pj-1		. #x496E)	; &I-GT-00790; [41-78]
     (=ucs@jis		. #x4FAE)	; 侮
     (mojikyo		. 050103)	; &MCS-6000C3B7;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA30)	; 侮
+      (=jis-x0213-1-2000  . #x2E38)	; &I-JX1-2E38; [14-24]
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -9111,14 +9190,6 @@
     (=ucs		. #x4FAB)	; 侫
     (->subsumptive
      ((morohashi-daikanwa	ho 16)
-      (<-vulgar
-       ((shinjigen-1	    . 1613)
-	(=jis-x0208	    . #x5524)	; &GT-00672; [53-04]
-	(=gb2312	    . #x587A)	; &I-G0-587A; [56-90]
-	(=daikanwa	    . 00521)	; &I-M-00521;
-	))
-      (<-vulgar*sources
-       shinjigen-1)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
@@ -9134,6 +9205,14 @@
       (=gt-pj-1		  . #x5525)	; &I-GT-00785; [53-05]
       (=cbeta		  . 00126)	; &I-CB00126;
       (=ucs@jis		  . #x4FAB)	; &GT-00785;
+      (<-vulgar
+       ((shinjigen-1	    . 1613)
+	(=jis-x0208	    . #x5524)	; &GT-00672; [53-04]
+	(=gb2312	    . #x587A)	; &I-G0-587A; [56-90]
+	(=daikanwa	    . 00521)	; &I-M-00521;
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       (->subsumptive
        ((mojikyo	    . 055195)	; &MCS-6000D79B;
 	)
@@ -9458,6 +9537,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
+    (=daikanwa		. 00634)	; &M-00634;
     (<-original
      ((=jis-x0208	  . #x3874)	; &GT-00835; [24-84]
       (=gb2312		  . #x3A6E)	; &I-G0-3A6E; [26-78]
@@ -9466,7 +9546,6 @@
       ))
     (<-original*sources
      zihui daikanwa)
-    (=daikanwa		. 00634)	; &M-00634;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -9550,7 +9629,7 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x5448)	; 呈
+     ((=ucs		  . #x2F83E)	; 呈
       ))
     (=ucs@unicode	. #x4FB1)	; &UU+4FB1;
     ))
@@ -9662,56 +9741,84 @@
     (mojikyo		. 000641)	; &MCS-60000281;
     ))
 (define-char
-  '((=>ucs		. #x20230)	; 𠈰
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 7)
-    (total-strokes	 . 9)
-    (=daikanwa		. 00642)	; &M-00642;
-    (mojikyo		. 000642)	; &MCS-60000282;
-    ))
-(define-char
-  '((morohashi-daikanwa	642 0 1)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
-    (hanyu-dazidian	1 163 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+  '((ideographic-radical . 9)	; ⼈
+    (=ucs		. #x20230)	; 𠈰
+    (->subsumptive
+     ((ideographic-strokes . 7)
+      (total-strokes	   . 9)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=ks-x1001	    . #x6645)	; &M-09569; [70-37]
+	(=daikanwa	    . 09569)	; &I-M-09569;
+	))
+      (=daikanwa	  . 00642)	; &M-00642;
       )
-     ((=ucs		  . #x4EBB)	; 亻
+     ((ideographic-strokes . 7)
+      (total-strokes	   . 9)
+      (hanyu-dazidian	  1 163 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x5153)	; &G0-5153; [49-51]
+	))
+      (=hanziku-1	  . #xC565)	; &HZK01-C565;
+      (=ucs@iso		  . #x20230)	; &HZK01-C565;
+      (mojikyo		  . 000642)	; &MCS-60000282;
       )
-     ((=cns11643-1	  . #x4D37)	; &I-C1-4D37; [45-23]
+     ((ideographic-strokes . 8)
+      (total-strokes	   . 10)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208@1990    . #x3164)	; &GT-12058; [17-68]
+	(=cns11643-1	    . #x4D37)	; &I-C1-4D37; [45-23]
+	))
+      (=cns11643-5	  . #x2B72)	; &C5-2B72; [11-82]
       ))
-    (=ucs		. #x20230)	; 𠈰
-    (=cns11643-5	. #x2B72)	; &I-C5-2B72; [11-82]
-    (=hanziku-1		. #xC565)	; &I-HZK01-C565;
     ))
 (define-char
-  '((=>ucs		. #x20231)	; 𠈱
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 7)
-    (total-strokes	 . 9)
-    (=daikanwa		. 00643)	; &M-00643;
-    (mojikyo		. 000643)	; &MCS-60000283;
-    ))
-(define-char
-  '((morohashi-daikanwa	643 0 1)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (hanyu-dazidian	1 166 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x20231)	; 𠈱
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x3A3B)	; &GT-21980; [26-27]
+	(=ks-x1001	    . #x5E5E)	; &I-K0-5E5E; [62-62]
+	(=daikanwa	    . 17212)	; &I-M-17212;
+	))
+      (=daikanwa	  . 00643)	; &M-00643;
+      (mojikyo		  . 000643)	; &MCS-60000283;
       )
-     ((=ucs		  . #x6C99)	; 沙
+     ((hanyu-dazidian	  1 166 4)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x4933)	; &C1-4A67; [41-19]
+	(=cns11643-1	    . #x4A67)	; &I-C1-4A67; [42-71]
+	))
+      (=cns11643-4	  . #x2836)	; &HZK01-C5E8; [08-22]
+      (=hanziku-1	  . #xC5E8)	; &I-HZK01-C5E8;
+      (=ucs@iso		  . #x20231)	; &HZK01-C5E8;
       ))
-    (=ucs		. #x20231)	; 𠈱
-    (=cns11643-4	. #x2836)	; &I-C4-2836; [08-22]
-    (=hanziku-1		. #xC5E8)	; &I-HZK01-C5E8;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -9931,7 +10038,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x5EF7)	; &GT-12057;
+       ((=gb2312	    . #x4D22)	; &GT-12057; [45-02]
+	(=cns11643-1	    . #x4A2C)	; &I-C1-4A2C; [42-12]
 	))
       (=cns11643-2	  . #x2930)	; &C2-2930; [09-16]
       (=jef-china3	  . #x42BF)	; &I-JC3-42BF;
@@ -9940,8 +10048,7 @@
       ))
     ))
 (define-char
-  '((=>daikanwa		. 00651)	; &M-00651;
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
     (=ucs		. #x3459)	; 㑙
@@ -10084,34 +10191,49 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
     (=ucs		. #x345A)	; 㑚
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=jis-x0208@1978    . #x4661)	; &M-39305; [38-65]
-	(=ks-x1001	    . #x5161)	; &I-K0-5161; [49-65]
-	(=daikanwa	    . 39305)	; &I-M-39305;
-	))
-      (=daikanwa	  . 00656)	; &M-00656;
-      (mojikyo		  . 000656)	; &MCS-60000290;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x345A)	; 㑚
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((hanyu-dazidian	  1 154 7)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=ucs@unicode	    . #x90A3)	; &GT-52927;
-	))
-      (=cns11643-3	  . #x2B30)	; &CB04175; [11-16]
-      (=hanziku-1	  . #xC3A5)	; &I-HZK01-C3A5;
-      (=cbeta		  . 04175)	; &I-CB04175;
-      (=ucs@unicode	  . #x345A)	; &CB04175;
+     ((=ucs		  . #x4EBB)	; 亻
+      )
+     ((=jis-x0208@1978	  . #x4661)	; &M-39305; [38-65]
+      (=ks-x1001	  . #x5161)	; &I-K0-5161; [49-65]
+      (=daikanwa	  . 39305)	; &I-M-39305;
+      ))
+    (=daikanwa		. 00656)	; &M-00656;
+    (mojikyo		. 000656)	; &MCS-60000290;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x345A)	; 㑚
       ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	1 154 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x4EBB)	; 亻
+      )
+     ((=gb2312		  . #x4447)	; &GT-52927; [36-39]
+      (=jis-x0208@1983	  . #x4661)	; &I-J83-4661; [38-65]
+      (=cns11643-1	  . #x4B5B)	; &I-C1-4B5B; [43-59]
+      ))
+    (=cns11643-3	. #x2B30)	; &CB04175; [11-16]
+    (=hanziku-1		. #xC3A5)	; &I-HZK01-C3A5;
+    (=cbeta		. 04175)	; &I-CB04175;
+    (=ucs@unicode	. #x345A)	; &CB04175;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -10340,7 +10462,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x5433)	; &M-03365;
+       ((=ks-x1001	    . #x676F)	; &M-03365; [71-79]
+	(=daikanwa	    . 03365)	; &I-M-03365;
 	))
       (=jis-x0212	  . #x3137)	; &M-00662; [17-23]
       (=big5		  . #xCDE3)	; &I-B-CDE3;
@@ -10362,65 +10485,58 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x4FC2)	; 係
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 7)
-    (total-strokes	 . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=jis-x0208	  . #x374F)	; &GT-35081; [23-47]
-      (=ks-x1001	  . #x4D27)	; &I-K0-4D27; [45-07]
-      (=daikanwa	  . 27223)	; &I-M-27223;
-      ))
-    (shinjigen-1	. 251)
-    (shinjigen-2	. 251)
-    (=jis-x0208		. #x3738)	; &GT-00830; [23-24]
-    (=ks-x1001		. #x4C75)	; &I-K0-4C75; [44-85]
-    (=big5		. #xAB59)	; &I-B-AB59;
-    (=gt		. 00830)	; &I-GT-00830;
-    (=gt-pj-1		. #x3738)	; &I-GT-00830; [23-24]
-    (=daikanwa		. 00663)	; &I-M-00663;
-    (=ucs@jis		. #x4FC2)	; &GT-00830;
-    (=ucs@big5		. #x4FC2)	; &GT-00830;
-    (mojikyo		. 000663)	; &MCS-60000297;
-    ))
-(define-char
-  '((=>ucs		. #x4FC2)	; 係
-    (morohashi-daikanwa	663 0 0)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 7)
-    (total-strokes	 . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((name		  . "CJK RADICAL PERSON")
-      (=ucs		  . #x2E85)	; ⺅
-      )
-     ((=cns11643-1	  . #x4B37)	; &C1-4B37; [43-23]
-      ))
-    (=cns11643-1	. #x4F7B)	; &C1-4F7B; [47-91]
-    ))
-(define-char
-  '((morohashi-daikanwa	663 0 1)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (hanyu-dazidian	1 164 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x4FC2)	; 係
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((name		    . "CJK RADICAL PERSON")
+	(=ucs		    . #x2E85)	; ⺅
+	)
+       ((=jis-x0208	    . #x374F)	; &GT-35081; [23-47]
+	(=ks-x1001	    . #x4D27)	; &I-K0-4D27; [45-07]
+	(=daikanwa	    . 27223)	; &I-M-27223;
+	))
+      (shinjigen-1	  . 251)
+      (shinjigen-2	  . 251)
+      (=jis-x0208	  . #x3738)	; &GT-00830; [23-24]
+      (=ks-x1001	  . #x4C75)	; &I-K0-4C75; [44-85]
+      (=big5		  . #xAB59)	; &I-B-AB59;
+      (=gt		  . 00830)	; &I-GT-00830;
+      (=gt-pj-1		  . #x3738)	; &I-GT-00830; [23-24]
+      (=daikanwa	  . 00663)	; &I-M-00663;
+      (=ucs@jis		  . #x4FC2)	; &GT-00830;
+      (=ucs@big5	  . #x4FC2)	; &GT-00830;
+      (mojikyo		  . 000663)	; &MCS-60000297;
       )
-     ((=ucs		  . #x4EBB)	; 亻
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((name		    . "CJK RADICAL PERSON")
+	(=ucs		    . #x2E85)	; ⺅
+	)
+       ((=cns11643-1	    . #x4B37)	; &C1-4B37; [43-23]
+	))
+      (=cns11643-1	  . #x4F7B)	; &C1-4F7B; [47-91]
       )
-     ((=ucs		  . #x7CFB)	; ç³»
+     ((hanyu-dazidian	  1 164 8)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((name		    . "CJK RADICAL PERSON")
+	(=ucs		    . #x2E85)	; ⺅
+	)
+       ((=gb2312	    . #x4F35)	; &G0-4F35; [47-21]
+	))
+      (=gb12345		  . #x7872)	; &UU+4FC2; [88-82]
+      (=ucs@unicode	  . #x4FC2)	; &UU+4FC2;
       ))
-    (=ucs		. #x4FC2)	; 係
-    (=gb12345		. #x7872)	; 係 [88-82]
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -11214,7 +11330,7 @@
        ((name		    . "CJK RADICAL PERSON")
 	(=ucs		    . #x2E85)	; ⺅
 	)
-       ((=ucs@unicode	    . #x7077)	; &M-18871;
+       ((=daikanwa	    . 18871)	; &M-18871;
 	))
       (=daikanwa	  . 00693)	; &M-00693;
       (=hanziku-1	  . #xC5E7)	; &I-HZK01-C5E7;
@@ -11225,7 +11341,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x4EBB)	; 亻
+       ((name		    . "CJK RADICAL PERSON")
+	(=ucs		    . #x2E85)	; ⺅
 	)
        ((=cns11643-3	    . #x265F)	; &C3-265F; [06-63]
 	))
@@ -11480,7 +11597,10 @@
     (=ucs		. #x4FDE)	; 俞
     (=big5		. #xAB5C)	; &I-B-AB5C;
     (->subsumptive
-     ((<-vulgar
+     ((shinjigen-1	  . 488)
+      (=daikanwa	  . 00703)	; &M-00703;
+      (mojikyo		  . 000703)	; &MCS-600002BF;
+      (<-vulgar
        ((shinjigen-1	    . 487)
 	(=jis-x0208	    . #x5141)	; &GT-01873; [49-33]
 	(=ks-x1001	    . #x6A64)	; &I-K0-6A64; [74-68]
@@ -11488,9 +11608,6 @@
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 488)
-      (=daikanwa	  . 00703)	; &M-00703;
-      (mojikyo		  . 000703)	; &MCS-600002BF;
       )
      ((hanyu-dazidian	  1 155 3)
       (=gb2312		  . #x5361)	; &G0-5361; [51-65]
@@ -11541,7 +11658,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x77E3)	; &GT-30619;
+       ((=jis-x0208	    . #x6263)	; &GT-30619; [66-67]
+	(=gb2312	    . #x5253)	; &I-G0-5253; [50-51]
+	(=ks-x1001	    . #x6B78)	; &I-K0-6B78; [75-88]
+	(=daikanwa	    . 23931)	; &I-M-23931;
 	))
       (shinjigen-1	  . 257)
       (shinjigen-2	  . 257)
@@ -11982,14 +12102,7 @@
     (total-strokes	 . 9)
     (=ucs		. #x2028A)	; 𠊊
     (->subsumptive
-     ((<-original
-       ((=ks-x1001	    . #x635D)	; &GT-59026; [67-61]
-	(=cns11643-1	    . #x537A)	; &I-C1-537A; [51-90]
-	(=daikanwa	    . 44014)	; &I-M-44014;
-	))
-      (<-original*sources
-       zhonghua-dazidian daikanwa)
-      (hanyu-dazidian	  1 169 7)
+     ((hanyu-dazidian	  1 169 7)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
@@ -12003,6 +12116,13 @@
       (=daikanwa	  . 44018)	; &M-44018;
       (=hanziku-1	  . #xC94D)	; &I-HZK01-C94D;
       (=ucs@iso		  . #x2028A)	; &M-44018;
+      (<-original
+       ((=ks-x1001	    . #x635D)	; &GT-59026; [67-61]
+	(=cns11643-1	    . #x537A)	; &I-C1-537A; [51-90]
+	(=daikanwa	    . 44014)	; &I-M-44014;
+	))
+      (<-original*sources
+       zhonghua-dazidian daikanwa)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -12231,7 +12351,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x5E9C)	; &UU+5E9C;
+       ((=gb2312	    . #x382E)	; &C1-4D34; [24-14]
+	(=cns11643-1	    . #x4D34)	; &I-C1-4D34; [45-20]
 	))
       (=gb2312		  . #x3829)	; &C1-5424; [24-09]
       (=cns11643-1	  . #x5424)	; &I-C1-5424; [52-04]
@@ -12549,7 +12670,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x80A5)	; &GT-37958;
+       ((=jis-x0208	    . #x486E)	; &GT-37958; [40-78]
+	(=gb2312	    . #x374A)	; &I-G0-374A; [23-42]
+	(=ks-x1001	    . #x5D7E)	; &I-K0-5D7E; [61-94]
+	(=daikanwa	    . 29290)	; &I-M-29290;
 	))
       (=big5		  . #xD0D5)	; &M-00733;
       (=daikanwa	  . 00733)	; &I-M-00733;
@@ -12713,7 +12837,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x80B2)	; &G0-537D;
+       ((=gb2312	    . #x537D)	; &G0-537D; [51-93]
 	))
       (=hanziku-1	  . #xCBF4)	; &HZK01-CBF4;
       (=ucs@unicode	  . #x4FFC)	; &HZK01-CBF4;
@@ -12832,7 +12956,7 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x864E)	; &G0-3B22;
+     ((=gb2312		  . #x3B22)	; &G0-3B22; [27-02]
       ))
     (=hanziku-1		. #xCA6E)	; &HZK01-CA6E;
     (=ucs@unicode	. #x4FFF)	; &HZK01-CA6E;
@@ -13001,7 +13125,7 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x548E)	; &G0-3E4C;
+     ((=gb2312		  . #x3E4C)	; &G0-3E4C; [30-44]
       ))
     (=hanziku-1		. #xCBD3)	; &HZK01-CBD3;
     (=ucs@unicode	. #x5003)	; &HZK01-CBD3;
@@ -13012,12 +13136,13 @@
     (total-strokes	 . 10)
     (hanyu-dazidian	1 172 7)
     (ideographic-structure
-     (:cdp-combinator	4)
-     ((=ucs		  . #x4EBB)	; 亻
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x3401)	; 㐁
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
       )
-     ((=ucs		  . #x4EBA)	; 人
+     ((=ucs		  . #x2002C)	; 𠀬
       ))
     (=ucs		. #x20266)	; 𠉦
     (=cns11643-6	. #x3536)	; &I-C6-3536; [21-22]
@@ -13038,7 +13163,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x80B4)	; &GT-37924;
+       ((=jis-x0208	    . #x3A68)	; &GT-37924; [26-72]
+	(=gb2312	    . #x6B48)	; &I-G0-6B48; [75-40]
+	(=ks-x1001	    . #x7D22)	; &I-K0-7D22; [93-02]
+	(=daikanwa	    . 29322)	; &I-M-29322;
 	))
       (=jis-x0212	  . #x314B)	; &M-00749; [17-43]
       (=daikanwa	  . 00749)	; &I-M-00749;
@@ -13060,50 +13188,44 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x5005)	; 倅
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (hanyu-dazidian	1 182 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=jis-x0208	  . #x4234)	; &GT-03504; [34-20]
-      (=ks-x1001	  . #x706F)	; &I-K0-706F; [80-79]
-      (=daikanwa	  . 02740)	; &I-M-02740;
-      ))
-    (shinjigen-1	. 298)
-    (shinjigen-2	. 298)
-    (=jis-x0208		. #x5066)	; &GT-00973; [48-70]
+    (=ucs		. #x5005)	; 倅
     (=big5		. #xD0C9)	; &I-B-D0C9;
-    (=gt		. 00973)	; &I-GT-00973;
-    (=gt-pj-1		. #x5066)	; &I-GT-00973; [48-70]
-    (=daikanwa		. 00750)	; &I-M-00750;
-    (=ucs@jis		. #x5005)	; &GT-00973;
-    (=ucs@big5		. #x5005)	; &GT-00973;
-    (mojikyo		. 000750)	; &MCS-600002EE;
-    ))
-(define-char
-  '((morohashi-daikanwa	750 0 0)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 182)
-    (hanyu-dazidian-char . 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x4234)	; &GT-03504; [34-20]
+	(=ks-x1001	    . #x706F)	; &I-K0-706F; [80-79]
+	(=daikanwa	    . 02740)	; &I-M-02740;
+	))
+      (shinjigen-1	  . 298)
+      (shinjigen-2	  . 298)
+      (=jis-x0208	  . #x5066)	; &GT-00973; [48-70]
+      (=gt		  . 00973)	; &I-GT-00973;
+      (=gt-pj-1		  . #x5066)	; &I-GT-00973; [48-70]
+      (=daikanwa	  . 00750)	; &I-M-00750;
+      (=ucs@jis		  . #x5005)	; &GT-00973;
+      (mojikyo		  . 000750)	; &MCS-600002EE;
       )
-     ((=ucs		  . #x5352)	; 卒
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x5764)	; &C1-4C35; [55-68]
+	(=cns11643-1	    . #x4C35)	; &I-C1-4C35; [44-21]
+	))
+      (=cns11643-2	  . #x2D6A)	; &C2-2D6A; [13-74]
+      (=ucs@unicode	  . #x5005)	; &C2-2D6A;
       ))
-    (=ucs		. #x5005)	; 倅
-    (=cns11643-2	. #x2D6A)	; &I-C2-2D6A; [13-74]
     ))
 (define-char
   '((=>ucs		. #x5006)	; 倆
@@ -13568,13 +13690,6 @@
     (->subsumptive
      ((ideographic-strokes . 8)
       (total-strokes	   . 10)
-      (<-vulgar
-       ((shinjigen-1	    . 4789)
-	(=jis-x0208	    . #x6047)	; &GT-00986; [64-39]
-	(=daikanwa	    . 00762)	; &I-M-00762;
-	))
-      (<-vulgar*sources
-       shinjigen-1)
       (shinjigen-1	  . 4790)
       (shinjigen-2	  . 4790)
       (=jis-x0212	  . #x3150)	; &M-00763; [17-48]
@@ -13584,6 +13699,13 @@
       (=jef-china3	  . #x42D8)	; &I-JC3-42D8;
       (=ucs@jis		  . #x5010)	; &M-00763;
       (mojikyo		  . 000763)	; &MCS-600002FB;
+      (<-vulgar
+       ((shinjigen-1	    . 4789)
+	(=jis-x0208	    . #x6047)	; &GT-00986; [64-39]
+	(=daikanwa	    . 00762)	; &I-M-00762;
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       )
      ((ideographic-strokes . 8)
       (total-strokes	   . 10)
@@ -13689,7 +13811,9 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x6BD2)	; &UU+6BD2;
+     ((=gb2312		  . #x363E)	; &C1-5175; [22-30]
+      (=ks-x1001	  . #x5438)	; &I-K0-5438; [52-24]
+      (=cns11643-1	  . #x5175)	; &I-C1-5175; [49-85]
       ))
     (=ucs@iso		. #x20269)	; &U-00020269;
     ))
@@ -13869,7 +13993,8 @@
        ((name		    . "CJK RADICAL PERSON")
 	(=ucs		    . #x2E85)	; ⺅
 	)
-       ((=ucs@unicode	    . #x5E78)	; &C1-4D31;
+       ((=gb2312	    . #x5052)	; &C1-4D31; [48-50]
+	(=cns11643-1	    . #x4D31)	; &I-C1-4D31; [45-17]
 	))
       (=cns11643-1	  . #x5429)	; &C1-5429; [52-09]
       (=ucs@unicode	  . #x5016)	; &C1-5429;
@@ -13939,7 +14064,10 @@
      ((name		  . "CJK RADICAL PERSON")
       (=ucs		  . #x2E85)	; ⺅
       )
-     ((=ucs@unicode	  . #x670B)	; &UU+670B;
+     ((=jis-x0208	  . #x4A7E)	; &GT-18173; [42-94]
+      (=gb2312		  . #x4573)	; &I-G0-4573; [37-83]
+      (=ks-x1001	  . #x5D5B)	; &I-K0-5D5B; [61-59]
+      (=cns11643-1	  . #x4E25)	; &I-C1-4E25; [46-05]
       ))
     (=cns11643-2	. #x2D77)	; &C2-2D77; [13-87]
     (=big5		. #xD0D6)	; &I-B-D0D6;
@@ -13992,7 +14120,8 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x5C19)	; &M-07493;
+     ((=ks-x1001	  . #x5F46)	; &M-07493; [63-38]
+      (=daikanwa	  . 07493)	; &I-M-07493;
       ))
     (shinjigen-1	. 303)
     (shinjigen-2	. 303)
@@ -14016,7 +14145,7 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x5C1A)	; &UU+5C1A;
+     ((=ucs		  . #x5C1A)	; 尚
       ))
     (=gb2312		. #x4C48)	; &C1-5438; [44-40]
     (=cns11643-1	. #x5438)	; &I-C1-5438; [52-24]
@@ -14390,7 +14519,54 @@
     (mojikyo		. 000786)	; &MCS-60000312;
     ))
 (define-char
-  '((=>ucs		. #x5025)	; 倥
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (hanyu-dazidian	1 184 5)
+    (=ucs		. #x5025)	; 倥
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5025)	; 倥
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (=big5		. #xADC3)	; &B-ADC3;
+    (=ucs@big5		. #x5025)	; &B-ADC3;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x3675)	; &GT-32804; [22-85]
+	(=ks-x1001	    . #x4D76)	; &I-K0-4D76; [45-86]
+	(=daikanwa	    . 25415)	; &I-M-25415;
+	))
+      (=jis-x0208	  . #x5065)	; &GT-00969; [48-69]
+      (=gt		  . 00969)	; &I-GT-00969;
+      (=gt-pj-1		  . #x5065)	; &I-GT-00969; [48-69]
+      (=daikanwa	  . 00787)	; &I-M-00787;
+      (=ucs@jis		  . #x5025)	; &GT-00969;
+      (mojikyo		  . 000787)	; &MCS-60000313;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-1	    . #x4F28)	; &C1-4F28; [47-08]
+	))
+      (=cns11643-1	  . #x5426)	; &C1-5426; [52-06]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5025)	; 倥
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
@@ -14400,22 +14576,15 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=jis-x0208	  . #x3675)	; &GT-32804; [22-85]
-      (=ks-x1001	  . #x4D76)	; &I-K0-4D76; [45-86]
-      (=daikanwa	  . 25415)	; &I-M-25415;
+     ((=jef-china3	  . #x5DCC)	; &JC3-5DCC;
       ))
-    (=jis-x0208		. #x5065)	; &GT-00969; [48-69]
-    (=big5		. #xADC3)	; &I-B-ADC3;
-    (=gt		. 00969)	; &I-GT-00969;
-    (=gt-pj-1		. #x5065)	; &I-GT-00969; [48-69]
-    (=daikanwa		. 00787)	; &I-M-00787;
-    (=ucs@jis		. #x5025)	; &GT-00969;
-    (=ucs@big5		. #x5025)	; &GT-00969;
-    (mojikyo		. 000787)	; &MCS-60000313;
+    (shinjigen-1	. 297)
+    (shinjigen-2	. 297)
     ))
 (define-char
-  '((=>ucs		. #x5025)	; 倥
-    (morohashi-daikanwa	787 0 0)
+  '((<-denotational
+     ((=ucs		  . #x5025)	; 倥
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
@@ -14425,100 +14594,94 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=cns11643-1	  . #x4F28)	; &C1-4F28; [47-08]
+     ((=gb2312		  . #x3F55)	; &G0-3F55; [31-53]
       ))
-    (=cns11643-1	. #x5426)	; &C1-5426; [52-06]
+    (=gb2312		. #x5945)	; &G0-5945; [57-37]
+    (=ucs@unicode	. #x5025)	; &G0-5945;
     ))
 (define-char
-  '((morohashi-daikanwa	787 0 1)
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (=ucs		. #x5026)	; 倦
+    (=jis-x0208@1997	. #x3771)	; 倦 [23-81]
+    ))
+(define-char
+  '((<-denotational
+     ((=big5		  . #xADC2)	; &B-ADC2;
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian	1 184 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x7A7A)	; 空
+     ((=jis-x0208	  . #x524B)	; &GT-03636; [50-43]
+      (=ks-x1001	  . #x4F69)	; &I-K0-4F69; [47-73]
+      (=daikanwa	  . 02860)	; &I-M-02860;
       ))
-    (=ucs		. #x5025)	; 倥
-    (=gb2312		. #x5945)	; &I-G0-5945; [57-37]
+    (shinjigen-1	. 292)
+    (shinjigen-2	. 292)
+    (=jis-x0208@1978	. #x3771)	; &M-00788; [23-81]
+    (=ks-x1001		. #x4F66)	; &I-K0-4F66; [47-70]
+    (=daikanwa		. 00788)	; &I-M-00788;
+    (mojikyo		. 000788)	; &MCS-60000314;
     ))
 (define-char
-  '((=>ucs		. #x5025)	; 倥
-    (morohashi-daikanwa	787 0 1)
+  '((<-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)	; ⼈
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (hanyu-dazidian	1 183 7)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=jef-china3	  . #x5DCC)	; &JC3-5DCC;
+     ((=gb2312		  . #x3E6D)	; &C1-4C3A; [30-77]
+      (=cns11643-1	  . #x4C3A)	; &I-C1-4C3A; [44-26]
       ))
-    (shinjigen-1	. 297)
-    (shinjigen-2	. 297)
+    (=gb2312		. #x3E6B)	; &C1-5425; [30-75]
+    (=cns11643-1	. #x5425)	; &I-C1-5425; [52-05]
+    (=ucs@unicode	. #x5026)	; &C1-5425;
     ))
 (define-char
-  '((ideographic-radical . 9)	; ⼈
+  '((<-denotational
+     ((=ucs		  . #x5026)	; 倦
+      ))
+    (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (=ucs		. #x5026)	; 倦
-    (=jis-x0208@1997	. #x3771)	; 倦 [23-81]
-    (->subsumptive
-     ((=big5		  . #xADC2)	; &B-ADC2;
-      (->subsumptive
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	  (=ucs		      . #x2FF0)	; â¿°
-	  )
-	 ((=ucs		      . #x4EBB)	; 亻
-	  )
-	 ((=jis-x0208	      . #x524B)	; &GT-03636; [50-43]
-	  (=ks-x1001	      . #x4F69)	; &I-K0-4F69; [47-73]
-	  (=daikanwa	      . 02860)	; &I-M-02860;
-	  ))
-	(shinjigen-1	    . 292)
-	(shinjigen-2	    . 292)
-	(=jis-x0208@1978    . #x3771)	; &M-00788; [23-81]
-	(=ks-x1001	    . #x4F66)	; &I-K0-4F66; [47-70]
-	(=daikanwa	    . 00788)	; &I-M-00788;
-	(mojikyo	    . 000788)	; &MCS-60000314;
-	)
-       ((hanyu-dazidian	    1 183 7)
-	(ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	  (=ucs		      . #x2FF0)	; â¿°
-	  )
-	 ((=ucs		      . #x4EBB)	; 亻
-	  )
-	 ((=ucs@unicode	      . #x5377)	; &UU+5377;
-	  ))
-	(=gb2312	    . #x3E6B)	; &C1-5425; [30-75]
-	(=cns11643-1	    . #x5425)	; &I-C1-5425; [52-05]
-	(=ucs@unicode	    . #x5026)	; &C1-5425;
-	))
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((name		    . "CJK RADICAL PERSON")
-	(=ucs		    . #x2E85)	; ⺅
-	)
-       ((=ucs		    . #x5DFB)	; å·»
-	))
-      (=jis-x0208@1983	  . #x3771)	; &GT-01087; [23-81]
-      (=jis-x0208@1990	  . #x3771)	; &I-J90-3771; [23-81]
-      (=gt		  . 01087)	; &I-GT-01087;
-      (=gt-pj-1		  . #x3771)	; &I-GT-01087; [23-81]
-      (=jef-china3	  . #x43CD)	; &I-JC3-43CD;
-      (=ucs@jis		  . #x5026)	; &GT-01087;
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
+      )
+     ((=jis-x0208	  . #x342C)	; &GT-11038; [20-12]
       ))
+    (=jis-x0208@1983	. #x3771)	; &GT-01087; [23-81]
+    (=jis-x0208@1990	. #x3771)	; &I-J90-3771; [23-81]
+    (=gt		. 01087)	; &I-GT-01087;
+    (=gt-pj-1		. #x3771)	; &I-GT-01087; [23-81]
+    (=jef-china3	. #x43CD)	; &I-JC3-43CD;
+    (=ucs@jis		. #x5026)	; &GT-01087;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -14608,6 +14771,7 @@
     (total-strokes	 . 10)
     (hanyu-dazidian	1 170 1)
     (=ucs		. #x5029)	; 倩
+    (=big5		. #xADC5)	; &I-B-ADC5;
     ))
 (define-char
   '((<-denotational
@@ -14648,10 +14812,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x9752)	; &GT-57125;
+       ((=jis-x0208	    . #x4044)	; &GT-57125; [32-36]
+	(=gb2312	    . #x4760)	; &I-G0-4760; [39-64]
 	))
       (=gb2312		  . #x593B)	; &G0-593B; [57-27]
-      (=big5		  . #xADC5)	; &I-B-ADC5;
       (=ucs@unicode	  . #x5029)	; &G0-593B;
       )
      ((ideographic-structure
@@ -14805,7 +14969,10 @@
        ((name		    . "CJK RADICAL PERSON")
 	(=ucs		    . #x2E85)	; ⺅
 	)
-       ((=ucs@unicode	    . #x59D4)	; &UU+59D4;
+       ((=jis-x0208	    . #x3051)	; &GT-07715; [16-49]
+	(=gb2312	    . #x4E2F)	; &I-G0-4E2F; [46-15]
+	(=ks-x1001	    . #x6A4D)	; &I-K0-6A4D; [74-45]
+	(=daikanwa	    . 06181)	; &I-M-06181;
 	))
       (shinjigen-1	  . 283)
       (shinjigen-2	  . 283)
@@ -14896,7 +15063,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x677E)	; &GT-18480;
+       ((=gb2312	    . #x4B49)	; &GT-18480; [43-41]
 	))
       (=ucs@unicode	  . #x502F)	; &UU+502F;
       ))
@@ -14907,6 +15074,15 @@
     (total-strokes	 . 10)
     (hanyu-dazidian	1 170 5)
     (=ucs		. #x5030)	; 倰
+    (=big5		. #xD0CD)	; &I-B-D0CD;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5030)	; 倰
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -14929,20 +15105,67 @@
       (=cns11643-2	  . #x2D6E)	; &C2-2D6E; [13-78]
       (=ucs@cns		  . #x5030)	; &C2-2D6E;
       (mojikyo		  . 000799)	; &MCS-6000031F;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5030)	; 倰
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x4EBB)	; 亻
+      )
+     ((=ucs@unicode	  . #x590C)	; &UU+590C;
+      ))
+    (=ucs@unicode	. #x5030)	; &UU+5030;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5030)	; 倰
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
+     ((=ucs		  . #x4EBB)	; 亻
+      )
+     ((=jis-x0212	  . #x3862)	; &JX1-2F67; [24-66]
+      (=jis-x0213-1-2000  . #x2F67)	; &I-JX1-2F67; [15-71]
+      ))
+    (=jis-x0212		. #x315B)	; &JSP-315B; [17-59]
+    (=jef-china3	. #x42E2)	; &I-JC3-42E2;
+    (=ucs@jis		. #x5030)	; &JSP-315B;
+    ))
+(define-char
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (hanyu-dazidian	1 177 4)
+    (=ucs		. #x5031)	; 倱
+    (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=jis-x0212	    . #x3862)	; &JX1-2F67; [24-66]
-	(=jis-x0213-1-2000  . #x2F67)	; &I-JX1-2F67; [15-71]
+       ((=jis-x0208	    . #x3A2B)	; &GT-17433; [26-11]
+	(=gb2312	    . #x4025)	; &I-G0-4025; [32-05]
+	(=ks-x1001	    . #x4D60)	; &I-K0-4D60; [45-64]
+	(=daikanwa	    . 13792)	; &I-M-13792;
 	))
-      (=jis-x0212	  . #x315B)	; &JSP-315B; [17-59]
-      (=big5		  . #xD0CD)	; &I-B-D0CD;
-      (=jef-china3	  . #x42E2)	; &I-JC3-42E2;
-      (=ucs@jis		  . #x5030)	; &JSP-315B;
+      (=big5		  . #xD0DC)	; &M-00800;
+      (=daikanwa	  . 00800)	; &I-M-00800;
+      (=ucs@unicode	  . #x5031)	; &M-00800;
+      (mojikyo		  . 000800)	; &MCS-60000320;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -14950,34 +15173,15 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x590C)	; &UU+590C;
+       ((=cns11643-1	    . #x4D7A)	; &C1-4D7A; [45-90]
 	))
-      (=ucs@unicode	  . #x5030)	; &UU+5030;
+      (=cns11643-2	  . #x2D7D)	; &C2-2D7D; [13-93]
       ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian	1 177 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x6606)	; 昆
-      ))
-    (=ucs		. #x5031)	; 倱
-    (=cns11643-2	. #x2D7D)	; &I-C2-2D7D; [13-93]
-    (=big5		. #xD0DC)	; &I-B-D0DC;
-    (=daikanwa		. 00800)	; &I-M-00800;
-    (mojikyo		. 000800)	; &MCS-60000320;
-    ))
-(define-char
-  '((ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
     (hanyu-dazidian	1 172 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -15516,7 +15720,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x91C7)	; &GT-53946;
+       ((=gb2312	    . #x3249)	; &GT-53946; [18-41]
+	(=jis-x0208@1983    . #x3A53)	; &I-J83-3A53; [26-51]
 	))
       (=ucs@unicode	  . #x5038)	; &UU+5038;
       (mojikyo		  . 057233)	; &UU+5038;
@@ -15537,10 +15742,6 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5109)	; 儉
-      (=jis-x0208	  . #x512D)	; &I-J90-512D; [49-13]
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -15558,6 +15759,10 @@
     (=gt-pj-1		. #x3770)	; &I-GT-00962; [23-80]
     (=daikanwa		. 00823)	; &I-M-00823;
     (mojikyo		. 000823)	; &MCS-60000337;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x5109)	; 儉
+      (=jis-x0208	  . #x512D)	; &I-J90-512D; [49-13]
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -16075,7 +16280,9 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x524D)	; &GT-02595;
+       ((=jis-x0208	    . #x4130)	; &GT-02595; [33-16]
+	(=gb2312	    . #x4730)	; &I-G0-4730; [39-16]
+	(=ks-x1001	    . #x6E71)	; &I-K0-6E71; [78-81]
 	))
       (=hanziku-1	  . #xCE78)	; &HZK01-CE78;
       (=ucs@unicode	  . #x5042)	; &HZK01-CE78;
@@ -16105,7 +16312,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x533D)	; &JSP-3434;
+       ((=jis-x0212	    . #x3434)	; &JSP-3434; [20-20]
 	))
       (shinjigen-1	  . 329)
       (shinjigen-2	  . 329)
@@ -16153,7 +16360,9 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x800E)	; &M-28877;
+       ((=jis-x0212	    . #x554C)	; &M-28877; [53-44]
+	(=jis-x0213-2-2000  . #x7525)	; &I-JX2-7525; [85-05]
+	(=daikanwa	    . 28877)	; &I-M-28877;
 	))
       (=daikanwa	  . 00831)	; &M-00831;
       (=hanziku-1	  . #xCCF8)	; &I-HZK01-CCF8;
@@ -16310,7 +16519,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x97CB)	; &GT-57812;
+       ((=gb12345	    . #x4E24)	; &GT-57812; [46-04]
+	(=daikanwa	    . 43108)	; &GT-57812;
 	))
       (shinjigen-1	  . 353)
       (shinjigen-2	  . 353)
@@ -16435,7 +16645,10 @@
      ((name		  . "CJK RADICAL PERSON")
       (=ucs		  . #x2E85)	; ⺅
       )
-     ((=ucs@unicode	  . #x82E5)	; &GT-39907;
+     ((=jis-x0208	  . #x3C63)	; &GT-39907; [28-67]
+      (=gb2312		  . #x4874)	; &I-G0-4874; [40-84]
+      (=ks-x1001	  . #x6534)	; &I-K0-6534; [69-20]
+      (=cns11643-6	  . #x2E24)	; &I-C6-2E24; [14-04]
       ))
     (=gb2312		. #x593C)	; &JSP-3165; [57-28]
     (=jis-x0212		. #x3165)	; &I-JSP-3165; [17-69]
@@ -16671,46 +16884,52 @@
     (mojikyo		. 000849)	; &MCS-60000351;
     ))
 (define-char
-  '((=>ucs		. #x5050)	; 偐
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=daikanwa	  . 09980)	; &M-09980;
-      ))
-    (shinjigen-1	. 331)
-    (shinjigen-2	. 331)
-    (=jis-x0208		. #x5074)	; &GT-01074; [48-84]
-    (=gt		. 01074)	; &I-GT-01074;
-    (=gt-pj-1		. #x5074)	; &I-GT-01074; [48-84]
-    (=daikanwa		. 00850)	; &I-M-00850;
-    (=ucs@jis		. #x5050)	; &GT-01074;
-    (mojikyo		. 000850)	; &MCS-60000352;
+    (=ucs		. #x5050)	; 偐
     ))
 (define-char
-  '((=>ucs		. #x5050)	; 偐
-    (morohashi-daikanwa	850 0 0)
+  '((<-denotational
+     ((=ucs		  . #x5050)	; 偐
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 194 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=daikanwa	    . 09980)	; &M-09980;
+	))
+      (shinjigen-1	  . 331)
+      (shinjigen-2	  . 331)
+      (=jis-x0208	  . #x5074)	; &GT-01074; [48-84]
+      (=gt		  . 01074)	; &I-GT-01074;
+      (=gt-pj-1		  . #x5074)	; &I-GT-01074; [48-84]
+      (=daikanwa	  . 00850)	; &I-M-00850;
+      (=ucs@jis		  . #x5050)	; &GT-01074;
+      (mojikyo		  . 000850)	; &MCS-60000352;
       )
-     ((=ucs		  . #x5F65)	; å½¥
+     ((hanyu-dazidian	  1 194 10)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=ucs@unicode	    . #x5F65)	; &UU+5F65;
+	))
+      (=hanziku-1	  . #xCE5F)	; &HZK01-CE5F;
       ))
-    (=hanziku-1		. #xCE5F)	; &HZK01-CE5F;
     ))
 (define-char
-  '((morohashi-daikanwa	850 0 3)
+  '((<-denotational
+     ((=ucs		  . #x5050)	; 偐
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
@@ -16720,10 +16939,11 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x5F66)	; 彦
+     ((=gb2312		  . #x5165)	; &C3-2C50; [49-69]
+      (=cns11643-3	  . #x2C50)	; &I-C3-2C50; [12-48]
       ))
-    (=ucs		. #x5050)	; 偐
-    (=cns11643-3	. #x3444)	; &I-C3-3444; [20-36]
+    (=cns11643-3	. #x3444)	; &C3-3444; [20-36]
+    (=ucs@unicode	. #x5050)	; &C3-3444;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -16739,7 +16959,9 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x98A8)	; &GT-58717;
+       ((=jis-x0208	    . #x4977)	; &GT-58717; [41-87]
+	(=ks-x1001	    . #x7926)	; &I-K0-7926; [89-06]
+	(=daikanwa	    . 43756)	; &I-M-43756;
 	))
       (=jis-x0212	  . #x3167)	; &M-00851; [17-71]
       (=daikanwa	  . 00851)	; &I-M-00851;
@@ -16835,7 +17057,10 @@
        ((name		    . "CJK RADICAL PERSON")
 	(=ucs		    . #x2E85)	; ⺅
 	)
-       ((=ucs@unicode	    . #x7686)	; &GT-29091;
+       ((=jis-x0208	    . #x3327)	; &GT-29091; [19-07]
+	(=gb2312	    . #x3D54)	; &I-G0-3D54; [29-52]
+	(=ks-x1001	    . #x4B4B)	; &I-K0-4B4B; [43-43]
+	(=daikanwa	    . 22699)	; &I-M-22699;
 	))
       (shinjigen-1	  . 330)
       (shinjigen-2	  . 330)
@@ -16947,7 +17172,8 @@
        ((name		    . "CJK RADICAL PERSON")
 	(=ucs		    . #x2E85)	; ⺅
 	)
-       ((=ucs@unicode	    . #x7701)	; &UU+7701;
+       ((=gb2312	    . #x4A21)	; &C1-525C; [42-01]
+	(=cns11643-1	    . #x525C)	; &I-C1-525C; [50-60]
 	))
       (=cns11643-2	  . #x3369)	; &C2-3369; [19-73]
       (=ucs@unicode	  . #x5057)	; &C2-3369;
@@ -16957,23 +17183,6 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (<-formed
-     ((shinjigen-1	  . 211)
-      (=jis-x0208	  . #x3426)	; &GT-00718; [20-06]
-      (=gb2312		  . #x5929)	; &I-G0-5929; [57-09]
-      (=ks-x1001	  . #x4A49)	; &I-K0-4A49; [42-41]
-      (=daikanwa	  . 00577)	; &I-M-00577;
-      ))
-    (<-formed*sources
-     shinjigen-1)
-    (<-same
-     ((=jis-x0208	  . #x3426)	; &GT-00718; [20-06]
-      (=gb2312		  . #x5929)	; &I-G0-5929; [57-09]
-      (=ks-x1001	  . #x4A49)	; &I-K0-4A49; [42-41]
-      (=daikanwa	  . 00577)	; &I-M-00577;
-      ))
-    (<-same*sources
-     yupian daikanwa)
     (hanyu-dazidian	1 191 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -16991,6 +17200,23 @@
     (=cbeta		. 00130)	; &I-CB00130;
     (=jef-china3	. #x91A6)	; &I-JC3-91A6;
     (mojikyo		. 000858)	; &MCS-6000035A;
+    (<-formed
+     ((shinjigen-1	  . 211)
+      (=jis-x0208	  . #x3426)	; &GT-00718; [20-06]
+      (=gb2312		  . #x5929)	; &I-G0-5929; [57-09]
+      (=ks-x1001	  . #x4A49)	; &I-K0-4A49; [42-41]
+      (=daikanwa	  . 00577)	; &I-M-00577;
+      ))
+    (<-formed*sources
+     shinjigen-1)
+    (<-same
+     ((=jis-x0208	  . #x3426)	; &GT-00718; [20-06]
+      (=gb2312		  . #x5929)	; &I-G0-5929; [57-09]
+      (=ks-x1001	  . #x4A49)	; &I-K0-4A49; [42-41]
+      (=daikanwa	  . 00577)	; &I-M-00577;
+      ))
+    (<-same*sources
+     yupian daikanwa)
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -17147,52 +17373,46 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x505C)	; 停
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (hanyu-dazidian	1 194 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=jis-x0208	  . #x4462)	; &GT-00406; [36-66]
-      (=ks-x1001	  . #x6F4D)	; &I-K0-6F4D; [79-45]
-      (=daikanwa	  . 00303)	; &I-M-00303;
-      ))
-    (shinjigen-1	. 346)
-    (shinjigen-2	. 346)
-    (=jis-x0208		. #x4464)	; &GT-01143; [36-68]
-    (=ks-x1001		. #x6F4E)	; &I-K0-6F4E; [79-46]
+    (=ucs		. #x505C)	; 停
     (=big5		. #xB0B1)	; &I-B-B0B1;
-    (=gt		. 01143)	; &I-GT-01143;
-    (=gt-pj-1		. #x4464)	; &I-GT-01143; [36-68]
-    (=daikanwa		. 00864)	; &I-M-00864;
-    (=ucs@jis		. #x505C)	; &GT-01143;
-    (=ucs@big5		. #x505C)	; &GT-01143;
-    (mojikyo		. 000864)	; &MCS-60000360;
-    ))
-(define-char
-  '((morohashi-daikanwa	864 0 0)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 9)
-    (total-strokes	 . 11)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 194)
-    (hanyu-dazidian-char . 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x4462)	; &GT-00406; [36-66]
+	(=ks-x1001	    . #x6F4D)	; &I-K0-6F4D; [79-45]
+	(=daikanwa	    . 00303)	; &I-M-00303;
+	))
+      (shinjigen-1	  . 346)
+      (shinjigen-2	  . 346)
+      (=jis-x0208	  . #x4464)	; &GT-01143; [36-68]
+      (=ks-x1001	  . #x6F4E)	; &I-K0-6F4E; [79-46]
+      (=gt		  . 01143)	; &I-GT-01143;
+      (=gt-pj-1		  . #x4464)	; &I-GT-01143; [36-68]
+      (=daikanwa	  . 00864)	; &I-M-00864;
+      (=ucs@jis		  . #x505C)	; &GT-01143;
+      (mojikyo		  . 000864)	; &MCS-60000360;
       )
-     ((=ucs		  . #x4EAD)	; 亭
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x4D24)	; &C1-4F68; [45-04]
+	(=cns11643-1	    . #x4F68)	; &I-C1-4F68; [47-72]
+	))
+      (=gb2312		  . #x4D23)	; &C1-5874; [45-03]
+      (=cns11643-1	  . #x5874)	; &I-C1-5874; [56-84]
+      (=ucs@unicode	  . #x505C)	; &C1-5874;
       ))
-    (=ucs		. #x505C)	; 停
-    (=gb2312		. #x4D23)	; &I-G0-4D23; [45-03]
-    (=cns11643-1	. #x5874)	; &I-C1-5874; [56-84]
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -17207,7 +17427,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x80CC)	; &GT-38037;
+       ((=jis-x0208	    . #x4758)	; &GT-38037; [39-56]
+	(=gb2312	    . #x3133)	; &I-G0-3133; [17-19]
+	(=ks-x1001	    . #x5B4E)	; &I-K0-5B4E; [59-46]
+	(=daikanwa	    . 29363)	; &I-M-29363;
 	))
       (=big5		  . #xD453)	; &M-00865;
       (=daikanwa	  . 00865)	; &I-M-00865;
@@ -17334,6 +17557,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
+    (=big5		. #xD450)	; &B-D450;
     (->subsumptive
      ((hanyu-dazidian	  1 187 3)
       (ideographic-structure
@@ -17342,11 +17566,12 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x8981)	; &GT-46811;
+       ((=jis-x0208	    . #x4D57)	; &GT-46811; [45-55]
+	(=gb2312	    . #x522A)	; &I-G0-522A; [50-10]
+	(=ks-x1001	    . #x6929)	; &I-K0-6929; [73-09]
 	))
-      (=big5		  . #xD450)	; &B-D450;
-      (=ucs@unicode	  . #x5060)	; &B-D450;
-      (mojikyo		  . 059081)	; &MCS-6000E6C9;
+      (=ucs@unicode	  . #x5060)	; &UU+5060;
+      (mojikyo		  . 059081)	; &UU+5060;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -17368,83 +17593,47 @@
     (hanyu-dazidian	1 186 14)
     (=ucs		. #x5061)	; 偡
     (=big5		. #xD44E)	; &I-B-D44E;
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=jis-x0208	    . #x3F53)	; &GT-27811; [31-51]
-	(=ks-x1001	    . #x6424)	; &I-K0-6424; [68-04]
-	(=daikanwa	    . 21648)	; &I-M-21648;
-	))
-      (=daikanwa	  . 00870)	; &M-00870;
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=ucs@unicode	    . #x751A)	; &UU+751A;
-	))
-      (=ucs@unicode	  . #x5061)	; &UU+5061;
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=cns11643-1	    . #x5249)	; &C1-5249; [50-41]
-	))
-      (=cns11643-2	  . #x3351)	; &C2-3351; [19-49]
-      (=ucs@cns		  . #x5061)	; &C2-3351;
-      (mojikyo		  . 000870)	; &MCS-60000366;
-      ))
     ))
 (define-char
-  '((ideographic-radical . 9)	; ⼈
+  '((<-denotational
+     ((=ucs		  . #x5061)	; 偡
+      ))
+    (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 192 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x79CB)	; 秋
+     ((=jis-x0208	  . #x3F53)	; &GT-27811; [31-51]
+      (=ks-x1001	  . #x6424)	; &I-K0-6424; [68-04]
+      (=daikanwa	  . 21648)	; &I-M-21648;
       ))
-    (=ucs		. #x5062)	; 偢
-    (=jis-x0212		. #x316E)	; &I-JSP-316E; [17-78]
-    (=cns11643-2	. #x335D)	; &I-C2-335D; [19-61]
-    (=big5		. #xD45A)	; &I-B-D45A;
-    (=daikanwa		. 00871)	; &I-M-00871;
-    (=jef-china3	. #x42EF)	; &I-JC3-42EF;
-    (mojikyo		. 000871)	; &MCS-60000367;
+    (=daikanwa		. 00870)	; &M-00870;
     ))
 (define-char
-  '((=>ucs		. #x202B1)	; 𠊱
+  '((<-denotational
+     ((=ucs		  . #x5061)	; 偡
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 193 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x77E6)	; 矦
+     ((=gb2312		  . #x4975)	; &G0-4975; [41-85]
       ))
-    (=daikanwa		. 00872)	; &M-00872;
-    (=hanziku-1		. #xCDFC)	; &I-HZK01-CDFC;
-    (mojikyo		. 000872)	; &MCS-60000368;
+    (=ucs@unicode	. #x5061)	; &UU+5061;
     ))
 (define-char
-  '((morohashi-daikanwa	872 0 0)
+  '((<-denotational
+     ((=ucs		  . #x5061)	; 偡
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
@@ -17454,52 +17643,117 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=cns11643-3	  . #x2E36)	; &C3-2E36; [14-22]
+     ((=cns11643-1	  . #x5249)	; &C1-5249; [50-41]
       ))
-    (=ucs		. #x202B1)	; 𠊱
-    (=cns11643-6	. #x3D33)	; &I-C6-3D33; [29-19]
+    (=cns11643-2	. #x3351)	; &C2-3351; [19-49]
+    (=ucs@cns		. #x5061)	; &C2-3351;
+    (mojikyo		. 000870)	; &MCS-60000366;
     ))
 (define-char
-  '((=>ucs		. #x5063)	; 偣
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 194 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (hanyu-dazidian	1 192 2)
+    (=ucs		. #x5062)	; 偢
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x3D29)	; &GT-32182; [29-09]
+	(=gb2312	    . #x476F)	; &I-G0-476F; [39-79]
+	(=ks-x1001	    . #x7555)	; &I-K0-7555; [85-53]
+	(=daikanwa	    . 24940)	; &I-M-24940;
+	))
+      (=jis-x0212	  . #x316E)	; &M-00871; [17-78]
+      (=big5		  . #xD45A)	; &I-B-D45A;
+      (=daikanwa	  . 00871)	; &I-M-00871;
+      (=jef-china3	  . #x42EF)	; &I-JC3-42EF;
+      (=ucs@unicode	  . #x5062)	; &M-00871;
+      (mojikyo		  . 000871)	; &MCS-60000367;
       )
-     ((=ucs		  . #x97F3)	; 音
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-1	    . #x5271)	; &C1-5271; [50-81]
+	))
+      (=cns11643-2	  . #x335D)	; &C2-335D; [19-61]
       ))
-    (=jis-x0212		. #x316F)	; &M-00873; [17-79]
-    (=jis-x0213-2-2000	. #x2164)	; &I-JX2-2164; [01-68]
-    (=big5		. #xD460)	; &I-B-D460;
-    (=daikanwa		. 00873)	; &I-M-00873;
-    (=jef-china3	. #x42F0)	; &I-JC3-42F0;
-    (=ucs@jis		. #x5063)	; &M-00873;
-    (=ucs@big5		. #x5063)	; &M-00873;
-    (mojikyo		. 000873)	; &MCS-60000369;
     ))
 (define-char
-  '((morohashi-daikanwa	873 0 0)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 194)
-    (hanyu-dazidian-char . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x202B1)	; 𠊱
+    (->subsumptive
+     ((hanyu-dazidian	  1 193 8)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0212	    . #x4F46)	; &M-23937; [47-38]
+	(=jis-x0213-2-2000  . #x7236)	; &I-JX2-7236; [82-22]
+	(=daikanwa	    . 23937)	; &I-M-23937;
+	))
+      (=daikanwa	  . 00872)	; &M-00872;
+      (=hanziku-1	  . #xCDFC)	; &I-HZK01-CDFC;
+      (mojikyo		  . 000872)	; &MCS-60000368;
       )
-     ((=ucs		  . #x97F3)	; 音
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-3	    . #x2E36)	; &C3-2E36; [14-22]
+	))
+      (=cns11643-6	  . #x3D33)	; &C6-3D33; [29-19]
+      (=ucs@iso		  . #x202B1)	; &C6-3D33;
       ))
+    ))
+(define-char
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (hanyu-dazidian	1 194 9)
     (=ucs		. #x5063)	; 偣
-    (=cns11643-2	. #x3363)	; &I-C2-3363; [19-67]
+    (=big5		. #xD460)	; &I-B-D460;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x323B)	; &GT-58109; [18-27]
+	(=ks-x1001	    . #x6B65)	; &I-K0-6B65; [75-69]
+	))
+      (=jis-x0212	  . #x316F)	; &M-00873; [17-79]
+      (=jis-x0213-2-2000  . #x2164)	; &I-JX2-2164; [01-68]
+      (=daikanwa	  . 00873)	; &I-M-00873;
+      (=jef-china3	  . #x42F0)	; &I-JC3-42F0;
+      (=ucs@jis		  . #x5063)	; &M-00873;
+      (mojikyo		  . 000873)	; &MCS-60000369;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x5274)	; &C1-5376; [50-84]
+	(=cns11643-1	    . #x5376)	; &I-C1-5376; [51-86]
+	))
+      (=cns11643-2	  . #x3363)	; &C2-3363; [19-67]
+      (=ucs@unicode	  . #x5063)	; &C2-3363;
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -17591,7 +17845,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x5EFA)	; &GT-12065;
+       ((=gb2312	    . #x3D28)	; &GT-12065; [29-08]
+	(=cns11643-1	    . #x507A)	; &I-C1-507A; [48-90]
 	))
       (shinjigen-1	  . 336)
       (shinjigen-2	  . 336)
@@ -17606,31 +17861,37 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x202B2)	; 𠊲
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 9)
-    (total-strokes	 . 11)
-    (=daikanwa		. 00876)	; &M-00876;
-    (=cbeta		. 05087)	; &I-CB05087;
-    (mojikyo		. 000876)	; &MCS-6000036C;
-    ))
-(define-char
-  '((morohashi-daikanwa	876 0 0)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 195 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x202B2)	; 𠊲
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=ucs		    . #xFA55)	; 突
+	))
+      (=daikanwa	  . 00876)	; &M-00876;
       )
-     ((=ucs		  . #x4EBB)	; 亻
+     ((=cbeta		  . 05087)	; &CB05087;
+      (mojikyo		  . 000876)	; &MCS-6000036C;
       )
-     ((=ucs		  . #x7A81)	; 突
+     ((hanyu-dazidian	  1 195 8)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-1	    . #x5273)	; &C1-5273; [50-83]
+	))
+      (=cns11643-5	  . #x3077)	; &HZK01-CE7D; [16-87]
+      (=hanziku-1	  . #xCE7D)	; &I-HZK01-CE7D;
+      (=ucs@iso		  . #x202B2)	; &HZK01-CE7D;
       ))
-    (=ucs		. #x202B2)	; 𠊲
-    (=cns11643-5	. #x3077)	; &I-C5-3077; [16-87]
-    (=hanziku-1		. #xCE7D)	; &I-HZK01-CE7D;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -17657,12 +17918,13 @@
     (total-strokes	 . 11)
     (hanyu-dazidian	1 187 4)
     (ideographic-structure
-     (:cdp-combinator	4)
-     ((=ucs		  . #x4EBB)	; 亻
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x4E19)	; 丙
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
       )
-     ((=ucs		  . #x6534)	; 攴
+     ((=ucs		  . #x3A85)	; 㪅
       ))
     (=ucs		. #x202B3)	; 𠊳
     (=cns11643-6	. #x3D2E)	; &I-C6-3D2E; [29-14]
@@ -17690,7 +17952,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x80E5)	; &GT-38009;
+       ((=jis-x0208	    . #x6671)	; &GT-38009; [70-81]
+	(=gb2312	    . #x7163)	; &I-G0-7163; [81-67]
+	(=ks-x1001	    . #x6021)	; &I-K0-6021; [64-01]
+	(=daikanwa	    . 29406)	; &I-M-29406;
 	))
       (=jis-x0212	  . #x3170)	; &M-00879; [17-80]
       (=jis-x0213-2-2000  . #x2165)	; &I-JX2-2165; [01-69]
@@ -17716,20 +17981,43 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 198 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x3470)	; 㑰
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x5741)	; &GT-12518; [55-33]
+	(=ks-x1001	    . #x5327)	; &I-K0-5327; [51-07]
+	(=daikanwa	    . 09920)	; &I-M-09920;
+	))
+      (=daikanwa	  . 00880)	; &M-00880;
+      (mojikyo		  . 000880)	; &MCS-60000370;
       )
-     ((=ucs		  . #x4EBB)	; 亻
+     ((hanyu-dazidian	  1 198 9)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x6568)	; &G0-6568; [69-72]
+	))
+      (=hanziku-1	  . #xCF41)	; &HZK01-CF41;
+      (=ucs@unicode	  . #x3470)	; &HZK01-CF41;
       )
-     ((=ucs		  . #x5F56)	; 彖
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-2	    . #x2A3E)	; &C2-2A3E; [10-30]
+	))
+      (=cns11643-3	  . #x3448)	; &C3-3448; [20-40]
       ))
-    (=ucs		. #x3470)	; 㑰
-    (=cns11643-3	. #x3448)	; &I-C3-3448; [20-40]
-    (=daikanwa		. 00880)	; &I-M-00880;
-    (=hanziku-1		. #xCF41)	; &I-HZK01-CF41;
-    (mojikyo		. 000880)	; &MCS-60000370;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -17754,38 +18042,35 @@
     (mojikyo		. 000881)	; &MCS-60000371;
     ))
 (define-char
-  '((=>ucs		. #x202B4)	; 𠊴
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 9)
-    (total-strokes	 . 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=daikanwa	  . 09306)	; &M-09306;
-      ))
-    (=daikanwa		. 00882)	; &M-00882;
-    (mojikyo		. 000882)	; &MCS-60000372;
-    ))
-(define-char
-  '((morohashi-daikanwa	882 0 0)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 194 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x202B4)	; 𠊴
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=daikanwa	    . 09306)	; &M-09306;
+	))
+      (=daikanwa	  . 00882)	; &M-00882;
+      (mojikyo		  . 000882)	; &MCS-60000372;
       )
-     ((=ucs		  . #x387F)	; ã¡¿
+     ((hanyu-dazidian	  1 194 8)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-4	    . #x292A)	; &C4-292A; [09-10]
+	))
+      (=cns11643-6	  . #x3D27)	; &HZK01-CE5D; [29-07]
+      (=hanziku-1	  . #xCE5D)	; &I-HZK01-CE5D;
+      (=ucs@iso		  . #x202B4)	; &HZK01-CE5D;
       ))
-    (=ucs		. #x202B4)	; 𠊴
-    (=cns11643-6	. #x3D27)	; &I-C6-3D27; [29-07]
-    (=hanziku-1		. #xCE5D)	; &I-HZK01-CE5D;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -17829,14 +18114,6 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (hanyu-dazidian	1 191 10)
-    (ideographic-structure
-     (:cdp-combinator	4)
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x5C71)	; å±±
-      )
-     ((=ucs		  . #x591A)	; 多
-      ))
     (=ucs		. #x202B5)	; 𠊵
     (=cns11643-5	. #x3122)	; &I-C5-3122; [17-02]
     (=daikanwa		. 00884)	; &I-M-00884;
@@ -17896,7 +18173,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x8CA0)	; &UU+8CA0;
+       ((=jis-x0208	    . #x4969)	; &GT-49123; [41-73]
+	(=cns11643-1	    . #x5357)	; &I-C1-5357; [51-55]
 	))
       (=cns11643-2	  . #x3361)	; &C2-3361; [19-65]
       (=ucs@unicode	  . #x5069)	; &C2-3361;
@@ -18092,7 +18370,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x54C0)	; &C1-5037;
+       ((=gb2312	    . #x3027)	; &C1-5037; [16-07]
+	(=cns11643-1	    . #x5037)	; &I-C1-5037; [48-23]
 	))
       (=cns11643-1	  . #x5925)	; &C1-5925; [57-05]
       (=ucs@unicode	  . #x506F)	; &C1-5925;
@@ -18112,7 +18391,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=gt		    . 07464)	; &I-GT-07464;
+       ((=gt		    . 07464)	; &GT-07464;
 	(=daikanwa	    . 05917)	; &I-M-05917;
 	))
       (=jis-x0212	  . #x3174)	; &M-00893; [17-84]
@@ -18128,7 +18407,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x5951)	; &UU+5951;
+       ((=gb2312	    . #x4675)	; &G0-4675; [38-85]
 	))
       (=ucs@unicode	  . #x5070)	; &UU+5070;
       )
@@ -18744,7 +19023,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x67D4)	; &GT-18606;
+       ((=gb2312	    . #x4861)	; &GT-18606; [40-65]
+	(=ks-x1001	    . #x6A75)	; &I-K0-6A75; [74-85]
 	))
       (=daikanwa	  . 00912)	; &M-00912;
       (=hanziku-1	  . #xCEFE)	; &I-HZK01-CEFE;
@@ -18767,52 +19047,44 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ks-x1001	  . #x635D)	; &GT-59026; [67-61]
-      (=cns11643-1	  . #x537A)	; &I-C1-537A; [51-90]
-      (=daikanwa	  . 44014)	; &I-M-44014;
-      ))
     (=ucs		. #x202E1)	; 𠋡
-    (=cns11643-5	. #x3123)	; &I-C5-3123; [17-03]
-    (=daikanwa		. 00913)	; &I-M-00913;
-    ))
-(define-char
-  '((=>ucs		. #x202E1)	; 𠋡
-    (morohashi-daikanwa	913 0 1)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 9)
-    (total-strokes	 . 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=ks-x1001	    . #x635D)	; &GT-59026; [67-61]
+	(=cns11643-1	    . #x537A)	; &I-C1-537A; [51-90]
+	(=daikanwa	    . 44014)	; &I-M-44014;
+	))
+      (=daikanwa	  . 00913)	; &M-00913;
+      (=ucs@iso		  . #x202E1)	; &M-00913;
       )
-     ((=ucs		  . #x98DF)	; 食
-      ))
-    (mojikyo		. 000913)	; &MCS-60000391;
-    ))
-(define-char
-  '((=>ucs		. #x202E1)	; 𠋡
-    (morohashi-daikanwa	913 0 2)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 9)
-    (total-strokes	 . 11)
-    (hanyu-dazidian	1 193 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+     ((=cns11643-5	  . #x3123)	; &C5-3123; [17-03]
       )
-     ((=ucs		  . #x4EBB)	; 亻
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((mojikyo	    . 044014)	; &MCS-6000ABEE;
+	))
+      (mojikyo		  . 000913)	; &MCS-60000391;
       )
-     ((=ucs		  . #x98DF)	; 食
+     ((hanyu-dazidian	  1 193 7)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x4A33)	; &G0-4A33; [42-19]
+	))
+      (=hanziku-1	  . #xCDFB)	; &HZK01-CDFB;
       ))
-    (=hanziku-1		. #xCDFB)	; &HZK01-CDFB;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -18825,14 +19097,47 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
+    (=ucs		. #x202DC)	; 𠋜
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x202DC)	; 𠋜
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
     (=daikanwa		. 00915)	; &M-00915;
     (mojikyo		. 000915)	; &MCS-60000393;
     ))
 (define-char
-  '((ideographic-radical . 9)	; ⼈
+  '((<-denotational
+     ((=ucs		  . #x202DC)	; 𠋜
+      ))
+    (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
+    (hanyu-dazidian	1 189 3)
+    (=hanziku-1		. #xCD55)	; &HZK01-CD55;
+    (=ucs@iso		. #x202DC)	; &HZK01-CD55;
+    ))
+(define-char
+  '((=>ucs		. #x48CF)	; 䣏
+    (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		  . #x48BC)	; 䢼
+      ))
     (=daikanwa		. 00916)	; &M-00916;
+    (<-unknown
+     ((=ucs		  . #x48CF)	; 䣏
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -18886,7 +19191,20 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (=daikanwa		. 00919)	; &M-00919;
+    (hanyu-dazidian	1 191 3)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+      (=ucs		  . #x2FF2)	; ⿲
+      )
+     ((=ucs		  . #x4EBB)	; 亻
+      )
+     ((=ucs		  . #x866B)	; 虫
+      )
+     ((=ucs		  . #x4E5F)	; 也
+      ))
+    (=ucs		. #x202DE)	; 𠋞
+    (=daikanwa		. 00919)	; &I-M-00919;
+    (=hanziku-1		. #xCDB7)	; &I-HZK01-CDB7;
     (mojikyo		. 000919)	; &MCS-60000397;
     ))
 (define-char
@@ -18994,32 +19312,45 @@
     (total-strokes	 . 11)
     (hanyu-dazidian	1 194 4)
     (=ucs		. #x507A)	; 偺
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=ucs@unicode	    . #x661D)	; &G0-6A43;
-	))
-      (=daikanwa	  . 00923)	; &M-00923;
-      (=ucs@unicode	  . #x507A)	; &M-00923;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x507A)	; 偺
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=jis-x0212	    . #x417E)	; &M-13834; [33-94]
-	(=cns11643-2	    . #x2A76)	; &I-C2-2A76; [10-86]
-	(=daikanwa	    . 13834)	; &I-M-13834;
-	))
-      (=cns11643-1	  . #x5872)	; &C1-5872; [56-82]
-      (=big5		  . #xB0AF)	; &I-B-B0AF;
-      (mojikyo		  . 000923)	; &MCS-6000039B;
+     ((=ucs		  . #x4EBB)	; 亻
+      )
+     ((=gb2312		  . #x6A43)	; &G0-6A43; [74-35]
+      ))
+    (=daikanwa		. 00923)	; &M-00923;
+    (=ucs@unicode	. #x507A)	; &M-00923;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x507A)	; 偺
       ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x4EBB)	; 亻
+      )
+     ((=jis-x0212	  . #x417E)	; &M-13834; [33-94]
+      (=cns11643-2	  . #x2A76)	; &I-C2-2A76; [10-86]
+      (=daikanwa	  . 13834)	; &I-M-13834;
+      ))
+    (=cns11643-1	. #x5872)	; &C1-5872; [56-82]
+    (=big5		. #xB0AF)	; &I-B-B0AF;
+    (mojikyo		. 000923)	; &MCS-6000039B;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -19100,11 +19431,6 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5126)	; &GT-01416; [49-06]
-      (=ks-x1001	  . #x6A4A)	; &I-K0-6A4A; [74-42]
-      (=daikanwa	  . 01105)	; &I-M-01105;
-      ))
     (hanyu-dazidian	1 195 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -19123,10 +19449,14 @@
     (=gt		. 01077)	; &I-GT-01077;
     (=gt-pj-1		. #x3536)	; &I-GT-01077; [21-22]
     (mojikyo		. 050104)	; &MCS-6000C3B8;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5126)	; &GT-01416; [49-06]
+      (=ks-x1001	  . #x6A4A)	; &I-K0-6A4A; [74-42]
+      (=daikanwa	  . 01105)	; &I-M-01105;
+      ))
     ))
 (define-char
-  '((=>daikanwa		. 07516)	; &M-07516;
-    (ideographic-radical@ucs . 9)	; ⼈
+  '((ideographic-radical@ucs . 9)	; ⼈
     (ideographic-strokes@ucs . 9)
     (ideographic-radical@daikanwa . 42)	; ⼩
     (ideographic-strokes@daikanwa . 8)
@@ -19213,7 +19543,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=cns11643-1	    . #x5326)	; &I-C1-5326; [51-06]
+       ((=jis-x0208@1990    . #x4C6D)	; &GT-37579; [44-77]
+	(=cns11643-1	    . #x5326)	; &I-C1-5326; [51-06]
 	(=daikanwa	    . 29008)	; &I-M-29008;
 	))
       (=jis-x0212	  . #x3176)	; &JX1-2E42; [17-86]
@@ -19228,7 +19559,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x8036)	; &J83-4C6D;
+       ((=jis-x0208@1978    . #x4C6D)	; &J83-4C6D; [44-77]
+	(=gb2312	    . #x522E)	; &I-G0-522E; [50-14]
+	(=jis-x0208@1983    . #x4C6D)	; &I-J83-4C6D; [44-77]
+	(=ks-x1001	    . #x652D)	; &I-K0-652D; [69-13]
 	))
       (=ks-x1001	  . #x6526)	; &HZK01-C9AB; [69-06]
       (=hanziku-1	  . #xC9AB)	; &I-HZK01-C9AB;
@@ -19310,34 +19644,6 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 189 3)
-    (ideographic-structure
-     (:cdp-combinator	4)
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((name		  . "CJK RADICAL SMALL ONE")
-      (=ucs		  . #x2E8C)	; ⺌
-      )
-     ((=ucs		  . #x4E00)	; 一
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs		    . #x4E00)	; 一
-	)
-       ((=ucs		    . #x4E00)	; 一
-	))
-      )
-     ((=ucs		  . #x53E3)	; 口
-      ))
-    (=ucs		. #x202DC)	; 𠋜
-    (=hanziku-1		. #xCD55)	; &I-HZK01-CD55;
-    ))
-(define-char
-  '((ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 9)
-    (total-strokes	 . 11)
     (hanyu-dazidian	8 8 19)
     (=ucs		. #x202E3)	; 𠋣
     (=cns11643-6	. #x3D26)	; &I-C6-3D26; [29-06]
@@ -19568,7 +19874,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x7D20)	; &G0-4B58;
+       ((=gb2312	    . #x4B58)	; &G0-4B58; [43-56]
 	))
       (=ucs@unicode	  . #x5083)	; &UU+5083;
       ))
@@ -19666,13 +19972,13 @@
     (ideographic-radical@cns*sources
      cns11643 daikanwa=02134)
     (total-strokes	 . 12)
+    (=ucs		. #x202F4)	; 𠋴
     (<-same
      ((=ucs		  . #x5013)	; 倓
       (=daikanwa	  . 00768)	; &I-M-00768;
       ))
     (<-same*sources
      shuowen yunhai-bei daikanwa)
-    (=ucs		. #x202F4)	; 𠋴
     (->subsumptive
      ((hanyu-dazidian	  1 206 1)
       (ideographic-structure
@@ -19746,7 +20052,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x5C03)	; &M-07433;
+       ((=jis-x0213-2-2000  . #x282D)	; &M-07433; [08-13]
+	(=daikanwa	    . 07433)	; &I-M-07433;
 	))
       (shinjigen-1	  . 365)
       (shinjigen-2	  . 365)
@@ -19836,7 +20143,7 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x8338)	; &G0-4857;
+     ((=gb2312		  . #x4857)	; &G0-4857; [40-55]
       ))
     (=ucs@unicode	. #x5087)	; &UU+5087;
     ))
@@ -19936,7 +20243,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x8654)	; &G0-722F;
+       ((=gb2312	    . #x722F)	; &G0-722F; [82-15]
 	))
       (=hanziku-1	  . #xCFE3)	; &HZK01-CFE3;
       )
@@ -19955,7 +20262,16 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x508B)	; 傋
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 10)
+    (total-strokes	 . 12)
+    (=ucs		. #x508B)	; 傋
+    (=big5		. #xD855)	; &I-B-D855;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x508B)	; 傋
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
@@ -19965,13 +20281,15 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=gt		  . 02025)	; &I-GT-02025;
+     ((=gt		  . 02025)	; &GT-02025;
       ))
     (=daikanwa		. 00946)	; &M-00946;
     (mojikyo		. 000946)	; &MCS-600003B2;
     ))
 (define-char
-  '((morohashi-daikanwa	946 0 1)
+  '((<-denotational
+     ((=ucs		  . #x508B)	; 傋
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
@@ -19982,11 +20300,11 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x5193)	; 冓
+     ((=jis-x0208@1990	  . #x514A)	; &GT-02024; [49-42]
+      (=cns11643-2	  . #x2E23)	; &I-C2-2E23; [14-03]
       ))
-    (=ucs		. #x508B)	; 傋
-    (=cns11643-2	. #x3A39)	; &I-C2-3A39; [26-25]
-    (=big5		. #xD855)	; &I-B-D855;
+    (=cns11643-2	. #x3A39)	; &C2-3A39; [26-25]
+    (=ucs@unicode	. #x508B)	; &C2-3A39;
     (mojikyo		. 059086)	; &MCS-6000E6CE;
     ))
 (define-char
@@ -20009,61 +20327,49 @@
     (mojikyo		. 000947)	; &MCS-600003B3;
     ))
 (define-char
-  '((=>ucs		. #x508D)	; 傍
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 205 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=jis-x0208	  . #x5A55)	; &GT-17242; [58-53]
-      (=ks-x1001	  . #x5B31)	; &I-K0-5B31; [59-17]
-      (=daikanwa	  . 13637)	; &I-M-13637;
-      ))
-    (shinjigen-1	. 366)
-    (shinjigen-2	. 366)
-    (=jis-x0208		. #x4B35)	; &GT-01282; [43-21]
-    (=ks-x1001		. #x5B28)	; &I-K0-5B28; [59-08]
+    (=ucs		. #x508D)	; 傍
     (=big5		. #xB3C4)	; &I-B-B3C4;
-    (=gt		. 01282)	; &I-GT-01282;
-    (=gt-pj-1		. #x4B35)	; &I-GT-01282; [43-21]
-    (=daikanwa		. 00948)	; &I-M-00948;
-    (=ucs@jis		. #x508D)	; &GT-01282;
-    (=ucs@big5		. #x508D)	; &GT-01282;
-    (mojikyo		. 000948)	; &MCS-600003B4;
-    ))
-(define-char
-  '((morohashi-daikanwa	948 0 0)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 205)
-    (hanyu-dazidian-char . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x5A55)	; &GT-17242; [58-53]
+	(=ks-x1001	    . #x5B31)	; &I-K0-5B31; [59-17]
+	(=daikanwa	    . 13637)	; &I-M-13637;
+	))
+      (shinjigen-1	  . 366)
+      (shinjigen-2	  . 366)
+      (=jis-x0208	  . #x4B35)	; &GT-01282; [43-21]
+      (=ks-x1001	  . #x5B28)	; &I-K0-5B28; [59-08]
+      (=gt		  . 01282)	; &I-GT-01282;
+      (=gt-pj-1		  . #x4B35)	; &I-GT-01282; [43-21]
+      (=daikanwa	  . 00948)	; &I-M-00948;
+      (=ucs@jis		  . #x508D)	; &GT-01282;
+      (mojikyo		  . 000948)	; &MCS-600003B4;
       )
-     ((=ucs		  . #x4EBB)	; 亻
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x4554)	; &C1-5569; [37-52]
+	(=cns11643-1	    . #x5569)	; &I-C1-5569; [53-73]
+	))
+      (=gb2312		  . #x3078)	; &C1-5E2A; [16-88]
+      (=cns11643-1	  . #x5E2A)	; &I-C1-5E2A; [62-10]
+      (=ucs@unicode	  . #x508D)	; &C1-5E2A;
       )
-     ((=ucs		  . #x65C1)	; 旁
+     ((shinjigen-1	  . 367)
+      (shinjigen-2	  . 367)
       ))
-    (=ucs		. #x508D)	; 傍
-    (=gb2312		. #x3078)	; &I-G0-3078; [16-88]
-    (=cns11643-1	. #x5E2A)	; &I-C1-5E2A; [62-10]
-    ))
-(define-char
-  '((=>ucs		. #x508D)	; 傍
-    (morohashi-daikanwa	948 0 1)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (shinjigen-1	. 367)
-    (shinjigen-2	. 367)
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -20112,20 +20418,34 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 203 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x3476)	; 㑶
+    (->subsumptive
+     ((hanyu-dazidian	  1 203 8)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x5D66)	; &GT-21850; [61-70]
+	(=ks-x1001	    . #x5128)	; &I-K0-5128; [49-08]
+	(=daikanwa	    . 17059)	; &I-M-17059;
+	))
+      (=daikanwa	  . 00950)	; &M-00950;
+      (=hanziku-1	  . #xD043)	; &I-HZK01-D043;
+      (=ucs@unicode	  . #x3476)	; &M-00950;
+      (mojikyo		  . 000950)	; &MCS-600003B6;
       )
-     ((=ucs		  . #x6C23)	; æ°£
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-1	    . #x5634)	; &C1-5634; [54-20]
+	))
+      (=cns11643-4	  . #x3637)	; &C4-3637; [22-23]
       ))
-    (=ucs		. #x3476)	; 㑶
-    (=cns11643-4	. #x3637)	; &I-C4-3637; [22-23]
-    (=daikanwa		. 00950)	; &I-M-00950;
-    (=hanziku-1		. #xD043)	; &I-HZK01-D043;
-    (mojikyo		. 000950)	; &MCS-600003B6;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -20133,6 +20453,7 @@
     (total-strokes	 . 12)
     (hanyu-dazidian	1 201 1)
     (=ucs		. #x508E)	; 傎
+    (=big5		. #xD859)	; &I-B-D859;
     ))
 (define-char
   '((<-denotational
@@ -20150,11 +20471,9 @@
      ((=ucs@unicode	  . #x771E)	; &UU+771E;
       ))
     (=jis-x0212		. #x317C)	; &M-00951; [17-92]
-    (=big5		. #xD859)	; &I-B-D859;
     (=daikanwa		. 00951)	; &I-M-00951;
     (=jef-china3	. #x42FA)	; &I-JC3-42FA;
     (=ucs@jis		. #x508E)	; &M-00951;
-    (=ucs@big5		. #x508E)	; &M-00951;
     (mojikyo		. 000951)	; &MCS-600003B7;
     ))
 (define-char
@@ -20170,7 +20489,8 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x771F)	; &UU+771F;
+     ((=gb2312		  . #x5566)	; &C1-5678; [53-70]
+      (=cns11643-1	  . #x5678)	; &I-C1-5678; [54-88]
       ))
     (=cns11643-2	. #x3A3D)	; &C2-3A3D; [26-29]
     (=ucs@unicode	. #x508E)	; &C2-3A3D;
@@ -20189,7 +20509,10 @@
        ((name		    . "CJK RADICAL PERSON")
 	(=ucs		    . #x2E85)	; ⺅
 	)
-       ((=ucs@unicode	    . #x80FD)	; &GT-38124;
+       ((=jis-x0208	    . #x473D)	; &GT-38124; [39-29]
+	(=gb2312	    . #x445C)	; &I-G0-445C; [36-60]
+	(=ks-x1001	    . #x5276)	; &I-K0-5276; [50-86]
+	(=daikanwa	    . 29454)	; &I-M-29454;
 	))
       (=daikanwa	  . 00952)	; &M-00952;
       (=hanziku-1	  . #xD0CA)	; &I-HZK01-D0CA;
@@ -20201,42 +20524,40 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x508F)	; 傏
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ks-x1001	  . #x5350)	; &M-03709; [51-48]
-      (=daikanwa	  . 03709)	; &I-M-03709;
-      ))
-    (=jis-x0212		. #x317D)	; &M-00953; [17-93]
-    (=daikanwa		. 00953)	; &I-M-00953;
-    (=cbeta		. 05088)	; &I-CB05088;
-    (=ucs@jis		. #x508F)	; &M-00953;
-    (mojikyo		. 000953)	; &MCS-600003B9;
-    ))
-(define-char
-  '((morohashi-daikanwa	953 0 0)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 205 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x508F)	; 傏
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=ks-x1001	    . #x5350)	; &M-03709; [51-48]
+	(=daikanwa	    . 03709)	; &I-M-03709;
+	))
+      (=jis-x0212	  . #x317D)	; &M-00953; [17-93]
+      (=daikanwa	  . 00953)	; &I-M-00953;
+      (=cbeta		  . 05088)	; &I-CB05088;
+      (=ucs@jis		  . #x508F)	; &M-00953;
+      (mojikyo		  . 000953)	; &MCS-600003B9;
       )
-     ((=ucs		  . #x5510)	; 唐
+     ((hanyu-dazidian	  1 205 4)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x4C46)	; &C1-5453; [44-38]
+	(=cns11643-1	    . #x5453)	; &I-C1-5453; [52-51]
+	))
+      (=cns11643-3	  . #x396F)	; &HZK01-D0A1; [25-79]
+      (=hanziku-1	  . #xD0A1)	; &I-HZK01-D0A1;
+      (=ucs@unicode	  . #x508F)	; &HZK01-D0A1;
       ))
-    (=ucs		. #x508F)	; 傏
-    (=cns11643-3	. #x396F)	; &I-C3-396F; [25-79]
-    (=hanziku-1		. #xD0A1)	; &I-HZK01-D0A1;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -20288,7 +20609,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x6840)	; &UU+6840;
+       ((=gb2312	    . #x686E)	; &M-14753; [72-78]
+	(=daikanwa	    . 14753)	; &I-M-14753;
 	))
       (shinjigen-1	  . 372)
       (shinjigen-2	  . 372)
@@ -20337,74 +20659,72 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x202F6)	; 𠋶
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=jis-x0208	  . #x4C3D)	; &GT-02095; [44-29]
-      (=ks-x1001	  . #x5922)	; &I-K0-5922; [57-02]
-      (=daikanwa	  . 01588)	; &I-M-01588;
-      ))
-    (=daikanwa		. 00956)	; &M-00956;
-    (mojikyo		. 000956)	; &MCS-600003BC;
-    ))
-(define-char
-  '((morohashi-daikanwa	956 0 0)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 206 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x51A5)	; 冥
-      ))
     (=ucs		. #x202F6)	; 𠋶
-    (=cns11643-6	. #x4648)	; &I-C6-4648; [38-40]
-    (=hanziku-1		. #xD0C5)	; &I-HZK01-D0C5;
-    ))
-(define-char
-  '((=>ucs		. #x202F7)	; 𠋷
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x4C3D)	; &GT-02095; [44-29]
+	(=ks-x1001	    . #x5922)	; &I-K0-5922; [57-02]
+	(=daikanwa	    . 01588)	; &I-M-01588;
+	))
+      (=daikanwa	  . 00956)	; &M-00956;
+      (mojikyo		  . 000956)	; &MCS-600003BC;
       )
-     ((=ucs		  . #x86A9)	; 蚩
+     ((hanyu-dazidian	  1 206 8)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x5A24)	; &C1-5442; [58-04]
+	(=cns11643-1	    . #x5442)	; &I-C1-5442; [52-34]
+	))
+      (=cns11643-6	  . #x4648)	; &HZK01-D0C5; [38-40]
+      (=hanziku-1	  . #xD0C5)	; &I-HZK01-D0C5;
+      (=ucs@iso		  . #x202F6)	; &HZK01-D0C5;
       ))
-    (=daikanwa		. 00957)	; &M-00957;
     ))
 (define-char
-  '((morohashi-daikanwa	957 0 0)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 206 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x202F7)	; 𠋷
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x6950)	; &M-32902; [73-48]
+	(=ks-x1001	    . #x7649)	; &I-K0-7649; [86-41]
+	(=daikanwa	    . 32902)	; &I-M-32902;
+	))
+      (=daikanwa	  . 00957)	; &M-00957;
       )
-     ((=ucs		  . #x86A9)	; 蚩
+     ((hanyu-dazidian	  1 206 12)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x723F)	; &C1-582A; [82-31]
+	(=cns11643-1	    . #x582A)	; &I-C1-582A; [56-10]
+	))
+      (=cns11643-5	  . #x3655)	; &HZK01-D0C9; [22-53]
+      (=hanziku-1	  . #xD0C9)	; &I-HZK01-D0C9;
+      (=ucs@iso		  . #x202F7)	; &HZK01-D0C9;
+      (mojikyo		  . 000957)	; &MCS-600003BD;
       ))
-    (=ucs		. #x202F7)	; 𠋷
-    (=cns11643-5	. #x3655)	; &I-C5-3655; [22-53]
-    (=hanziku-1		. #xD0C9)	; &I-HZK01-D0C9;
-    (mojikyo		. 000957)	; &MCS-600003BD;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -20467,7 +20787,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x595A)	; &G0-5E49;
+       ((=gb2312	    . #x5E49)	; &G0-5E49; [62-41]
 	))
       (=iso-ir165	  . #x2E28)	; &EGB-2E28; [14-08]
       (=ucs@unicode	  . #x5092)	; &EGB-2E28;
@@ -20520,7 +20840,7 @@
 	)
        ((=ucs		    . #x4F9A)	; 侚
 	)
-       ((=ucs@unicode	    . #x516E)	; &G0-5962;
+       ((=gb2312	    . #x5962)	; &G0-5962; [57-66]
 	))
       (=hanziku-1	  . #xD05F)	; &HZK01-D05F;
       (=ucs@iso		  . #x202F9)	; &HZK01-D05F;
@@ -20587,7 +20907,7 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x6247)	; &G0-4948;
+     ((=gb2312		  . #x4948)	; &G0-4948; [41-40]
       ))
     (=ucs@unicode	. #x5093)	; &UU+5093;
     (mojikyo		. 059088)	; &UU+5093;
@@ -20603,7 +20923,16 @@
     (=hanziku-1		. #xD0C3)	; &HZK01-D0C3;
     ))
 (define-char
-  '((=>ucs		. #x5094)	; 傔
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 10)
+    (total-strokes	 . 12)
+    (=ucs		. #x5094)	; 傔
+    (=big5		. #xD853)	; &I-B-D853;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5094)	; 傔
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
@@ -20625,7 +20954,9 @@
     (mojikyo		. 000962)	; &MCS-600003C2;
     ))
 (define-char
-  '((morohashi-daikanwa	962 0 2)
+  '((<-denotational
+     ((=ucs		  . #x5094)	; 傔
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
@@ -20636,118 +20967,123 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x517C)	; 兼
+     ((=jis-x0208	  . #x3773)	; &GT-01935; [23-83]
+      (=gb2312		  . #x3C66)	; &I-G0-3C66; [28-70]
+      (=cns11643-1	  . #x5440)	; &I-C1-5440; [52-32]
       ))
-    (=ucs		. #x5094)	; 傔
-    (=cns11643-2	. #x3A37)	; &I-C2-3A37; [26-23]
-    (=big5		. #xD853)	; &I-B-D853;
+    (=cns11643-2	. #x3A37)	; &C2-3A37; [26-23]
+    (=ucs@unicode	. #x5094)	; &C2-3A37;
     ))
 (define-char
-  '((=>ucs		. #x5095)	; 傕
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 206 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=jis-x0212	  . #x6671)	; &CDP-8D4B; [70-81]
-      (=jis-x0213-2-2000  . #x7B6E)	; &I-JX2-7B6E; [91-78]
-      (=daikanwa	  . 41940)	; &I-M-41940;
-      ))
-    (=jis-x0213-2-2000	. #x216C)	; &M-00963; [01-76]
-    (=big5		. #xD852)	; &I-B-D852;
-    (=daikanwa		. 00963)	; &I-M-00963;
-    (=ucs@jis		. #x5095)	; &M-00963;
-    (=ucs@big5		. #x5095)	; &M-00963;
-    (mojikyo		. 000963)	; &MCS-600003C3;
-    ))
-(define-char
-  '((morohashi-daikanwa	963 0 1)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 206)
-    (hanyu-dazidian-char . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x96BA)	; 隺
-      ))
     (=ucs		. #x5095)	; 傕
-    (=cns11643-2	. #x3A36)	; &I-C2-3A36; [26-22]
-    ))
-(define-char
-  '((=>ucs		. #x5096)	; 傖
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=big5		. #xD852)	; &I-B-D852;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0212	    . #x6671)	; &CDP-8D4B; [70-81]
+	(=jis-x0213-2-2000  . #x7B6E)	; &I-JX2-7B6E; [91-78]
+	(=daikanwa	    . 41940)	; &I-M-41940;
+	))
+      (=jis-x0213-2-2000  . #x216C)	; &M-00963; [01-76]
+      (=daikanwa	  . 00963)	; &I-M-00963;
+      (=ucs@jis		  . #x5095)	; &M-00963;
+      (mojikyo		  . 000963)	; &MCS-600003C3;
       )
-     ((=jis-x0208	  . #x4152)	; &GT-01002; [33-50]
-      (=ks-x1001	  . #x735A)	; &I-K0-735A; [83-58]
-      (=cns11643-1	  . #x543F)	; &I-C1-543F; [52-31]
-      (=daikanwa	  . 00756)	; &I-M-00756;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-4	    . #x3041)	; &C4-3041; [16-33]
+	))
+      (=cns11643-2	  . #x3A36)	; &C2-3A36; [26-22]
+      (=ucs@unicode	  . #x5095)	; &C2-3A36;
       ))
-    (shinjigen-1	. 361)
-    (shinjigen-2	. 361)
-    (=jis-x0212		. #x3224)	; &M-00964; [18-04]
-    (=cns11643-1	. #x5E2F)	; &I-C1-5E2F; [62-15]
-    (=jis-x0213-2-2000	. #x216D)	; &I-JX2-216D; [01-77]
-    (=big5		. #xB3C9)	; &I-B-B3C9;
-    (=daikanwa		. 00964)	; &I-M-00964;
-    (=jef-china3	. #x42FD)	; &I-JC3-42FD;
-    (=ucs@jis		. #x5096)	; &M-00964;
-    (=ucs@big5		. #x5096)	; &M-00964;
-    (mojikyo		. 000964)	; &MCS-600003C4;
     ))
 (define-char
-  '((morohashi-daikanwa	964 0 0)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 204 2)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x5096)	; 傖
+    (=big5		. #xB3C9)	; &I-B-B3C9;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x4152)	; &GT-01002; [33-50]
+	(=ks-x1001	    . #x735A)	; &I-K0-735A; [83-58]
+	(=cns11643-1	    . #x543F)	; &I-C1-543F; [52-31]
+	(=daikanwa	    . 00756)	; &I-M-00756;
+	))
+      (shinjigen-1	  . 361)
+      (shinjigen-2	  . 361)
+      (=jis-x0212	  . #x3224)	; &M-00964; [18-04]
+      (=cns11643-1	  . #x5E2F)	; &I-C1-5E2F; [62-15]
+      (=jis-x0213-2-2000  . #x216D)	; &I-JX2-216D; [01-77]
+      (=daikanwa	  . 00964)	; &I-M-00964;
+      (=jef-china3	  . #x42FD)	; &I-JC3-42FD;
+      (=ucs@jis		  . #x5096)	; &M-00964;
+      (mojikyo		  . 000964)	; &MCS-600003C4;
       )
-     ((=ucs		  . #x5009)	; 倉
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb12345	    . #x3256)	; &UU+5009; [18-54]
+	))
+      (=gb12345		  . #x5877)	; &UU+5096; [56-87]
+      (=ucs@unicode	  . #x5096)	; &UU+5096;
       ))
-    (=ucs		. #x5096)	; 傖
-    (=gb12345		. #x5877)	; 傖 [56-87]
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 205 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x5097)	; 傗
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x435C)	; &GT-28000; [35-60]
+	(=ks-x1001	    . #x7565)	; &I-K0-7565; [85-69]
+	(=daikanwa	    . 21814)	; &I-M-21814;
+	))
+      (=daikanwa	  . 00965)	; &M-00965;
+      (=cbeta		  . 01954)	; &I-CB01954;
+      (mojikyo		  . 000965)	; &MCS-600003C5;
       )
-     ((=ucs		  . #x755C)	; 畜
+     ((hanyu-dazidian	  1 205 8)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x5073)	; &C1-5665; [48-83]
+	(=cns11643-1	    . #x5665)	; &I-C1-5665; [54-69]
+	))
+      (=cns11643-3	  . #x3970)	; &HZK01-D0A5; [25-80]
+      (=hanziku-1	  . #xD0A5)	; &I-HZK01-D0A5;
+      (=ucs@unicode	  . #x5097)	; &HZK01-D0A5;
       ))
-    (=ucs		. #x5097)	; 傗
-    (=cns11643-3	. #x3970)	; &I-C3-3970; [25-80]
-    (=daikanwa		. 00965)	; &I-M-00965;
-    (=hanziku-1		. #xD0A5)	; &I-HZK01-D0A5;
-    (=cbeta		. 01954)	; &I-CB01954;
-    (mojikyo		. 000965)	; &MCS-600003C5;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -20788,7 +21124,7 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=big5-cdp	  . #x8C73)	; &CDP-8C73;
+     ((=cns11643-6	  . #x395D)	; &CDP-8C73; [25-61]
       ))
     (shinjigen-1	. 362)
     (shinjigen-2	. 362)
@@ -20824,88 +21160,81 @@
     (mojikyo		. 000968)	; &MCS-600003C8;
     ))
 (define-char
-  '((=>ucs		. #x509A)	; 傚
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=jis-x0208	  . #x5A43)	; &GT-16660; [58-35]
-      (=ks-x1001	  . #x7C79)	; &I-K0-7C79; [92-89]
-      (=daikanwa	  . 13186)	; &I-M-13186;
-      ))
-    (shinjigen-1	. 356)
-    (shinjigen-2	. 356)
-    (=jis-x0208		. #x507B)	; &GT-01222; [48-91]
-    (=big5		. #xB3CB)	; &I-B-B3CB;
-    (=gt		. 01222)	; &I-GT-01222;
-    (=gt-pj-1		. #x507B)	; &I-GT-01222; [48-91]
-    (=daikanwa		. 00969)	; &I-M-00969;
-    (=ucs@jis		. #x509A)	; &GT-01222;
-    (=ucs@big5		. #x509A)	; &GT-01222;
-    (mojikyo		. 000969)	; &MCS-600003C9;
-    ))
-(define-char
-  '((morohashi-daikanwa	969 0 0)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 205 2)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x509A)	; 傚
+    (=big5		. #xB3CB)	; &I-B-B3CB;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x5A43)	; &GT-16660; [58-35]
+	(=ks-x1001	    . #x7C79)	; &I-K0-7C79; [92-89]
+	(=daikanwa	    . 13186)	; &I-M-13186;
+	))
+      (shinjigen-1	  . 356)
+      (shinjigen-2	  . 356)
+      (=jis-x0208	  . #x507B)	; &GT-01222; [48-91]
+      (=gt		  . 01222)	; &I-GT-01222;
+      (=gt-pj-1		  . #x507B)	; &I-GT-01222; [48-91]
+      (=daikanwa	  . 00969)	; &I-M-00969;
+      (=ucs@jis		  . #x509A)	; &GT-01222;
+      (mojikyo		  . 000969)	; &MCS-600003C9;
       )
-     ((=ucs		  . #x6548)	; 效
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x5027)	; &C1-5566; [48-07]
+	(=cns11643-1	    . #x5566)	; &I-C1-5566; [53-70]
+	))
+      (=cns11643-1	  . #x5E31)	; &C1-5E31; [62-17]
+      (=ucs@unicode	  . #x509A)	; &C1-5E31;
       ))
-    (=ucs		. #x509A)	; 傚
-    (=cns11643-1	. #x5E31)	; &I-C1-5E31; [62-17]
     ))
 (define-char
-  '((=>ucs		. #x509B)	; 傛
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 206 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x5BB9)	; 容
-      ))
-    (=jis-x0212		. #x3225)	; &M-00970; [18-05]
+    (=ucs		. #x509B)	; 傛
     (=big5		. #xD851)	; &I-B-D851;
-    (=daikanwa		. 00970)	; &I-M-00970;
-    (=jef-china3	. #x43A1)	; &I-JC3-43A1;
-    (=ucs@jis		. #x509B)	; &M-00970;
-    (=ucs@big5		. #x509B)	; &M-00970;
-    (mojikyo		. 000970)	; &MCS-600003CA;
-    ))
-(define-char
-  '((morohashi-daikanwa	970 0 0)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 206)
-    (hanyu-dazidian-char . 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x4D46)	; &GT-09028; [45-38]
+	(=ks-x1001	    . #x693B)	; &I-K0-693B; [73-27]
+	(=daikanwa	    . 07172)	; &I-M-07172;
+	))
+      (=jis-x0212	  . #x3225)	; &M-00970; [18-05]
+      (=daikanwa	  . 00970)	; &I-M-00970;
+      (=jef-china3	  . #x43A1)	; &I-JC3-43A1;
+      (=ucs@jis		  . #x509B)	; &M-00970;
+      (mojikyo		  . 000970)	; &MCS-600003CA;
       )
-     ((=ucs		  . #x5BB9)	; 容
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x485D)	; &C1-5529; [40-61]
+	(=cns11643-1	    . #x5529)	; &I-C1-5529; [53-09]
+	))
+      (=cns11643-2	  . #x3A35)	; &C2-3A35; [26-21]
+      (=ucs@unicode	  . #x509B)	; &C2-3A35;
       ))
-    (=ucs		. #x509B)	; 傛
-    (=cns11643-2	. #x3A35)	; &I-C2-3A35; [26-21]
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -20971,7 +21300,17 @@
     (=ucs@unicode	. #x509C)	; &UU+509C;
     ))
 (define-char
-  '((=>ucs		. #x509D)	; 傝
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 10)
+    (total-strokes	 . 12)
+    (hanyu-dazidian	1 202 17)
+    (=ucs		. #x509D)	; 傝
+    (=big5		. #xD85A)	; &I-B-D85A;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x509D)	; 傝
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
@@ -20987,8 +21326,9 @@
     (mojikyo		. 000972)	; &MCS-600003CC;
     ))
 (define-char
-  '((=>ucs		. #x509D)	; 傝
-    (morohashi-daikanwa	972 0 1)
+  '((<-denotational
+     ((=ucs		  . #x509D)	; 傝
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
@@ -20998,26 +21338,19 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs		    . #x65E5)	; 日
-	)
-       ((=ks-x1001	    . #x6962)	; &GT-36832; [73-66]
-	(=daikanwa	    . 28614)	; &I-M-28614;
-	))
+     ((=cns11643-4	  . #x2F31)	; &C4-2F31; [15-17]
       ))
-    (=big5		. #xD85A)	; &B-D85A;
-    (=ucs@big5		. #x509D)	; &B-D85A;
+    (=cns11643-2	. #x3A3E)	; &C2-3A3E; [26-30]
+    (=ucs@unicode	. #x509D)	; &C2-3A3E;
+    (mojikyo		. 059093)	; &MCS-6000E6D5;
     ))
 (define-char
-  '((=>ucs		. #x509D)	; 傝
-    (morohashi-daikanwa	972 0 2)
+  '((<-denotational
+     ((=ucs		  . #x509D)	; 傝
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 202 17)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -21029,24 +21362,6 @@
     (mojikyo		. 059094)	; &MCS-6000E6D6;
     ))
 (define-char
-  '((morohashi-daikanwa	972 0 3)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (hanyu-dazidian	1 202 17)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x26407)	; 𦐇
-      ))
-    (=ucs		. #x509D)	; 傝
-    (=cns11643-2	. #x3A3E)	; &I-C2-3A3E; [26-30]
-    (mojikyo		. 059093)	; &MCS-6000E6D5;
-    ))
-(define-char
   '((ideographic-radical . 9)	; ⼈
     (hanyu-dazidian	1 194 12)
     (=ucs		. #x509E)	; 傞
@@ -21082,7 +21397,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x5DEE)	; &UU+5DEE;
+       ((=gb2312	    . #x326E)	; &G0-326E; [18-78]
 	))
       (=ucs@unicode	  . #x509E)	; &UU+509E;
       ))
@@ -21145,7 +21460,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x7FC1)	; &GT-36866;
+       ((=gb2312	    . #x4E4C)	; &GT-36866; [46-44]
 	))
       (=ucs@unicode	  . #x509F)	; &UU+509F;
       ))
@@ -21366,8 +21681,17 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (=ucs		. #x20300)	; 𠌀
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20300)	; 𠌀
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 10)
+    (total-strokes	 . 12)
     (->subsumptive
-     ((<-ancient
+     ((=daikanwa	  . 00981)	; &M-00981;
+      (<-ancient
        ((=jis-x0208	    . #x4A5D)	; &GT-00905; [42-61]
 	(=gb2312	    . #x3123)	; &I-G0-3123; [17-03]
 	(=ks-x1001	    . #x5C41)	; &I-K0-5C41; [60-33]
@@ -21375,17 +21699,33 @@
 	))
       (<-ancient*sources
        jiyun daikanwa)
-      (=daikanwa	  . 00981)	; &M-00981;
       )
      ((hanyu-dazidian	  1 203 16)
       (=hanziku-1	  . #xD04B)	; &HZK01-D04B;
-      )
-     ((=cns11643-6	  . #x4653)	; &C6-4653; [38-51]
-      (=ucs@iso		  . #x20300)	; &C6-4653;
       ))
     ))
 (define-char
-  '((morohashi-daikanwa	981 0 5)
+  '((<-denotational
+     ((=ucs		  . #x20300)	; 𠌀
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 10)
+    (total-strokes	 . 12)
+    (=ucs@iso		. #x20300)	; &U-00020300;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20300)	; 𠌀
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 10)
+    (total-strokes	 . 12)
+    (=cns11643-6	. #x4653)	; &C6-4653; [38-51]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20300)	; 𠌀
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
@@ -21488,11 +21828,11 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
+    (=ucs		. #x20367)	; 𠍧
+    (=cns11643-6	. #x4657)	; &I-C6-4657; [38-55]
     (<-unknown
      ((=daikanwa	  . 00985)	; &M-00985;
       ))
-    (=ucs		. #x20367)	; 𠍧
-    (=cns11643-6	. #x4657)	; &I-C6-4657; [38-55]
     ))
 (define-char
   '((=>ucs		. #x202ED)	; 𠋭
@@ -22106,23 +22446,27 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (hanyu-dazidian	1 215 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x50AA)	; 傪
+    (->subsumptive
+     ((hanyu-dazidian	  1 215 10)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=ucs		    . #x53C3)	; 參
+	))
+      (=jis-x0212	  . #x322C)	; &M-01002; [18-12]
+      (=jis-x0213-2-2000  . #x216F)	; &I-JX2-216F; [01-79]
+      (=daikanwa	  . 01002)	; &I-M-01002;
+      (=hanziku-1	  . #xD2AD)	; &I-HZK01-D2AD;
+      (=ucs@unicode	  . #x50AA)	; &M-01002;
       )
-     ((=ucs		  . #x53C3)	; 參
+     ((=cns11643-3	  . #x4039)	; &CB05255; [32-25]
+      (=cbeta		  . 05255)	; &I-CB05255;
+      (mojikyo		  . 001002)	; &MCS-600003EA;
       ))
-    (=ucs		. #x50AA)	; 傪
-    (=jis-x0212		. #x322C)	; &I-JSP-322C; [18-12]
-    (=cns11643-3	. #x4039)	; &I-C3-4039; [32-25]
-    (=jis-x0213-2-2000	. #x216F)	; &I-JX2-216F; [01-79]
-    (=daikanwa		. 01002)	; &I-M-01002;
-    (=hanziku-1		. #xD2AD)	; &I-HZK01-D2AD;
-    (=cbeta		. 05255)	; &I-CB05255;
-    (mojikyo		. 001002)	; &MCS-600003EA;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -22153,7 +22497,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x7D2F)	; &G0-405B;
+       ((=gb2312	    . #x405B)	; &G0-405B; [32-59]
 	))
       (=hanziku-1	  . #xD1C4)	; &HZK01-D1C4;
       (=ucs@unicode	  . #x50AB)	; &HZK01-D1C4;
@@ -22180,128 +22524,114 @@
     (mojikyo		. 001004)	; &MCS-600003EC;
     ))
 (define-char
-  '((=>ucs		. #x50AC)	; 催
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
     (hanyu-dazidian	1 211 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=jis-x0208	  . #x5643)	; &GT-10305; [54-35]
-      (=ks-x1001	  . #x754B)	; &I-K0-754B; [85-43]
-      (=daikanwa	  . 08178)	; &I-M-08178;
-      ))
-    (shinjigen-1	. 376)
-    (shinjigen-2	. 376)
-    (=jis-x0208		. #x3A45)	; &GT-01323; [26-37]
-    (=ks-x1001		. #x754A)	; &I-K0-754A; [85-42]
+    (=ucs		. #x50AC)	; 催
     (=big5		. #xB6CA)	; &I-B-B6CA;
-    (=gt		. 01323)	; &I-GT-01323;
-    (=gt-pj-1		. #x3A45)	; &I-GT-01323; [26-37]
-    (=daikanwa		. 01005)	; &I-M-01005;
-    (=ucs@jis		. #x50AC)	; &GT-01323;
-    (=ucs@big5		. #x50AC)	; &GT-01323;
-    (mojikyo		. 001005)	; &MCS-600003ED;
-    ))
-(define-char
-  '((morohashi-daikanwa	1005 0 1)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 11)
-    (total-strokes	 . 13)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 211)
-    (hanyu-dazidian-char . 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x5643)	; &GT-10305; [54-35]
+	(=ks-x1001	    . #x754B)	; &I-K0-754B; [85-43]
+	(=daikanwa	    . 08178)	; &I-M-08178;
+	))
+      (shinjigen-1	  . 376)
+      (shinjigen-2	  . 376)
+      (=jis-x0208	  . #x3A45)	; &GT-01323; [26-37]
+      (=ks-x1001	  . #x754A)	; &I-K0-754A; [85-42]
+      (=gt		  . 01323)	; &I-GT-01323;
+      (=gt-pj-1		  . #x3A45)	; &I-GT-01323; [26-37]
+      (=daikanwa	  . 01005)	; &I-M-01005;
+      (=ucs@jis		  . #x50AC)	; &GT-01323;
+      (mojikyo		  . 001005)	; &MCS-600003ED;
       )
-     ((=ucs		  . #x5D14)	; 崔
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x345E)	; &C1-597E; [20-62]
+	(=cns11643-1	    . #x597E)	; &I-C1-597E; [57-94]
+	))
+      (=gb2312		  . #x345F)	; &C1-6331; [20-63]
+      (=cns11643-1	  . #x6331)	; &I-C1-6331; [67-17]
+      (=ucs@unicode	  . #x50AC)	; &C1-6331;
       ))
-    (shinjigen-1	. 376)
-    (shinjigen-2	. 376)
-    (=ucs		. #x50AC)	; 催
-    (=gb2312		. #x345F)	; &I-G0-345F; [20-63]
-    (=cns11643-1	. #x6331)	; &I-C1-6331; [67-17]
-    ))
-(define-char
-  '((=>ucs		. #x2032C)	; 𠌬
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 11)
-    (total-strokes	 . 13)
-    (=daikanwa		. 01006)	; &M-01006;
-    (mojikyo		. 001006)	; &MCS-600003EE;
     ))
 (define-char
-  '((morohashi-daikanwa	1006 0 1)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 12)
-    (total-strokes	 . 14)
-    (hanyu-dazidian	1 222 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+  '((ideographic-radical . 9)	; ⼈
+    (=ucs		. #x2032C)	; 𠌬
+    (->subsumptive
+     ((ideographic-strokes . 11)
+      (total-strokes	   . 13)
+      (=daikanwa	  . 01006)	; &M-01006;
+      (mojikyo		  . 001006)	; &MCS-600003EE;
       )
-     ((=ucs		  . #x7280)	; 犀
+     ((ideographic-strokes . 12)
+      (total-strokes	   . 14)
+      (hanyu-dazidian	  1 222 10)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x4F2C)	; &C1-6058; [47-12]
+	(=cns11643-1	    . #x6058)	; &I-C1-6058; [64-56]
+	))
+      (=cns11643-4	  . #x4238)	; &HZK01-D3F0; [34-24]
+      (=hanziku-1	  . #xD3F0)	; &I-HZK01-D3F0;
+      (=ucs@iso		  . #x2032C)	; &HZK01-D3F0;
       ))
-    (=ucs		. #x2032C)	; 𠌬
-    (=cns11643-4	. #x4238)	; &I-C4-4238; [34-24]
-    (=hanziku-1		. #xD3F0)	; &I-HZK01-D3F0;
     ))
 (define-char
-  '((=>ucs		. #x50AD)	; 傭
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
     (hanyu-dazidian	1 214 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=jis-x0208	  . #x4D47)	; &GT-11819; [45-39]
-      (=ks-x1001	  . #x693C)	; &I-K0-693C; [73-28]
-      (=daikanwa	  . 09378)	; &I-M-09378;
-      ))
-    (shinjigen-1	. 384)
-    (shinjigen-2	. 384)
-    (=jis-x0208		. #x4D43)	; &GT-01386; [45-35]
-    (=ks-x1001		. #x6936)	; &I-K0-6936; [73-22]
+    (=ucs		. #x50AD)	; 傭
     (=big5		. #xB6C4)	; &I-B-B6C4;
-    (=gt		. 01386)	; &I-GT-01386;
-    (=gt-pj-1		. #x4D43)	; &I-GT-01386; [45-35]
-    (=daikanwa		. 01007)	; &I-M-01007;
-    (=ucs@jis		. #x50AD)	; &GT-01386;
-    (=ucs@big5		. #x50AD)	; &GT-01386;
-    (mojikyo		. 001007)	; &MCS-600003EF;
-    ))
-(define-char
-  '((morohashi-daikanwa	1007 0 0)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 11)
-    (total-strokes	 . 13)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 214)
-    (hanyu-dazidian-char . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x4D47)	; &GT-11819; [45-39]
+	(=ks-x1001	    . #x693C)	; &I-K0-693C; [73-28]
+	(=daikanwa	    . 09378)	; &I-M-09378;
+	))
+      (shinjigen-1	  . 384)
+      (shinjigen-2	  . 384)
+      (=jis-x0208	  . #x4D43)	; &GT-01386; [45-35]
+      (=ks-x1001	  . #x6936)	; &I-K0-6936; [73-22]
+      (=gt		  . 01386)	; &I-GT-01386;
+      (=gt-pj-1		  . #x4D43)	; &I-GT-01386; [45-35]
+      (=daikanwa	  . 01007)	; &I-M-01007;
+      (=ucs@jis		  . #x50AD)	; &GT-01386;
+      (mojikyo		  . 001007)	; &MCS-600003EF;
       )
-     ((=ucs		  . #x5EB8)	; 庸
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x5339)	; &C1-5A2B; [51-25]
+	(=cns11643-1	    . #x5A2B)	; &I-C1-5A2B; [58-11]
+	))
+      (=cns11643-1	  . #x632B)	; &C1-632B; [67-11]
+      (=gb12345		  . #x5336)	; &C1-632B; [51-22]
+      (=ucs@unicode	  . #x50AD)	; &C1-632B;
       ))
-    (=ucs		. #x50AD)	; 傭
-    (=cns11643-1	. #x632B)	; &I-C1-632B; [67-11]
-    (=gb12345		. #x5336)	; 傭 [51-22]
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -22323,8 +22653,7 @@
     (mojikyo		. 001008)	; &MCS-600003F0;
     ))
 (define-char
-  '((=>daikanwa		. 01009)	; &M-01009;
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
     (=ucs		. #x347B)	; 㑻
@@ -22396,7 +22725,8 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x7387)	; &UU+7387;
+     ((=gb2312		  . #x424A)	; &C1-5B7B; [34-42]
+      (=cns11643-1	  . #x5B7B)	; &I-C1-5B7B; [59-91]
       ))
     (=cns11643-5	. #x3D5A)	; &HZK01-D2A4; [29-58]
     (=hanziku-1		. #xD2A4)	; &I-HZK01-D2A4;
@@ -22501,7 +22831,10 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x5D29)	; &UU+5D29;
+     ((=jis-x0208	  . #x4A78)	; &GT-10360; [42-88]
+      (=gb2312		  . #x3140)	; &I-G0-3140; [17-32]
+      (=ks-x1001	  . #x5D5A)	; &I-K0-5D5A; [61-58]
+      (=cns11643-1	  . #x597D)	; &I-C1-597D; [57-93]
       ))
     (=cns11643-2	. #x4162)	; &C2-4162; [33-66]
     (=big5		. #xDCBD)	; &I-B-DCBD;
@@ -22531,24 +22864,53 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (hanyu-dazidian	1 214 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x2032E)	; 𠌮
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x3D6E)	; &GT-11788; [29-78]
+	(=ks-x1001	    . #x5F6E)	; &I-K0-5F6E; [63-78]
+	(=daikanwa	    . 09373)	; &I-M-09373;
+	))
+      (=daikanwa	  . 01014)	; &M-01014;
+      (mojikyo		  . 001014)	; &MCS-600003F6;
       )
-     ((=ucs		  . #x5EB6)	; 庶
+     ((hanyu-dazidian	  1 214 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x4A7C)	; &C1-5A2C; [42-92]
+	(=cns11643-1	    . #x5A2C)	; &I-C1-5A2C; [58-12]
+	))
+      (=cns11643-5	  . #x3D58)	; &HZK01-D264; [29-56]
+      (=hanziku-1	  . #xD264)	; &I-HZK01-D264;
+      (=ucs@iso		  . #x2032E)	; &HZK01-D264;
       ))
-    (=ucs		. #x2032E)	; 𠌮
-    (=cns11643-5	. #x3D58)	; &I-C5-3D58; [29-56]
-    (=daikanwa		. 01014)	; &I-M-01014;
-    (=hanziku-1		. #xD264)	; &I-HZK01-D264;
-    (=cbeta		. 02101)	; &I-CB02101;
-    (mojikyo		. 001014)	; &MCS-600003F6;
     ))
 (define-char
-  '((=>ucs		. #x50B2)	; 傲
+  '((<-denotational
+     ((=ucs		  . #x2032E)	; 𠌮
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (=cbeta		. 02101)	; &CB02101;
+    ))
+(define-char
+  '((ideographic-radical . 9)	; ⼈
+    (=ucs		. #x50B2)	; 傲
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x50B2)	; 傲
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
@@ -22573,82 +22935,95 @@
     (mojikyo		. 001015)	; &MCS-600003F7;
     ))
 (define-char
-  '((=>ucs		. #x50B2)	; 傲
-    (morohashi-daikanwa	1015 0 0)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 11)
-    (total-strokes	 . 13)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=jis-x0208	  . #x5A44)	; &GT-16699; [58-36]
-      (=ks-x1001	  . #x6779)	; &I-K0-6779; [71-89]
-      (=daikanwa	  . 13226)	; &I-M-13226;
+  '((<-denotational
+     ((=ucs		  . #x50B2)	; 傲
       ))
-    (=big5		. #xB6C6)	; &B-B6C6;
-    (=ucs@big5		. #x50B2)	; &B-B6C6;
-    ))
-(define-char
-  '((morohashi-daikanwa	1015 0 1)
     (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (hanyu-dazidian	1 199 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=big5		. #xB6C6)	; &B-B6C6;
+    (->subsumptive
+     ((ideographic-strokes . 10)
+      (total-strokes	   . 12)
+      (hanyu-dazidian	  1 199 6)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x303D)	; &G0-303D; [16-29]
+	))
+      (=gb2312		  . #x3041)	; &G0-3041; [16-33]
+      (=ucs@unicode	  . #x50B2)	; &G0-3041;
       )
-     ((=ucs		  . #x6556)	; 敖
+     ((ideographic-strokes . 11)
+      (total-strokes	   . 13)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-1	    . #x5A72)	; &C1-5A72; [58-82]
+	))
+      (=cns11643-1	  . #x632D)	; &C1-632D; [67-13]
       ))
-    (=ucs		. #x50B2)	; 傲
-    (=gb2312		. #x3041)	; &I-G0-3041; [16-33]
     ))
 (define-char
-  '((=>ucs		. #x50B2)	; 傲
-    (morohashi-daikanwa	1015 0 2)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=cns11643-1	  . #x5A72)	; &C1-5A72; [58-82]
-      ))
-    (=cns11643-1	. #x632D)	; &C1-632D; [67-13]
+    (=ucs		. #x2032F)	; 𠌯
     ))
 (define-char
-  '((=>ucs		. #x2032F)	; 𠌯
+  '((<-denotational
+     ((=ucs		  . #x2032F)	; 𠌯
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (=daikanwa		. 01016)	; &M-01016;
-    (mojikyo		. 001016)	; &MCS-600003F8;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0212	    . #x5073)	; &M-24888; [48-83]
+	(=jis-x0213-2-2000  . #x726E)	; &I-JX2-726E; [82-78]
+	(=daikanwa	    . 24888)	; &I-M-24888;
+	))
+      (=daikanwa	  . 01016)	; &M-01016;
+      (mojikyo		  . 001016)	; &MCS-600003F8;
+      )
+     ((hanyu-dazidian	  1 205 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x406B)	; &G0-406B; [32-75]
+	))
+      (=hanziku-1	  . #xD07E)	; &HZK01-D07E;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	1016 0 2)
+  '((<-denotational
+     ((=ucs		  . #x2032F)	; 𠌯
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (hanyu-dazidian	1 205 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x79BB)	; 离
+     ((=cns11643-2	  . #x3766)	; &C2-3766; [23-70]
       ))
-    (=ucs		. #x2032F)	; 𠌯
-    (=cns11643-6	. #x5053)	; &I-C6-5053; [48-51]
-    (=hanziku-1		. #xD07E)	; &I-HZK01-D07E;
+    (=cns11643-6	. #x5053)	; &C6-5053; [48-51]
+    (=ucs@iso		. #x2032F)	; &C6-5053;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -23065,7 +23440,8 @@
        ((name		    . "CJK RADICAL PERSON")
 	(=ucs		    . #x2E85)	; ⺅
 	)
-       ((=ucs@unicode	    . #x7ADF)	; &C1-5D7E;
+       ((=gb2312	    . #x3E39)	; &C1-5D7E; [30-25]
+	(=cns11643-1	    . #x5D7E)	; &I-C1-5D7E; [61-94]
 	))
       (=cns11643-3	  . #x403A)	; &HZK01-D269; [32-26]
       (=hanziku-1	  . #xD269)	; &I-HZK01-D269;
@@ -23109,7 +23485,9 @@
        ((name		    . "CJK RADICAL PERSON")
 	(=ucs		    . #x2E85)	; ⺅
 	)
-       ((=ucs@unicode	    . #x796D)	; &GT-31678;
+       ((=jis-x0208	    . #x3A57)	; &GT-31678; [26-55]
+	(=gb2312	    . #x3C40)	; &I-G0-3C40; [28-32]
+	(=ks-x1001	    . #x702E)	; &I-K0-702E; [80-14]
 	))
       (=gb2312		  . #x5951)	; &JX2-2172; [57-49]
       (=jis-x0212	  . #x3230)	; &I-JSP-3230; [18-16]
@@ -23390,8 +23768,7 @@
     (mojikyo		. 050105)	; &MCS-6000C3B9;
     ))
 (define-char
-  '((=>daikanwa		. 01043)	; &M-01043;
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
     (=ucs		. #x3480)	; 㒀
@@ -23428,19 +23805,23 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
     (hanyu-dazidian	1 212 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x6089)	; 悉
-      ))
     (=ucs		. #x50C1)	; 僁
-    (=cns11643-2	. #x4163)	; &I-C2-4163; [33-67]
     (=big5		. #xDCBE)	; &I-B-DCBE;
-    (=daikanwa		. 01044)	; &I-M-01044;
-    (mojikyo		. 001044)	; &MCS-60000414;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=ucs		    . #x6089)	; 悉
+	))
+      (=daikanwa	  . 01044)	; &M-01044;
+      (=ucs@unicode	  . #x50C1)	; &M-01044;
+      (mojikyo		  . 001044)	; &MCS-60000414;
+      )
+     ((=cns11643-2	  . #x4163)	; &C2-4163; [33-67]
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -23455,7 +23836,9 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x5A41)	; &UU+5A41;
+       ((=jis-x0208	    . #x4F2C)	; &GT-08103; [47-12]
+	(=ks-x1001	    . #x5725)	; &I-K0-5725; [55-05]
+	(=daikanwa	    . 06383)	; &I-M-06383;
 	))
       (shinjigen-1	  . 385)
       (shinjigen-2	  . 385)
@@ -23562,7 +23945,9 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x7968)	; &GT-31700;
+       ((=jis-x0208	    . #x493C)	; &GT-31700; [41-28]
+	(=gb2312	    . #x4631)	; &I-G0-4631; [38-17]
+	(=ks-x1001	    . #x7879)	; &I-K0-7879; [88-89]
 	))
       (shinjigen-2	  . 383)
       (=jis-x0212	  . #x3234)	; &JX2-2174; [18-20]
@@ -23614,18 +23999,18 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x364F)	; &GT-01313; [22-47]
-      (=ks-x1001	  . #x5041)	; &I-K0-5041; [48-33]
-      (=cns11643-1	  . #x632F)	; &I-C1-632F; [67-15]
-      (=daikanwa	  . 01048)	; &I-M-01048;
-      ))
     (=jis-x0208@1983	. #x364F)	; &GT-01207; [22-47]
     (=jis-x0208@1990	. #x364F)	; &I-J90-364F; [22-47]
     (=gt		. 01207)	; &I-GT-01207;
     (=gt-pj-1		. #x364F)	; &I-GT-01207; [22-47]
     (=jef-china3	. #x43CC)	; &I-JC3-43CC;
     (=ucs@jis		. #x50C5)	; &GT-01207;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x364F)	; &GT-01313; [22-47]
+      (=ks-x1001	  . #x5041)	; &I-K0-5041; [48-33]
+      (=cns11643-1	  . #x632F)	; &I-C1-632F; [67-15]
+      (=daikanwa	  . 01048)	; &I-M-01048;
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -23693,46 +24078,75 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (hanyu-dazidian	1 211 3)
+    (=ucs		. #x3481)	; 㒁
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x537E)	; &GT-06021; [51-94]
+	(=daikanwa	    . 04793)	; &I-M-04793;
+	))
+      (=daikanwa	  . 01050)	; &M-01050;
+      (mojikyo		  . 001050)	; &MCS-6000041A;
+      )
+     ((hanyu-dazidian	  1 211 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x6076)	; &C1-5950; [64-86]
+	(=cns11643-1	    . #x5950)	; &I-C1-5950; [57-48]
+	))
+      (=cns11643-4	  . #x3C2A)	; &HZK01-D1C3; [28-10]
+      (=hanziku-1	  . #xD1C3)	; &I-HZK01-D1C3;
+      (=ucs@unicode	  . #x3481)	; &HZK01-D1C3;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (=ucs		. #x50C7)	; 僇
+    (=big5		. #xB6CE)	; &I-B-B6CE;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x50C7)	; 僇
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x5709)	; 圉
+     ((=jis-x0212	  . #x553A)	; &M-28665; [53-26]
+      (=jis-x0213-2-2000  . #x747B)	; &I-JX2-747B; [84-91]
+      (=daikanwa	  . 28665)	; &I-M-28665;
       ))
-    (=ucs		. #x3481)	; 㒁
-    (=cns11643-4	. #x3C2A)	; &I-C4-3C2A; [28-10]
-    (=daikanwa		. 01050)	; &I-M-01050;
-    (=hanziku-1		. #xD1C3)	; &I-HZK01-D1C3;
-    (mojikyo		. 001050)	; &MCS-6000041A;
+    (shinjigen-2	. 2789)
+    (=jis-x0212		. #x3235)	; &M-01051; [18-21]
+    (=jis-x0213-2-2000	. #x2175)	; &I-JX2-2175; [01-85]
+    (=daikanwa		. 01051)	; &I-M-01051;
+    (=jef-china3	. #x43AC)	; &I-JC3-43AC;
+    (=ucs@jis		. #x50C7)	; &M-01051;
+    (mojikyo		. 001051)	; &MCS-6000041B;
     ))
 (define-char
-  '((ideographic-radical . 9)	; ⼈
+  '((<-denotational
+     ((=ucs		  . #x50C7)	; 僇
+      ))
+    (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (=ucs		. #x50C7)	; 僇
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=jis-x0212	    . #x553A)	; &M-28665; [53-26]
-	(=jis-x0213-2-2000  . #x747B)	; &I-JX2-747B; [84-91]
-	(=daikanwa	    . 28665)	; &I-M-28665;
-	))
-      (shinjigen-2	  . 2789)
-      (=jis-x0212	  . #x3235)	; &M-01051; [18-21]
-      (=jis-x0213-2-2000  . #x2175)	; &I-JX2-2175; [01-85]
-      (=big5		  . #xB6CE)	; &I-B-B6CE;
-      (=daikanwa	  . 01051)	; &I-M-01051;
-      (=jef-china3	  . #x43AC)	; &I-JC3-43AC;
-      (=ucs@jis		  . #x50C7)	; &M-01051;
-      (mojikyo		  . 001051)	; &MCS-6000041B;
-      )
      ((hanyu-dazidian	  1 215 8)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -23754,7 +24168,6 @@
 	)
        ((=cns11643-2	    . #x3841)	; &C2-3841; [24-33]
 	))
-      (shinjigen-2	  . 2789)
       (=cns11643-1	  . #x6335)	; &C1-6335; [67-21]
       (=ucs@cns		  . #x50C7)	; &C1-6335;
       ))
@@ -23763,7 +24176,17 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
+    (hanyu-dazidian	1 211 1)
     (=ucs		. #x50C8)	; 僈
+    (=big5		. #xDCBB)	; &I-B-DCBB;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x50C8)	; 僈
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -23787,19 +24210,26 @@
        ((mojikyo	    . 014298)	; &MCS-600037DA;
 	))
       (mojikyo		  . 001052)	; &MCS-6000041C;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x50C8)	; 僈
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((hanyu-dazidian	  1 211 1)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=ucs@unicode	    . #x66FC)	; &GT-18098;
-	))
-      (=big5		  . #xDCBB)	; &B-DCBB;
-      (=ucs@unicode	  . #x50C8)	; &B-DCBB;
+     ((=ucs		  . #x4EBB)	; 亻
+      )
+     ((=jis-x0208	  . #x5258)	; &GT-18098; [50-56]
+      (=gb2312		  . #x427C)	; &I-G0-427C; [34-92]
+      (=ks-x1001	  . #x583A)	; &I-K0-583A; [56-26]
       ))
+    (=ucs@unicode	. #x50C8)	; &UU+50C8;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -23941,62 +24371,51 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x8CAA)	; &UU+8CAA;
+       ((=gb12345	    . #x4C30)	; &UU+8CAA; [44-16]
 	))
       (=ucs@unicode	  . #x50CB)	; &UU+50CB;
       ))
     ))
 (define-char
-  '((=>ucs		. #x20339)	; 𠌹
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
+    (=ucs		. #x20339)	; 𠌹
+    (->subsumptive
      ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-	(=ucs		    . #x2FF3)	; ⿳
-	)
-       ((=ucs		    . #x6B62)	; æ­¢
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x65E5)	; 日
+       ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs		    . #x23942)	; 𣥂
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	  (=ucs		      . #x2FF3)	; ⿳
+	  )
+	 ((=ucs		      . #x6B62)	; æ­¢
+	  )
+	 ((=ucs		      . #x65E5)	; 日
+	  )
+	 ((=gt		      . 20883)	; &GT-20883;
+	  (=daikanwa	      . 16254)	; &I-M-16254;
+	  ))
 	))
-      ))
-    (=daikanwa		. 01057)	; &M-01057;
-    ))
-(define-char
-  '((morohashi-daikanwa	1057 0 0)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 11)
-    (total-strokes	 . 13)
-    (hanyu-dazidian	1 210 13)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+      (=daikanwa	  . 01057)	; &M-01057;
       )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-	(=ucs		    . #x2FF3)	; ⿳
-	)
-       ((=ucs		    . #x6B62)	; æ­¢
+     ((hanyu-dazidian	  1 210 13)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x65E5)	; 日
+       ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs		    . #x23942)	; 𣥂
+       ((=ucs		    . #x23976)	; 𣥶
 	))
+      (=cns11643-6	  . #x505C)	; &HZK01-D1AD; [48-60]
+      (=hanziku-1	  . #xD1AD)	; &I-HZK01-D1AD;
+      (=ucs@iso		  . #x20339)	; &HZK01-D1AD;
+      (mojikyo		  . 001057)	; &MCS-60000421;
       ))
-    (=ucs		. #x20339)	; 𠌹
-    (=cns11643-6	. #x505C)	; &I-C6-505C; [48-60]
-    (=hanziku-1		. #xD1AD)	; &I-HZK01-D1AD;
-    (mojikyo		. 001057)	; &MCS-60000421;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -24383,14 +24802,10 @@
     ))
 (define-char
   '((=>ucs*		. #x50E7)	; 僧
-    (morohashi-daikanwa	1076 0 2)
+    (=>daikanwa		. 01076)	; &M-01076;
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA31)	; 僧
-      (=jis-x0213-1-2000  . #x2E49)	; &I-JX1-2E49; [14-41]
-      ))
     (shinjigen-1	. 381)
     (shinjigen-2	. 381)
     (=ucs		. #x2F80A)	; 僧
@@ -24400,6 +24815,10 @@
     (=gt-pj-1		. #x414E)	; &I-GT-01350; [33-46]
     (=ucs@jis		. #x50E7)	; 僧
     (mojikyo		. 054198)	; &MCS-6000D3B6;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA31)	; 僧
+      (=jis-x0213-1-2000  . #x2E49)	; &I-JX1-2E49; [14-41]
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -24731,7 +25150,8 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x8DF1)	; &UU+8DF1;
+     ((=jis-x0212	  . #x5F70)	; &M-37529; [63-80]
+      (=daikanwa	  . 37529)	; &I-M-37529;
       ))
     (=daikanwa		. 01086)	; &M-01086;
     (=hanziku-1		. #xD4AA)	; &I-HZK01-D4AA;
@@ -24760,35 +25180,52 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
     (=ucs		. #x50D0)	; 僐
-    (->subsumptive
-     ((hanyu-dazidian	  1 221 5)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=ucs@unicode	    . #x5584)	; &GT-04973;
-	))
-      (=jis-x0212	  . #x3238)	; &M-01087; [18-24]
-      (=jis-x0213-1-2000  . #x2E47)	; &I-JX1-2E47; [14-39]
-      (=daikanwa	  . 01087)	; &I-M-01087;
-      (=hanziku-1	  . #xD3CB)	; &I-HZK01-D3CB;
-      (=ucs@unicode	  . #x50D0)	; &M-01087;
-      (mojikyo		  . 001087)	; &MCS-6000043F;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x50D0)	; 僐
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (hanyu-dazidian	1 221 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=cns11643-1	    . #x6143)	; &C1-6143; [65-35]
-	))
-      (=cns11643-3	  . #x456B)	; &CB04736; [37-75]
-      (=cbeta		  . 04736)	; &I-CB04736;
-      (=ucs@cns		  . #x50D0)	; &CB04736;
+     ((=ucs		  . #x4EBB)	; 亻
+      )
+     ((=jis-x0208	  . #x4131)	; &GT-04973; [33-17]
+      (=gb2312		  . #x4946)	; &I-G0-4946; [41-38]
+      (=ks-x1001	  . #x603C)	; &I-K0-603C; [64-28]
+      (=cns11643-6	  . #x472A)	; &I-C6-472A; [39-10]
+      (=daikanwa	  . 03904)	; &I-M-03904;
       ))
+    (=jis-x0212		. #x3238)	; &M-01087; [18-24]
+    (=jis-x0213-1-2000	. #x2E47)	; &I-JX1-2E47; [14-39]
+    (=daikanwa		. 01087)	; &I-M-01087;
+    (=hanziku-1		. #xD3CB)	; &I-HZK01-D3CB;
+    (=ucs@unicode	. #x50D0)	; &M-01087;
+    (mojikyo		. 001087)	; &MCS-6000043F;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x50D0)	; 僐
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x4EBB)	; 亻
+      )
+     ((=cns11643-1	  . #x6143)	; &C1-6143; [65-35]
+      ))
+    (=cns11643-3	. #x456B)	; &CB04736; [37-75]
+    (=cbeta		. 04736)	; &I-CB04736;
+    (=ucs@cns		. #x50D0)	; &CB04736;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -24884,7 +25321,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x96C6)	; &G0-3C2F;
+       ((=gb2312	    . #x3C2F)	; &G0-3C2F; [28-15]
 	))
       (=hanziku-1	  . #xD3AC)	; &HZK01-D3AC;
       (=ucs@iso		  . #x20371)	; &HZK01-D3AC;
@@ -24914,11 +25351,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x6E20)	; &UU+6E20;
+       ((=daikanwa	    . 17764)	; &M-17764;
 	))
       (=daikanwa	  . 01092)	; &M-01092;
       (=hanziku-1	  . #xD2A7)	; &I-HZK01-D2A7;
-      (=ucs@iso		  . #x20372)	; &M-01092;
       (mojikyo		  . 001092)	; &MCS-60000444;
       )
      ((ideographic-structure
@@ -24927,6 +25363,18 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
+       ((=jis-x0208	    . #x3574)	; &GT-22731; [21-84]
+	(=gb2312	    . #x477E)	; &I-G0-477E; [39-94]
+	(=ks-x1001	    . #x4B62)	; &I-K0-4B62; [43-66]
+	))
+      (=ucs@iso		  . #x20372)	; &U-00020372;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
        ((=cns11643-1	    . #x6032)	; &C1-6032; [64-18]
 	))
       (=cns11643-5	  . #x4456)	; &C5-4456; [36-54]
@@ -25155,7 +25603,8 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x655E)	; &UU+655E;
+     ((=gb2312		  . #x3328)	; &C1-5F54; [19-08]
+      (=cns11643-1	  . #x5F54)	; &I-C1-5F54; [63-52]
       ))
     (=cns11643-3	. #x456E)	; &HZK01-D365; [37-78]
     (=hanziku-1		. #xD365)	; &I-HZK01-D365;
@@ -25179,7 +25628,9 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x9EC3)	; &GT-65324;
+       ((=ks-x1001	    . #x7C5C)	; &GT-65324; [92-60]
+	(=jis-x0213-1-2000  . #x7E71)	; &I-JX1-7E71; [94-81]
+	(=daikanwa	    . 47926)	; &I-M-47926;
 	))
       (=jis-x0213-2-2000  . #x217B)	; &M-01098; [01-91]
       (=daikanwa	  . 01098)	; &I-M-01098;
@@ -25232,7 +25683,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x7136)	; &UU+7136;
+       ((=jis-x0208	    . #x4133)	; &GT-24509; [33-19]
+	(=gb2312	    . #x483B)	; &I-G0-483B; [40-27]
+	(=ks-x1001	    . #x6654)	; &I-K0-6654; [70-52]
+	(=daikanwa	    . 19149)	; &I-M-19149;
 	))
       (=daikanwa	  . 01099)	; &M-01099;
       (=hanziku-1	  . #xD3B3)	; &I-HZK01-D3B3;
@@ -25447,7 +25901,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x5E7E)	; &UU+5E7E;
+       ((=gb12345	    . #x3C38)	; &UU+5E7E; [28-24]
 	))
       (=hanziku-1	  . #xD44C)	; &HZK01-D44C;
       (=ucs@unicode	  . #x50DF)	; &HZK01-D44C;
@@ -25469,19 +25923,34 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
     (hanyu-dazidian	1 220 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x756A)	; 番
-      ))
     (=ucs		. #x50E0)	; 僠
-    (=cns11643-2	. #x4926)	; &I-C2-4926; [41-06]
     (=big5		. #xE0FE)	; &I-B-E0FE;
-    (=daikanwa		. 01107)	; &I-M-01107;
-    (mojikyo		. 001107)	; &MCS-60000453;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x4856)	; &GT-28068; [40-54]
+	(=gb2312	    . #x372C)	; &I-G0-372C; [23-12]
+	(=ks-x1001	    . #x5B63)	; &I-K0-5B63; [59-67]
+	(=daikanwa	    . 21858)	; &I-M-21858;
+	))
+      (=daikanwa	  . 01107)	; &M-01107;
+      (=ucs@unicode	  . #x50E0)	; &M-01107;
+      (mojikyo		  . 001107)	; &MCS-60000453;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-1	    . #x606C)	; &C1-606C; [64-76]
+	))
+      (=cns11643-2	  . #x4926)	; &C2-4926; [41-06]
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -25628,26 +26097,72 @@
     (mojikyo		. 001113)	; &MCS-60000459;
     ))
 (define-char
-  '((=>daikanwa		. 01114)	; &M-01114;
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
     (=ucs		. #x3486)	; 㒆
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3486)	; 㒆
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (hanyu-dazidian	1 220 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x4EBB)	; 亻
+      )
+     ((=jis-x0208	  . #x6645)	; &GT-36979; [70-37]
+      (=ks-x1001	  . #x7D68)	; &I-K0-7D68; [93-72]
+      (=daikanwa	  . 28691)	; &I-M-28691;
+      ))
+    (=daikanwa		. 01114)	; &M-01114;
+    (=hanziku-1		. #xD3B0)	; &I-HZK01-D3B0;
+    (mojikyo		. 001114)	; &MCS-6000045A;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3486)	; 㒆
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x4EBB)	; 亻
+      )
+     ((=gb2312		  . #x7462)	; &C1-6145; [84-66]
+      (=cns11643-1	  . #x6145)	; &I-C1-6145; [65-37]
+      ))
+    (=cns11643-3	. #x4578)	; &C3-4578; [37-88]
+    (=ucs@unicode	. #x3486)	; &C3-4578;
+    ))
+(define-char
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (hanyu-dazidian	1 221 2)
+    (=ucs		. #x50E6)	; 僦
+    (=big5		. #xE0F0)	; &I-B-E0F0;
     (->subsumptive
-     ((hanyu-dazidian	  1 220 10)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=jis-x0208	    . #x6645)	; &GT-36979; [70-37]
-	(=ks-x1001	    . #x7D68)	; &I-K0-7D68; [93-72]
-	(=daikanwa	    . 28691)	; &I-M-28691;
+       ((=daikanwa	    . 07599)	; &M-07599;
 	))
-      (=daikanwa	  . 01114)	; &M-01114;
-      (=hanziku-1	  . #xD3B0)	; &I-HZK01-D3B0;
-      (mojikyo		  . 001114)	; &MCS-6000045A;
+      (shinjigen-1	  . 394)
+      (shinjigen-2	  . 394)
+      (=daikanwa	  . 01115)	; &M-01115;
+      (mojikyo		  . 001115)	; &MCS-6000045B;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -25655,36 +26170,26 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=gb2312	    . #x7462)	; &C1-6145; [84-66]
-	(=cns11643-1	    . #x6145)	; &I-C1-6145; [65-37]
+       ((=jis-x0208	    . #x3D22)	; &GT-09571; [29-02]
+	(=ks-x1001	    . #x7626)	; &I-K0-7626; [86-06]
 	))
-      (=cns11643-3	  . #x4578)	; &C3-4578; [37-88]
-      (=ucs@unicode	  . #x3486)	; &C3-4578;
-      ))
-    ))
-(define-char
-  '((ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 12)
-    (total-strokes	 . 14)
-    (hanyu-dazidian	1 221 2)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+      (=jis-x0212	  . #x3241)	; &JX1-2E48; [18-33]
+      (=jis-x0213-1-2000  . #x2E48)	; &I-JX1-2E48; [14-40]
+      (=jef-china3	  . #x43B6)	; &I-JC3-43B6;
+      (=ucs@jis		  . #x50E6)	; &JX1-2E48;
       )
-     ((=ucs		  . #x5C31)	; å°±
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-1	    . #x5E73)	; &C1-5E73; [62-83]
+	))
+      (=gb2312		  . #x5956)	; &C2-4876; [57-54]
+      (=cns11643-2	  . #x4876)	; &I-C2-4876; [40-86]
+      (=ucs@unicode	  . #x50E6)	; &C2-4876;
       ))
-    (shinjigen-2	. 394)
-    (=ucs		. #x50E6)	; 僦
-    (=gb2312		. #x5956)	; &I-G0-5956; [57-54]
-    (=jis-x0212		. #x3241)	; &I-JSP-3241; [18-33]
-    (=cns11643-2	. #x4876)	; &I-C2-4876; [40-86]
-    (=jis-x0213-1-2000	. #x2E48)	; &I-JX1-2E48; [14-40]
-    (=big5		. #xE0F0)	; &I-B-E0F0;
-    (=daikanwa		. 01115)	; &I-M-01115;
-    (=jef-china3	. #x43B6)	; &I-JC3-43B6;
-    (mojikyo		. 001115)	; &MCS-6000045B;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -25706,7 +26211,17 @@
     (mojikyo		. 001116)	; &MCS-6000045C;
     ))
 (define-char
-  '((=>ucs*		. #x50E7)	; 僧
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (=ucs		. #x50E7)	; 僧
+    (=big5		. #xB9AC)	; &I-B-B9AC;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x50E7)	; 僧
+      ))
+    (=>ucs*		. #x50E7)	; 僧
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
@@ -25725,14 +26240,15 @@
     (=ucs		. #xFA31)	; 僧
     (=ks-x1001		. #x632C)	; &I-K0-632C; [67-12]
     (=jis-x0213-1-2000	. #x2E49)	; &I-JX1-2E49; [14-41]
-    (=big5-cdp		. #xB9AC)	; &I-B-B9AC;
     (=daikanwa		. 01117)	; &I-M-01117;
     (=jef-china3	. #x43B7)	; &I-JC3-43B7;
     (=ucs@ks		. #x50E7)	; 僧
     (mojikyo		. 001117)	; &MCS-6000045D;
     ))
 (define-char
-  '((morohashi-daikanwa	1117 0 2)
+  '((<-denotational
+     ((=ucs		  . #x50E7)	; 僧
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
@@ -25743,20 +26259,26 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x66FE)	; 曾
+     ((=gb2312		  . #x5478)	; &C1-5F64; [52-88]
+      (=cns11643-1	  . #x5F64)	; &I-C1-5F64; [63-68]
       ))
-    (=ucs		. #x50E7)	; 僧
-    (=gb2312		. #x492E)	; &I-G0-492E; [41-14]
+    (=gb2312		. #x492E)	; &C1-6772; [41-14]
     (=cns11643-1	. #x6772)	; &I-C1-6772; [71-82]
-    (=big5		. #xB9AC)	; &I-B-B9AC;
+    (=ucs@unicode	. #x50E7)	; &C1-6772;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (=ucs		. #x3488)	; 㒈
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3488)	; 㒈
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
     (->subsumptive
-     ((ideographic-strokes . 12)
-      (total-strokes	   . 14)
-      (hanyu-dazidian	  1 216 13)
+     ((hanyu-dazidian	  1 216 13)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
@@ -25764,6 +26286,7 @@
        ((=ucs		    . #x4EBB)	; 亻
 	)
        ((=ks-x1001	    . #x4A72)	; &GT-16742; [42-82]
+	(=jis-x0208@1990    . #x343A)	; &I-J90-343A; [20-26]
 	(=cns11643-1	    . #x5F56)	; &I-C1-5F56; [63-54]
 	(=daikanwa	    . 13260)	; &I-M-13260;
 	))
@@ -25772,10 +26295,7 @@
       (=hanziku-1	  . #xD2D0)	; &I-HZK01-D2D0;
       (=ucs@cns		  . #x3488)	; &M-01118;
       )
-     ((ideographic-strokes . 12)
-      (total-strokes	   . 14)
-      (hanyu-dazidian	  1 216 13)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
@@ -25785,80 +26305,74 @@
 	(=jis-x0208@1983    . #x343A)	; &I-J83-343A; [20-26]
 	))
       (mojikyo		  . 001118)	; &MCS-6000045E;
-      )
-     ((ideographic-strokes . 11)
-      (total-strokes	   . 13)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=gb2312	    . #x3852)	; &G0-3852; [24-50]
-	))
-      (=ucs@unicode	  . #x3488)	; &UU+3488;
       ))
     ))
 (define-char
-  '((ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 12)
-    (total-strokes	 . 14)
-    (hanyu-dazidian	1 216 14)
+  '((<-denotational
+     ((=ucs		  . #x3488)	; 㒈
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x8CC1)	; 賁
+     ((=gb2312		  . #x3852)	; &G0-3852; [24-50]
       ))
-    (=ucs		. #x50E8)	; 僨
-    (=jis-x0212		. #x3242)	; &I-JSP-3242; [18-34]
-    (=cns11643-2	. #x4879)	; &I-C2-4879; [40-89]
-    (=gb12345		. #x5947)	; 僨 [57-39]
-    (=big5		. #xE0F3)	; &I-B-E0F3;
-    (=daikanwa		. 01119)	; &I-M-01119;
-    (mojikyo		. 001119)	; &MCS-6000045F;
+    (=ucs@unicode	. #x3488)	; &UU+3488;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 216 10)
-    (ideographic-structure
-     (:cdp-combinator	4)
-     ((=ucs		  . #x4EBB)	; 亻
-      )
+    (hanyu-dazidian	1 216 14)
+    (=ucs		. #x50E8)	; 僨
+    (=big5		. #xE0F3)	; &I-B-E0F3;
+    (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x5929)	; 天
+       ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs		    . #x5929)	; 天
+       ((=jis-x0208	    . #x6C4C)	; &GT-49201; [76-44]
+	(=ks-x1001	    . #x5D53)	; &I-K0-5D53; [61-51]
+	(=daikanwa	    . 36727)	; &I-M-36727;
 	))
-      )
-     ((=ucs		  . #x5FC3)	; 心
+      (=jis-x0212	  . #x3242)	; &M-01119; [18-34]
+      (=cns11643-2	  . #x4879)	; &I-C2-4879; [40-89]
+      (=gb12345		  . #x5947)	; &M-01119; [57-39]
+      (=daikanwa	  . 01119)	; &I-M-01119;
+      (=ucs@unicode	  . #x50E8)	; &M-01119;
+      (mojikyo		  . 001119)	; &MCS-6000045F;
       ))
-    (=ucs		. #x20374)	; 𠍴
-    (=cns11643-6	. #x5A69)	; &I-C6-5A69; [58-73]
-    (=daikanwa		. 01120)	; &I-M-01120;
-    (=hanziku-1		. #xD2CD)	; &I-HZK01-D2CD;
-    (mojikyo		. 001120)	; &MCS-60000460;
     ))
 (define-char
-  '((=>ucs		. #x20375)	; 𠍵
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (=daikanwa		. 01121)	; &M-01121;
-    (mojikyo		. 001121)	; &MCS-60000461;
+    (=ucs		. #x20374)	; 𠍴
+    (->subsumptive
+     ((hanyu-dazidian	  1 216 10)
+      (=daikanwa	  . 01120)	; &M-01120;
+      (=hanziku-1	  . #xD2CD)	; &I-HZK01-D2CD;
+      (=ucs@iso		  . #x20374)	; &M-01120;
+      (mojikyo		  . 001120)	; &MCS-60000460;
+      )
+     ((=cns11643-6	  . #x5A69)	; &C6-5A69; [58-73]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	1121 0 1)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 11)
-    (total-strokes	 . 13)
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes@ucs . 12)
+    (total-strokes@ucs	     . 14)
+    (ideographic-strokes@ucs*sources
+     daikanwa ucs)
+    (ideographic-strokes@cns . 11)
+    (total-strokes@cns	     . 13)
     (hanyu-dazidian	1 221 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -25870,30 +26384,45 @@
       ))
     (=ucs		. #x20375)	; 𠍵
     (=cns11643-5	. #x3D62)	; &I-C5-3D62; [29-66]
+    (=daikanwa		. 01121)	; &I-M-01121;
     (=hanziku-1		. #xD3CC)	; &I-HZK01-D3CC;
+    (mojikyo		. 001121)	; &MCS-60000461;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
     (hanyu-dazidian	1 222 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x50E9)	; 僩
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=daikanwa	    . 41248)	; &M-41248;
+	))
+      (=daikanwa	  . 01122)	; &M-01122;
       )
-     ((=ucs		  . #x9592)	; 閒
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=ks-x1001	    . #x7959)	; &C1-6267; [89-57]
+	(=cns11643-1	    . #x6267)	; &I-C1-6267; [66-71]
+	))
+      (shinjigen-1	  . 388)
+      (=jis-x0212	  . #x3243)	; &JX2-217D; [18-35]
+      (=cns11643-1	  . #x677D)	; &I-C1-677D; [71-93]
+      (=jis-x0213-2-2000  . #x217D)	; &I-JX2-217D; [01-93]
+      (=big5		  . #xB9B7)	; &I-B-B9B7;
+      (=jef-china3	  . #x43B8)	; &I-JC3-43B8;
+      (=ucs@unicode	  . #x50E9)	; &JX2-217D;
+      (mojikyo		  . 001122)	; &MCS-60000462;
       ))
-    (shinjigen-1	. 388)
-    (=ucs		. #x50E9)	; 僩
-    (=jis-x0212		. #x3243)	; &I-JSP-3243; [18-35]
-    (=cns11643-1	. #x677D)	; &I-C1-677D; [71-93]
-    (=jis-x0213-2-2000	. #x217D)	; &I-JX2-217D; [01-93]
-    (=big5		. #xB9B7)	; &I-B-B9B7;
-    (=daikanwa		. 01122)	; &I-M-01122;
-    (=jef-china3	. #x43B8)	; &I-JC3-43B8;
-    (mojikyo		. 001122)	; &MCS-60000462;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -25901,7 +26430,15 @@
     (total-strokes	 . 14)
     (hanyu-dazidian	1 223 3)
     (=ucs		. #x50EA)	; 僪
-    (=big5		. #xE0F6)	; &I-B-E0F6;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x50EA)	; 僪
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (=big5		. #xE0F6)	; &B-E0F6;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -25926,43 +26463,40 @@
 	))
       (=cns11643-2	  . #x487C)	; &C2-487C; [40-92]
       (=ucs@cns		  . #x50EA)	; &C2-487C;
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=ucs@unicode	    . #x77DE)	; &EGB-7D75;
-	))
-      (=ucs@unicode	  . #x50EA)	; &UU+50EA;
       ))
     ))
 (define-char
-  '((ideographic-radical . 9)	; ⼈
+  '((<-denotational
+     ((=ucs		  . #x50EA)	; 僪
+      ))
+    (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 217 15)
     (ideographic-structure
-     (:cdp-combinator	4)
-     ((=ucs		  . #x4EBB)	; 亻
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=big5-cdp	  . #x88E1)	; &CDP-88E1;
+     ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=big5-cdp	  . #x8C40)	; &CDP-8C40;
+     ((=iso-ir165	  . #x7D75)	; &EGB-7D75; [93-85]
       ))
-    (=ucs		. #x20376)	; 𠍶
-    (=daikanwa		. 01124)	; &I-M-01124;
-    (=hanziku-1		. #xD2F2)	; &I-HZK01-D2F2;
-    (mojikyo		. 001124)	; &MCS-60000464;
+    (=ucs@unicode	. #x50EA)	; &UU+50EA;
     ))
 (define-char
-  '((=>ucs		. #x20376)	; 𠍶
-    (morohashi-daikanwa	1124 0 1)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (=cns11643-6	. #x5A6B)	; &C6-5A6B; [58-75]
+    (=ucs		. #x20376)	; 𠍶
+    (->subsumptive
+     ((hanyu-dazidian	  1 217 15)
+      (=daikanwa	  . 01124)	; &M-01124;
+      (=hanziku-1	  . #xD2F2)	; &I-HZK01-D2F2;
+      (mojikyo		  . 001124)	; &MCS-60000464;
+      )
+     ((=ucs@iso		  . #x20376)	; &U-00020376;
+      )
+     ((=cns11643-6	  . #x5A6B)	; &C6-5A6B; [58-75]
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -26017,45 +26551,51 @@
     (mojikyo		. 001126)	; &MCS-60000466;
     ))
 (define-char
-  '((=>ucs		. #x50EC)	; 僬
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x50EC)	; 僬
+    (=big5		. #xE0FA)	; &I-B-E0FA;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x3E47)	; &GT-24496; [30-39]
+	(=ks-x1001	    . #x7525)	; &I-K0-7525; [85-05]
+	(=daikanwa	    . 19119)	; &I-M-19119;
+	))
+      (=daikanwa	  . 01127)	; &M-01127;
+      (mojikyo		  . 001127)	; &MCS-60000467;
       )
-     ((=jis-x0208	  . #x3E47)	; &GT-24496; [30-39]
-      (=ks-x1001	  . #x7525)	; &I-K0-7525; [85-05]
-      (=daikanwa	  . 19119)	; &I-M-19119;
+     ((hanyu-dazidian	  1 220 7)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x3D39)	; &C1-6050; [29-25]
+	(=cns11643-1	    . #x6050)	; &I-C1-6050; [64-48]
+	))
+      (=gb2312		  . #x5955)	; &C2-4922; [57-53]
+      (=cns11643-2	  . #x4922)	; &I-C2-4922; [41-02]
+      (=ucs@unicode	  . #x50EC)	; &C2-4922;
       ))
-    (=big5		. #xE0FA)	; &M-01127;
-    (=daikanwa		. 01127)	; &I-M-01127;
-    (=ucs@big5		. #x50EC)	; &M-01127;
-    (mojikyo		. 001127)	; &MCS-60000467;
     ))
 (define-char
-  '((morohashi-daikanwa	1127 0 1)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 220 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x7126)	; 焦
-      ))
-    (=ucs		. #x50EC)	; 僬
-    (=gb2312		. #x5955)	; &I-G0-5955; [57-53]
-    (=cns11643-2	. #x4922)	; &I-C2-4922; [41-02]
+    (hanyu-dazidian	1 218 5)
+    (=ucs		. #x50ED)	; 僭
     ))
 (define-char
-  '((=>ucs		. #x50ED)	; 僭
+  '((<-denotational
+     ((=ucs		  . #x50ED)	; 僭
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
@@ -26077,24 +26617,37 @@
     (mojikyo		. 001128)	; &MCS-60000468;
     ))
 (define-char
-  '((morohashi-daikanwa	1128 0 2)
+  '((<-denotational
+     ((=ucs		  . #x50ED)	; 僭
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 218 5)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=big5		. #xB9B0)	; &B-B9B0;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=ucs@unicode	    . #x6701)	; &UU+6701;
+	))
+      (=gb2312		  . #x5954)	; &G0-5954; [57-52]
+      (=ucs@unicode	  . #x50ED)	; &G0-5954;
       )
-     ((=ucs		  . #x4EBB)	; 亻
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-2	    . #x3C4C)	; &C2-3C4C; [28-44]
+	))
+      (=cns11643-1	  . #x6776)	; &C1-6776; [71-86]
       )
-     ((=ucs		  . #x6701)	; 朁
+     ((=ks-x1001	  . #x7350)	; &K0-7350; [83-48]
       ))
-    (=ucs		. #x50ED)	; 僭
-    (=gb2312		. #x5954)	; &I-G0-5954; [57-52]
-    (=ks-x1001		. #x7350)	; &I-K0-7350; [83-48]
-    (=cns11643-1	. #x6776)	; &I-C1-6776; [71-86]
-    (=big5		. #xB9B0)	; &I-B-B9B0;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -26216,7 +26769,6 @@
       (=gt-pj-1		  . #x512A)	; &I-GT-01474; [49-10]
       (=daikanwa	  . 01132)	; &I-M-01132;
       (=ucs@jis		  . #x50EE)	; &GT-01474;
-      (=ucs@big5	  . #x50EE)	; &GT-01474;
       (mojikyo		  . 001132)	; &MCS-6000046C;
       )
      ((hanyu-dazidian	  1 221 4)
@@ -26226,7 +26778,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x7AE5)	; &C1-6129;
+       ((=gb2312	    . #x4D2F)	; &C1-6129; [45-15]
+	(=cns11643-1	    . #x6129)	; &I-C1-6129; [65-09]
 	))
       (=gb2312		  . #x5957)	; &C1-6773; [57-55]
       (=cns11643-1	  . #x6773)	; &I-C1-6773; [71-83]
@@ -26256,7 +26809,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x7CA6)	; &CDP-8CB9;
+       ((=iso-ir165	    . #x2F7B)	; &CDP-8CB9; [15-91]
+	(=daikanwa	    . 26939)	; &I-M-26939;
 	))
       (=big5		  . #xE0FC)	; &M-01133;
       (=daikanwa	  . 01133)	; &I-M-01133;
@@ -27007,7 +27561,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x7C9F)	; &GT-34709;
+       ((=jis-x0208	    . #x3040)	; &GT-34709; [16-32]
+	(=gb2312	    . #x4B5A)	; &I-G0-4B5A; [43-58]
+	(=ks-x1001	    . #x6158)	; &I-K0-6158; [65-56]
+	(=daikanwa	    . 26922)	; &I-M-26922;
 	))
       (=gb2312		  . #x4B5B)	; &JX2-2176; [43-59]
       (=jis-x0213-2-2000  . #x2176)	; &I-JX2-2176; [01-86]
@@ -27194,6 +27751,7 @@
     (total-strokes	 . 15)
     (hanyu-dazidian	1 223 14)
     (=ucs		. #x50F8)	; 僸
+    (=big5		. #xE4E9)	; &I-B-E4E9;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -27214,11 +27772,12 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x7981)	; &GT-31785;
+       ((=jis-x0208	    . #x3658)	; &GT-31785; [22-56]
+	(=gb2312	    . #x3D7B)	; &I-G0-3D7B; [29-91]
+	(=ks-x1001	    . #x5057)	; &I-K0-5057; [48-55]
 	))
-      (=big5		  . #xE4E9)	; &B-E4E9;
-      (=ucs@unicode	  . #x50F8)	; &B-E4E9;
-      (mojikyo		  . 001161)	; &MCS-60000489;
+      (=ucs@unicode	  . #x50F8)	; &UU+50F8;
+      (mojikyo		  . 001161)	; &UU+50F8;
       ))
     ))
 (define-char
@@ -27226,14 +27785,6 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
     (hanyu-dazidian	1 225 12)
-    (ideographic-structure
-     (:cdp-combinator	4)
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x592D)	; 夭
-      )
-     ((=ucs		  . #x97ED)	; 韭
-      ))
     (=ucs		. #x203B7)	; 𠎷
     (=cns11643-4	. #x487E)	; &I-C4-487E; [40-94]
     (=daikanwa		. 01162)	; &I-M-01162;
@@ -27267,8 +27818,7 @@
     (mojikyo		. 001163)	; &MCS-6000048B;
     ))
 (define-char
-  '((=>daikanwa		. 01164)	; &M-01164;
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
     (=ucs		. #x3491)	; 㒑
@@ -27313,7 +27863,9 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x55BF)	; &M-04029;
+       ((=jis-x0212	    . #x3575)	; &M-04029; [21-85]
+	(=jis-x0213-2-2000  . #x2433)	; &I-JX2-2433; [04-19]
+	(=daikanwa	    . 04029)	; &I-M-04029;
 	))
       (=jis-x0212	  . #x3247)	; &M-01165; [18-39]
       (=daikanwa	  . 01165)	; &I-M-01165;
@@ -27335,48 +27887,45 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x50FB)	; 僻
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=jis-x0208	  . #x6D64)	; &GT-51571; [77-68]
-      (=daikanwa	  . 38642)	; &I-M-38642;
-      ))
-    (shinjigen-1	. 419)
-    (shinjigen-2	. 419)
-    (=jis-x0208		. #x4A48)	; &GT-01554; [42-40]
-    (=ks-x1001		. #x5B78)	; &I-K0-5B78; [59-88]
+    (=ucs		. #x50FB)	; 僻
     (=big5		. #xBBF7)	; &I-B-BBF7;
-    (=gt		. 01554)	; &I-GT-01554;
-    (=gt-pj-1		. #x4A48)	; &I-GT-01554; [42-40]
-    (=daikanwa		. 01166)	; &I-M-01166;
-    (=ucs@jis		. #x50FB)	; &GT-01554;
-    (=ucs@big5		. #x50FB)	; &GT-01554;
-    (mojikyo		. 001166)	; &MCS-6000048E;
-    ))
-(define-char
-  '((morohashi-daikanwa	1166 0 0)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 13)
-    (total-strokes	 . 15)
-    (hanyu-dazidian	1 229 5)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x6D64)	; &GT-51571; [77-68]
+	(=daikanwa	    . 38642)	; &I-M-38642;
+	))
+      (shinjigen-1	  . 419)
+      (shinjigen-2	  . 419)
+      (=jis-x0208	  . #x4A48)	; &GT-01554; [42-40]
+      (=ks-x1001	  . #x5B78)	; &I-K0-5B78; [59-88]
+      (=gt		  . 01554)	; &I-GT-01554;
+      (=gt-pj-1		  . #x4A48)	; &I-GT-01554; [42-40]
+      (=daikanwa	  . 01166)	; &I-M-01166;
+      (=ucs@jis		  . #x50FB)	; &GT-01554;
+      (mojikyo		  . 001166)	; &MCS-6000048E;
       )
-     ((=ucs		  . #x8F9F)	; 辟
+     ((hanyu-dazidian	  1 229 5)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb2312	    . #x3159)	; &C1-6728; [17-57]
+	(=cns11643-1	    . #x6728)	; &I-C1-6728; [71-08]
+	))
+      (=gb2312		  . #x4627)	; &C1-6C22; [38-07]
+      (=cns11643-1	  . #x6C22)	; &I-C1-6C22; [76-02]
+      (=ucs@unicode	  . #x50FB)	; &C1-6C22;
       ))
-    (=ucs		. #x50FB)	; 僻
-    (=gb2312		. #x4627)	; &I-G0-4627; [38-07]
-    (=cns11643-1	. #x6C22)	; &I-C1-6C22; [76-02]
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -27578,7 +28127,9 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x696D)	; &GT-19258;
+       ((=jis-x0208	    . #x3648)	; &GT-19258; [22-40]
+	(=ks-x1001	    . #x6576)	; &I-K0-6576; [69-86]
+	(=daikanwa	    . 15170)	; &I-M-15170;
 	))
       (=jis-x0213-2-2000  . #x217E)	; &M-01173; [01-94]
       (=daikanwa	  . 01173)	; &I-M-01173;
@@ -27923,67 +28474,80 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
     (=ucs		. #x203BB)	; 𠎻
-    (->subsumptive
-     ((hanyu-dazidian	  1 226 3)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=jis-x0208@1978    . #x465B)	; &M-38982; [38-59]
-	(=ks-x1001	    . #x546D)	; &I-K0-546D; [52-77]
-	(=daikanwa	    . 38982)	; &I-M-38982;
-	))
-      (=daikanwa	  . 01182)	; &M-01182;
-      (=hanziku-1	  . #xD4CC)	; &I-HZK01-D4CC;
-      (mojikyo		  . 001182)	; &MCS-6000049E;
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=cns11643-1	    . #x6738)	; &C1-6738; [71-24]
-	))
-      (=cns11643-7	  . #x2131)	; &C7-2131; [01-17]
-      (=ucs@iso		  . #x203BB)	; &C7-2131;
-      ))
     ))
 (define-char
-  '((=>ucs		. #x203BC)	; 𠎼
+  '((<-denotational
+     ((=ucs		  . #x203BB)	; 𠎻
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
+    (hanyu-dazidian	1 226 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x527D)	; 剽
+     ((=jis-x0208@1978	  . #x465B)	; &M-38982; [38-59]
+      (=ks-x1001	  . #x546D)	; &I-K0-546D; [52-77]
+      (=daikanwa	  . 38982)	; &I-M-38982;
       ))
-    (=cns11643-7	. #x2129)	; &M-01183; [01-09]
-    (=daikanwa		. 01183)	; &I-M-01183;
+    (=daikanwa		. 01182)	; &M-01182;
+    (=hanziku-1		. #xD4CC)	; &I-HZK01-D4CC;
+    (mojikyo		. 001182)	; &MCS-6000049E;
     ))
 (define-char
-  '((morohashi-daikanwa	1183 0 1)
+  '((<-denotational
+     ((=ucs		  . #x203BB)	; 𠎻
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
-    (hanyu-dazidian	1 224 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x527D)	; 剽
+     ((=cns11643-1	  . #x6738)	; &C1-6738; [71-24]
       ))
+    (=cns11643-7	. #x2131)	; &C7-2131; [01-17]
+    (=ucs@iso		. #x203BB)	; &C7-2131;
+    ))
+(define-char
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 13)
+    (total-strokes	 . 15)
     (=ucs		. #x203BC)	; 𠎼
-    (=hanziku-1		. #xD46B)	; &I-HZK01-D46B;
-    (mojikyo		. 001183)	; &MCS-6000049F;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-1	    . #x6338)	; &M-02160; [67-24]
+	(=daikanwa	    . 02160)	; &I-M-02160;
+	))
+      (=cns11643-7	  . #x2129)	; &M-01183; [01-09]
+      (=daikanwa	  . 01183)	; &I-M-01183;
+      )
+     ((hanyu-dazidian	  1 224 4)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x5177)	; &GT-02792; [49-87]
+	(=gb2312	    . #x5862)	; &I-G0-5862; [56-66]
+	(=ks-x1001	    . #x7872)	; &I-K0-7872; [88-82]
+	))
+      (=hanziku-1	  . #xD46B)	; &HZK01-D46B;
+      (=ucs@unicode	  . #x203BC)	; &HZK01-D46B;
+      (mojikyo		  . 001183)	; &MCS-6000049F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -28016,7 +28580,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x7162)	; &GT-24581;
+       ((=jis-x0208	    . #x5F69)	; &GT-24581; [63-73]
 	))
       (=hanziku-1	  . #xD56C)	; &HZK01-D56C;
       (=ucs@iso		  . #x203BD)	; &HZK01-D56C;
@@ -29684,7 +30248,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x76E3)	; &UU+76E3;
+       ((=gb12345	    . #x3C60)	; &UU+76E3; [28-64]
 	))
       (=hanziku-1	  . #xD5B1)	; &HZK01-D5B1;
       (=ucs@unicode	  . #x5116)	; &HZK01-D5B1;
@@ -29748,20 +30312,34 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
-    (hanyu-dazidian	1 231 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
+    (=ucs		. #x349C)	; 㒜
+    (->subsumptive
+     ((hanyu-dazidian	  1 231 4)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x6750)	; &GT-39084; [71-48]
+	(=ks-x1001	    . #x6628)	; &I-K0-6628; [70-08]
+	(=daikanwa	    . 30212)	; &I-M-30212;
+	))
+      (=daikanwa	  . 01232)	; &M-01232;
+      (=hanziku-1	  . #xD5D0)	; &I-HZK01-D5D0;
+      (=ucs@unicode	  . #x349C)	; &M-01232;
       )
-     ((=cns11643-1	  . #x6A58)	; &C1-6A58; [74-56]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-1	    . #x6A58)	; &C1-6A58; [74-56]
+	))
+      (=cns11643-4	  . #x4F5B)	; &C4-4F5B; [47-59]
+      (mojikyo		  . 001232)	; &MCS-600004D0;
       ))
-    (=ucs		. #x349C)	; 㒜
-    (=cns11643-4	. #x4F5B)	; &I-C4-4F5B; [47-59]
-    (=daikanwa		. 01232)	; &I-M-01232;
-    (=hanziku-1		. #xD5D0)	; &I-HZK01-D5D0;
-    (mojikyo		. 001232)	; &MCS-600004D0;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -29776,7 +30354,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x7591)	; &UU+7591;
+       ((=jis-x0208	    . #x353F)	; &GT-28247; [21-31]
+	(=gb2312	    . #x5249)	; &I-G0-5249; [50-41]
+	(=ks-x1001	    . #x6B77)	; &I-K0-6B77; [75-87]
+	(=daikanwa	    . 22007)	; &I-M-22007;
 	))
       (=jis-x0212	  . #x3253)	; &M-01233; [18-51]
       (=jis-x0213-2-2000  . #x2323)	; &I-JX2-2323; [03-03]
@@ -29866,7 +30447,8 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x9063)	; &UU+9063;
+     ((=jis-x0208	  . #x382F)	; &GT-52327; [24-15]
+      (=gb2312		  . #x4732)	; &I-G0-4732; [39-18]
       ))
     (=ucs@unicode	. #x5119)	; &UU+5119;
     ))
@@ -29953,7 +30535,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x821E)	; &M-30342;
+       ((=gb2312	    . #x4E68)	; &M-30342; [46-72]
+	(=daikanwa	    . 30342)	; &I-M-30342;
 	))
       (=daikanwa	  . 01237)	; &M-01237;
       (=hanziku-1	  . #xD5CF)	; &I-HZK01-D5CF;
@@ -30491,24 +31074,36 @@
     (mojikyo		. 001249)	; &MCS-600004E1;
     ))
 (define-char
-  '((=>ucs		. #x20409)	; 𠐉
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 15)
-    (total-strokes	 . 17)
-    (=daikanwa		. 01250)	; &M-01250;
-    (mojikyo		. 001250)	; &MCS-600004E2;
+  '((ideographic-radical . 9)	; ⼈
+    (=ucs		. #x20409)	; 𠐉
     ))
 (define-char
-  '((=>ucs		. #x20409)	; 𠐉
-    (morohashi-daikanwa	1250 0 0)
+  '((<-denotational
+     ((=ucs		  . #x20409)	; 𠐉
+      ))
     (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 13)
-    (total-strokes	 . 15)
-    (hanyu-dazidian	1 235 5)
-    (=hanziku-1		. #xD6B4)	; &HZK01-D6B4;
+    (ideographic-strokes . 15)
+    (total-strokes	 . 17)
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=daikanwa	    . 26243)	; &M-26243;
+	))
+      (=daikanwa	  . 01250)	; &M-01250;
+      (mojikyo		  . 001250)	; &MCS-600004E2;
+      )
+     ((hanyu-dazidian	  1 235 5)
+      (=hanziku-1	  . #xD6B4)	; &HZK01-D6B4;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	1250 0 2)
+  '((<-denotational
+     ((=ucs		  . #x20409)	; 𠐉
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
@@ -30520,31 +31115,44 @@
       )
      ((=ucs		  . #x7BC0)	; 節
       ))
-    (=ucs		. #x20409)	; 𠐉
-    (=cns11643-5	. #x4B76)	; &I-C5-4B76; [43-86]
+    (=cns11643-5	. #x4B76)	; &C5-4B76; [43-86]
+    (=ucs@iso		. #x20409)	; &C5-4B76;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
     (hanyu-dazidian	1 233 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x616E)	; 慮
-      ))
     (=ucs		. #x5122)	; 儢
-    (=cns11643-2	. #x5C47)	; &I-C2-5C47; [60-39]
     (=big5		. #xECBB)	; &I-B-ECBB;
-    (=daikanwa		. 01251)	; &I-M-01251;
-    (mojikyo		. 001251)	; &MCS-600004E3;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x4E38)	; &GT-14186; [46-24]
+	(=ks-x1001	    . #x5567)	; &I-K0-5567; [53-71]
+	(=daikanwa	    . 11132)	; &I-M-11132;
+	))
+      (=daikanwa	  . 01251)	; &M-01251;
+      (=ucs@unicode	  . #x5122)	; &M-01251;
+      (mojikyo		  . 001251)	; &MCS-600004E3;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-1	    . #x6C65)	; &C1-6C65; [76-69]
+	))
+      (=cns11643-2	  . #x5C47)	; &C2-5C47; [60-39]
+      ))
     ))
 (define-char
-  '((=>daikanwa		. 01252)	; &M-01252;
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (=ucs		. #x349E)	; 㒞
     (->subsumptive
      ((ideographic-strokes . 15)
@@ -30635,7 +31243,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x5EE3)	; &UU+5EE3;
+       ((=gb12345	    . #x3963)	; &UU+5EE3; [25-67]
 	))
       (=ucs@unicode	  . #x5123)	; &UU+5123;
       ))
@@ -30894,7 +31502,9 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x7F77)	; &GT-36491;
+       ((=jis-x0208	    . #x486D)	; &GT-36491; [40-77]
+	(=ks-x1001	    . #x7773)	; &I-K0-7773; [87-83]
+	(=daikanwa	    . 28336)	; &I-M-28336;
 	))
       (=daikanwa	  . 01263)	; &M-01263;
       (=hanziku-1	  . #xD6B2)	; &I-HZK01-D6B2;
@@ -30951,26 +31561,58 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
+    (=ucs		. #x2040E)	; 𠐎
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2040E)	; 𠐎
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 15)
+    (total-strokes	 . 17)
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-1	    . #x6E58)	; &M-31784; [78-56]
+	(=daikanwa	    . 31784)	; &I-M-31784;
+	))
+      (=cns11643-7	  . #x3676)	; &M-01265; [22-86]
+      (=daikanwa	  . 01265)	; &I-M-01265;
+      (=ucs@iso		  . #x2040E)	; &M-01265;
+      )
+     ((mojikyo		  . 001265)	; &MCS-600004F1;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2040E)	; 𠐎
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 15)
+    (total-strokes	 . 17)
     (hanyu-dazidian	1 233 2)
+    (=hanziku-1		. #xD64F)	; &HZK01-D64F;
+    ))
+(define-char
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 15)
+    (total-strokes	 . 17)
+    (hanyu-dazidian	1 235 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x8513)	; 蔓
+     ((=ucs		  . #x563C)	; 嘼
       ))
-    (=ucs		. #x2040E)	; 𠐎
-    (=cns11643-7	. #x3676)	; &I-C7-3676; [22-86]
-    (=daikanwa		. 01265)	; &I-M-01265;
-    (=hanziku-1		. #xD64F)	; &I-HZK01-D64F;
-    (mojikyo		. 001265)	; &MCS-600004F1;
-    ))
-(define-char
-  '((ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 15)
-    (total-strokes	 . 17)
-    (=daikanwa		. 01266)	; &M-01266;
+    (=ucs		. #x20420)	; 𠐠
+    (=daikanwa		. 01266)	; &I-M-01266;
+    (=hanziku-1		. #xD6B0)	; &I-HZK01-D6B0;
     (mojikyo		. 001266)	; &MCS-600004F2;
     ))
 (define-char
@@ -31059,7 +31701,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x8F29)	; &UU+8F29;
+       ((=gb12345	    . #x3132)	; &UU+8F29; [17-18]
 	))
       (=hanziku-1	  . #xD654)	; &HZK01-D654;
       )
@@ -31392,22 +32034,6 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
-    (hanyu-dazidian	1 235 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x563C)	; 嘼
-      ))
-    (=ucs		. #x20420)	; 𠐠
-    (=hanziku-1		. #xD6B0)	; &I-HZK01-D6B0;
-    ))
-(define-char
-  '((ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 15)
-    (total-strokes	 . 17)
     (hanyu-dazidian-vol	 . 1)
     (hanyu-dazidian-page . 233)
     (hanyu-dazidian-char . 5)
@@ -31691,7 +32317,14 @@
     (=hanziku-1		. #xD6F1)	; &I-HZK01-D6F1;
     ))
 (define-char
-  '((=>ucs		. #x5130)	; 儰
+  '((ideographic-radical . 9)	; ⼈
+    (=ucs		. #x5130)	; 儰
+    (=big5		. #xE4E8)	; &I-B-E4E8;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5130)	; 儰
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 16)
     (total-strokes	 . 18)
@@ -31707,10 +32340,29 @@
     (mojikyo		. 001280)	; &MCS-60000500;
     ))
 (define-char
-  '((morohashi-daikanwa	1280 0 2)
+  '((<-denotational
+     ((=ucs		  . #x5130)	; 儰
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 15)
+    (total-strokes	 . 17)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x4EBB)	; 亻
+      )
+     ((=ks-x1001	  . #x6A59)	; &JSP-5940; [74-57]
+      (=jis-x0212	  . #x5940)	; &I-JSP-5940; [57-32]
+      ))
+    (=ucs@unicode	. #x5130)	; &UU+5130;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5130)	; 儰
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 13)
-    (kangxi-strokes	 . 12)
     (total-strokes	 . 15)
     (hanyu-dazidian	1 236 4)
     (ideographic-structure
@@ -31719,31 +32371,53 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs		  . #x848D)	; 蒍
+     ((=cns11643-2	  . #x4654)	; &C2-4654; [38-52]
       ))
-    (=ucs		. #x5130)	; 儰
-    (=cns11643-2	. #x4F50)	; &I-C2-4F50; [47-48]
-    (=big5		. #xE4E8)	; &I-B-E4E8;
+    (=cns11643-2	. #x4F50)	; &C2-4F50; [47-48]
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 16)
     (total-strokes	 . 18)
     (hanyu-dazidian	1 237 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x5131)	; 儱
+    (=big5		. #xEFB7)	; &I-B-EFB7;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x4E36)	; &GT-66672; [46-22]
+	(=ks-x1001	    . #x5723)	; &I-K0-5723; [55-03]
+	(=daikanwa	    . 48818)	; &I-M-48818;
+	))
+      (=jis-x0212	  . #x325F)	; &M-01281; [18-63]
+      (=daikanwa	  . 01281)	; &I-M-01281;
+      (=ucs@jis		  . #x5131)	; &M-01281;
+      (mojikyo		  . 001281)	; &MCS-60000501;
       )
-     ((=ucs		  . #x4EBB)	; 亻
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=gb12345	    . #x417A)	; &UU+9F8D; [33-90]
+	))
+      (=ucs@unicode	  . #x5131)	; &UU+5131;
       )
-     ((=ucs		  . #x9F8D)	; 龍
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-1	    . #x733E)	; &C1-733E; [83-30]
+	))
+      (=cns11643-2	  . #x6143)	; &C2-6143; [65-35]
       ))
-    (=ucs		. #x5131)	; 儱
-    (=jis-x0212		. #x325F)	; &I-JSP-325F; [18-63]
-    (=cns11643-2	. #x6143)	; &I-C2-6143; [65-35]
-    (=big5		. #xEFB7)	; &I-B-EFB7;
-    (=daikanwa		. 01281)	; &I-M-01281;
-    (mojikyo		. 001281)	; &MCS-60000501;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -31820,7 +32494,8 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x77A2)	; &JX2-7230;
+     ((=gb2312		  . #x5E2B)	; &JX2-7230; [62-11]
+      (=jis-x0213-2-2000  . #x7230)	; &I-JX2-7230; [82-16]
       ))
     (=cbeta		. 04186)	; &CB04186;
     ))
@@ -31882,7 +32557,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x8AF8)	; &UU+8AF8;
+       ((=ucs@unicode	    . #x8AF8)	; &C1-6E7A;
 	))
       (=cns11643-1	  . #x7343)	; &C1-7343; [83-35]
       (=gb12345		  . #x3422)	; &C1-7343; [20-02]
@@ -31937,7 +32612,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x983B)	; &C1-7322;
+       ((=cns11643-1	    . #x7322)	; &C1-7322; [83-02]
 	))
       (=cns11643-5	  . #x6132)	; &HZK01-D6D6; [65-18]
       (=hanziku-1	  . #xD6D6)	; &I-HZK01-D6D6;
@@ -32244,9 +32919,10 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x501B)	; 倛
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
       )
-     ((=ucs		  . #x9801)	; 頁
+     ((=ucs		  . #x4ACF)	; 䫏
       ))
     (=ucs		. #x2043E)	; 𠐾
     (=cns11643-5	. #x674D)	; &I-C5-674D; [71-45]
@@ -32267,7 +32943,10 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x6BDA)	; &UU+6BDA;
+       ((=jis-x0212	    . #x4639)	; &M-16767; [38-25]
+	(=iso-ir165	    . #x7A3B)	; &I-EGB-7A3B; [90-27]
+	(=jis-x0213-2-2000  . #x6E29)	; &I-JX2-6E29; [78-09]
+	(=daikanwa	    . 16767)	; &I-M-16767;
 	))
       (=jis-x0212	  . #x3260)	; &M-01296; [18-64]
       (=big5		  . #xC35F)	; &I-B-C35F;
@@ -32315,7 +32994,8 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x8944)	; &UU+8944;
+       ((=gb2312	    . #x4F65)	; &C1-7543; [47-69]
+	(=cns11643-1	    . #x7543)	; &I-C1-7543; [85-35]
 	))
       (=cns11643-2	  . #x6537)	; &C2-6537; [69-23]
       (=ucs@unicode	  . #x5134)	; &C2-6537;
@@ -32371,7 +33051,9 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=ucs@unicode	  . #x85A8)	; &UU+85A8;
+     ((=jis-x0208	  . #x692A)	; &GT-42689; [73-10]
+      (=gb2312		  . #x5E30)	; &I-G0-5E30; [62-16]
+      (=ks-x1001	  . #x7D3C)	; &I-K0-7D3C; [93-28]
       ))
     (=hanziku-1		. #xD6F7)	; &HZK01-D6F7;
     ))
@@ -32686,7 +33368,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x8076)	; &UU+8076;
+       ((=gb12345	    . #x4474)	; &UU+8076; [36-84]
 	))
       (=hanziku-1	  . #xD757)	; &HZK01-D757;
       (=ucs@unicode	  . #x34A4)	; &HZK01-D757;
@@ -32698,6 +33380,14 @@
     (ideographic-strokes . 18)
     (total-strokes	 . 20)
     (=ucs		. #x5136)	; 儶
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5136)	; 儶
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 18)
+    (total-strokes	 . 20)
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -32721,19 +33411,26 @@
 	))
       (=cns11643-3	  . #x5C32)	; &C3-5C32; [60-18]
       (=ucs@cns		  . #x5136)	; &C3-5C32;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5136)	; 儶
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 18)
+    (total-strokes	 . 20)
+    (hanyu-dazidian	1 238 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((hanyu-dazidian	  1 238 11)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=ucs@unicode	    . #x5DC2)	; &EGB-7B22;
-	))
-      (=hanziku-1	  . #xD75B)	; &HZK01-D75B;
-      (=ucs@unicode	  . #x5136)	; &HZK01-D75B;
+     ((=ucs		  . #x4EBB)	; 亻
+      )
+     ((=iso-ir165	  . #x7B22)	; &EGB-7B22; [91-02]
       ))
+    (=hanziku-1		. #xD75B)	; &HZK01-D75B;
+    (=ucs@unicode	. #x5136)	; &HZK01-D75B;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -32966,7 +33663,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x9E97)	; &UU+9E97;
+       ((=gb12345	    . #x4076)	; &UU+9E97; [32-86]
 	))
       (=gb12345		  . #x5933)	; &UU+5137; [57-19]
       (=ucs@unicode	  . #x5137)	; &UU+5137;
@@ -32987,8 +33684,26 @@
     (ideographic-strokes . 19)
     (total-strokes	 . 21)
     (=ucs		. #x34A7)	; 㒧
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x34A7)	; 㒧
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 19)
+    (total-strokes	 . 21)
     (->subsumptive
-     ((=daikanwa	  . 01312)	; &M-01312;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x4E25)	; &GT-56604; [46-05]
+	(=ks-x1001	    . #x576E)	; &I-K0-576E; [55-78]
+	(=daikanwa	    . 42140)	; &I-M-42140;
+	))
+      (=daikanwa	  . 01312)	; &M-01312;
       (=cbeta		  . 04184)	; &I-CB04184;
       (mojikyo		  . 001312)	; &MCS-60000520;
       )
@@ -33003,20 +33718,12 @@
 	))
       (=hanziku-1	  . #xD779)	; &HZK01-D779;
       (=ucs@unicode	  . #x34A7)	; &HZK01-D779;
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x4EBB)	; 亻
-	)
-       ((=cns11643-1	    . #x7762)	; &C1-7762; [87-66]
-	))
-      (=cns11643-7	  . #x5274)	; &C7-5274; [50-84]
       ))
     ))
 (define-char
-  '((=>ucs		. #x5138)	; 儸
+  '((<-denotational
+     ((=ucs		  . #x34A7)	; 㒧
+      ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 19)
     (total-strokes	 . 21)
@@ -33026,51 +33733,51 @@
       )
      ((=ucs		  . #x4EBB)	; 亻
       )
-     ((=jis-x0208	  . #x4D65)	; &GT-36564; [45-69]
-      (=ks-x1001	  . #x547E)	; &I-K0-547E; [52-94]
-      (=daikanwa	  . 28397)	; &I-M-28397;
+     ((=cns11643-1	  . #x7762)	; &C1-7762; [87-66]
       ))
-    (=jis-x0212		. #x3263)	; &M-01313; [18-67]
-    (=daikanwa		. 01313)	; &I-M-01313;
-    (=jef-china3	. #x43CA)	; &I-JC3-43CA;
-    (=ucs@jis		. #x5138)	; &M-01313;
-    (mojikyo		. 001313)	; &MCS-60000521;
+    (=cns11643-7	. #x5274)	; &C7-5274; [50-84]
     ))
 (define-char
-  '((morohashi-daikanwa	1313 0 1)
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 19)
     (total-strokes	 . 21)
-    (hanyu-dazidian	1 239 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x7F85)	; 羅
-      ))
     (=ucs		. #x5138)	; 儸
-    (=cns11643-1	. #x7A63)	; &I-C1-7A63; [90-67]
     (=big5		. #xC4D8)	; &I-B-C4D8;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208	    . #x4D65)	; &GT-36564; [45-69]
+	(=ks-x1001	    . #x547E)	; &I-K0-547E; [52-94]
+	(=daikanwa	    . 28397)	; &I-M-28397;
+	))
+      (=jis-x0212	  . #x3263)	; &M-01313; [18-67]
+      (=daikanwa	  . 01313)	; &I-M-01313;
+      (=jef-china3	  . #x43CA)	; &I-JC3-43CA;
+      (=ucs@jis		  . #x5138)	; &M-01313;
+      (mojikyo		  . 001313)	; &MCS-60000521;
+      )
+     ((hanyu-dazidian	  1 239 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=cns11643-1	    . #x7865)	; &C1-7865; [88-69]
+	))
+      (=cns11643-1	  . #x7A63)	; &C1-7A63; [90-67]
+      (=ucs@unicode	  . #x5138)	; &C1-7A63;
+      ))
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 19)
     (total-strokes	 . 21)
     (hanyu-dazidian	1 239 6)
-    (ideographic-structure
-     (:cdp-combinator	4)
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=big5-cdp	  . #x8AA3)	; &CDP-8AA3;
-      )
-     ((=ucs		  . #x56DF)	; 囟
-      )
-     ((=ucs		  . #x5927)	; 大
-      )
-     ((=ucs		  . #x5DF3)	; å·³
-      ))
     (=ucs		. #x20457)	; 𠑗
     (=cns11643-4	. #x662F)	; &I-C4-662F; [70-15]
     (=daikanwa		. 01314)	; &I-M-01314;
@@ -33155,7 +33862,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x96E3)	; &C1-7945;
+       ((=cns11643-1	    . #x7945)	; &C1-7945; [89-37]
 	))
       (=cns11643-2	  . #x6B4E)	; &C2-6B4E; [75-46]
       (=gb12345		  . #x5950)	; &C2-6B4E; [57-48]
@@ -33175,7 +33882,9 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=daikanwa	    . 07368)	; &I-M-07368;
+       ((=jis-x0208	    . #x437E)	; &GT-09271; [35-94]
+	(=ks-x1001	    . #x7541)	; &I-K0-7541; [85-33]
+	(=daikanwa	    . 07368)	; &I-M-07368;
 	))
       (=daikanwa	  . 01318)	; &M-01318;
       (mojikyo		  . 001318)	; &MCS-60000526;
@@ -33187,7 +33896,7 @@
 	)
        ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs@unicode	    . #x5BF5)	; &UU+5BF5;
+       ((=gb12345	    . #x3368)	; &UU+5BF5; [19-72]
 	))
       (=hanziku-1	  . #xD77B)	; &HZK01-D77B;
       (=ucs@unicode	  . #x20459)	; &HZK01-D77B;
@@ -34380,22 +35089,6 @@
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
-    (hanyu-dazidian	1 191 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
-      (=ucs		  . #x2FF2)	; ⿲
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x866B)	; 虫
-      )
-     ((=ucs		  . #x4E5F)	; 也
-      ))
-    (=ucs		. #x202DE)	; 𠋞
-    (=hanziku-1		. #xCDB7)	; &I-HZK01-CDB7;
-    ))
-(define-char
-  '((ideographic-radical . 9)	; ⼈
     (hanyu-dazidian	1 192 5)
     (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 b0a5bcb..6c642d1 100644
--- a/lisp/utf-2000/Ideograph-R010-Legs.el
+++ b/lisp/utf-2000/Ideograph-R010-Legs.el
@@ -48,11 +48,11 @@
     (ideographic-radical@unicode . 10)	; ⼉
     (ideographic-strokes@unicode . 1)
     (total-strokes	 . 3)
+    (=ucs		. #xFA0C)	; 兀
+    (=big5		. #xC94A)	; &I-B-C94A;
     (<-unknown
      ((=daikanwa	  . 07542)	; &M-07542;
       ))
-    (=ucs		. #xFA0C)	; 兀
-    (=big5		. #xC94A)	; &I-B-C94A;
     ))
 (define-char
   '((ideographic-radical . 10)	; ⼉
@@ -479,7 +479,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs@unicode	    . #x516C)	; &GT-01893;
+       ((=gb2312	    . #x392B)	; &GT-01893; [25-11]
 	)
        ((=ucs		    . #x513F)	; 儿
 	))
@@ -792,10 +792,6 @@
       ))
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA32)	; 免
-      (=jis-x0213-1-2000  . #x2E50)	; &I-JX1-2E50; [14-48]
-      ))
     (shinjigen-1	. 470)
     (shinjigen-2	. 470)
     (=jis-x0208		. #x4C48)	; &GT-01783; [44-40]
@@ -804,6 +800,10 @@
     (=gt-pj-1		. #x4C48)	; &I-GT-01783; [44-40]
     (=ucs@jis		. #x514D)	; &GT-01783;
     (mojikyo		. 054386)	; &MCS-6000D472;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA32)	; 免
+      (=jis-x0213-1-2000  . #x2E50)	; &I-JX1-2E50; [14-48]
+      ))
     ))
 (define-char
   '((ideographic-radical . 10)	; ⼉
@@ -950,10 +950,6 @@
   '((ideographic-radical . 10)	; ⼉
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5152)	; 兒
-      (=jis-x0208	  . #x513B)	; &I-J90-513B; [49-27]
-      ))
     (hanyu-dazidian	1 270 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -977,6 +973,10 @@
     (=daikanwa		. 01364)	; &I-M-01364;
     (=hanziku-1		. #xDDC6)	; &I-HZK01-DDC6;
     (mojikyo		. 001364)	; &MCS-60000554;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x5152)	; 兒
+      (=jis-x0208	  . #x513B)	; &I-J90-513B; [49-27]
+      ))
     ))
 (define-char
   '((ideographic-radical . 10)	; ⼉
@@ -1523,10 +1523,6 @@
   '((ideographic-radical . 10)	; ⼉
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9EE8)	; 黨
-      (=jis-x0208	  . #x735E)	; &I-J90-735E; [83-62]
-      ))
     (hanyu-dazidian	1 273 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1549,6 +1545,10 @@
     (=gt-pj-1		. #x455E)	; &I-GT-01799; [37-62]
     (=daikanwa		. 01381)	; &I-M-01381;
     (mojikyo		. 001381)	; &MCS-60000565;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x9EE8)	; 黨
+      (=jis-x0208	  . #x735E)	; &I-J90-735E; [83-62]
+      ))
     ))
 (define-char
   '((ideographic-radical . 10)	; ⼉
@@ -2659,7 +2659,7 @@
       )
      ((=ucs		  . #x5149)	; 光
       )
-     ((=ucs@unicode	  . #x862D)	; &UU+862D;
+     ((=ks-x1001	  . #x5535)	; &GT-43788; [53-21]
       ))
     (=hanziku-1		. #xDED9)	; &HZK01-DED9;
     ))
diff --git a/lisp/utf-2000/Ideograph-R011-Enter.el b/lisp/utf-2000/Ideograph-R011-Enter.el
index 83ccc70..8f93ab2 100644
--- a/lisp/utf-2000/Ideograph-R011-Enter.el
+++ b/lisp/utf-2000/Ideograph-R011-Enter.el
@@ -30,13 +30,7 @@
     (total-strokes	 . 3)
     (=ucs		. #x204DB)	; 𠓛
     (->subsumptive
-     ((<-wrong
-       ((=ucs		    . #x4EBC)	; 亼
-	(=daikanwa	    . 00345)	; &I-M-00345;
-	))
-      (<-wrong*sources
-       zhengzi-tong daikanwa)
-      (hanyu-dazidian	  1 102 3)
+     ((hanyu-dazidian	  1 102 3)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
@@ -50,6 +44,12 @@
       (=daikanwa	  . 01416)	; &M-01416;
       (=hanziku-1	  . #xB8E0)	; &I-HZK01-B8E0;
       (mojikyo		  . 001416)	; &MCS-60000588;
+      (<-wrong
+       ((=ucs		    . #x4EBC)	; 亼
+	(=daikanwa	    . 00345)	; &I-M-00345;
+	))
+      (<-wrong*sources
+       zhengzitong daikanwa)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -286,14 +286,7 @@
     (total-strokes	 . 5)
     (=ucs		. #x34B0)	; 㒰
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 4875)
-	(=ucs		    . #xFA72)	; 全
-	(=jis-x0208	    . #x4134)	; &I-J90-4134; [33-20]
-	))
-      (<-vulgar*sources
-       shinjigen-1)
-      (hanyu-dazidian	  1 111 3)
+     ((hanyu-dazidian	  1 111 3)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
@@ -308,6 +301,13 @@
       (=daikanwa	  . 01422)	; &M-01422;
       (=hanziku-1	  . #xBAC6)	; &I-HZK01-BAC6;
       (mojikyo		  . 001422)	; &MCS-6000058E;
+      (<-vulgar
+       ((shinjigen-1	    . 4875)
+	(=ucs		    . #xFA72)	; 全
+	(=jis-x0208	    . #x4134)	; &I-J90-4134; [33-20]
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -770,7 +770,15 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x516A)	; 兪
+  '((ideographic-radical . 11)	; ⼊
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (=ucs		. #x516A)	; 兪
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x516A)	; 兪
+      ))
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
@@ -801,8 +809,9 @@
     (mojikyo		. 001437)	; &MCS-6000059D;
     ))
 (define-char
-  '((=>ucs		. #x516A)	; 兪
-    (morohashi-daikanwa	1437 0 1)
+  '((<-denotational
+     ((=ucs		  . #x516A)	; 兪
+      ))
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
@@ -825,49 +834,50 @@
     (=hanziku-1		. #xC3C3)	; &HZK01-C3C3;
     ))
 (define-char
-  '((morohashi-daikanwa	1437 0 2)
+  '((<-denotational
+     ((=ucs		  . #x516A)	; 兪
+      ))
     (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;
-      )
+    (->subsumptive
      ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=big5-cdp	    . #x8958)	; &CDP-8958;
+       ((=big5-cdp	    . #x8AFC)	; &CDP-8AFC;
 	)
-       ((=ucs		    . #x5DDC)	; 巜
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((=big5-cdp	      . #x8958)	; &CDP-8958;
+	  )
+	 ((=ucs		      . #x5DDC)	; 巜
+	  ))
 	))
-      ))
-    (=ucs		. #x516A)	; 兪
-    ))
-(define-char
-  '((=>ucs		. #x516A)	; 兪
-    (morohashi-daikanwa	1437 0 3)
-    (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;
+      (=ucs@unicode	  . #x516A)	; &UU+516A;
       )
      ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x6708)	; 月
+       ((=big5-cdp	    . #x8AFC)	; &CDP-8AFC;
 	)
-       ((=ucs		    . #x5DDC)	; 巜
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((=jis-x0208	      . #x376E)	; &GT-18140; [23-78]
+	  (=gb2312	      . #x5442)	; &I-G0-5442; [52-34]
+	  (=ks-x1001	      . #x6A45)	; &I-K0-6A45; [74-37]
+	  (=cns11643-1	      . #x454C)	; &I-C1-454C; [37-44]
+	  )
+	 ((=ucs		      . #x5DDC)	; 巜
+	  ))
 	))
+      (=cns11643-3	  . #x2B37)	; &C3-2B37; [11-23]
       ))
-    (=cns11643-3	. #x2B37)	; &C3-2B37; [11-23]
     ))
 (define-char
   '((ideographic-radical . 11)	; ⼊
diff --git a/lisp/utf-2000/Ideograph-R012-Eight.el b/lisp/utf-2000/Ideograph-R012-Eight.el
index f0ca07b..760eb7c 100644
--- a/lisp/utf-2000/Ideograph-R012-Eight.el
+++ b/lisp/utf-2000/Ideograph-R012-Eight.el
@@ -35,35 +35,26 @@
     (ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x516B)	; 八
-      ))
     (=gt-k		. 00059)	; &GT-K00059;
     (=gt-pj-k1		. #x3768)	; &GT-K00059; [23-72]
+    (<-formed@component/connect-above
+     ((=ucs		  . #x516B)	; 八
+      ))
     ))
 (define-char
   '((ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
     (=ucs		. #x20500)	; 𠔀
-    (=daikanwa		. 01451)	; &I-M-01451;
-    ))
-(define-char
-  '((=>ucs		. #x20500)	; 𠔀
-    (morohashi-daikanwa	1451 0 0)
-    (ideographic-radical . 12)	; ⼋
-    (ideographic-strokes . 1)
-    (total-strokes	 . 3)
-    (=cns11643-6	. #x2137)	; &C6-2137; [01-23]
-    ))
-(define-char
-  '((=>ucs		. #x20500)	; 𠔀
-    (morohashi-daikanwa	1451 0 1)
-    (ideographic-radical . 12)	; ⼋
-    (ideographic-strokes . 1)
-    (total-strokes	 . 3)
-    (hanyu-dazidian	1 241 4)
-    (=big5-cdp		. #x88C1)	; &CDP-88C1;
+    (->subsumptive
+     ((=daikanwa	  . 01451)	; &M-01451;
+      (=ucs@iso		  . #x20500)	; &M-01451;
+      )
+     ((=cns11643-6	  . #x2137)	; &C6-2137; [01-23]
+      )
+     ((hanyu-dazidian	  1 241 4)
+      (=big5-cdp	  . #x88C1)	; &CDP-88C1;
+      ))
     ))
 (define-char
   '((ideographic-radical . 12)	; ⼋
@@ -249,24 +240,33 @@
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
     (=ucs		. #x20502)	; 𠔂
-    (=daikanwa		. 01456)	; &I-M-01456;
     ))
 (define-char
-  '((=>ucs		. #x20502)	; 𠔂
-    (morohashi-daikanwa	1456 0 0)
+  '((<-denotational
+     ((=ucs		  . #x20502)	; 𠔂
+      ))
     (ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (hanyu-dazidian	1 241 7)
-    (=hanziku-1		. #xD7D9)	; &HZK01-D7D9;
+    (->subsumptive
+     ((=daikanwa	  . 01456)	; &M-01456;
+      )
+     ((hanyu-dazidian	  1 241 7)
+      (=hanziku-1	  . #xD7D9)	; &HZK01-D7D9;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x20502)	; 𠔂
-    (morohashi-daikanwa	1456 0 1)
+  '((<-denotational
+     ((=ucs		  . #x20502)	; 𠔂
+      ))
     (ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (=cns11643-5	. #x2137)	; &C5-2137; [01-23]
+    (->subsumptive
+     ((=ucs@iso		  . #x20502)	; &U-00020502;
+      )
+     ((=cns11643-5	  . #x2137)	; &C5-2137; [01-23]
+      ))
     ))
 (define-char
   '((ideographic-radical@ucs . 12)	; ⼋
@@ -276,6 +276,12 @@
     (ideographic-radical@daikanwa . 1)	; ⼀
     (ideographic-strokes@daikanwa . 3)
     (total-strokes	 . 4)
+    (hanyu-dazidian	1 241 5)
+    (shinjigen-1	. 492)
+    (=ucs		. #x20503)	; 𠔃
+    (=cns11643-6	. #x2141)	; &I-C6-2141; [01-33]
+    (=daikanwa		. 48904)	; &I-M-48904;
+    (=hanziku-1		. #xD7D7)	; &I-HZK01-D7D7;
     (<-vulgar
      ((shinjigen-1	  . 491)
       (=jis-x0208	  . #x5142)	; &GT-01891; [49-34]
@@ -284,12 +290,6 @@
       ))
     (<-vulgar*sources
      daikanwa shinjigen-1)
-    (hanyu-dazidian	1 241 5)
-    (shinjigen-1	. 492)
-    (=ucs		. #x20503)	; 𠔃
-    (=cns11643-6	. #x2141)	; &I-C6-2141; [01-33]
-    (=daikanwa		. 48904)	; &I-M-48904;
-    (=hanziku-1		. #xD7D7)	; &I-HZK01-D7D7;
     ))
 (define-char
   '((ideographic-radical . 12)	; ⼋
@@ -535,13 +535,13 @@
     (ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (=ucs		. #x9FB9)	; é¾¹
     (<-same
      ((=ucs		  . #x20509)	; 𠔉
       ))
     (<-simplified
      ((=jis-x0213-2-2000  . #x2327)	; &GT-K01768; [03-07]
       ))
-    (=ucs		. #x9FB9)	; é¾¹
     (->subsumptive
      ((=gt-k		  . 01769)	; &GT-K01769;
       (=gt-pj-k1	  . #x3238)	; &GT-K01769; [18-24]
@@ -830,31 +830,30 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
     (=ucs		. #x20510)	; 𠔐
-    (=daikanwa		. 01475)	; &I-M-01475;
-    ))
-(define-char
-  '((=>ucs		. #x20510)	; 𠔐
-    (morohashi-daikanwa	1475 0 0)
-    (ideographic-radical . 12)	; ⼋
-    (ideographic-strokes . 6)
-    (total-strokes	 . 8)
-    (hanyu-dazidian	1 246 1)
-    (=cns11643-6	. #x2954)	; &HZK01-D8D6; [09-52]
-    (=hanziku-1		. #xD8D6)	; &I-HZK01-D8D6;
-    ))
-(define-char
-  '((ideographic-radical . 12)	; ⼋
-    (ideographic-strokes . 6)
-    (total-strokes	 . 8)
-    (=daikanwa		. 01476)	; &M-01476;
+    (->subsumptive
+     ((=daikanwa	  . 01475)	; &M-01475;
+      )
+     ((=ucs@iso		  . #x20510)	; &U-00020510;
+      )
+     ((=cns11643-6	  . #x2954)	; &C6-2954; [09-52]
+      )
+     ((hanyu-dazidian	  1 246 1)
+      (=hanziku-1	  . #xD8D6)	; &HZK01-D8D6;
+      ))
     ))
 (define-char
   '((ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (hanyu-dazidian	1 248 2)
     (=ucs		. #x20511)	; 𠔑
-    (=hanziku-1		. #xD958)	; &I-HZK01-D958;
+    (->subsumptive
+     ((=daikanwa	  . 01476)	; &M-01476;
+      )
+     ((=ucs@iso		  . #x20511)	; &U-00020511;
+      )
+     ((hanyu-dazidian	  1 248 2)
+      (=hanziku-1	  . #xD958)	; &HZK01-D958;
+      ))
     ))
 (define-char
   '((ideographic-radical . 12)	; ⼋
@@ -898,7 +897,7 @@
 	)
        ((=ucs		    . #x4E37)	; 丷
 	)
-       ((=ucs@unicode	    . #x8C55)	; &G0-7539;
+       ((=gb2312	    . #x7539)	; &G0-7539; [85-25]
 	))
       (=ucs@unicode	  . #x34B8)	; &UU+34B8;
       )
@@ -1010,49 +1009,54 @@
     (=hanziku-1		. #xD95D)	; &I-HZK01-D95D;
     ))
 (define-char
-  '((=>ucs		. #x517C)	; 兼
-    (ideographic-radical . 12)	; ⼋
+  '((ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=jis-x0208	  . #x482C)	; &GT-01888; [40-12]
-      (=ks-x1001	  . #x7822)	; &I-K0-7822; [88-02]
-      (=daikanwa	  . 01450)	; &I-M-01450;
-      )
-     ((=ucs		  . #x4E00)	; 一
-      )
-     ((=big5-cdp	  . #x8CDE)	; &CDP-8CDE;
-      ))
-    (=ks-x1001		. #x4C42)	; &M-01483; [44-34]
+    (=ucs		. #x517C)	; 兼
     (=big5		. #xADDD)	; &I-B-ADDD;
-    (=daikanwa		. 01483)	; &I-M-01483;
-    (=jef-china3	. #x43E6)	; &I-JC3-43E6;
-    (=ucs@big5		. #x517C)	; &M-01483;
-    (mojikyo		. 058241)	; &MCS-6000E381;
     ))
 (define-char
-  '((=>ucs		. #x517C)	; 兼
-    (morohashi-daikanwa	1483 0 0)
+  '((<-denotational
+     ((=ucs		  . #x517C)	; 兼
+      ))
     (ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=cns11643-1	  . #x442C)	; &C1-442C; [36-12]
-      )
-     ((=ucs		  . #x4E00)	; 一
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(=ucs		    . #x2FF3)	; ⿳
+	)
+       ((=jis-x0208	    . #x482C)	; &GT-01888; [40-12]
+	(=ks-x1001	    . #x7822)	; &I-K0-7822; [88-02]
+	(=daikanwa	    . 01450)	; &I-M-01450;
+	)
+       ((=ucs		    . #x4E00)	; 一
+	)
+       ((=big5-cdp	    . #x8CDE)	; &CDP-8CDE;
+	))
+      (=ks-x1001	  . #x4C42)	; &M-01483; [44-34]
+      (=daikanwa	  . 01483)	; &I-M-01483;
+      (=jef-china3	  . #x43E6)	; &I-JC3-43E6;
+      (mojikyo		  . 058241)	; &MCS-6000E381;
       )
-     ((=big5-cdp	  . #x8CDE)	; &CDP-8CDE;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(=ucs		    . #x2FF3)	; ⿳
+	)
+       ((=cns11643-1	    . #x442C)	; &C1-442C; [36-12]
+	)
+       ((=ucs		    . #x4E00)	; 一
+	)
+       ((=big5-cdp	    . #x8CDE)	; &CDP-8CDE;
+	))
+      (mojikyo		  . 001483)	; &MCS-600005CB;
       ))
-    (mojikyo		. 001483)	; &MCS-600005CB;
     ))
 (define-char
-  '((morohashi-daikanwa	1483 0 2)
+  '((<-denotational
+     ((=ucs		  . #x517C)	; 兼
+      ))
     (ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
@@ -1067,18 +1071,19 @@
       ))
     (shinjigen-1	. 502)
     (shinjigen-2	. 502)
-    (=ucs		. #x517C)	; 兼
-    (=jis-x0208		. #x3773)	; &I-J90-3773; [23-83]
+    (=jis-x0208		. #x3773)	; &GT-01935; [23-83]
     (=gb2312		. #x3C66)	; &I-G0-3C66; [28-70]
     (=cns11643-1	. #x5440)	; &I-C1-5440; [52-32]
     (=gt		. 01935)	; &I-GT-01935;
     (=gt-k		. 06417)	; &I-GT-K06417;
     (=gt-pj-1		. #x3773)	; &I-GT-01935; [23-83]
+    (=ucs@unicode	. #x517C)	; &GT-01935;
     (mojikyo		. 054100)	; &MCS-6000D354;
     ))
 (define-char
-  '((=>ucs		. #x517C)	; 兼
-    (morohashi-daikanwa	1483 0 3)
+  '((<-denotational
+     ((=ucs		  . #x517C)	; 兼
+      ))
     (ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
@@ -1385,11 +1390,11 @@
   '((ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (<-unknown
-     ((=daikanwa	  . 01498)	; &I-M-01498;
-      ))
     (=ucs		. #x20529)	; 𠔩
     (=cns11643-6	. #x5065)	; &I-C6-5065; [48-69]
+    (<-unknown
+     ((=ucs		  . #x20530)	; 𠔰
+      ))
     ))
 (define-char
   '((ideographic-radical . 12)	; ⼋
diff --git a/lisp/utf-2000/Ideograph-R013-Down-Box.el b/lisp/utf-2000/Ideograph-R013-Down-Box.el
index 7eee086..b7b74c6 100644
--- a/lisp/utf-2000/Ideograph-R013-Down-Box.el
+++ b/lisp/utf-2000/Ideograph-R013-Down-Box.el
@@ -23,10 +23,10 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (total-strokes	 . 2)
+    (=ucs		. #x2E86)	; ⺆
     (<-identical@component
      ((=ucs		  . #x5182)	; 冂
       ))
-    (=ucs		. #x2E86)	; ⺆
     ))
 (define-char
   '((<-denotational
@@ -35,12 +35,12 @@
     (ideographic-radical . 13)	; ⼌
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (<-formed@component
-     ((=ucs		  . #x5182)	; 冂
-      ))
     (=big5-cdp		. #x8BC0)	; &CDP-8BC0;
     (=gt-k		. 00079)	; &I-GT-K00079;
     (=gt-pj-k1		. #x3D6D)	; &CDP-8BC0; [29-77]
+    (<-formed@component
+     ((=ucs		  . #x5182)	; 冂
+      ))
     ))
 (define-char
   '((ideographic-radical . 13)	; ⼌
@@ -94,11 +94,11 @@
     (ideographic-radical . 13)	; ⼌
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (=big5-cdp		. #x8A78)	; &CDP-8A78;
+    (mojikyo		. 070546)	; &MCS-60011392;
     (<-same@component/connect-below
      ((=ucs		  . #x5183)	; 冃
       ))
-    (=big5-cdp		. #x8A78)	; &CDP-8A78;
-    (mojikyo		. 070546)	; &MCS-60011392;
     ))
 (define-char
   '((<-denotational
@@ -109,13 +109,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E9C)	; ⺜
+    (=gt-k		. 00565)	; &I-GT-K00565;
+    (=gt-pj-k1		. #x3229)	; ⺜ [18-09]
     (<-identical@component/connect-below
      ((name*		  . "ideographic component hood")
       (=big5-cdp	  . #x8A78)	; &CDP-8A78;
       ))
-    (=ucs		. #x2E9C)	; ⺜
-    (=gt-k		. 00565)	; &I-GT-K00565;
-    (=gt-pj-k1		. #x3229)	; ⺜ [18-09]
     ))
 (define-char
   '((ideographic-radical . 13)	; ⼌
@@ -183,16 +183,16 @@
     (ideographic-radical . 13)	; ⼌
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (=cns11643-6	. #x2150)	; &GT-01982; [01-48]
+    (=gt		. 01982)	; &I-GT-01982;
+    (=gt-pj-2		. #x3D2C)	; &I-GT-01982; [29-12]
+    (=daikanwa		. 01512)	; &I-M-01512;
     (<-vulgar
      ((=ks-x1001	  . #x522E)	; &M-01418; [50-14]
       (=daikanwa	  . 01418)	; &I-M-01418;
       ))
     (<-vulgar*sources
      daikanwa)
-    (=cns11643-6	. #x2150)	; &GT-01982; [01-48]
-    (=gt		. 01982)	; &I-GT-01982;
-    (=gt-pj-2		. #x3D2C)	; &I-GT-01982; [29-12]
-    (=daikanwa		. 01512)	; &I-M-01512;
     ))
 (define-char
   '((ideographic-radical@ucs . 13)	; ⼌
@@ -231,10 +231,6 @@
   '((ideographic-radical . 13)	; ⼌
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5713)	; 圓
-      (=jis-x0208	  . #x5424)	; &I-J90-5424; [52-04]
-      ))
     (hanyu-dazidian	1 96 18)
     (shinjigen-1	. 1331)
     (shinjigen-2	. 1331)
@@ -247,6 +243,10 @@
     (=gt-k		. 00400)	; &I-GT-K00400;
     (=gt-pj-1		. #x315F)	; &I-GT-01978; [17-63]
     (=daikanwa		. 01513)	; &I-M-01513;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x5713)	; 圓
+      (=jis-x0208	  . #x5424)	; &I-J90-5424; [52-04]
+      ))
     ))
 (define-char
   '((ideographic-radical@ucs . 13)	; ⼌
@@ -258,6 +258,21 @@
     (ideographic-radical@cns*sources
      daikanwa cns11643)
     (total-strokes	 . 4)
+    (hanyu-dazidian	1 97 3)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x5182)	; 冂
+      )
+     ((=ucs		  . #x3405)	; 㐅
+      ))
+    (=ucs		. #x5188)	; 冈
+    (=gb2312		. #x3854)	; &I-G0-3854; [24-52]
+    (=cns11643-4	. #x2152)	; &I-C4-2152; [01-50]
+    (=big5-cdp		. #x85BE)	; &I-CDP-85BE;
+    (=daikanwa		. 28201)	; &I-M-28201;
+    (=big5-eten		. #xC8A2)	; &B-C8A2;
     (<-formed@component/connect-below
      ((=ucs		  . #x7F51)	; 网
       (=daikanwa	  . 28199)	; &I-M-28199;
@@ -274,21 +289,6 @@
      ((=ucs		  . #x5CA1)	; 岡
       (=gb12345		  . #x3854)	; 岡 [24-52]
       ))
-    (hanyu-dazidian	1 97 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (=ucs		  . #x2FF4)	; â¿´
-      )
-     ((=ucs		  . #x5182)	; 冂
-      )
-     ((=ucs		  . #x3405)	; 㐅
-      ))
-    (=ucs		. #x5188)	; 冈
-    (=gb2312		. #x3854)	; &I-G0-3854; [24-52]
-    (=cns11643-4	. #x2152)	; &I-C4-2152; [01-50]
-    (=big5-cdp		. #x85BE)	; &I-CDP-85BE;
-    (=daikanwa		. 28201)	; &I-M-28201;
-    (=big5-eten		. #xC8A2)	; &B-C8A2;
     ))
 (define-char
   '((ideographic-radical . 13)	; ⼌
@@ -514,6 +514,14 @@
   '((ideographic-radical . 13)	; ⼌
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
+    (hanyu-dazidian	1 99 4)
+    (shinjigen-1	. 511)
+    (=ucs		. #x20541)	; 𠕁
+    (=cns11643-6	. #x2239)	; &I-C6-2239; [02-25]
+    (=big5-cdp		. #x8BA6)	; &I-CDP-8BA6;
+    (=gt		. 01990)	; &I-GT-01990;
+    (=gt-pj-2		. #x3D33)	; &I-GT-01990; [29-19]
+    (=daikanwa		. 48932)	; &I-M-48932;
     (<-formed
      ((shinjigen-1	  . 508)
       (=ucs		  . #x518A)	; 冊
@@ -527,14 +535,6 @@
       ))
     (<-same*sources
      daikanwa)
-    (hanyu-dazidian	1 99 4)
-    (shinjigen-1	. 511)
-    (=ucs		. #x20541)	; 𠕁
-    (=cns11643-6	. #x2239)	; &I-C6-2239; [02-25]
-    (=big5-cdp		. #x8BA6)	; &I-CDP-8BA6;
-    (=gt		. 01990)	; &I-GT-01990;
-    (=gt-pj-2		. #x3D33)	; &I-GT-01990; [29-19]
-    (=daikanwa		. 48932)	; &I-M-48932;
     ))
 (define-char
   '((<-denotational
@@ -1108,43 +1108,74 @@
   '((ideographic-radical . 13)	; ⼌
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
+    (hanyu-dazidian	1 100 17)
     (=ucs		. #x5193)	; 冓
-    (->subsumptive
-     ((=gt		  . 02023)	; &GT-02023;
-      (=gt-pj-2		  . #x3D43)	; &GT-02023; [29-35]
-      (=daikanwa	  . 01540)	; &I-M-01540;
+    (=big5		. #xD0E0)	; &I-B-D0E0;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5193)	; 冓
+      ))
+    (ideographic-radical . 13)	; ⼌
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (=gt		. 02023)	; &GT-02023;
+    (=gt-pj-2		. #x3D43)	; &GT-02023; [29-35]
+    (=daikanwa		. 01540)	; &I-M-01540;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5193)	; 冓
+      ))
+    (ideographic-radical . 13)	; ⼌
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=big5-cdp	    . #x8BB7)	; &CDP-8BB7;
-	)
-       ((=jis-x0208@1978    . #x5147)	; &GT-01992; [49-39]
-	(=daikanwa	    . 01514)	; &I-M-01514;
-	))
-      (shinjigen-1	  . 522)
-      (shinjigen-2	  . 522)
-      (=big5		  . #xD0E0)	; &GT-02025;
-      (=gt		  . 02025)	; &I-GT-02025;
-      (=gt-k		  . 06707)	; &I-GT-K06707;
-      (=gt-pj-9		  . #x3372)	; &I-GT-02025; [19-82]
-      (=jef-china3	  . #x43ED)	; &I-JC3-43ED;
-      (=ucs@big5	  . #x5193)	; &GT-02025;
-      (mojikyo		  . 070584)	; &MCS-600113B8;
-      )
-     ((hanyu-dazidian	  1 100 17)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=big5-cdp	    . #x8BB7)	; &CDP-8BB7;
-	)
-       ((=gb2312	    . #x483D)	; &GT-01993; [40-29]
-	(=jis-x0208@1983    . #x5147)	; &I-J83-5147; [49-39]
-	(=cns11643-1	    . #x4574)	; &I-C1-4574; [37-84]
-	))
-      (shinjigen-1	  . 523)
+     ((=big5-cdp	  . #x8BB7)	; &CDP-8BB7;
+      )
+     ((=jis-x0208@1978	  . #x5147)	; &GT-01992; [49-39]
+      (=daikanwa	  . 01514)	; &I-M-01514;
+      ))
+    (shinjigen-1	. 522)
+    (shinjigen-2	. 522)
+    (=gt		. 02025)	; &GT-02025;
+    (=gt-k		. 06707)	; &I-GT-K06707;
+    (=gt-pj-9		. #x3372)	; &GT-02025; [19-82]
+    (=jef-china3	. #x43ED)	; &I-JC3-43ED;
+    (mojikyo		. 070584)	; &MCS-600113B8;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5193)	; 冓
+      ))
+    (ideographic-radical . 13)	; ⼌
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (=gt		. 02026)	; &GT-02026;
+    (=gt-pj-9		. #x5237)	; &GT-02026; [50-23]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5193)	; 冓
+      ))
+    (ideographic-radical . 13)	; ⼌
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=big5-cdp	  . #x8BB7)	; &CDP-8BB7;
+      )
+     ((=gb2312		  . #x483D)	; &GT-01993; [40-29]
+      (=jis-x0208@1983	  . #x5147)	; &I-J83-5147; [49-39]
+      (=cns11643-1	  . #x4574)	; &I-C1-4574; [37-84]
+      ))
+    (->subsumptive
+     ((shinjigen-1	  . 523)
       (shinjigen-2	  . 523)
       (=jis-x0208@1990	  . #x514A)	; &GT-02024; [49-42]
       (=cns11643-2	  . #x2E23)	; &I-C2-2E23; [14-03]
@@ -1155,9 +1186,6 @@
       )
      ((=jis-x0208@1978	  . #x514A)	; &J83-514A; [49-42]
       (=jis-x0208@1983	  . #x514A)	; &I-J83-514A; [49-42]
-      )
-     ((=gt		  . 02026)	; &GT-02026;
-      (=gt-pj-9		  . #x5237)	; &GT-02026; [50-23]
       ))
     ))
 (define-char
@@ -1357,7 +1385,10 @@
       (=gt-pj-2		  . #x3D48)	; &GT-02031; [29-40]
       (=daikanwa	  . 01546)	; &I-M-01546;
       (->mistakable
-       ((=daikanwa	    . 13950)	; &I-M-13950;
+       ((=jis-x0208@1978    . #x5A70)	; &M-13950; [58-80]
+	(=jis-x0208@1983    . #x5A70)	; &I-J83-5A70; [58-80]
+	(=ks-x1001	    . #x6079)	; &I-K0-6079; [64-89]
+	(=daikanwa	    . 13950)	; &I-M-13950;
 	))
       (->mistakable*sources
        kangxi daikanwa)
@@ -1513,6 +1544,10 @@
     (ideographic-radical@shinjigen*sources
      shinjigen-1 jisx0208/a jisx0208/b)
     (total-strokes	 . 12)
+    (hanyu-dazidian	2 1516 8)
+    (shinjigen-1	. 926)
+    (=cns11643-1	. #x5E32)	; &M-01597; [62-18]
+    (=daikanwa		. 01597)	; &I-M-01597;
     (<-original
      ((shinjigen-1	  . 925)
       (=jis-x0208	  . #x3A47)	; &GT-18101; [26-39]
@@ -1521,11 +1556,7 @@
       (=daikanwa	  . 14301)	; &I-M-14301;
       ))
     (<-original*sources
-     zhengzi-tong daikanwa shinjigen-1)
-    (hanyu-dazidian	2 1516 8)
-    (shinjigen-1	. 926)
-    (=cns11643-1	. #x5E32)	; &M-01597; [62-18]
-    (=daikanwa		. 01597)	; &I-M-01597;
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R014-Cover.el b/lisp/utf-2000/Ideograph-R014-Cover.el
index 4c06bda..22a64d5 100644
--- a/lisp/utf-2000/Ideograph-R014-Cover.el
+++ b/lisp/utf-2000/Ideograph-R014-Cover.el
@@ -46,13 +46,6 @@
     (ideographic-radical . 14)	; ⼍
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (<-vulgar
-     ((shinjigen-1	  . 525)
-      (=ucs		  . #x5197)	; 冗
-      (=jis-x0208	  . #x3E69)	; &I-J90-3E69; [30-73]
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -66,6 +59,13 @@
     (=ucs		. #x2F817)	; 冗
     (=cns11643-3	. #x214F)	; &I-C3-214F; [01-47]
     (mojikyo		. 050943)	; &MCS-6000C6FF;
+    (<-vulgar
+     ((shinjigen-1	  . 525)
+      (=ucs		  . #x5197)	; 冗
+      (=jis-x0208	  . #x3E69)	; &I-J90-3E69; [30-73]
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 14)	; ⼍
@@ -109,6 +109,9 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (=ucs		. #x5199)	; 写
+    (<-simplified@ucs
+     ((=ucs		  . #x5BEB)	; 寫
+      ))
     ))
 (define-char
   '((<-denotational
@@ -117,11 +120,6 @@
     (ideographic-radical . 14)	; ⼍
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x556D)	; &GT-09222; [53-77]
-      (=ks-x1001	  . #x5E50)	; &I-K0-5E50; [62-48]
-      (=daikanwa	  . 07320)	; &I-M-07320;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -140,6 +138,11 @@
     (=daikanwa		. 01570)	; &I-M-01570;
     (=ucs@cns		. #x5199)	; &GT-02069;
     (=ucs@jis		. #x5199)	; &GT-02069;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x556D)	; &GT-09222; [53-77]
+      (=ks-x1001	  . #x5E50)	; &I-K0-5E50; [62-48]
+      (=daikanwa	  . 07320)	; &I-M-07320;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -162,6 +165,9 @@
     (=gb2312		. #x5034)	; &HZK01-E478; [48-20]
     (=hanziku-1		. #xE478)	; &I-HZK01-E478;
     (=ucs@unicode	. #x5199)	; &HZK01-E478;
+    (<-simplified@CN
+     ((=gb12345		  . #x5034)	; 寫 [48-20]
+      ))
     ))
 (define-char
   '((ideographic-radical . 14)	; ⼍
@@ -446,7 +452,9 @@
 	)
        ((=ucs		    . #x4E00)	; 一
 	)
-       ((=ucs@jis	    . #x8C55)	; &GT-48747;
+       ((=ks-x1001	    . #x634E)	; &GT-48747; [67-46]
+	(=jis-x0208@1990    . #x6C35)	; &I-J90-6C35; [76-21]
+	(=daikanwa	    . 36334)	; &I-M-36334;
 	))
       (=jis-x0212	  . #x3276)	; &M-01584; [18-86]
       (=daikanwa	  . 01584)	; &I-M-01584;
@@ -462,7 +470,7 @@
 	)
        ((=ucs		    . #x4E00)	; 一
 	)
-       ((=ucs@unicode	    . #x8C55)	; &G0-7539;
+       ((=gb2312	    . #x7539)	; &G0-7539; [85-25]
 	))
       (=ucs@unicode	  . #x51A1)	; &UU+51A1;
       )
@@ -489,25 +497,47 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (hanyu-dazidian	1 304 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
+    (=ucs		. #x51A2)	; 冢
+    (=big5		. #xADE0)	; &I-B-ADE0;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x5196)	; 冖
+	)
+       ((=daikanwa	    . 36338)	; &M-36338;
+	))
+      (shinjigen-1	  . 531)
+      (shinjigen-2	  . 531)
+      (=jis-x0208	  . #x514F)	; &GT-02093; [49-47]
+      (=gt		  . 02093)	; &I-GT-02093;
+      (=gt-k		  . 06576)	; &I-GT-K06576;
+      (=gt-pj-1		  . #x514F)	; &I-GT-02093; [49-47]
+      (=daikanwa	  . 01585)	; &I-M-01585;
+      (=ucs@jis		  . #x51A2)	; &GT-02093;
       )
-     ((=ucs		  . #x5196)	; 冖
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x5196)	; 冖
+	)
+       ((=ucs@unicode	    . #x8C56)	; &UU+8C56;
+	))
+      (=gb2312		  . #x5A23)	; &G0-5A23; [58-03]
+      (=ucs@unicode	  . #x51A2)	; &G0-5A23;
       )
-     ((=ucs		  . #x8C56)	; 豖
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x5196)	; 冖
+	)
+       ((=cns11643-2	    . #x286B)	; &C2-286B; [08-75]
+	))
+      (=cns11643-1	  . #x5443)	; &C1-5443; [52-35]
       ))
-    (shinjigen-1	. 531)
-    (shinjigen-2	. 531)
-    (=ucs		. #x51A2)	; 冢
-    (=jis-x0208		. #x514F)	; &I-J90-514F; [49-47]
-    (=gb2312		. #x5A23)	; &I-G0-5A23; [58-03]
-    (=cns11643-1	. #x5443)	; &I-C1-5443; [52-35]
-    (=big5		. #xADE0)	; &I-B-ADE0;
-    (=gt		. 02093)	; &I-GT-02093;
-    (=gt-k		. 06576)	; &I-GT-K06576;
-    (=gt-pj-1		. #x514F)	; &I-GT-02093; [49-47]
-    (=daikanwa		. 01585)	; &I-M-01585;
     ))
 (define-char
   '((ideographic-radical . 14)	; ⼍
@@ -620,70 +650,66 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x51A5)	; 冥
-    (ideographic-radical . 14)	; ⼍
+  '((ideographic-radical . 14)	; ⼍
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian	1 304 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=ucs		  . #x5196)	; 冖
-      )
-     ((=ucs		  . #x65E5)	; 日
-      )
-     ((=jis-x0208	  . #x4F3B)	; &GT-01896; [47-27]
-      (=ks-x1001	  . #x573F)	; &I-K0-573F; [55-31]
-      (=daikanwa	  . 01453)	; &I-M-01453;
-      ))
-    (shinjigen-1	. 534)
-    (shinjigen-2	. 534)
-    (=jis-x0208		. #x4C3D)	; &GT-02095; [44-29]
-    (=ks-x1001		. #x5922)	; &I-K0-5922; [57-02]
+    (=ucs		. #x51A5)	; 冥
     (=big5		. #xADDF)	; &I-B-ADDF;
-    (=gt		. 02095)	; &I-GT-02095;
-    (=gt-k		. 06553)	; &I-GT-K06553;
-    (=gt-pj-1		. #x4C3D)	; &I-GT-02095; [44-29]
-    (=daikanwa		. 01588)	; &I-M-01588;
-    (=ucs@jis		. #x51A5)	; &GT-02095;
-    (=ucs@big5		. #x51A5)	; &GT-02095;
-    ))
-(define-char
-  '((morohashi-daikanwa	1588 0 0)
-    (ideographic-radical . 14)	; ⼍
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=ucs		  . #x5196)	; 冖
-      )
-     ((=ucs		  . #x65E5)	; 日
+    (->subsumptive
+     ((hanyu-dazidian	  1 304 10)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(=ucs		    . #x2FF3)	; ⿳
+	)
+       ((=ucs		    . #x5196)	; 冖
+	)
+       ((=ucs		    . #x65E5)	; 日
+	)
+       ((=jis-x0208	    . #x4F3B)	; &GT-01896; [47-27]
+	(=ks-x1001	    . #x573F)	; &I-K0-573F; [55-31]
+	(=daikanwa	    . 01453)	; &I-M-01453;
+	))
+      (shinjigen-1	  . 534)
+      (shinjigen-2	  . 534)
+      (=jis-x0208	  . #x4C3D)	; &GT-02095; [44-29]
+      (=ks-x1001	  . #x5922)	; &I-K0-5922; [57-02]
+      (=gt		  . 02095)	; &I-GT-02095;
+      (=gt-k		  . 06553)	; &I-GT-K06553;
+      (=gt-pj-1		  . #x4C3D)	; &I-GT-02095; [44-29]
+      (=daikanwa	  . 01588)	; &I-M-01588;
+      (=ucs@jis		  . #x51A5)	; &GT-02095;
       )
-     ((=ucs		  . #x516D)	; 六
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(=ucs		    . #x2FF3)	; ⿳
+	)
+       ((=ucs		    . #x5196)	; 冖
+	)
+       ((=ucs		    . #x65E5)	; 日
+	)
+       ((=gb2312	    . #x4179)	; &C1-447A; [33-89]
+	(=cns11643-1	    . #x447A)	; &I-C1-447A; [36-90]
+	))
+      (=gb2312		  . #x5A24)	; &C1-5442; [58-04]
+      (=cns11643-1	  . #x5442)	; &I-C1-5442; [52-34]
+      (=ucs@unicode	  . #x51A5)	; &C1-5442;
       ))
-    (=ucs		. #x51A5)	; 冥
-    (=gb2312		. #x5A24)	; &I-G0-5A24; [58-04]
-    (=cns11643-1	. #x5442)	; &I-C1-5442; [52-34]
-    ))
-(define-char
-  '((=>ucs		. #x2058C)	; 𠖌
-    (ideographic-radical . 14)	; ⼍
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
-    (=daikanwa		. 01589)	; &M-01589;
     ))
 (define-char
-  '((morohashi-daikanwa	1589 0 0)
-    (ideographic-radical . 14)	; ⼍
-    (ideographic-strokes . 9)
-    (total-strokes	 . 11)
-    (hanyu-dazidian	1 305 2)
+  '((ideographic-radical . 14)	; ⼍
     (=ucs		. #x2058C)	; 𠖌
-    (=cns11643-6	. #x3D3E)	; &I-C6-3D3E; [29-30]
-    (=hanziku-1		. #xE4DB)	; &I-HZK01-E4DB;
+    (->subsumptive
+     ((ideographic-strokes . 8)
+      (total-strokes	   . 10)
+      (=daikanwa	  . 01589)	; &M-01589;
+      )
+     ((ideographic-strokes . 9)
+      (total-strokes	   . 11)
+      (hanyu-dazidian	  1 305 2)
+      (=cns11643-6	  . #x3D3E)	; &HZK01-E4DB; [29-30]
+      (=hanziku-1	  . #xE4DB)	; &I-HZK01-E4DB;
+      (=ucs@iso		  . #x2058C)	; &HZK01-E4DB;
+      ))
     ))
 (define-char
   '((ideographic-radical . 14)	; ⼍
@@ -739,14 +765,6 @@
   '((ideographic-radical . 14)	; ⼍
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (<-vulgar
-     ((shinjigen-1	  . 1852)
-      (=jis-x0208	  . #x4959)	; &GT-09112; [41-57]
-      (=ks-x1001	  . #x5D23)	; &I-K0-5D23; [61-03]
-      (=daikanwa	  . 07230)	; &I-M-07230;
-      ))
-    (<-vulgar*sources
-     zhengzi-tong daikanwa shinjigen-1)
     (hanyu-dazidian	1 305 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -767,6 +785,14 @@
     (=gt-pj-1		. #x495A)	; &I-GT-02099; [41-58]
     (=daikanwa		. 01592)	; &I-M-01592;
     (=hanziku-1		. #xE4DC)	; &I-HZK01-E4DC;
+    (<-vulgar
+     ((shinjigen-1	  . 1852)
+      (=jis-x0208	  . #x4959)	; &GT-09112; [41-57]
+      (=ks-x1001	  . #x5D23)	; &I-K0-5D23; [61-03]
+      (=daikanwa	  . 07230)	; &I-M-07230;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 14)	; ⼍
@@ -844,7 +870,9 @@
       )
      ((=ucs		  . #x5196)	; 冖
       )
-     ((=ucs@unicode	  . #x65F2)	; &M-13753;
+     ((=jis-x0212	  . #x416F)	; &M-13753; [33-79]
+      (=jis-x0213-2-2000  . #x2D72)	; &I-JX2-2D72; [13-82]
+      (=daikanwa	  . 13753)	; &I-M-13753;
       )
      ((=ucs		  . #x5DFE)	; å·¾
       ))
@@ -887,6 +915,10 @@
     (ideographic-radical@shinjigen*sources
      shinjigen-1 jisx0208/a jisx0208/b)
     (total-strokes	 . 12)
+    (hanyu-dazidian	2 1516 8)
+    (shinjigen-1	. 926)
+    (=cns11643-1	. #x5E32)	; &M-01597; [62-18]
+    (=daikanwa		. 01597)	; &I-M-01597;
     (<-original
      ((shinjigen-1	  . 925)
       (=jis-x0208	  . #x3A47)	; &GT-18101; [26-39]
@@ -895,11 +927,7 @@
       (=daikanwa	  . 14301)	; &I-M-14301;
       ))
     (<-original*sources
-     zhengzi-tong daikanwa shinjigen-1)
-    (hanyu-dazidian	2 1516 8)
-    (shinjigen-1	. 926)
-    (=cns11643-1	. #x5E32)	; &M-01597; [62-18]
-    (=daikanwa		. 01597)	; &I-M-01597;
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R015-Ice.el b/lisp/utf-2000/Ideograph-R015-Ice.el
index 124cf4c..0416134 100644
--- a/lisp/utf-2000/Ideograph-R015-Ice.el
+++ b/lisp/utf-2000/Ideograph-R015-Ice.el
@@ -135,19 +135,6 @@
   '((ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (<-original
-     ((shinjigen-1	  . 4051)
-      (=ucs		  . #x6C37)	; æ°·
-      (=jis-x0208	  . #x4939)	; &I-J90-4939; [41-25]
-      ))
-    (<-original*sources
-     shinjigen-1)
-    (<-same
-     ((=cns11643-3	  . #x214C)	; &M-00360; [01-44]
-      (=daikanwa	  . 00360)	; &I-M-00360;
-      ))
-    (<-same*sources
-     shuowen kanjo ronkou jiyun daikanwa)
     (hanyu-dazidian	1 295 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -168,12 +155,25 @@
     (=gt-k		. 01713)	; &I-GT-K01713;
     (=gt-pj-1		. #x5156)	; &I-GT-02139; [49-54]
     (=daikanwa		. 01612)	; &I-M-01612;
+    (<-original
+     ((shinjigen-1	  . 4051)
+      (=ucs		  . #x6C37)	; æ°·
+      (=jis-x0208	  . #x4939)	; &I-J90-4939; [41-25]
+      ))
+    (<-original*sources
+     shinjigen-1)
+    (<-same
+     ((=cns11643-3	  . #x214C)	; &M-00360; [01-44]
+      (=daikanwa	  . 00360)	; &I-M-00360;
+      ))
+    (<-same*sources
+     shuowen hanshu lunheng jiyun daikanwa)
     (->vulgar
      ((=ucs		  . #x6C37)	; æ°·
       (=daikanwa	  . 17087)	; &I-M-17087;
       ))
     (->vulgar*sources
-     zhengzi-tong daikanwa)
+     zhengzitong daikanwa)
     ))
 (define-char
   '((ideographic-radical . 15)	; ⼎
@@ -203,6 +203,12 @@
   '((ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (hanyu-dazidian	1 295 6)
+    (shinjigen-1	. 543)
+    (=ucs		. #x205B1)	; 𠖱
+    (=cns11643-6	. #x235C)	; &I-C6-235C; [03-60]
+    (=daikanwa		. 01614)	; &I-M-01614;
+    (=hanziku-1		. #xE2D9)	; &I-HZK01-E2D9;
     (<-vulgar
      ((shinjigen-1	  . 542)
       (=ucs		  . #x51B1)	; 冱
@@ -210,13 +216,7 @@
       (=daikanwa	  . 01613)	; &I-M-01613;
       ))
     (<-vulgar*sources
-     zhengzi-tong daikanwa shinjigen-1)
-    (hanyu-dazidian	1 295 6)
-    (shinjigen-1	. 543)
-    (=ucs		. #x205B1)	; 𠖱
-    (=cns11643-6	. #x235C)	; &I-C6-235C; [03-60]
-    (=daikanwa		. 01614)	; &I-M-01614;
-    (=hanziku-1		. #xE2D9)	; &I-HZK01-E2D9;
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 15)	; ⼎
@@ -226,15 +226,7 @@
      ((ideographic-strokes . 4)
       (total-strokes	   . 6)
       (->subsumptive
-       ((<-wrong
-	 ((shinjigen-1	      . 542)
-	  (=ucs		      . #x51B1)	; 冱
-	  (=jis-x0208	      . #x5154)	; &I-J90-5154; [49-52]
-	  (=daikanwa	      . 01613)	; &I-M-01613;
-	  ))
-	(<-wrong*sources
-	 daikanwa shinjigen-1)
-	(ideographic-structure
+       ((ideographic-structure
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	  (=ucs		      . #x2FF0)	; â¿°
 	  )
@@ -247,6 +239,14 @@
 	(=daikanwa	    . 01615)	; &M-01615;
 	(=ucs@unicode	    . #x51B4)	; &M-01615;
 	(mojikyo	    . 001615)	; &MCS-6000064F;
+	(<-wrong
+	 ((shinjigen-1	      . 542)
+	  (=ucs		      . #x51B1)	; 冱
+	  (=jis-x0208	      . #x5154)	; &I-J90-5154; [49-52]
+	  (=daikanwa	      . 01613)	; &I-M-01613;
+	  ))
+	(<-wrong*sources
+	 daikanwa shinjigen-1)
 	)
        ((ideographic-structure
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -280,14 +280,6 @@
   '((ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (<-vulgar
-     ((shinjigen-1	  . 4092)
-      (=ucs		  . #x6C96)	; 沖
-      (=jis-x0208	  . #x322D)	; &I-J90-322D; [18-13]
-      (=daikanwa	  . 17209)	; &I-M-17209;
-      ))
-    (<-vulgar*sources
-     yupian daikanwa shinjigen-1)
     (hanyu-dazidian	1 295 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -309,6 +301,14 @@
     (=hanziku-1		. #xE2DB)	; &I-HZK01-E2DB;
     (=cbeta		. 00287)	; &I-CB00287;
     (mojikyo		. 001616)	; &MCS-60000650;
+    (<-vulgar
+     ((shinjigen-1	  . 4092)
+      (=ucs		  . #x6C96)	; 沖
+      (=jis-x0208	  . #x322D)	; &I-J90-322D; [18-13]
+      (=daikanwa	  . 17209)	; &I-M-17209;
+      ))
+    (<-vulgar*sources
+     yupian daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 15)	; ⼎
@@ -316,15 +316,7 @@
     (total-strokes	 . 6)
     (=ucs		. #x51B3)	; 决
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 4080)
-	(=jis-x0208	    . #x3768)	; &GT-21966; [23-72]
-	(=ks-x1001	    . #x4C3D)	; &I-K0-4C3D; [44-29]
-	(=daikanwa	    . 17174)	; &I-M-17174;
-	))
-      (<-vulgar*sources
-       yupian daikanwa shinjigen-1)
-      (hanyu-dazidian	  1 295 12)
+     ((hanyu-dazidian	  1 295 12)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
@@ -347,6 +339,14 @@
       (=cbeta		  . 00804)	; &I-CB00804;
       (=ucs@unicode	  . #x51B3)	; &GT-02132;
       (mojikyo		  . 001617)	; &MCS-60000651;
+      (<-vulgar
+       ((shinjigen-1	    . 4080)
+	(=jis-x0208	    . #x3768)	; &GT-21966; [23-72]
+	(=ks-x1001	    . #x4C3D)	; &I-K0-4C3D; [44-29]
+	(=daikanwa	    . 17174)	; &I-M-17174;
+	))
+      (<-vulgar*sources
+       yupian daikanwa shinjigen-1)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -388,14 +388,6 @@
   '((ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-vulgar
-     ((shinjigen-1	  . 4122)
-      (=ucs		  . #x6CC1)	; 況
-      (=jis-x0208	  . #x3637)	; &I-J90-3637; [22-23]
-      (=daikanwa	  . 17264)	; &I-M-17264;
-      ))
-    (<-vulgar*sources
-     yupian kangxi daikanwa shinjigen-1)
     (hanyu-dazidian	1 295 17)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -415,6 +407,15 @@
     (=gt-pj-1		. #x5157)	; &I-GT-02141; [49-55]
     (=daikanwa		. 01620)	; &I-M-01620;
     (=hanziku-1		. #xE2E4)	; &I-HZK01-E2E4;
+    (mojikyo		. 001620)	; &MCS-60000654;
+    (<-vulgar
+     ((shinjigen-1	  . 4122)
+      (=ucs		  . #x6CC1)	; 況
+      (=jis-x0208	  . #x3637)	; &I-J90-3637; [22-23]
+      (=daikanwa	  . 17264)	; &I-M-17264;
+      ))
+    (<-vulgar*sources
+     yupian kangxi daikanwa shinjigen-1)
     ))
 (define-char
   '((=>ucs*		. #x51B5)	; 况
@@ -422,6 +423,8 @@
     (ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (=ucs		. #xFA71)	; 况
+    (=cbeta		. 00288)	; &I-CB00288;
     (<-same
      ((=ucs		  . #x51B5)	; 况
       )
@@ -430,9 +433,6 @@
     (<-vulgar
      ((=ucs		  . #x6CC1)	; 況
       ))
-    (=ucs		. #xFA71)	; 况
-    (=cbeta		. 00288)	; &I-CB00288;
-    (mojikyo		. 001620)	; &MCS-60000654;
     ))
 (define-char
   '((ideographic-radical . 15)	; ⼎
@@ -1051,7 +1051,10 @@
 	)
        ((=ucs		    . #x51AB)	; 冫
 	)
-       ((=ucs@unicode	    . #x59BB)	; &UU+59BB;
+       ((=jis-x0208	    . #x3A4A)	; &GT-07743; [26-42]
+	(=gb2312	    . #x465E)	; &I-G0-465E; [38-62]
+	(=ks-x1001	    . #x7423)	; &I-K0-7423; [84-03]
+	(=daikanwa	    . 06140)	; &I-M-06140;
 	))
       (shinjigen-1	  . 551)
       (shinjigen-2	  . 551)
@@ -1081,17 +1084,32 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (=ucs		. #x34D0)	; 㓐
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x34D0)	; 㓐
+      ))
+    (ideographic-radical . 15)	; ⼎
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
     (->subsumptive
      ((=daikanwa	  . 01658)	; &M-01658;
       )
      ((hanyu-dazidian	  1 298 2)
       (=cns11643-3	  . #x2F5D)	; &HZK01-E376; [15-61]
       (=hanziku-1	  . #xE376)	; &I-HZK01-E376;
-      )
-     ((=ucs@unicode	  . #x34D0)	; &UU+34D0;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x34D0)	; 㓐
+      ))
+    (ideographic-radical . 15)	; ⼎
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (=ucs@unicode	. #x34D0)	; &UU+34D0;
+    ))
+(define-char
   '((ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
@@ -1157,7 +1175,8 @@
 	)
        ((=ucs		    . #x51AB)	; 冫
 	)
-       ((=ucs@unicode	    . #x96B9)	; &C1-4F63;
+       ((=gb2312	    . #x763F)	; &C1-4F63; [86-31]
+	(=cns11643-1	    . #x4F63)	; &I-C1-4F63; [47-67]
 	))
       (=gb2312		  . #x573C)	; &C1-5446; [55-28]
       (=cns11643-1	  . #x5446)	; &I-C1-5446; [52-38]
@@ -1172,7 +1191,7 @@
     (=daikanwa		. 01662)	; &M-01662;
     ))
 (define-char
-  '((morohashi-daikanwa	1662 0 0)
+  '((=>daikanwa		. 01662)	; &M-01662;
     (ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
@@ -1232,35 +1251,47 @@
     (hanyu-dazidian	1 297 13)
     (=ucs		. #x51C8)	; 凈
     (=big5		. #xD0E4)	; &I-B-D0E4;
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x51AB)	; 冫
-	)
-       ((=jis-x0208	    . #x6027)	; &GT-25238; [64-07]
-	(=ks-x1001	    . #x6E33)	; &I-K0-6E33; [78-19]
-	(=daikanwa	    . 19663)	; &I-M-19663;
-	))
-      (=jis-x0212	  . #x3321)	; &M-01664; [19-01]
-      (=daikanwa	  . 01664)	; &I-M-01664;
-      (=jef-china3	  . #x43FA)	; &I-JC3-43FA;
-      (=ucs@jis		  . #x51C8)	; &M-01664;
-      (=ucs@big5	  . #x51C8)	; &M-01664;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x51C8)	; 凈
+      ))
+    (ideographic-radical . 15)	; ⼎
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x51AB)	; 冫
-	)
-       ((=ucs@unicode	    . #x722D)	; &C1-4E68;
-	))
-      (=cns11643-2	  . #x2E27)	; &C2-2E27; [14-07]
-      (=gb12345		  . #x3E3B)	; &C2-2E27; [30-27]
-      (=ucs@unicode	  . #x51C8)	; &C2-2E27;
+     ((=ucs		  . #x51AB)	; 冫
+      )
+     ((=jis-x0208	  . #x6027)	; &GT-25238; [64-07]
+      (=ks-x1001	  . #x6E33)	; &I-K0-6E33; [78-19]
+      (=daikanwa	  . 19663)	; &I-M-19663;
+      ))
+    (=jis-x0212		. #x3321)	; &M-01664; [19-01]
+    (=daikanwa		. 01664)	; &I-M-01664;
+    (=jef-china3	. #x43FA)	; &I-JC3-43FA;
+    (=ucs@jis		. #x51C8)	; &M-01664;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x51C8)	; 凈
+      ))
+    (ideographic-radical . 15)	; ⼎
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x51AB)	; 冫
+      )
+     ((=cns11643-1	  . #x4E68)	; &C1-4E68; [46-72]
       ))
+    (=cns11643-2	. #x2E27)	; &C2-2E27; [14-07]
+    (=gb12345		. #x3E3B)	; &C2-2E27; [30-27]
+    (=ucs@unicode	. #x51C8)	; &C2-2E27;
     ))
 (define-char
   '((ideographic-radical . 15)	; ⼎
@@ -1268,14 +1299,7 @@
     (total-strokes	 . 10)
     (=ucs		. #x51C9)	; 凉
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 4308)
-	(=jis-x0208	    . #x4E43)	; &GT-22670; [46-35]
-	(=daikanwa	    . 17606)	; &I-M-17606;
-	))
-      (<-vulgar*sources
-       shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
@@ -1295,6 +1319,13 @@
       (=cbeta		  . 00289)	; &I-CB00289;
       (=ucs@jis		  . #x51C9)	; &GT-02201;
       (mojikyo		  . 001665)	; &MCS-60000681;
+      (<-vulgar
+       ((shinjigen-1	    . 4308)
+	(=jis-x0208	    . #x4E43)	; &GT-22670; [46-35]
+	(=daikanwa	    . 17606)	; &I-M-17606;
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       )
      ((hanyu-dazidian	  1 299 9)
       (ideographic-structure
@@ -1303,7 +1334,8 @@
 	)
        ((=ucs		    . #x51AB)	; 冫
 	)
-       ((=ucs		    . #x4EAC)	; 京
+       ((=gb2312	    . #x3E29)	; &C1-4B6B; [30-09]
+	(=cns11643-1	    . #x4B6B)	; &I-C1-4B6B; [43-75]
 	))
       (=gb2312		  . #x4139)	; &HZK01-E3BF; [33-25]
       (=cns11643-3	  . #x2F5F)	; &I-C3-2F5F; [15-63]
@@ -1332,7 +1364,8 @@
       )
      ((=ucs		  . #x51AB)	; 冫
       )
-     ((=ucs@unicode	  . #x9751)	; &M-42564;
+     ((=ks-x1001	  . #x746C)	; &M-42564; [84-76]
+      (=daikanwa	  . 42564)	; &I-M-42564;
       ))
     (=jis-x0213-1-2000	. #x2E56)	; &M-01666; [14-54]
     (=daikanwa		. 01666)	; &I-M-01666;
@@ -1353,7 +1386,8 @@
 	)
        ((=ucs		    . #x51AB)	; 冫
 	)
-       ((=ucs@unicode	    . #x9752)	; &GT-57125;
+       ((=jis-x0208	    . #x4044)	; &GT-57125; [32-36]
+	(=gb2312	    . #x4760)	; &I-G0-4760; [39-64]
 	))
       (=ucs@unicode	  . #x51CA)	; &UU+51CA;
       )
@@ -1370,29 +1404,90 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x205DA)	; 𠗚
+  '((ideographic-radical . 15)	; ⼎
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (=ucs		. #x205DA)	; 𠗚
+    (->subsumptive
+     ((=daikanwa	  . 01667)	; &M-01667;
+      )
+     ((hanyu-dazidian	  1 299 10)
+      (=cns11643-5	  . #x2B79)	; &HZK01-E3C0; [11-89]
+      (=hanziku-1	  . #xE3C0)	; &I-HZK01-E3C0;
+      (=ucs@iso		  . #x205DA)	; &HZK01-E3C0;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 15)	; ⼎
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (hanyu-dazidian	1 299 7)
+    (=ucs		. #x51CB)	; 凋
+    (=big5		. #xADE4)	; &I-B-ADE4;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x51CB)	; 凋
+      ))
     (ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (=daikanwa		. 01667)	; &M-01667;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x51AB)	; 冫
+      )
+     ((=ks-x1001	  . #x7132)	; &M-03441; [81-18]
+      (=cns11643-6	  . #x2A3C)	; &I-C6-2A3C; [10-28]
+      (=daikanwa	  . 03441)	; &I-M-03441;
+      ))
+    (shinjigen-1	. 553)
+    (shinjigen-2	. 553)
+    (=jis-x0208@1978	. #x437C)	; &M-01668; [35-92]
+    (=ks-x1001		. #x703D)	; &I-K0-703D; [80-29]
+    (=daikanwa		. 01668)	; &I-M-01668;
     ))
 (define-char
-  '((morohashi-daikanwa	1667 0 0)
+  '((<-denotational
+     ((=ucs		  . #x51CB)	; 凋
+      ))
     (ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian	1 299 10)
-    (=ucs		. #x205DA)	; 𠗚
-    (=cns11643-5	. #x2B79)	; &I-C5-2B79; [11-89]
-    (=hanziku-1		. #xE3C0)	; &I-HZK01-E3C0;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x51AB)	; 冫
+      )
+     ((=jis-x0208	  . #x3C7E)	; &GT-04362; [28-94]
+      (=gb2312		  . #x565C)	; &I-G0-565C; [54-60]
+      (=cns11643-1	  . #x4C52)	; &I-C1-4C52; [44-50]
+      ))
+    (=gb2312		. #x3572)	; &GT-02197; [21-82]
+    (=jis-x0208@1983	. #x437C)	; &I-J83-437C; [35-92]
+    (=jis-x0208@1990	. #x437C)	; &I-J90-437C; [35-92]
+    (=cns11643-1	. #x5447)	; &I-C1-5447; [52-39]
+    (=gt		. 02197)	; &I-GT-02197;
+    (=gt-k		. 06506)	; &I-GT-K06506;
+    (=gt-pj-1		. #x437C)	; &I-GT-02197; [35-92]
+    (=jef-china3	. #x44A6)	; &I-JC3-44A6;
+    (=ucs@unicode	. #x51CB)	; &GT-02197;
     ))
 (define-char
   '((ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian	1 299 7)
-    (=ucs		. #x51CB)	; 凋
-    (=big5		. #xADE4)	; &I-B-ADE4;
+    (=ucs		. #x51CC)	; 凌
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x51CC)	; 凌
+      ))
+    (ideographic-radical . 15)	; ⼎
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -1400,56 +1495,25 @@
 	)
        ((=ucs		    . #x51AB)	; 冫
 	)
-       ((=ks-x1001	    . #x7132)	; &M-03441; [81-18]
-	(=cns11643-6	    . #x2A3C)	; &I-C6-2A3C; [10-28]
-	(=daikanwa	    . 03441)	; &I-M-03441;
+       ((=daikanwa	    . 05714)	; &M-05714;
 	))
-      (shinjigen-1	  . 553)
-      (shinjigen-2	  . 553)
-      (=jis-x0208@1978	  . #x437C)	; &M-01668; [35-92]
-      (=ks-x1001	  . #x703D)	; &I-K0-703D; [80-29]
-      (=daikanwa	  . 01668)	; &I-M-01668;
+      (=daikanwa	  . 01669)	; &M-01669;
       )
-     ((hanyu-dazidian	  1 299 7)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
        ((=ucs		    . #x51AB)	; 冫
 	)
-       ((=jis-x0208	    . #x3C7E)	; &GT-04362; [28-94]
-	(=gb2312	    . #x565C)	; &I-G0-565C; [54-60]
-	(=cns11643-1	    . #x4C52)	; &I-C1-4C52; [44-50]
+       ((=cns11643-2	    . #x2623)	; &C2-2623; [06-03]
 	))
-      (=gb2312		  . #x3572)	; &GT-02197; [21-82]
-      (=jis-x0208@1983	  . #x437C)	; &I-J83-437C; [35-92]
-      (=jis-x0208@1990	  . #x437C)	; &I-J90-437C; [35-92]
-      (=cns11643-1	  . #x5447)	; &I-C1-5447; [52-39]
-      (=gt		  . 02197)	; &I-GT-02197;
-      (=gt-k		  . 06506)	; &I-GT-K06506;
-      (=gt-pj-1		  . #x437C)	; &I-GT-02197; [35-92]
-      (=jef-china3	  . #x44A6)	; &I-JC3-44A6;
-      (=ucs@unicode	  . #x51CB)	; &GT-02197;
+      (=cns11643-1	  . #x5445)	; &C1-5445; [52-37]
       ))
     ))
 (define-char
-  '((=>ucs		. #x51CC)	; 凌
-    (ideographic-radical . 15)	; ⼎
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x51AB)	; 冫
-      )
-     ((=daikanwa	  . 05714)	; &M-05714;
+  '((<-denotational
+     ((=ucs		  . #x51CC)	; 凌
       ))
-    (=daikanwa		. 01669)	; &M-01669;
-    ))
-(define-char
-  '((=>ucs		. #x51CC)	; 凌
-    (morohashi-daikanwa	1669 0 0)
     (ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
@@ -1459,13 +1523,15 @@
       )
      ((=ucs		  . #x51AB)	; 冫
       )
-     ((=cns11643-2	  . #x2623)	; &C2-2623; [06-03]
+     ((=ucs@unicode	  . #x590C)	; &UU+590C;
       ))
-    (=cns11643-1	. #x5445)	; &C1-5445; [52-37]
+    (=gb2312		. #x4168)	; &G0-4168; [33-72]
+    (=ucs@unicode	. #x51CC)	; &G0-4168;
     ))
 (define-char
-  '((=>ucs		. #x51CC)	; 凌
-    (morohashi-daikanwa	1669 0 1)
+  '((<-denotational
+     ((=ucs		  . #x51CC)	; 凌
+      ))
     (ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
@@ -1490,22 +1556,6 @@
     (=ucs@big5		. #x51CC)	; &GT-02202;
     ))
 (define-char
-  '((morohashi-daikanwa	1669 0 2)
-    (ideographic-radical . 15)	; ⼎
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x51AB)	; 冫
-      )
-     ((=ucs		  . #x590C)	; 夌
-      ))
-    (=ucs		. #x51CC)	; 凌
-    (=gb2312		. #x4168)	; &I-G0-4168; [33-72]
-    ))
-(define-char
   '((ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
@@ -1979,15 +2029,7 @@
     (total-strokes	 . 12)
     (=ucs		. #x51D6)	; 凖
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 4378)
-	(=jis-x0208	    . #x3D60)	; &GT-22976; [29-64]
-	(=ks-x1001	    . #x715E)	; &I-K0-715E; [81-62]
-	(=daikanwa	    . 17934)	; &I-M-17934;
-	))
-      (<-vulgar*sources
-       zhengzi-tong daikanwa shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
@@ -2004,13 +2046,22 @@
       (=gt-pj-1		  . #x5245)	; &I-GT-02216; [50-37]
       (=daikanwa	  . 01695)	; &I-M-01695;
       (=ucs@jis		  . #x51D6)	; &GT-02216;
+      (<-vulgar
+       ((shinjigen-1	    . 4378)
+	(=jis-x0208	    . #x3D60)	; &GT-22976; [29-64]
+	(=ks-x1001	    . #x715E)	; &I-K0-715E; [81-62]
+	(=daikanwa	    . 17934)	; &I-M-17934;
+	))
+      (<-vulgar*sources
+       zhengzitong daikanwa shinjigen-1)
       )
      ((hanyu-dazidian	  1 300 4)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x51C6)	; 准
+       ((=gb2312	    . #x573C)	; &C1-5446; [55-28]
+	(=cns11643-1	    . #x5446)	; &I-C1-5446; [52-38]
 	)
        ((=ucs		    . #x5341)	; 十
 	))
@@ -2087,14 +2138,23 @@
 	)
        ((=ucs		    . #x51AB)	; 冫
 	)
-       ((=ucs@unicode	    . #x5D14)	; &UU+5D14;
+       ((=gb2312	    . #x345E)	; &C1-597E; [20-62]
+	(=cns11643-1	    . #x597E)	; &I-C1-597E; [57-94]
 	))
       (=cns11643-2	  . #x416A)	; &C2-416A; [33-74]
       (=ucs@unicode	  . #x51D7)	; &C2-416A;
       ))
     ))
 (define-char
-  '((=>ucs		. #x205FD)	; 𠗽
+  '((ideographic-radical . 15)	; ⼎
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (=ucs		. #x205FD)	; 𠗽
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x205FD)	; 𠗽
+      ))
     (ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
@@ -2103,12 +2163,17 @@
     (=hanziku-1		. #xE3EB)	; &I-HZK01-E3EB;
     ))
 (define-char
-  '((morohashi-daikanwa	1700 0 2)
+  '((<-denotational
+     ((=ucs		  . #x205FD)	; 𠗽
+      ))
     (ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (=ucs		. #x205FD)	; 𠗽
-    (=cns11643-5	. #x3D6A)	; &I-C5-3D6A; [29-74]
+    (->subsumptive
+     ((=ucs@iso		  . #x205FD)	; &U-000205FD;
+      )
+     ((=cns11643-5	  . #x3D6A)	; &C5-3D6A; [29-74]
+      ))
     ))
 (define-char
   '((ideographic-radical . 15)	; ⼎
@@ -2439,14 +2504,7 @@
     (total-strokes	 . 15)
     (=ucs		. #x51DB)	; 凛
     (->subsumptive
-     ((<-vulgar
-       ((=ks-x1001	    . #x574F)	; &GT-02256; [55-47]
-	(=jis-x0208@1990    . #x7425)	; &I-J90-7425; [84-05]
-	(=daikanwa	    . 01717)	; &I-M-01717;
-	))
-      (<-vulgar*sources
-       pianhai daikanwa)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
@@ -2457,6 +2515,13 @@
       (=jis-x0208@1978	  . #x515B)	; &M-01718; [49-59]
       (=jis-x0208@1983	  . #x515B)	; &I-J83-515B; [49-59]
       (=daikanwa	  . 01718)	; &I-M-01718;
+      (<-vulgar
+       ((=ks-x1001	    . #x574F)	; &GT-02256; [55-47]
+	(=jis-x0208@1990    . #x7425)	; &I-J90-7425; [84-05]
+	(=daikanwa	    . 01717)	; &I-M-01717;
+	))
+      (<-vulgar*sources
+       pianhai daikanwa)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -2468,15 +2533,7 @@
 	))
       (=cns11643-3	  . #x4B30)	; &C3-4B30; [43-16]
       )
-     ((<-vulgar
-       ((shinjigen-1	    . 561)
-	(=ks-x1001	    . #x574F)	; &GT-02256; [55-47]
-	(=jis-x0208@1990    . #x7425)	; &I-J90-7425; [84-05]
-	(=daikanwa	    . 01717)	; &I-M-01717;
-	))
-      (<-vulgar*sources
-       shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
@@ -2490,6 +2547,14 @@
       (=gt		  . 02257)	; &I-GT-02257;
       (=gt-pj-1		  . #x515B)	; &I-GT-02257; [49-59]
       (=ucs@jis		  . #x51DB)	; &GT-02257;
+      (<-vulgar
+       ((shinjigen-1	    . 561)
+	(=ks-x1001	    . #x574F)	; &GT-02256; [55-47]
+	(=jis-x0208@1990    . #x7425)	; &I-J90-7425; [84-05]
+	(=daikanwa	    . 01717)	; &I-M-01717;
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       )
      ((hanyu-dazidian	  1 301 12)
       (ideographic-structure
@@ -2506,21 +2571,18 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x2060D)	; 𠘍
-    (ideographic-radical . 15)	; ⼎
-    (ideographic-strokes . 13)
-    (total-strokes	 . 15)
-    (hanyu-dazidian	1 301 6)
-    (=daikanwa		. 01719)	; &M-01719;
-    (=hanziku-1		. #xE3FC)	; &I-HZK01-E3FC;
-    ))
-(define-char
-  '((morohashi-daikanwa	1719 0 1)
-    (ideographic-radical . 15)	; ⼎
+  '((ideographic-radical . 15)	; ⼎
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
     (=ucs		. #x2060D)	; 𠘍
-    (=cns11643-7	. #x2136)	; &I-C7-2136; [01-22]
+    (->subsumptive
+     ((hanyu-dazidian	  1 301 6)
+      (=daikanwa	  . 01719)	; &M-01719;
+      (=hanziku-1	  . #xE3FC)	; &I-HZK01-E3FC;
+      )
+     ((=cns11643-7	  . #x2136)	; &C7-2136; [01-22]
+      (=ucs@iso		  . #x2060D)	; &C7-2136;
+      ))
     ))
 (define-char
   '((ideographic-radical . 15)	; ⼎
@@ -2535,7 +2597,10 @@
 	)
        ((=ucs		    . #x51AB)	; 冫
 	)
-       ((=ucs@unicode	    . #x7591)	; &UU+7591;
+       ((=jis-x0208	    . #x353F)	; &GT-28247; [21-31]
+	(=gb2312	    . #x5249)	; &I-G0-5249; [50-41]
+	(=ks-x1001	    . #x6B77)	; &I-K0-6B77; [75-87]
+	(=daikanwa	    . 22007)	; &I-M-22007;
 	))
       (shinjigen-1	  . 564)
       (shinjigen-2	  . 564)
diff --git a/lisp/utf-2000/Ideograph-R016-Table.el b/lisp/utf-2000/Ideograph-R016-Table.el
index 394dc8d..0daa6e8 100644
--- a/lisp/utf-2000/Ideograph-R016-Table.el
+++ b/lisp/utf-2000/Ideograph-R016-Table.el
@@ -25,14 +25,14 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (total-strokes	 . 2)
-    (<-identical@component
-     ((=ucs		  . #x51E0)	; 几
-      ))
     (=ucs		. #x2E87)	; ⺇
     (=big5-cdp		. #x8D66)	; &I-CDP-8D66;
     (=gt		. 02284)	; &I-GT-02284;
     (=gt-k		. 00086)	; &I-GT-K00086;
     (=gt-pj-9		. #x505D)	; &I-GT-02284; [48-61]
+    (<-identical@component
+     ((=ucs		  . #x51E0)	; 几
+      ))
     ))
 (define-char
   '((=>ucs		. #x20627)	; 𠘧
@@ -143,15 +143,6 @@
     ))
 (define-char
   '((total-strokes	 . 3)
-    (<-vulgar
-     ((=jis-x0208	  . #x4B5E)	; &GT-02286; [43-62]
-      (=gb2312		  . #x3732)	; &I-G0-3732; [23-18]
-      (=ks-x1001	  . #x5B6D)	; &I-K0-5B6D; [59-77]
-      (=cns11643-1	  . #x443B)	; &I-C1-443B; [36-27]
-      (=daikanwa	  . 01739)	; &I-M-01739;
-      ))
-    (<-vulgar*sources
-     zhengzi-tong daikanwa)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -166,6 +157,15 @@
     (=jis-x0213-1-2000	. #x2E58)	; &I-JX1-2E58; [14-56]
     (=hanziku-1		. #xDEE9)	; &I-HZK01-DEE9;
     (=jef-china3	. #x41B8)	; &I-JC3-41B8;
+    (<-vulgar
+     ((=jis-x0208	  . #x4B5E)	; &GT-02286; [43-62]
+      (=gb2312		  . #x3732)	; &I-G0-3732; [23-18]
+      (=ks-x1001	  . #x5B6D)	; &I-K0-5B6D; [59-77]
+      (=cns11643-1	  . #x443B)	; &I-C1-443B; [36-27]
+      (=daikanwa	  . 01739)	; &I-M-01739;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa)
     (->subsumptive
      ((ideographic-radical . 4)	; ⼃
       (ideographic-strokes . 2)
@@ -317,11 +317,6 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x515D)	; &GT-44206; [49-61]
-      (=ks-x1001	  . #x7425)	; &I-K0-7425; [84-05]
-      (=daikanwa	  . 32697)	; &I-M-32697;
-      ))
     (hanyu-dazidian	1 276 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
@@ -340,6 +335,11 @@
     (=gt-k		. 00956)	; &I-GT-K00956;
     (=gt-pj-1		. #x3D68)	; &I-GT-02293; [29-72]
     (=daikanwa		. 01745)	; &I-M-01745;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x515D)	; &GT-44206; [49-61]
+      (=ks-x1001	  . #x7425)	; &I-K0-7425; [84-05]
+      (=daikanwa	  . 32697)	; &I-M-32697;
+      ))
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -619,6 +619,12 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (hanyu-dazidian	1 277 11)
+    (=ucs		. #x51EC)	; 凬
+    (=cns11643-3	. #x245B)	; &I-C3-245B; [04-59]
+    (=daikanwa		. 01765)	; &I-M-01765;
+    (=hanziku-1		. #xDF53)	; &I-HZK01-DF53;
+    (=jef-china3	. #x44AC)	; &I-JC3-44AC;
     (<-ancient
      ((shinjigen-1	  . 9211)
       (=jis-x0208	  . #x4977)	; &GT-58717; [41-87]
@@ -627,12 +633,6 @@
       ))
     (<-ancient*sources
      shinjigen-1)
-    (hanyu-dazidian	1 277 11)
-    (=ucs		. #x51EC)	; 凬
-    (=cns11643-3	. #x245B)	; &I-C3-245B; [04-59]
-    (=daikanwa		. 01765)	; &I-M-01765;
-    (=hanziku-1		. #xDF53)	; &I-HZK01-DF53;
-    (=jef-china3	. #x44AC)	; &I-JC3-44AC;
     ))
 (define-char
   '((morohashi-daikanwa	ho 46)
@@ -777,6 +777,10 @@
     (ideographic-radical@cns*sources
      daikanwa=01775 cns11643)
     (total-strokes	 . 8)
+    (hanyu-dazidian	2 1094 6)
+    (=ucs		. #x221BB)	; 𢆻
+    (=cns11643-6	. #x295E)	; &I-C6-295E; [09-62]
+    (=hanziku-3		. #xDF74)	; &I-HZK03-DF74;
     (<-ancient
      ((=jis-x0208	  . #x3476)	; &M-09208; [20-86]
       (=ks-x1001	  . #x507A)	; &I-K0-507A; [48-90]
@@ -784,10 +788,6 @@
       ))
     (<-ancient*sources
      yupian jiyun daikanwa)
-    (hanyu-dazidian	2 1094 6)
-    (=ucs		. #x221BB)	; 𢆻
-    (=cns11643-6	. #x295E)	; &I-C6-295E; [09-62]
-    (=hanziku-3		. #xDF74)	; &I-HZK03-DF74;
     (->subsumptive
      ((=daikanwa	  . 01775)	; &M-01775;
       )
diff --git a/lisp/utf-2000/Ideograph-R017-Open-Box.el b/lisp/utf-2000/Ideograph-R017-Open-Box.el
index fca2d3b..f93a568 100644
--- a/lisp/utf-2000/Ideograph-R017-Open-Box.el
+++ b/lisp/utf-2000/Ideograph-R017-Open-Box.el
@@ -20,11 +20,11 @@
     (ideographic-radical . 17)	; ⼐
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
+    (=ucs		. #x2F81D)	; 凵
+    (=cns11643-5	. #x2129)	; &I-C5-2129; [01-09]
     (<-unknown
      ((=ucs		  . #x51F5)	; 凵
       ))
-    (=ucs		. #x2F81D)	; 凵
-    (=cns11643-5	. #x2129)	; &I-C5-2129; [01-09]
     ))
 (define-char
   '((ideographic-radical . 17)	; ⼐
@@ -533,14 +533,6 @@
     (total-strokes@jis	     . 9)
     (ideographic-strokes@jis*sources
      daikanwa jis gt)
-    (<-vulgar
-     ((shinjigen-1	  . 584)
-      (=jis-x0208	  . #x4821)	; &GT-02383; [40-01]
-      (=ks-x1001	  . #x795E)	; &I-K0-795E; [89-62]
-      (=daikanwa	  . 01826)	; &I-M-01826;
-      ))
-    (<-vulgar*sources
-     zhengzi-tong daikanwa shinjigen-1)
     (hanyu-dazidian	1 309 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW")
@@ -561,6 +553,14 @@
     (=daikanwa		. 01830)	; &I-M-01830;
     (=hanziku-1		. #xE5C8)	; &I-HZK01-E5C8;
     (=cbeta		. 00630)	; &I-CB00630;
+    (<-vulgar
+     ((shinjigen-1	  . 584)
+      (=jis-x0208	  . #x4821)	; &GT-02383; [40-01]
+      (=ks-x1001	  . #x795E)	; &I-K0-795E; [89-62]
+      (=daikanwa	  . 01826)	; &I-M-01826;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((=>ucs		. #x2068E)	; 𠚎
diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el
index d43d1c3..59d35eb 100644
--- a/lisp/utf-2000/Ideograph-R018-Knife.el
+++ b/lisp/utf-2000/Ideograph-R018-Knife.el
@@ -45,12 +45,6 @@
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (<-formed@component/connect-left
-     ((=ucs		  . #x5200)	; 刀
-      (=daikanwa	  . 01845)	; &I-M-01845;
-      ))
-    (<-formed@component/connect-left*sources
-     zhengzitong daikanwa)
     (hanyu-dazidian	1 320 1)
     (=ucs		. #x5202)	; 刂
     (=gb2312		. #x5856)	; &I-G0-5856; [56-54]
@@ -64,6 +58,12 @@
     (=daikanwa		. 01847)	; &I-M-01847;
     (=big5-eten		. #xC87D)	; &B-C87D;
     (=jef-china3	. #x44B2)	; &I-JC3-44B2;
+    (<-formed@component/connect-left
+     ((=ucs		  . #x5200)	; 刀
+      (=daikanwa	  . 01845)	; &I-M-01845;
+      ))
+    (<-formed@component/connect-left*sources
+     zhengzitong daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -73,10 +73,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E89)	; ⺉
     (<-identical@component/connect-left
      ((=ucs		  . #x5202)	; 刂
       ))
-    (=ucs		. #x2E89)	; ⺉
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -140,7 +140,15 @@
     (total-strokes	 . 3)
     (=ucs		. #x5204)	; 刄
     (->subsumptive
-     ((<-simplified@misc
+     ((shinjigen-1	  . 592)
+      (shinjigen-2	  . 592)
+      (=jis-x0208	  . #x5163)	; &GT-02408; [49-67]
+      (=gt		  . 02408)	; &I-GT-02408;
+      (=gt-k		  . 00213)	; &I-GT-K00213;
+      (=gt-pj-1		  . #x5163)	; &I-GT-02408; [49-67]
+      (=daikanwa	  . 01849)	; &I-M-01849;
+      (=ucs@jis		  . #x5204)	; &GT-02408;
+      (<-simplified@misc
        ((=jis-x0208	    . #x5140)	; &GT-01871; [49-32]
 	(=ks-x1001	    . #x5557)	; &I-K0-5557; [53-55]
 	(=daikanwa	    . 01436)	; &I-M-01436;
@@ -155,20 +163,12 @@
 	))
       (<-vulgar@shinjigen*sources
        shinjigen-1)
-      (<-vulgar@zhengzi-tong
+      (<-vulgar@zhengzitong
        ((=gt		    . 02406)	; &GT-02406;
 	(=daikanwa	    . 01848)	; &I-M-01848;
 	))
-      (<-vulgar@zhengzi-tong*sources
-       zhengzi-tong daikanwa)
-      (shinjigen-1	  . 592)
-      (shinjigen-2	  . 592)
-      (=jis-x0208	  . #x5163)	; &GT-02408; [49-67]
-      (=gt		  . 02408)	; &I-GT-02408;
-      (=gt-k		  . 00213)	; &I-GT-K00213;
-      (=gt-pj-1		  . #x5163)	; &I-GT-02408; [49-67]
-      (=daikanwa	  . 01849)	; &I-M-01849;
-      (=ucs@jis		  . #x5204)	; &GT-02408;
+      (<-vulgar@zhengzitong*sources
+       zhengzitong daikanwa)
       )
      ((hanyu-dazidian	  1 320 4)
       (=cns11643-3	  . #x2136)	; &CDP-89F7; [01-22]
@@ -197,6 +197,10 @@
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
+    (shinjigen-1	. 589)
+    (=ucs		. #x206A3)	; 𠚣
+    (=cns11643-6	. #x2139)	; &I-C6-2139; [01-25]
+    (=daikanwa		. 01851)	; &I-M-01851;
     (<-Small-Seal
      ((=ucs		  . #x5200)	; 刀
       (=daikanwa	  . 01845)	; &I-M-01845;
@@ -210,10 +214,6 @@
       ))
     (<-formed*sources
      shinjigen-1)
-    (shinjigen-1	. 589)
-    (=ucs		. #x206A3)	; 𠚣
-    (=cns11643-6	. #x2139)	; &I-C6-2139; [01-25]
-    (=daikanwa		. 01851)	; &I-M-01851;
     (->Bopomofo
      ((name		  . "BOPOMOFO LETTER D")
       (=ucs		  . #x3109)	; ㄉ
@@ -222,6 +222,20 @@
      daikanwa)
     ))
 (define-char
+  '((=>ucs		. #x206A3)	; 𠚣
+    (ideographic-radical . 18)	; ⼑
+    (ideographic-strokes . 1)
+    (total-strokes	 . 3)
+    (=big5-cdp		. #x8DC9)	; &CDP-8DC9;
+    (<-formed@component
+     ((=ucs		  . #x206A3)	; 𠚣
+      )
+     ((=ucs		  . #x5200)	; 刀
+      )
+     ((=ucs		  . #x52FA)	; 勺
+      ))
+    ))
+(define-char
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
@@ -405,6 +419,7 @@
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
+    (shinjigen-1	. 597)
     (<-wrong
      ((shinjigen-1	  . 596)
       (=jis-x0208	  . #x405A)	; &GT-02415; [32-58]
@@ -413,7 +428,6 @@
       ))
     (<-wrong*sources
      shinjigen-1)
-    (shinjigen-1	. 597)
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -1733,22 +1747,6 @@
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-same
-     ((=ucs		  . #x5227)	; 刧
-      (=daikanwa	  . 01927)	; &I-M-01927;
-      )
-     ((=ucs		  . #x52AB)	; 劫
-      (=daikanwa	  . 02316)	; &I-M-02316;
-      ))
-    (<-same*sources
-     zhengzi-tong daikanwa)
-    (<-vulgar
-     ((shinjigen-1	  . 709)
-      (=ucs		  . #x52AB)	; 劫
-      (=jis-x0208	  . #x3965)	; &I-J90-3965; [25-69]
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (hanyu-dazidian	1 328 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -1765,20 +1763,15 @@
     (=hanziku-1		. #xE9AC)	; &I-HZK01-E9AC;
     (=cbeta		. 03637)	; &I-CB03637;
     (=jef-china3	. #x44C0)	; &I-JC3-44C0;
-    ))
-(define-char
-  '((ideographic-radical . 18)	; ⼑
-    (ideographic-strokes . 5)
-    (total-strokes	 . 7)
     (<-same
-     ((=ucs		  . #x5226)	; 刦
-      (=daikanwa	  . 01926)	; &I-M-01926;
+     ((=ucs		  . #x5227)	; 刧
+      (=daikanwa	  . 01927)	; &I-M-01927;
       )
      ((=ucs		  . #x52AB)	; 劫
       (=daikanwa	  . 02316)	; &I-M-02316;
       ))
     (<-same*sources
-     zhengzi-tong daikanwa)
+     zhengzitong daikanwa)
     (<-vulgar
      ((shinjigen-1	  . 709)
       (=ucs		  . #x52AB)	; 劫
@@ -1786,6 +1779,11 @@
       ))
     (<-vulgar*sources
      shinjigen-1)
+    ))
+(define-char
+  '((ideographic-radical . 18)	; ⼑
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
     (hanyu-dazidian	1 327 20)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -1806,6 +1804,22 @@
     (=daikanwa		. 01927)	; &I-M-01927;
     (=hanziku-1		. #xE97A)	; &I-HZK01-E97A;
     (=cbeta		. 04068)	; &I-CB04068;
+    (<-same
+     ((=ucs		  . #x5226)	; 刦
+      (=daikanwa	  . 01926)	; &I-M-01926;
+      )
+     ((=ucs		  . #x52AB)	; 劫
+      (=daikanwa	  . 02316)	; &I-M-02316;
+      ))
+    (<-same*sources
+     zhengzitong daikanwa)
+    (<-vulgar
+     ((shinjigen-1	  . 709)
+      (=ucs		  . #x52AB)	; 劫
+      (=jis-x0208	  . #x3965)	; &I-J90-3965; [25-69]
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -2449,6 +2463,10 @@
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (shinjigen-1	. 616)
+    (=ucs		. #x206F0)	; 𠛰
+    (=cns11643-6	. #x2965)	; &I-C6-2965; [09-69]
+    (=daikanwa		. 01965)	; &I-M-01965;
     (<-original
      ((shinjigen-1	  . 615)
       (=ucs		  . #x5225)	; 別
@@ -2456,10 +2474,6 @@
       ))
     (<-original*sources
      shinjigen-1)
-    (shinjigen-1	. 616)
-    (=ucs		. #x206F0)	; 𠛰
-    (=cns11643-6	. #x2965)	; &I-C6-2965; [09-69]
-    (=daikanwa		. 01965)	; &I-M-01965;
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -2773,15 +2787,15 @@
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (=ucs		. #x206F9)	; 𠛹
+    (=cns11643-6	. #x2967)	; &I-C6-2967; [09-71]
+    (=daikanwa		. 01980)	; &I-M-01980;
     (<-ancient
      ((=ucs		  . #x522A)	; 刪
       (=daikanwa	  . 01917)	; &I-M-01917;
       ))
     (<-ancient*sources
      zihui-bei daikanwa)
-    (=ucs		. #x206F9)	; 𠛹
-    (=cns11643-6	. #x2967)	; &I-C6-2967; [09-71]
-    (=daikanwa		. 01980)	; &I-M-01980;
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -2926,6 +2940,10 @@
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (shinjigen-1	. 610)
+    (=ucs		. #x20702)	; 𠜂
+    (=cns11643-6	. #x2968)	; &I-C6-2968; [09-72]
+    (=daikanwa		. 48938)	; &I-M-48938;
     (<-formed
      ((shinjigen-1	  . 609)
       (=ucs		  . #x522A)	; 刪
@@ -2939,10 +2957,6 @@
       ))
     (<-same*sources
      daikanwa)
-    (shinjigen-1	. 610)
-    (=ucs		. #x20702)	; 𠜂
-    (=cns11643-6	. #x2968)	; &I-C6-2968; [09-72]
-    (=daikanwa		. 48938)	; &I-M-48938;
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -3777,13 +3791,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
     (->subsumptive
-     ((<-vulgar
-       ((=jis-x0212	    . #x333A)	; &M-01953; [19-26]
-	(=daikanwa	    . 01953)	; &I-M-01953;
-	))
-      (<-vulgar*sources
-       zhengzi-tong daikanwa)
-      (hanyu-dazidian	  1 338 14)
+     ((hanyu-dazidian	  1 338 14)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
@@ -3796,14 +3804,14 @@
       (=daikanwa	  . 02024)	; &I-M-02024;
       (=hanziku-1	  . #xEBBC)	; &I-HZK01-EBBC;
       (=cbeta		  . 01772)	; &I-CB01772;
-      )
-     ((<-vulgar
-       ((shinjigen-1	    . 634)
-	(=ucs@unicode	    . #x5231)	; &UU+5231;
+      (<-vulgar
+       ((=jis-x0212	    . #x333A)	; &M-01953; [19-26]
+	(=daikanwa	    . 01953)	; &I-M-01953;
 	))
       (<-vulgar*sources
-       shinjigen-1)
-      (ideographic-structure
+       zhengzitong daikanwa)
+      )
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
@@ -3818,6 +3826,12 @@
       (=gt		  . 02591)	; &I-GT-02591;
       (=gt-pj-1		  . #x516C)	; &I-GT-02591; [49-76]
       (=ucs@jis		  . #x524F)	; &GT-02591;
+      (<-vulgar
+       ((shinjigen-1	    . 634)
+	(=ucs@unicode	    . #x5231)	; &UU+5231;
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       ))
     ))
 (define-char
@@ -4179,13 +4193,7 @@
     (total-strokes	 . 10)
     (=ucs		. #x5259)	; 剙
     (->subsumptive
-     ((<-vulgar
-       ((=jis-x0212	    . #x333A)	; &M-01953; [19-26]
-	(=daikanwa	    . 01953)	; &I-M-01953;
-	))
-      (<-vulgar*sources
-       zihui daikanwa)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
@@ -4195,14 +4203,14 @@
 	))
       (=daikanwa	  . 02040)	; &M-02040;
       (=cbeta		  . 04485)	; &I-CB04485;
-      )
-     ((<-vulgar
-       ((shinjigen-1	    . 634)
-	(=ucs@unicode	    . #x5231)	; &UU+5231;
+      (<-vulgar
+       ((=jis-x0212	    . #x333A)	; &M-01953; [19-26]
+	(=daikanwa	    . 01953)	; &I-M-01953;
 	))
       (<-vulgar*sources
-       shinjigen-1)
-      (ideographic-structure
+       zihui daikanwa)
+      )
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
@@ -4212,6 +4220,12 @@
 	))
       (shinjigen-1	  . 636)
       (=ucs@unicode	  . #x5259)	; &UU+5259;
+      (<-vulgar
+       ((shinjigen-1	    . 634)
+	(=ucs@unicode	    . #x5231)	; &UU+5231;
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       )
      ((hanyu-dazidian	  1 343 4)
       (ideographic-structure
@@ -4530,41 +4544,41 @@
     (=daikanwa		. 02057)	; &I-M-02057;
     ))
 (define-char
-  '((=>ucs		. #x5260)	; 剠
-    (ideographic-radical . 18)	; ⼑
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EAC)	; 京
-      )
-     ((=ucs		  . #x5202)	; 刂
-      ))
-    (=jis-x0212		. #x3346)	; &M-02058; [19-38]
-    (=daikanwa		. 02058)	; &I-M-02058;
-    (=cbeta		. 05822)	; &I-CB05822;
-    (=jef-china3	. #x44C6)	; &I-JC3-44C6;
-    (=ucs@jis		. #x5260)	; &M-02058;
-    ))
-(define-char
-  '((morohashi-daikanwa	2058 0 0)
-    (ideographic-radical . 18)	; ⼑
+  '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian	1 345 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EAC)	; 京
+    (=ucs		. #x5260)	; 剠
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x357E)	; &GT-00397; [21-94]
+	(=ks-x1001	    . #x4C48)	; &I-K0-4C48; [44-40]
+	(=daikanwa	    . 00299)	; &I-M-00299;
+	)
+       ((=ucs		    . #x5202)	; 刂
+	))
+      (=jis-x0212	  . #x3346)	; &M-02058; [19-38]
+      (=daikanwa	  . 02058)	; &I-M-02058;
+      (=cbeta		  . 05822)	; &I-CB05822;
+      (=jef-china3	  . #x44C6)	; &I-JC3-44C6;
+      (=ucs@jis		  . #x5260)	; &M-02058;
       )
-     ((=ucs		  . #x5202)	; 刂
+     ((hanyu-dazidian	  1 345 12)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gb2312	    . #x3E29)	; &C1-4B6B; [30-09]
+	(=cns11643-1	    . #x4B6B)	; &I-C1-4B6B; [43-75]
+	)
+       ((=ucs		    . #x5202)	; 刂
+	))
+      (=cns11643-3	  . #x2F60)	; &HZK01-ECFD; [15-64]
+      (=hanziku-1	  . #xECFD)	; &I-HZK01-ECFD;
+      (=ucs@unicode	  . #x5260)	; &HZK01-ECFD;
       ))
-    (=ucs		. #x5260)	; 剠
-    (=cns11643-3	. #x2F60)	; &I-C3-2F60; [15-64]
-    (=hanziku-1		. #xECFD)	; &I-HZK01-ECFD;
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -4577,7 +4591,10 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs@unicode	    . #x708E)	; &M-18910;
+       ((=jis-x0208	    . #x316A)	; &M-18910; [17-74]
+	(=gb2312	    . #x5157)	; &I-G0-5157; [49-55]
+	(=ks-x1001	    . #x667A)	; &I-K0-667A; [70-90]
+	(=daikanwa	    . 18910)	; &I-M-18910;
 	)
        ((=ucs		    . #x5202)	; 刂
 	))
@@ -4754,23 +4771,24 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (=ucs		. #x20759)	; 𠝙
-    (=cns11643-5	. #x2B7D)	; &I-C5-2B7D; [11-93]
-    (=daikanwa		. 02071)	; &I-M-02071;
-    ))
-(define-char
-  '((=>ucs		. #x2075A)	; 𠝚
-    (ideographic-radical . 18)	; ⼑
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
-    (=daikanwa		. 02072)	; &M-02072;
+    (->subsumptive
+     ((=daikanwa	  . 02071)	; &M-02071;
+      (=ucs@iso		  . #x20759)	; &M-02071;
+      )
+     ((=cns11643-5	  . #x2B7D)	; &C5-2B7D; [11-93]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	2072 0 0)
-    (ideographic-radical . 18)	; ⼑
+  '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (=ucs		. #x2075A)	; 𠝚
-    (=cns11643-5	. #x2C21)	; &I-C5-2C21; [12-01]
+    (->subsumptive
+     ((=daikanwa	  . 02072)	; &M-02072;
+      )
+     ((=cns11643-5	  . #x2C21)	; &C5-2C21; [12-01]
+      (=ucs@iso		  . #x2075A)	; &C5-2C21;
+      ))
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -4781,30 +4799,46 @@
     (=daikanwa		. 02073)	; &I-M-02073;
     ))
 (define-char
-  '((ideographic-radical . 18)	; ⼑
+  '((=>ucs		. #x2075C)	; 𠝜
+    (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (=daikanwa		. 02074)	; &M-02074;
     ))
 (define-char
+  '((=>daikanwa		. 02074)	; &M-02074;
+    (ideographic-radical . 18)	; ⼑
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (=ucs		. #x2075C)	; 𠝜
+    ))
+(define-char
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (=daikanwa		. 02075)	; &M-02075;
+    (=ucs		. #x20751)	; 𠝑
+    (->subsumptive
+     ((=daikanwa	  . 02075)	; &M-02075;
+      (=ucs@iso		  . #x20751)	; &M-02075;
+      )
+     ((=hanziku-1	  . #xED73)	; &HZK01-ED73;
+      ))
     ))
 (define-char
-  '((script		JP Touyou Jouyou Ideograph)
+  '((=>daikanwa		. 02075)	; &M-02075;
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((shinjigen-1	  . 653)
-      (=ucs		  . #x528D)	; 劍
-      (=jis-x0208	  . #x5178)	; &I-J90-5178; [49-88]
-      (=daikanwa	  . 02228)	; &I-M-02228;
+    (=ucs		. #x2074B)	; 𠝋
+    (<-unknown
+     ((=daikanwa	  . 02075)	; &M-02075;
       ))
-    (<-simplified@JP/Jouyou*sources
-     songyuan-yilai-suzipu daikanwa shinjigen-1 JP/Jouyou)
+    ))
+(define-char
+  '((script		JP Touyou Jouyou Ideograph)
+    (ideographic-radical . 18)	; ⼑
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
     (hanyu-dazidian	1 345 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -4824,53 +4858,64 @@
     (=gt-pj-1		. #x3775)	; &I-GT-02628; [23-85]
     (=daikanwa		. 02076)	; &I-M-02076;
     (=hanziku-1		. #xECF5)	; &I-HZK01-ECF5;
-    ))
-(define-char
-  '((script		JP Touyou Jouyou Ideograph)
-    (=>ucs		. #x5264)	; 剤
-    (morohashi-daikanwa	2076 1)
-    (ideographic-radical . 18)	; ⼑
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
+    (<-simplified
+     ((=ucs		  . #x528D)	; 劍
+      (=daikanwa	  . 02228)	; &I-M-02228;
+      ))
+    (<-simplified*sources
+     songyuan-yilai-suzipu daikanwa)
     (<-simplified@JP/Jouyou
-     ((shinjigen-1	  . 659)
-      (=jis-x0208	  . #x517D)	; &GT-02895; [49-93]
-      (=ks-x1001	  . #x7025)	; &I-K0-7025; [80-05]
-      (=daikanwa	  . 02241)	; &I-M-02241;
+     ((shinjigen-1	  . 653)
+      (=ucs		  . #x528D)	; 劍
+      (=jis-x0208	  . #x5178)	; &I-J90-5178; [49-88]
       ))
     (<-simplified@JP/Jouyou*sources
-     daikanwa shinjigen-1 JP/Jouyou)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=jis-x0208	  . #x4046)	; &GT-17014; [32-38]
-      )
-     ((=ucs		  . #x5202)	; 刂
-      ))
-    (shinjigen-1	. 658)
-    (shinjigen-2	. 658)
-    (=jis-x0208		. #x3A5E)	; &GT-02637; [26-62]
-    (=gt		. 02637)	; &I-GT-02637;
-    (=gt-pj-1		. #x3A5E)	; &I-GT-02637; [26-62]
-    (=ucs@jis		. #x5264)	; &GT-02637;
-    (mojikyo		. 050107)	; &MCS-6000C3BB;
+     shinjigen-1 JP/Jouyou)
     ))
 (define-char
-  '((morohashi-daikanwa	2076 1 0)
-    (ideographic-radical . 18)	; ⼑
+  '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6589)	; 斉
-      )
-     ((=ucs		  . #x5202)	; 刂
-      ))
     (=ucs		. #x5264)	; 剤
-    (=cns11643-3	. #x2F61)	; &I-C3-2F61; [15-65]
+    (->subsumptive
+     ((script		JP Touyou Jouyou Ideograph)
+      (morohashi-daikanwa	2076 1)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x4046)	; &GT-17014; [32-38]
+	)
+       ((=ucs		    . #x5202)	; 刂
+	))
+      (shinjigen-1	  . 658)
+      (shinjigen-2	  . 658)
+      (=jis-x0208	  . #x3A5E)	; &GT-02637; [26-62]
+      (=gt		  . 02637)	; &I-GT-02637;
+      (=gt-pj-1		  . #x3A5E)	; &I-GT-02637; [26-62]
+      (=ucs@jis		  . #x5264)	; &GT-02637;
+      (<-simplified@JP/Jouyou
+       ((shinjigen-1	    . 659)
+	(=jis-x0208	    . #x517D)	; &GT-02895; [49-93]
+	(=ks-x1001	    . #x7025)	; &I-K0-7025; [80-05]
+	(=daikanwa	    . 02241)	; &I-M-02241;
+	))
+      (<-simplified@JP/Jouyou*sources
+       daikanwa shinjigen-1 JP/Jouyou)
+      )
+     ((mojikyo		  . 050107)	; &MCS-6000C3BB;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=cns11643-3	    . #x2939)	; &C3-2939; [09-25]
+	)
+       ((=ucs		    . #x5202)	; 刂
+	))
+      (=cns11643-3	  . #x2F61)	; &C3-2F61; [15-65]
+      (=ucs@unicode	  . #x5264)	; &C3-2F61;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -4879,19 +4924,6 @@
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (<-same
-     ((=ucs		  . #x525D)	; 剝
-      (=daikanwa	  . 02049)	; &I-M-02049;
-      ))
-    (<-same*sources
-     daikanwa)
-    (<-vulgar
-     ((shinjigen-1	  . 666)
-      (=ucs		  . #x525D)	; 剝
-      (=jis-x0208@1978	  . #x476D)	; &I-J78-476D; [39-77]
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -4911,23 +4943,45 @@
     (=gt-pj-1		. #x476D)	; &I-GT-02662; [39-77]
     (=daikanwa		. 48939)	; &I-M-48939;
     (=jef-china3	. #x44D0)	; &I-JC3-44D0;
+    (<-same
+     ((=ucs		  . #x525D)	; 剝
+      (=daikanwa	  . 02049)	; &I-M-02049;
+      ))
+    (<-same*sources
+     daikanwa)
+    (<-vulgar
+     ((shinjigen-1	  . 666)
+      (=ucs		  . #x525D)	; 剝
+      (=jis-x0208@1978	  . #x476D)	; &I-J78-476D; [39-77]
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
-  '((morohashi-daikanwa	ho 50)
-    (ideographic-radical . 18)	; ⼑
+  '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x5266)	; 剦
+    (->subsumptive
+     ((morohashi-daikanwa	ho 50)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x3162)	; &GT-07418; [17-66]
+	(=gb2312	    . #x5159)	; &I-G0-5159; [49-57]
+	(=ks-x1001	    . #x6572)	; &I-K0-6572; [69-82]
+	(=daikanwa	    . 05881)	; &I-M-05881;
+	)
+       ((=ucs		    . #x5202)	; 刂
+	))
+      (=jis-x0212	  . #x3348)	; &JSP-3348; [19-40]
+      (=ucs@jis		  . #x5266)	; &JSP-3348;
       )
-     ((=ucs		  . #x5944)	; 奄
+     ((mojikyo		  . 050004)	; &MCS-6000C354;
       )
-     ((=ucs		  . #x5202)	; 刂
+     ((=ucs@unicode	  . #x5266)	; &UU+5266;
       ))
-    (=ucs		. #x5266)	; 剦
-    (=jis-x0212		. #x3348)	; &I-JSP-3348; [19-40]
-    (mojikyo		. 050004)	; &MCS-6000C354;
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -5015,7 +5069,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs@unicode	    . #x7809)	; &UU+7809;
+       ((=gb2312	    . #x6D39)	; &G0-6D39; [77-25]
 	)
        ((=ucs		    . #x5202)	; 刂
 	))
@@ -5154,7 +5208,16 @@
     (=hanziku-1		. #xEDB5)	; &I-HZK01-EDB5;
     ))
 (define-char
-  '((=>ucs		. #x526A)	; 剪
+  '((ideographic-radical . 18)	; ⼑
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (hanyu-dazidian	1 347 9)
+    (=ucs		. #x526A)	; 剪
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x526A)	; 剪
+      ))
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
@@ -5177,30 +5240,37 @@
     (=ucs@jis		. #x526A)	; &GT-02704;
     ))
 (define-char
-  '((morohashi-daikanwa	2088 0 1)
+  '((<-denotational
+     ((=ucs		  . #x526A)	; 剪
+      ))
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 347 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x524D)	; 前
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=jis-x0208	    . #x4130)	; &GT-02595; [33-16]
+	(=gb2312	    . #x4730)	; &I-G0-4730; [39-16]
+	(=ks-x1001	    . #x6E71)	; &I-K0-6E71; [78-81]
+	)
+       ((=ucs		    . #x5200)	; 刀
+	))
+      (=gb2312		  . #x3C74)	; &G0-3C74; [28-84]
+      (=big5		  . #xB0C5)	; &I-B-B0C5;
+      (=ucs@unicode	  . #x526A)	; &G0-3C74;
       )
-     ((=ucs		  . #x5200)	; 刀
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=cns11643-1	    . #x5029)	; &C1-5029; [48-09]
+	)
+       ((=ucs		    . #x5200)	; 刀
+	))
+      (=cns11643-1	  . #x592A)	; &C1-592A; [57-10]
       ))
-    (=ucs		. #x526A)	; 剪
-    (=gb2312		. #x3C74)	; &I-G0-3C74; [28-84]
-    (=big5		. #xB0C5)	; &I-B-B0C5;
-    ))
-(define-char
-  '((=>ucs		. #x526A)	; 剪
-    (morohashi-daikanwa	2088 0 2)
-    (ideographic-radical . 18)	; ⼑
-    (ideographic-strokes . 9)
-    (total-strokes	 . 11)
-    (=cns11643-1	. #x592A)	; &C1-592A; [57-10]
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -5224,7 +5294,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs@unicode	    . #x5EA6)	; &UU+5EA6;
+       ((=gb2312	    . #x3648)	; &C1-5079; [22-40]
+	(=cns11643-1	    . #x5079)	; &I-C1-5079; [48-89]
 	)
        ((=ucs		    . #x5202)	; 刂
 	))
@@ -5460,13 +5531,13 @@
     (total-strokes	 . 11)
     (=ucs		. #x20771)	; 𠝱
     (->subsumptive
-     ((<-wrong
-       ((=ucs		    . #x34FC)	; 㓼
+     ((=daikanwa	  . 02103)	; &M-02103;
+      (<-wrong
+       ((=cns11643-5	    . #x3D70)	; &M-02144; [29-80]
 	(=daikanwa	    . 02144)	; &I-M-02144;
 	))
       (<-wrong*sources
        zihui-bei daikanwa)
-      (=daikanwa	  . 02103)	; &M-02103;
       )
      ((=cns11643-6	  . #x3D48)	; &C6-3D48; [29-40]
       (=ucs@unicode	  . #x20771)	; &C6-3D48;
@@ -5476,13 +5547,20 @@
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (=daikanwa		. 02104)	; &M-02104;
+    (=ucs		. #x20772)	; 𠝲
+    (=daikanwa		. 02104)	; &I-M-02104;
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (=daikanwa		. 02105)	; &M-02105;
+    (=ucs		. #x20773)	; 𠝳
+    (->subsumptive
+     ((=daikanwa	  . 02105)	; &M-02105;
+      )
+     ((=hanziku-1	  . #xEDDA)	; &HZK01-EDDA;
+      (=ucs@iso		  . #x20773)	; &HZK01-EDDA;
+      ))
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -5494,128 +5572,145 @@
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
+    (=ucs		. #x5270)	; 剰
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5270)	; 剰
+      ))
+    (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5269)	; 剩
-      (=jis-x0208	  . #x5174)	; &I-J90-5174; [49-84]
-      ))
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4E57)	; 乗
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x3E68)	; &GT-00208; [30-72]
+	(=daikanwa	    . 00153)	; &I-M-00153;
+	)
+       ((=ucs		    . #x5202)	; 刂
+	))
+      (shinjigen-1	  . 673)
+      (shinjigen-2	  . 673)
+      (=jis-x0208	  . #x3E6A)	; &GT-02701; [30-74]
+      (=gt		  . 02701)	; &I-GT-02701;
+      (=gt-pj-1		  . #x3E6A)	; &I-GT-02701; [30-74]
+      (=daikanwa	  . 02107)	; &I-M-02107;
+      (=ucs@jis		  . #x5270)	; &GT-02701;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x5269)	; 剩
+	(=jis-x0208	    . #x5174)	; &I-J90-5174; [49-84]
+	))
       )
-     ((=ucs		  . #x5202)	; 刂
+     ((=ucs@unicode	  . #x5270)	; &UU+5270;
       ))
-    (shinjigen-1	. 673)
-    (shinjigen-2	. 673)
-    (=ucs		. #x5270)	; 剰
-    (=jis-x0208		. #x3E6A)	; &I-J90-3E6A; [30-74]
-    (=gt		. 02701)	; &I-GT-02701;
-    (=gt-pj-1		. #x3E6A)	; &I-GT-02701; [30-74]
-    (=daikanwa		. 02107)	; &I-M-02107;
     ))
 (define-char
-  '((=>ucs		. #x5270)	; 剰
-    (morohashi-daikanwa	2107 0 2)
+  '((<-denotational
+     ((=ucs		  . #x5270)	; 剰
+      ))
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (=cns11643-3	. #x3A23)	; &C3-3A23; [26-03]
     ))
 (define-char
-  '((=>ucs		. #x5271)	; 剱
-    (morohashi-daikanwa	ho 51)
-    (ideographic-radical . 18)	; ⼑
+  '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=gt-k		  . 03992)	; &GT-K03992;
-      )
-     ((=jis-x0208	  . #x3F4F)	; &GT-02407; [31-47]
-      (=cns11643-6	  . #x2138)	; &I-C6-2138; [01-24]
-      (=daikanwa	  . 01850)	; &I-M-01850;
-      ))
-    (=gt		. 02691)	; &GT-02691;
-    (=gt-k		. 08026)	; &I-GT-K08026;
-    (=gt-pj-9		. #x3437)	; &GT-02691; [20-23]
-    (mojikyo		. 085278)	; &MCS-60014D1E;
+    (=ucs		. #x5271)	; 剱
     ))
 (define-char
-  '((=>ucs		. #x5271)	; 剱
-    (morohashi-daikanwa	ho 51 0)
+  '((<-denotational
+     ((=ucs		  . #x5271)	; 剱
+      ))
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (<-simplified
-     ((=ucs		  . #x5294)	; 劔
+    (->subsumptive
+     ((morohashi-daikanwa	ho 51)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 03992)	; &GT-K03992;
+	)
+       ((=jis-x0208	    . #x3F4F)	; &GT-02407; [31-47]
+	(=cns11643-6	    . #x2138)	; &I-C6-2138; [01-24]
+	(=daikanwa	    . 01850)	; &I-M-01850;
+	))
+      (=gt		  . 02691)	; &GT-02691;
+      (=gt-k		  . 08026)	; &I-GT-K08026;
+      (=gt-pj-9		  . #x3437)	; &GT-02691; [20-23]
+      (mojikyo		  . 085278)	; &MCS-60014D1E;
+      )
+     ((=jef-china3	  . #x44CF)	; &JC3-44CF;
+      (<-simplified
+       ((=ucs		    . #x5294)	; 劔
+	))
       ))
-    (=jef-china3	. #x44CF)	; &JC3-44CF;
     ))
 (define-char
-  '((morohashi-daikanwa	ho 51 1)
+  '((<-denotational
+     ((=ucs		  . #x5271)	; 剱
+      ))
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (<-simplified
-     ((=ucs		  . #x5294)	; 劔
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=gt-k		  . 03992)	; &GT-K03992;
       )
-     ((=ucs		  . #x5203)	; 刃
+     ((=gb2312		  . #x4850)	; &K0-6C53; [40-48]
+      (=ks-x1001	  . #x6C53)	; &I-K0-6C53; [76-51]
       ))
-    (=ucs		. #x5271)	; 剱
-    ))
-(define-char
-  '((=>ucs		. #x5271)	; 剱
-    (morohashi-daikanwa	ho 51 2)
-    (ideographic-radical . 18)	; ⼑
-    (ideographic-strokes . 9)
-    (total-strokes	 . 11)
+    (=ucs@unicode	. #x5271)	; &UU+5271;
     (<-simplified
      ((=ucs		  . #x5294)	; 劔
       ))
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=gt-k		  . 03992)	; &GT-K03992;
-      )
-     ((=ucs		  . #x5204)	; 刄
-      ))
-    (mojikyo		. 054511)	; &MCS-6000D4EF;
     ))
 (define-char
-  '((=>ucs		. #x5271)	; 剱
-    (morohashi-daikanwa	ho 51 3)
+  '((<-denotational
+     ((=ucs		  . #x5271)	; 剱
+      ))
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (<-simplified
-     ((=jis-x0208	  . #x5179)	; &GT-02886; [49-89]
-      (=daikanwa	  . 02245)	; &I-M-02245;
-      ))
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=gt-k		  . 03992)	; &GT-K03992;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 03992)	; &GT-K03992;
+	)
+       ((=jis-x0208	    . #x5163)	; &GT-02408; [49-67]
+	(=daikanwa	    . 01849)	; &I-M-01849;
+	))
+      (=jis-x0208	  . #x517B)	; &GT-02690; [49-91]
+      (=gt		  . 02690)	; &I-GT-02690;
+      (=gt-pj-1		  . #x517B)	; &I-GT-02690; [49-91]
+      (=ucs@jis		  . #x5271)	; &GT-02690;
+      (<-simplified
+       ((=jis-x0208	    . #x5179)	; &GT-02886; [49-89]
+	(=daikanwa	    . 02245)	; &I-M-02245;
+	))
       )
-     ((=jis-x0208	  . #x5163)	; &GT-02408; [49-67]
-      (=daikanwa	  . 01849)	; &I-M-01849;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 03992)	; &GT-K03992;
+	)
+       ((=cns11643-3	    . #x2136)	; &CDP-89F7; [01-22]
+	))
+      (mojikyo		  . 054511)	; &MCS-6000D4EF;
+      (<-simplified
+       ((=cns11643-3	    . #x5037)	; &CB00669; [48-23]
+	))
       ))
-    (=jis-x0208		. #x517B)	; &GT-02690; [49-91]
-    (=gt		. 02690)	; &I-GT-02690;
-    (=gt-pj-1		. #x517B)	; &I-GT-02690; [49-91]
-    (=ucs@jis		. #x5271)	; &GT-02690;
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -5740,7 +5835,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs@unicode	    . #x5BB3)	; &UU+5BB3;
+       ((=gb2312	    . #x3A26)	; &G0-3A26; [26-06]
 	)
        ((=ucs		    . #x5202)	; 刂
 	))
@@ -5821,7 +5916,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@unicode	  . #x8345)	; &UU+8345;
+     ((=jis-x0208	  . #x6829)	; &GT-40184; [72-09]
+      (=iso-ir165	  . #x7E3E)	; &I-EGB-7E3E; [94-30]
       )
      ((=ucs		  . #x5202)	; 刂
       ))
@@ -5834,20 +5930,19 @@
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (hanyu-dazidian	1 352 4)
     (=ucs		. #x34F8)	; 㓸
-    (=daikanwa		. 02114)	; &I-M-02114;
-    (=hanziku-1		. #xEE79)	; &I-HZK01-EE79;
-    ))
-(define-char
-  '((=>ucs		. #x34F8)	; 㓸
-    (morohashi-daikanwa	2114 0 1)
-    (ideographic-radical . 18)	; ⼑
-    (ideographic-strokes . 11)
-    (total-strokes	 . 13)
-    (=cns11643-6	. #x506C)	; &C6-506C; [48-76]
+    (->subsumptive
+     ((ideographic-strokes . 10)
+      (total-strokes	   . 12)
+      (hanyu-dazidian	  1 352 4)
+      (=daikanwa	  . 02114)	; &M-02114;
+      (=hanziku-1	  . #xEE79)	; &I-HZK01-EE79;
+      (=ucs@iso		  . #x34F8)	; &M-02114;
+      )
+     ((ideographic-strokes . 11)
+      (total-strokes	   . 13)
+      (=cns11643-6	  . #x506C)	; &C6-506C; [48-76]
+      ))
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -6149,13 +6244,13 @@
     (ideographic-radical@cns*sources
      cns11643 daikanwa=02134)
     (total-strokes	 . 12)
+    (=ucs		. #x202F4)	; 𠋴
     (<-same
      ((=ucs		  . #x5013)	; 倓
       (=daikanwa	  . 00768)	; &I-M-00768;
       ))
     (<-same*sources
      shuowen yunhai-bei daikanwa)
-    (=ucs		. #x202F4)	; 𠋴
     (->subsumptive
      ((hanyu-dazidian	  1 206 1)
       (ideographic-structure
@@ -6318,7 +6413,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=daikanwa	    . 21684)	; &I-M-21684;
+       ((=daikanwa	    . 21684)	; &M-21684;
 	)
        ((=ucs		    . #x5202)	; 刂
 	))
@@ -6334,7 +6429,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs@unicode	    . #x7522)	; &UU+7522;
+       ((=cns11643-1	    . #x5C28)	; &C1-5C28; [60-08]
 	)
        ((=ucs		    . #x5202)	; 刂
 	))
@@ -6367,7 +6462,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs@unicode	    . #x7523)	; &UU+7523;
+       ((=cns11643-3	    . #x3745)	; &C3-3745; [23-37]
 	)
        ((=ucs		    . #x5202)	; 刂
 	))
@@ -6381,12 +6476,16 @@
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (hanyu-dazidian	1 353 1)
     (=ucs		. #x34FC)	; 㓼
-    (=cns11643-5	. #x3D70)	; &I-C5-3D70; [29-80]
-    (=daikanwa		. 02144)	; &I-M-02144;
-    (=hanziku-1		. #xEEB8)	; &I-HZK01-EEB8;
-    (=cbeta		. 04565)	; &I-CB04565;
+    (->subsumptive
+     ((hanyu-dazidian	  1 353 1)
+      (=cns11643-5	  . #x3D70)	; &M-02144; [29-80]
+      (=daikanwa	  . 02144)	; &I-M-02144;
+      (=hanziku-1	  . #xEEB8)	; &I-HZK01-EEB8;
+      (=ucs@unicode	  . #x34FC)	; &M-02144;
+      )
+     ((=cbeta		  . 04565)	; &CB04565;
+      ))
     ))
 (define-char
   '((=>ucs		. #x207A5)	; 𠞥
@@ -6645,7 +6744,10 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@unicode	  . #x5D29)	; &UU+5D29;
+     ((=jis-x0208	  . #x4A78)	; &GT-10360; [42-88]
+      (=gb2312		  . #x3140)	; &I-G0-3140; [17-32]
+      (=ks-x1001	  . #x5D5A)	; &I-K0-5D5A; [61-58]
+      (=cns11643-1	  . #x597D)	; &I-C1-597D; [57-93]
       )
      ((=ucs		  . #x5202)	; 刂
       ))
@@ -6694,7 +6796,9 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs@unicode	    . #x7968)	; &GT-31700;
+       ((=jis-x0208	    . #x493C)	; &GT-31700; [41-28]
+	(=gb2312	    . #x4631)	; &I-G0-4631; [38-17]
+	(=ks-x1001	    . #x7879)	; &I-K0-7879; [88-89]
 	)
        ((=ucs		    . #x5202)	; 刂
 	))
@@ -6786,12 +6890,6 @@
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (<-same
-     ((shinjigen-1	  . 687)
-      (=ucs		  . #x207B0)	; 𠞰
-      ))
-    (<-same*sources
-     shinjigen-1)
     (hanyu-dazidian	1 354 18)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -6812,6 +6910,12 @@
     (=gt		. 02784)	; &I-GT-02784;
     (=gt-pj-1		. #x5176)	; &I-GT-02784; [49-86]
     (=daikanwa		. 02165)	; &I-M-02165;
+    (<-same
+     ((shinjigen-1	  . 687)
+      (=ucs		  . #x207B0)	; 𠞰
+      ))
+    (<-same*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -7030,7 +7134,15 @@
     (total-strokes	 . 14)
     (hanyu-dazidian	1 357 1)
     (=ucs		. #x5280)	; 劀
-    (=big5		. #xE141)	; &I-B-E141;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5280)	; 劀
+      ))
+    (ideographic-radical . 18)	; ⼑
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (=big5		. #xE141)	; &B-E141;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -7056,17 +7168,24 @@
 	))
       (=cns11643-2	  . #x4928)	; &C2-4928; [41-08]
       (=ucs@cns		  . #x5280)	; &C2-4928;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5280)	; 劀
+      ))
+    (ideographic-radical . 18)	; ⼑
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs@unicode	    . #x77DE)	; &EGB-7D75;
-	)
-       ((=ucs		    . #x5202)	; 刂
-	))
-      (=ucs@unicode	  . #x5280)	; &UU+5280;
+     ((=iso-ir165	  . #x7D75)	; &EGB-7D75; [93-85]
+      )
+     ((=ucs		  . #x5202)	; 刂
       ))
+    (=ucs@unicode	. #x5280)	; &UU+5280;
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -7079,74 +7198,92 @@
     (=hanziku-1		. #xEFFE)	; &I-HZK01-EFFE;
     ))
 (define-char
-  '((=>ucs		. #x5281)	; 劁
-    (ideographic-radical . 18)	; ⼑
+  '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=jis-x0208	  . #x3E47)	; &GT-24496; [30-39]
-      (=ks-x1001	  . #x7525)	; &I-K0-7525; [85-05]
-      (=daikanwa	  . 19119)	; &I-M-19119;
+    (=ucs		. #x5281)	; 劁
+    (=big5		. #xE142)	; &I-B-E142;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x3E47)	; &GT-24496; [30-39]
+	(=ks-x1001	    . #x7525)	; &I-K0-7525; [85-05]
+	(=daikanwa	    . 19119)	; &I-M-19119;
+	)
+       ((=ucs		    . #x5202)	; 刂
+	))
+      (=daikanwa	  . 02182)	; &M-02182;
       )
-     ((=ucs		  . #x5202)	; 刂
+     ((hanyu-dazidian	  1 355 20)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gb2312	    . #x3D39)	; &C1-6050; [29-25]
+	(=cns11643-1	    . #x6050)	; &I-C1-6050; [64-48]
+	)
+       ((=ucs		    . #x5202)	; 刂
+	))
+      (=gb2312		  . #x5864)	; &C2-4929; [56-68]
+      (=cns11643-2	  . #x4929)	; &I-C2-4929; [41-09]
+      (=ucs@unicode	  . #x5281)	; &C2-4929;
       ))
-    (=daikanwa		. 02182)	; &M-02182;
     ))
 (define-char
-  '((morohashi-daikanwa	2182 0 1)
-    (ideographic-radical . 18)	; ⼑
+  '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 355 20)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x7126)	; 焦
+    (=ucs		. #x207C4)	; 𠟄
+    (->subsumptive
+     ((=daikanwa	  . 02183)	; &M-02183;
       )
-     ((=ucs		  . #x5202)	; 刂
+     ((=cns11643-6	  . #x5B24)	; &C6-5B24; [59-04]
+      (=ucs@iso		  . #x207C4)	; &C6-5B24;
       ))
-    (=ucs		. #x5281)	; 劁
-    (=gb2312		. #x5864)	; &I-G0-5864; [56-68]
-    (=cns11643-2	. #x4929)	; &I-C2-4929; [41-09]
-    (=big5		. #xE142)	; &I-B-E142;
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (=ucs		. #x207C4)	; 𠟄
-    (=cns11643-6	. #x5B24)	; &I-C6-5B24; [59-04]
-    (=daikanwa		. 02183)	; &I-M-02183;
+    (=ucs		. #x207C5)	; 𠟅
+    (=cns11643-5	. #x4461)	; &I-C5-4461; [36-65]
+    (=daikanwa		. 02184)	; &I-M-02184;
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (=ucs		. #x207C5)	; 𠟅
-    (=cns11643-5	. #x4461)	; &I-C5-4461; [36-65]
-    (=daikanwa		. 02184)	; &I-M-02184;
+    (=ucs		. #x3506)	; 㔆
     ))
 (define-char
-  '((=>ucs		. #x3506)	; 㔆
+  '((<-denotational
+     ((=ucs		  . #x3506)	; 㔆
+      ))
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 355 11)
-    (=daikanwa		. 02185)	; &M-02185;
-    (=hanziku-1		. #xEF43)	; &I-HZK01-EF43;
-    (mojikyo		. 002185)	; &MCS-60000889;
+    (->subsumptive
+     ((=daikanwa	  . 02185)	; &M-02185;
+      (mojikyo		  . 002185)	; &MCS-60000889;
+      )
+     ((hanyu-dazidian	  1 355 11)
+      (=hanziku-1	  . #xEF43)	; &HZK01-EF43;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	2185 0 2)
+  '((<-denotational
+     ((=ucs		  . #x3506)	; 㔆
+      ))
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (=ucs		. #x3506)	; 㔆
-    (=cns11643-4	. #x423E)	; &I-C4-423E; [34-30]
+    (->subsumptive
+     ((=ucs@unicode	  . #x3506)	; &UU+3506;
+      )
+     ((=cns11643-4	  . #x423E)	; &C4-423E; [34-30]
+      ))
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -7160,11 +7297,15 @@
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 356 14)
     (=ucs		. #x3507)	; 㔇
-    (=cns11643-3	. #x457C)	; &I-C3-457C; [37-92]
-    (=daikanwa		. 02187)	; &I-M-02187;
-    (=hanziku-1		. #xEF66)	; &I-HZK01-EF66;
+    (->subsumptive
+     ((hanyu-dazidian	  1 356 14)
+      (=cns11643-3	  . #x457C)	; &M-02187; [37-92]
+      (=daikanwa	  . 02187)	; &I-M-02187;
+      (=hanziku-1	  . #xEF66)	; &I-HZK01-EF66;
+      )
+     ((=ucs@unicode	  . #x3507)	; &UU+3507;
+      ))
     ))
 (define-char
   '((=>ucs		. #x207C7)	; 𠟇
@@ -7484,12 +7625,6 @@
     (ideographic-radical@cns . 118)	; â½µ
     (ideographic-strokes@cns . 8)
     (total-strokes	 . 14)
-    (<-same
-     ((=ucs		  . #x7B9A)	; 箚
-      (=daikanwa	  . 26149)	; &I-M-26149;
-      ))
-    (<-same*sources
-     kouin kangxi daikanwa)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -7504,6 +7639,12 @@
     (=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 . 18)	; ⼑
@@ -7817,19 +7958,7 @@
     (hanyu-dazidian	1 358 7)
     (=ucs		. #x528B)	; 劋
     (->subsumptive
-     ((<-same
-       ((shinjigen-1	    . 687)
-	(=ucs		    . #x207B0)	; 𠞰
-	(=daikanwa	    . 02164)	; &I-M-02164;
-	)
-       ((shinjigen-1	    . 689)
-	(=ucs		    . #x527F)	; 剿
-	(=jis-x0208	    . #x5176)	; &I-J90-5176; [49-86]
-	(=daikanwa	    . 02165)	; &I-M-02165;
-	))
-      (<-same*sources
-       shuowen-tongxun-dingsheng daikanwa shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
@@ -7843,6 +7972,18 @@
       (=big5		  . #xE4F2)	; &M-02226;
       (=daikanwa	  . 02226)	; &I-M-02226;
       (=ucs@unicode	  . #x528B)	; &M-02226;
+      (<-same
+       ((shinjigen-1	    . 687)
+	(=ucs		    . #x207B0)	; 𠞰
+	(=daikanwa	    . 02164)	; &I-M-02164;
+	)
+       ((shinjigen-1	    . 689)
+	(=ucs		    . #x527F)	; 剿
+	(=jis-x0208	    . #x5176)	; &I-J90-5176; [49-86]
+	(=daikanwa	    . 02165)	; &I-M-02165;
+	))
+      (<-same*sources
+       shuowen-tongxun-dingsheng daikanwa shinjigen-1)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -8199,20 +8340,7 @@
     (total-strokes	 . 16)
     (=ucs		. #x5292)	; 劒
     (->subsumptive
-     ((<-ancient
-       ((shinjigen-1	    . 653)
-	(=ucs		    . #x528D)	; 劍
-	(=jis-x0208	    . #x5178)	; &I-J90-5178; [49-88]
-	))
-      (<-ancient*sources
-       shinjigen-1)
-      (<-same
-       ((=ucs		    . #x528D)	; 劍
-	(=daikanwa	    . 02228)	; &I-M-02228;
-	))
-      (<-same*sources
-       yupian daikanwa)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
@@ -8229,6 +8357,19 @@
       (=gt-pj-1		  . #x517A)	; &I-GT-02884; [49-90]
       (=daikanwa	  . 02243)	; &I-M-02243;
       (=ucs@unicode	  . #x5292)	; &GT-02884;
+      (<-ancient
+       ((shinjigen-1	    . 653)
+	(=ucs		    . #x528D)	; 劍
+	(=jis-x0208	    . #x5178)	; &I-J90-5178; [49-88]
+	))
+      (<-ancient*sources
+       shinjigen-1)
+      (<-same
+       ((=ucs		    . #x528D)	; 劍
+	(=daikanwa	    . 02228)	; &I-M-02228;
+	))
+      (<-same*sources
+       yupian daikanwa)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -8255,15 +8396,7 @@
     (total-strokes	 . 16)
     (=ucs		. #x5294)	; 劔
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 653)
-	(=ucs		    . #x528D)	; 劍
-	(=jis-x0208	    . #x5178)	; &I-J90-5178; [49-88]
-	(=daikanwa	    . 02228)	; &I-M-02228;
-	))
-      (<-vulgar*sources
-       daikanwa shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
@@ -8279,6 +8412,14 @@
       (=gt-pj-1		  . #x5179)	; &I-GT-02886; [49-89]
       (=daikanwa	  . 02245)	; &I-M-02245;
       (=ucs@jis		  . #x5294)	; &GT-02886;
+      (<-vulgar
+       ((shinjigen-1	    . 653)
+	(=ucs		    . #x528D)	; 劍
+	(=jis-x0208	    . #x5178)	; &I-J90-5178; [49-88]
+	(=daikanwa	    . 02228)	; &I-M-02228;
+	))
+      (<-vulgar*sources
+       daikanwa shinjigen-1)
       )
      ((hanyu-dazidian	  1 360 7)
       (ideographic-structure
@@ -8287,7 +8428,7 @@
 	)
        ((=ucs		    . #x50C9)	; 僉
 	)
-       ((=ucs		    . #x5204)	; 刄
+       ((=cns11643-3	    . #x2136)	; &CDP-89F7; [01-22]
 	))
       (=cns11643-3	  . #x5037)	; &CB00669; [48-23]
       (=hanziku-1	  . #xF042)	; &I-HZK01-F042;
diff --git a/lisp/utf-2000/Ideograph-R019-Power.el b/lisp/utf-2000/Ideograph-R019-Power.el
index f985fee..90a84d1 100644
--- a/lisp/utf-2000/Ideograph-R019-Power.el
+++ b/lisp/utf-2000/Ideograph-R019-Power.el
@@ -717,21 +717,10 @@
       ))
     ))
 (define-char
-  '((script		JP Touyou Jouyou Ideograph)
+  '((script		JP Touyou Jouyou CN Simplified Ideograph)
     (ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-simplified
-     ((shinjigen-1	  . 716)
-      (=cns11643-1	  . #x7344)	; &M-02472; [83-36]
-      (=daikanwa	  . 02472)	; &I-M-02472;
-      ))
-    (<-simplified*sources
-     songyuan-yilai-suzipu daikanwa shinjigen-1)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x522F)	; &GT-03172; [50-15]
-      (=ks-x1001	  . #x5564)	; &I-K0-5564; [53-68]
-      ))
     (hanyu-dazidian	1 368 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -751,6 +740,23 @@
     (=gt-pj-1		. #x4E65)	; &I-GT-02985; [46-69]
     (=daikanwa		. 02326)	; &I-M-02326;
     (=hanziku-1		. #xF1C4)	; &I-HZK01-F1C4;
+    (<-simplified
+     ((shinjigen-1	  . 716)
+      (=cns11643-1	  . #x7344)	; &M-02472; [83-36]
+      (=daikanwa	  . 02472)	; &I-M-02472;
+      ))
+    (<-simplified*sources
+     songyuan-yilai-suzipu daikanwa shinjigen-1)
+    (<-simplified@CN
+     ((=gb12345		  . #x4078)	; &GT-03172; [32-88]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x522F)	; &GT-03172; [50-15]
+      (=ks-x1001	  . #x5564)	; &I-K0-5564; [53-68]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x52F5)	; 勵
+      ))
     ))
 (define-char
   '((ideographic-radical . 19)	; ⼒
@@ -804,13 +810,6 @@
   '((ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-vulgar
-     ((=jis-x0208	  . #x5229)	; &GT-03104; [50-09]
-      (=ks-x1001	  . #x564C)	; &I-K0-564C; [54-44]
-      (=daikanwa	  . 02410)	; &I-M-02410;
-      ))
-    (<-vulgar*sources
-     songyuan-yilai-suzipu daikanwa)
     (hanyu-dazidian	1 368 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -826,20 +825,22 @@
     (=daikanwa		. 02328)	; &I-M-02328;
     (=hanziku-1		. #xF1C1)	; &I-HZK01-F1C1;
     (=jef-china3	. #x82B2)	; &I-JC3-82B2;
+    (<-simplified@CN
+     ((=gb12345		  . #x404D)	; &GT-03104; [32-45]
+      ))
+    (<-vulgar
+     ((=jis-x0208	  . #x5229)	; &GT-03104; [50-09]
+      (=ks-x1001	  . #x564C)	; &I-K0-564C; [54-44]
+      (=daikanwa	  . 02410)	; &I-M-02410;
+      ))
+    (<-vulgar*sources
+     songyuan-yilai-suzipu daikanwa)
     ))
 (define-char
   '((script		JP Jouyou Ideograph)
     (ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((shinjigen-1	  . 718)
-      (=jis-x0208	  . #x5229)	; &GT-03104; [50-09]
-      (=ks-x1001	  . #x564C)	; &I-K0-564C; [54-44]
-      (=daikanwa	  . 02410)	; &I-M-02410;
-      ))
-    (<-simplified@JP/Jouyou*sources
-     daikanwa shinjigen-1 JP/Jouyou)
     (shinjigen-1	. 717)
     (shinjigen-2	. 717)
     (=ucs		. #x52B4)	; 労
@@ -849,6 +850,14 @@
     (=gt-k		. 02676)	; &I-GT-K02676;
     (=gt-pj-1		. #x4F2B)	; &I-GT-02987; [47-11]
     (=daikanwa		. 02329)	; &I-M-02329;
+    (<-simplified@JP/Jouyou
+     ((shinjigen-1	  . 718)
+      (=jis-x0208	  . #x5229)	; &GT-03104; [50-09]
+      (=ks-x1001	  . #x564C)	; &I-K0-564C; [54-44]
+      (=daikanwa	  . 02410)	; &I-M-02410;
+      ))
+    (<-simplified@JP/Jouyou*sources
+     daikanwa shinjigen-1 JP/Jouyou)
     ))
 (define-char
   '((ideographic-radical . 19)	; ⼒
@@ -966,19 +975,6 @@
     (=ucs		. #x52B9)	; 効
     (->subsumptive
      ((script		JP Jouyou Ideograph)
-      (<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x5A43)	; &GT-16660; [58-35]
-	(=ks-x1001	    . #x7C79)	; &I-K0-7C79; [92-89]
-	(=daikanwa	    . 13186)	; &I-M-13186;
-	))
-      (<-vulgar
-       ((shinjigen-1	    . 725)
-	(=jis-x0208	    . #x5A43)	; &GT-16660; [58-35]
-	(=ks-x1001	    . #x7C79)	; &I-K0-7C79; [92-89]
-	(=daikanwa	    . 13186)	; &I-M-13186;
-	))
-      (<-vulgar*sources
-       yupian zhengyun zhengzi-tong daikanwa shinjigen-1)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
@@ -996,6 +992,19 @@
       (=daikanwa	  . 02334)	; &I-M-02334;
       (=cbeta		  . 00283)	; &I-CB00283;
       (=ucs@jis		  . #x52B9)	; &GT-02999;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5A43)	; &GT-16660; [58-35]
+	(=ks-x1001	    . #x7C79)	; &I-K0-7C79; [92-89]
+	(=daikanwa	    . 13186)	; &I-M-13186;
+	))
+      (<-vulgar
+       ((shinjigen-1	    . 725)
+	(=jis-x0208	    . #x5A43)	; &GT-16660; [58-35]
+	(=ks-x1001	    . #x7C79)	; &I-K0-7C79; [92-89]
+	(=daikanwa	    . 13186)	; &I-M-13186;
+	))
+      (<-vulgar*sources
+       yupian zhengyun zhengzitong daikanwa shinjigen-1)
       )
      ((hanyu-dazidian	  1 370 1)
       (ideographic-structure
@@ -1393,7 +1402,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@unicode	  . #x5B5A)	; &UU+5B5A;
+     ((=gb2312		  . #x665A)	; &C1-4977; [70-58]
+      (=cns11643-1	  . #x4977)	; &I-C1-4977; [41-87]
       )
      ((=ucs		  . #x529B)	; 力
       ))
@@ -1425,16 +1435,6 @@
     (ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6555)	; 敕
-      (=jis-x0208	  . #x5A45)	; &I-J90-5A45; [58-37]
-      ))
-    (<-vulgar
-     ((=ucs		  . #x52D1)	; 勑
-      (=daikanwa	  . 02380)	; &I-M-02380;
-      ))
-    (<-vulgar*sources
-     zhengzi-tong daikanwa)
     (hanyu-dazidian	1 371 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -1456,12 +1456,22 @@
     (=daikanwa		. 02354)	; &I-M-02354;
     (=hanziku-1		. #xF263)	; &I-HZK01-F263;
     (=cbeta		. 00330)	; &I-CB00330;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x6555)	; 敕
+      (=jis-x0208	  . #x5A45)	; &I-J90-5A45; [58-37]
+      ))
+    (<-vulgar
+     ((=ucs		  . #x52D1)	; 勑
+      (=daikanwa	  . 02380)	; &I-M-02380;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa)
     (->synonyms
      ((=ucs		  . #x6555)	; 敕
       (=daikanwa	  . 13225)	; &I-M-13225;
       ))
     (->synonyms*sources
-     jiyun zhengzi-tong daikanwa)
+     jiyun zhengzitong daikanwa)
     ))
 (define-char
   '((ideographic-radical . 19)	; ⼒
@@ -1559,6 +1569,7 @@
       (=gb2312		  . #x5342)	; &I-G0-5342; [51-34]
       (=big5		  . #xAB69)	; &I-B-AB69;
       (=daikanwa	  . 02360)	; &I-M-02360;
+      (=jef-china3	  . #x44D4)	; &I-JC3-44D4;
       (=ucs@unicode	  . #x52C7)	; 勇
       )
      ((ideographic-structure
@@ -1578,13 +1589,6 @@
       ))
     (script		JP Jouyou Ideograph)
     (morohashi-daikanwa	2360 1)
-    (<-vulgar
-     ((shinjigen-1	  . 731)
-      (=ucs		  . #xFA76)	; 勇
-      (=daikanwa	  . 02360)	; &I-M-02360;
-      ))
-    (<-vulgar*sources
-     daikanwa shinjigen-1)
     (shinjigen-1	. 730)
     (shinjigen-2	. 730)
     (=jis-x0208		. #x4D26)	; &GT-03030; [45-06]
@@ -1593,9 +1597,15 @@
     (=gt		. 03030)	; &I-GT-03030;
     (=gt-k		. 05197)	; &I-GT-K05197;
     (=gt-pj-1		. #x4D26)	; &I-GT-03030; [45-06]
-    (=jef-china3	. #x44D4)	; &I-JC3-44D4;
     (=ucs@jis		. #x52C7)	; &GT-03030;
     (mojikyo		. 050110)	; &MCS-6000C3BE;
+    (<-vulgar
+     ((shinjigen-1	  . 731)
+      (=ucs		  . #xFA76)	; 勇
+      (=daikanwa	  . 02360)	; &I-M-02360;
+      ))
+    (<-vulgar*sources
+     daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 19)	; ⼒
@@ -1629,13 +1639,6 @@
     (ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (<-same
-     ((shinjigen-1	  . 735)
-      (=jis-x0208	  . #x4A59)	; &GT-03050; [42-57]
-      (=cns11643-6	  . #x3558)	; &I-C6-3558; [21-56]
-      ))
-    (<-same*sources
-     shinjigen-1)
     (hanyu-dazidian	1 372 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
@@ -1657,6 +1660,13 @@
     (=jef-china3	. #x44E7)	; &I-JC3-44E7;
     (=ucs@unicode	. #x52C9)	; 勉
     (=ucs@jis		. #xFA33)	; 勉
+    (<-same
+     ((shinjigen-1	  . 735)
+      (=jis-x0208	  . #x4A59)	; &GT-03050; [42-57]
+      (=cns11643-6	  . #x3558)	; &I-C6-3558; [21-56]
+      ))
+    (<-same*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 19)	; ⼒
@@ -2057,10 +2067,6 @@
     (ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA33)	; 勉
-      (=jis-x0213-1-2000  . #x2E63)	; &I-JX1-2E63; [14-67]
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
       (=ucs		  . #x2FFA)	; ⿺
@@ -2078,6 +2084,10 @@
     (=gt-pj-1		. #x4A59)	; &I-GT-03050; [42-57]
     (=ucs@jis		. #x52C9)	; &GT-03050;
     (mojikyo		. 050111)	; &MCS-6000C3BF;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA33)	; 勉
+      (=jis-x0213-1-2000  . #x2E63)	; &I-JX1-2E63; [14-67]
+      ))
     ))
 (define-char
   '((ideographic-radical . 19)	; ⼒
@@ -2273,17 +2283,6 @@
     (ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (<-vulgar
-     ((shinjigen-1	  . 740)
-      (=gb2312		  . #x5B43)	; &M-02391; [59-35]
-      (=ks-x1001	  . #x696D)	; &I-K0-696D; [73-77]
-      (=jis-x0212	  . #x336D)	; &I-JSP-336D; [19-77]
-      (=cns11643-2	  . #x3370)	; &I-C2-3370; [19-80]
-      (=jis-x0213-1-2000  . #x2E66)	; &I-JX1-2E66; [14-70]
-      (=daikanwa	  . 02391)	; &I-M-02391;
-      ))
-    (<-vulgar*sources
-     daikanwa shinjigen-1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2296,6 +2295,17 @@
     (shinjigen-1	. 741)
     (shinjigen-2	. 741)
     (=daikanwa		. 02392)	; &M-02392;
+    (<-vulgar
+     ((shinjigen-1	  . 740)
+      (=gb2312		  . #x5B43)	; &M-02391; [59-35]
+      (=ks-x1001	  . #x696D)	; &I-K0-696D; [73-77]
+      (=jis-x0212	  . #x336D)	; &I-JSP-336D; [19-77]
+      (=cns11643-2	  . #x3370)	; &I-C2-3370; [19-80]
+      (=jis-x0213-1-2000  . #x2E66)	; &I-JX1-2E66; [14-70]
+      (=daikanwa	  . 02391)	; &I-M-02391;
+      ))
+    (<-vulgar*sources
+     daikanwa shinjigen-1)
     ))
 (define-char
   '((<-denotational
@@ -2328,27 +2338,61 @@
   '((ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
+    (hanyu-dazidian	1 373 18)
     (=ucs		. #x52D8)	; 勘
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=jis-x0208	    . #x3F53)	; &GT-27811; [31-51]
-	(=ks-x1001	    . #x6424)	; &I-K0-6424; [68-04]
-	(=daikanwa	    . 21648)	; &I-M-21648;
-	)
-       ((=ucs		    . #x529B)	; 力
-	))
-      (shinjigen-1	  . 738)
-      (shinjigen-2	  . 738)
-      (=jis-x0208	  . #x342A)	; &M-02393; [20-10]
-      (=ks-x1001	  . #x4A6B)	; &I-K0-4A6B; [42-75]
-      (=big5		  . #xB0C9)	; &I-B-B0C9;
-      (=daikanwa	  . 02393)	; &I-M-02393;
-      (=ucs@jis		  . #x52D8)	; &M-02393;
-      (=ucs@big5	  . #x52D8)	; &M-02393;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x52D8)	; 勘
+      ))
+    (ideographic-radical . 19)	; ⼒
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=jis-x0208	  . #x3F53)	; &GT-27811; [31-51]
+      (=ks-x1001	  . #x6424)	; &I-K0-6424; [68-04]
+      (=daikanwa	  . 21648)	; &I-M-21648;
+      )
+     ((=ucs		  . #x529B)	; 力
+      ))
+    (shinjigen-1	. 738)
+    (shinjigen-2	. 738)
+    (=jis-x0208		. #x342A)	; &M-02393; [20-10]
+    (=ks-x1001		. #x4A6B)	; &I-K0-4A6B; [42-75]
+    (=big5		. #xB0C9)	; &I-B-B0C9;
+    (=daikanwa		. 02393)	; &I-M-02393;
+    (=ucs@jis		. #x52D8)	; &M-02393;
+    (=ucs@big5		. #x52D8)	; &M-02393;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x52D8)	; 勘
+      ))
+    (ideographic-radical . 19)	; ⼒
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=gb2312		  . #x4975)	; &G0-4975; [41-85]
       )
+     ((=ucs		  . #x529B)	; 力
+      ))
+    (=gb2312		. #x3F31)	; &G0-3F31; [31-17]
+    (=ucs@unicode	. #x52D8)	; &G0-3F31;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x52D8)	; 勘
+      ))
+    (ideographic-radical . 19)	; ⼒
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (->subsumptive
      ((=gt		  . 03062)	; &GT-03062;
       (=gt-k		  . 07734)	; &I-GT-K07734;
       (=gt-pj-1		  . #x342A)	; &GT-03062; [20-10]
@@ -2362,18 +2406,6 @@
        ((=ucs		    . #x529B)	; 力
 	))
       (=cns11643-1	  . #x592E)	; &C1-592E; [57-14]
-      )
-     ((hanyu-dazidian	  1 373 18)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs@unicode	    . #x751A)	; &UU+751A;
-	)
-       ((=ucs		    . #x529B)	; 力
-	))
-      (=gb2312		  . #x3F31)	; &G0-3F31; [31-17]
-      (=ucs@unicode	  . #x52D8)	; &G0-3F31;
       ))
     ))
 (define-char
@@ -2503,12 +2535,6 @@
   '((ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (<-ancient
-     ((=ucs		  . #x52F3)	; 勳
-      (=daikanwa	  . 02465)	; &I-M-02465;
-      ))
-    (<-ancient*sources
-     shuowen daikanwa)
     (hanyu-dazidian	1 376 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -2529,6 +2555,12 @@
     (=big5		. #xB3D4)	; &I-B-B3D4;
     (=daikanwa		. 02402)	; &I-M-02402;
     (=jef-china3	. #x44ED)	; &I-JC3-44ED;
+    (<-ancient
+     ((=ucs		  . #x52F3)	; 勳
+      (=daikanwa	  . 02465)	; &I-M-02465;
+      ))
+    (<-ancient*sources
+     shuowen daikanwa)
     ))
 (define-char
   '((ideographic-radical . 19)	; ⼒
@@ -2699,12 +2731,7 @@
     (hanyu-dazidian	1 376 17)
     (=ucs		. #x52DE)	; 勞
     (->subsumptive
-     ((<-formed
-       ((=jis-x0208@1978    . #x4E4B)	; &M-39137; [46-43]
-	(=ks-x1001	    . #x5721)	; &I-K0-5721; [55-01]
-	(=daikanwa	    . 39137)	; &I-M-39137;
-	))
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
@@ -2723,6 +2750,11 @@
       (=gt-pj-1		  . #x5229)	; &I-GT-03104; [50-09]
       (=daikanwa	  . 02410)	; &I-M-02410;
       (=ucs@unicode	  . #x52DE)	; &GT-03104;
+      (<-formed
+       ((=jis-x0208@1978    . #x4E4B)	; &M-39137; [46-43]
+	(=ks-x1001	    . #x5721)	; &I-K0-5721; [55-01]
+	(=daikanwa	    . 39137)	; &I-M-39137;
+	))
       )
      ((=cns11643-1	  . #x5E38)	; &C1-5E38; [62-24]
       ))
@@ -2787,6 +2819,16 @@
     (ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
+    (shinjigen-1	. 743)
+    (shinjigen-2	. 743)
+    (=ucs		. #x2F827)	; 勤
+    (=jis-x0208		. #x3650)	; &I-J90-3650; [22-48]
+    (=cns11643-4	. #x364C)	; &I-C4-364C; [22-44]
+    (=gt		. 03088)	; &I-GT-03088;
+    (=gt-k		. 09036)	; &I-GT-K09036;
+    (=gt-pj-1		. #x3650)	; &I-GT-03088; [22-48]
+    (=ucs@jis		. #x52E4)	; 勤
+    (mojikyo		. 050112)	; &MCS-6000C3C0;
     (<-simplified@JP/Jouyou
      ((=ucs		  . #xFA34)	; 勤
       (=jis-x0213-1-2000  . #x2E68)	; &I-JX1-2E68; [14-72]
@@ -2801,16 +2843,6 @@
       ))
     (<-vulgar*sources
      shinjigen-1)
-    (shinjigen-1	. 743)
-    (shinjigen-2	. 743)
-    (=ucs		. #x2F827)	; 勤
-    (=jis-x0208		. #x3650)	; &I-J90-3650; [22-48]
-    (=cns11643-4	. #x364C)	; &I-C4-364C; [22-44]
-    (=gt		. 03088)	; &I-GT-03088;
-    (=gt-k		. 09036)	; &I-GT-K09036;
-    (=gt-pj-1		. #x3650)	; &I-GT-03088; [22-48]
-    (=ucs@jis		. #x52E4)	; 勤
-    (mojikyo		. 050112)	; &MCS-6000C3C0;
     ))
 (define-char
   '((ideographic-radical . 19)	; ⼒
@@ -3219,7 +3251,29 @@
   '((ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (=daikanwa		. 02432)	; &M-02432;
+    (=ucs		. #x2089A)	; 𠢚
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2089A)	; 𠢚
+      ))
+    (ideographic-radical . 19)	; ⼒
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (->subsumptive
+     ((=daikanwa	  . 02432)	; &M-02432;
+      )
+     ((=hanziku-1	  . #xF3EC)	; &HZK01-F3EC;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2089A)	; 𠢚
+      ))
+    (ideographic-radical . 19)	; ⼒
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (=ucs@iso		. #x2089A)	; &U-0002089A;
     ))
 (define-char
   '((ideographic-radical . 19)	; ⼒
@@ -3228,16 +3282,6 @@
     (=ucs		. #x52E7)	; 勧
     (->subsumptive
      ((script		JP Jouyou Ideograph)
-      (<-simplified
-       ((shinjigen-1	    . 751)
-	(=daikanwa	    . 02486)	; &M-02486;
-	))
-      (<-simplified*sources
-       songyuan-yilai-suzipu daikanwa shinjigen-1)
-      (<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x5230)	; &GT-03191; [50-16]
-	(=ks-x1001	    . #x4F68)	; &I-K0-4F68; [47-72]
-	))
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
@@ -3253,6 +3297,16 @@
       (=gt-pj-1		  . #x342B)	; &I-GT-03106; [20-11]
       (=daikanwa	  . 02433)	; &I-M-02433;
       (=ucs@jis		  . #x52E7)	; &GT-03106;
+      (<-simplified
+       ((shinjigen-1	    . 751)
+	(=daikanwa	    . 02486)	; &M-02486;
+	))
+      (<-simplified*sources
+       songyuan-yilai-suzipu daikanwa shinjigen-1)
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5230)	; &GT-03191; [50-16]
+	(=ks-x1001	    . #x4F68)	; &I-K0-4F68; [47-72]
+	))
       )
      ((hanyu-dazidian	  1 379 4)
       (ideographic-structure
@@ -3273,7 +3327,8 @@
 	   ((=ucs		. #x4E00)	; 一
 	    ))
 	  )
-	 ((=ucs		      . #x96B9)	; 隹
+	 ((=gb2312	      . #x763F)	; &C1-4F63; [86-31]
+	  (=cns11643-1	      . #x4F63)	; &I-C1-4F63; [47-67]
 	  ))
 	)
        ((=ucs		    . #x529B)	; 力
@@ -3648,7 +3703,13 @@
   '((ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
-    (=daikanwa		. 02457)	; &M-02457;
+    (=ucs		. #x208B5)	; ð ¢µ
+    (->subsumptive
+     ((=daikanwa	  . 02457)	; &M-02457;
+      )
+     ((=hanziku-1	  . #xF46E)	; &HZK01-F46E;
+      (=ucs@iso		  . #x208B5)	; &HZK01-F46E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 19)	; ⼒
@@ -3711,7 +3772,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@unicode	  . #x842C)	; &GT-41264;
+     ((=jis-x0208	  . #x685F)	; &GT-41264; [72-63]
+      (=ks-x1001	  . #x583F)	; &I-K0-583F; [56-31]
       )
      ((=ucs		  . #x529B)	; 力
       ))
@@ -3753,10 +3815,6 @@
   '((ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x52F3)	; 勳
-      (=jis-x0208	  . #x522E)	; &I-J90-522E; [50-14]
-      ))
     (hanyu-dazidian	1 381 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -3775,6 +3833,10 @@
     (=gt-pj-1		. #x372E)	; &I-GT-24769; [23-14]
     (=daikanwa		. 02463)	; &I-M-02463;
     (=hanziku-1		. #xF472)	; &I-HZK01-F472;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x52F3)	; 勳
+      (=jis-x0208	  . #x522E)	; &I-J90-522E; [50-14]
+      ))
     ))
 (define-char
   '((ideographic-radical . 19)	; ⼒
diff --git a/lisp/utf-2000/Ideograph-R020-Wrap.el b/lisp/utf-2000/Ideograph-R020-Wrap.el
index 3947e9a..449f137 100644
--- a/lisp/utf-2000/Ideograph-R020-Wrap.el
+++ b/lisp/utf-2000/Ideograph-R020-Wrap.el
@@ -125,20 +125,20 @@
     (total-strokes	 . 4)
     (=ucs		. #x5300)	; 匀
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 764)
-	(=jis-x0213-1-2000  . #x2E6A)	; &M-02496; [14-74]
-	(=daikanwa	    . 02496)	; &I-M-02496;
-	))
-      (<-vulgar*sources
-       zhengzi-tong daikanwa shinjigen-1)
-      (shinjigen-1	  . 764)
+     ((shinjigen-1	  . 764)
       (shinjigen-2	  . 765)
       (=jis-x0212	  . #x337B)	; &M-02497; [19-91]
       (=jis-x0213-1-2000  . #x2E6B)	; &I-JX1-2E6B; [14-75]
       (=daikanwa	  . 02497)	; &I-M-02497;
       (=jef-china3	  . #x45A3)	; &I-JC3-45A3;
       (=ucs@jis		  . #x5300)	; &M-02497;
+      (<-vulgar
+       ((shinjigen-1	    . 764)
+	(=jis-x0213-1-2000  . #x2E6A)	; &M-02496; [14-74]
+	(=daikanwa	    . 02496)	; &I-M-02496;
+	))
+      (<-vulgar*sources
+       zhengzitong daikanwa shinjigen-1)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
@@ -260,10 +260,6 @@
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (<-same
-     ((=gt		  . 00176)	; &GT-00176;
-      (=daikanwa	  . 00129)	; &I-M-00129;
-      ))
     (ideographic-structure
      ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
       (=ucs		  . #x2FFB)	; â¿»
@@ -279,6 +275,10 @@
     (=gt		. 03212)	; &I-GT-03212;
     (=gt-pj-1		. #x4C68)	; &I-GT-03212; [44-72]
     (=daikanwa		. 02502)	; &I-M-02502;
+    (<-same
+     ((=gt		  . 00176)	; &GT-00176;
+      (=daikanwa	  . 00129)	; &I-M-00129;
+      ))
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -480,13 +480,6 @@
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (<-formed
-     ((shinjigen-1	  . 772)
-      (=ucs		  . #x5306)	; 匆
-      (=jis-x0208	  . #x5232)	; &I-J90-5232; [50-18]
-      ))
-    (<-formed*sources
-     shinjigen-1)
     (ideographic-structure
      ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
       (=ucs		  . #x2FFB)	; â¿»
@@ -501,6 +494,13 @@
     (=cns11643-3	. #x2225)	; &I-C3-2225; [02-05]
     (=daikanwa		. 02511)	; &I-M-02511;
     (mojikyo		. 002511)	; &MCS-600009CF;
+    (<-formed
+     ((shinjigen-1	  . 772)
+      (=ucs		  . #x5306)	; 匆
+      (=jis-x0208	  . #x5232)	; &I-J90-5232; [50-18]
+      ))
+    (<-formed*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -540,10 +540,10 @@
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
+    (=ucs		. #x5307)	; 匇
     (<-formed
      ((=ucs		  . #x2F82A)	; 匆
       ))
-    (=ucs		. #x5307)	; 匇
     ))
 (define-char
   '((<-denotational
@@ -1179,6 +1179,7 @@
   '((ideographic-radical . 20)	; ⼓
     (hanyu-dazidian	1 260 12)
     (=ucs		. #x5312)	; 匒
+    (=big5		. #xD862)	; &I-B-D862;
     ))
 (define-char
   '((<-denotational
@@ -1213,25 +1214,35 @@
       )
      ((=ucs		  . #x52F9)	; 勹
       )
-     ((=ucs@unicode	  . #x8345)	; &UU+8345;
+     ((=jis-x0208	  . #x6829)	; &GT-40184; [72-09]
+      (=iso-ir165	  . #x7E3E)	; &I-EGB-7E3E; [94-30]
       ))
-    (=big5		. #xD862)	; &B-D862;
-    (=ucs@unicode	. #x5312)	; &B-D862;
+    (=ucs@unicode	. #x5312)	; &UU+5312;
     ))
 (define-char
-  '((=>ucs		. #x208F8)	; 𠣸
+  '((ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (=ucs		. #x208F8)	; 𠣸
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x208F8)	; 𠣸
+      ))
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
     (=daikanwa		. 02553)	; &M-02553;
     ))
 (define-char
-  '((morohashi-daikanwa	2553 0 0)
+  '((<-denotational
+     ((=ucs		  . #x208F8)	; 𠣸
+      ))
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (=ucs		. #x208F8)	; 𠣸
-    (=cns11643-6	. #x5073)	; &I-C6-5073; [48-83]
+    (=cns11643-6	. #x5073)	; &C6-5073; [48-83]
+    (=ucs@iso		. #x208F8)	; &C6-5073;
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
diff --git a/lisp/utf-2000/Ideograph-R021-Spoon.el b/lisp/utf-2000/Ideograph-R021-Spoon.el
index fa1bab8..67dcb1a 100644
--- a/lisp/utf-2000/Ideograph-R021-Spoon.el
+++ b/lisp/utf-2000/Ideograph-R021-Spoon.el
@@ -34,10 +34,10 @@
     (ideographic-radical . 21)	; ⼔
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (<-ideographic-component-forms
+    (=big5-cdp		. #x895F)	; &CDP-895F;
+    (<-formed@component
      ((=ucs		  . #x5315)	; 匕
       ))
-    (=big5-cdp		. #x895F)	; &CDP-895F;
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el
index a9bbe67..b048638 100644
--- a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el
+++ b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el
@@ -98,14 +98,6 @@
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (<-vulgar
-     ((shinjigen-1	  . 2079)
-      (=ucs		  . #x5E00)	; 帀
-      (=jis-x0212	  . #x3C24)	; &I-JSP-3C24; [28-04]
-      (=jis-x0213-2-2000  . #x2870)	; &I-JX2-2870; [08-80]
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (hanyu-dazidian	1 82 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
@@ -126,6 +118,14 @@
     (=gt-k		. 00969)	; &I-GT-K00969;
     (=gt-pj-1		. #x4159)	; &I-GT-03333; [33-57]
     (=daikanwa		. 02599)	; &I-M-02599;
+    (<-vulgar
+     ((shinjigen-1	  . 2079)
+      (=ucs		  . #x5E00)	; 帀
+      (=jis-x0212	  . #x3C24)	; &I-JSP-3C24; [28-04]
+      (=jis-x0213-2-2000  . #x2870)	; &I-JX2-2870; [08-80]
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 22)	; ⼕
@@ -1224,14 +1224,6 @@
   '((ideographic-radical . 22)	; ⼕
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (<-vulgar
-     ((shinjigen-1	  . 796)
-      (=ucs		  . #x5333)	; 匳
-      (=jis-x0208	  . #x523D)	; &I-J90-523D; [50-29]
-      (=daikanwa	  . 02655)	; &I-M-02655;
-      ))
-    (<-vulgar*sources
-     zhengzi-tong daikanwa shinjigen-1)
     (hanyu-dazidian	1 89 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
@@ -1249,6 +1241,14 @@
     (=hanziku-1		. #xB662)	; &I-HZK01-B662;
     (=cbeta		. 02324)	; &I-CB02324;
     (=jef-china3	. #x45BC)	; &I-JC3-45BC;
+    (<-vulgar
+     ((shinjigen-1	  . 796)
+      (=ucs		  . #x5333)	; 匳
+      (=jis-x0208	  . #x523D)	; &I-J90-523D; [50-29]
+      (=daikanwa	  . 02655)	; &I-M-02655;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((=>ucs		. #x2095A)	; 𠥚
diff --git a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
index 029ca04..0d8a795 100644
--- a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
@@ -98,14 +98,11 @@
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
     (=ucs		. #x533A)	; 区
+    (<-simplified@ucs
+     ((=ucs		  . #x5340)	; 區
+      ))
     (->subsumptive
-     ((<-simplified
-       ((=cns11643-1	    . #x5934)	; &M-02691; [57-20]
-	(=daikanwa	    . 02691)	; &I-M-02691;
-	))
-      (<-simplified*sources
-       daikanwa)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
 	(=ucs		    . #x2FF7)	; â¿·
 	)
@@ -117,19 +114,14 @@
 	))
       (=cns11643-3	  . #x2157)	; &M-02674; [01-55]
       (=daikanwa	  . 02674)	; &I-M-02674;
-      )
-     ((script		JP Jouyou Ideograph)
       (<-simplified
-       ((shinjigen-1	    . 802)
-	(=cns11643-1	    . #x5934)	; &M-02691; [57-20]
+       ((=cns11643-1	    . #x5934)	; &M-02691; [57-20]
 	(=daikanwa	    . 02691)	; &I-M-02691;
 	))
       (<-simplified*sources
-       shinjigen-1)
-      (<-simplified@JP/Jouyou
-       ((=ks-x1001	    . #x4F21)	; &GT-03378; [47-01]
-	(=jis-x0208@1990    . #x523F)	; &I-J90-523F; [50-31]
-	))
+       daikanwa)
+      )
+     ((script		JP Jouyou CN Simplified Ideograph)
       (hanyu-dazidian	  1 81 5)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
@@ -148,6 +140,20 @@
       (=gt-pj-1		  . #x3668)	; &I-GT-03327; [22-72]
       (=hanziku-1	  . #xB4B6)	; &I-HZK01-B4B6;
       (=ucs@unicode	  . #x533A)	; &GT-03327;
+      (<-simplified
+       ((shinjigen-1	    . 802)
+	(=cns11643-1	    . #x5934)	; &M-02691; [57-20]
+	(=daikanwa	    . 02691)	; &I-M-02691;
+	))
+      (<-simplified*sources
+       shinjigen-1)
+      (<-simplified@CN
+       ((=gb12345	    . #x4778)	; &GT-03378; [39-88]
+	))
+      (<-simplified@JP/Jouyou
+       ((=ks-x1001	    . #x4F21)	; &GT-03378; [47-01]
+	(=jis-x0208@1990    . #x523F)	; &I-J90-523F; [50-31]
+	))
       ))
     ))
 (define-char
@@ -211,7 +217,18 @@
     (=daikanwa		. 02679)	; &I-M-02679;
     ))
 (define-char
-  '((=>ucs		. #x533B)	; 医
+  '((ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (=ucs		. #x533B)	; 医
+    (<-simplified@ucs
+     ((=ucs		  . #x91AB)	; 醫
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x533B)	; 医
+      ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
@@ -220,40 +237,47 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=ucs		  . #x5338)	; 匸
+     ((=jis-x0208	  . #x523E)	; &GT-03427; [50-30]
+      (=cns11643-3	  . #x2129)	; &I-C3-2129; [01-09]
+      (=daikanwa	  . 02672)	; &I-M-02672;
       )
-     ((=ucs		  . #x77E2)	; 矢
+     ((=gt-k		  . 01013)	; &GT-K01013;
       ))
     (=cns11643-3	. #x2466)	; &CDP-8CD3; [04-70]
     (=big5-cdp		. #x8CD3)	; &I-CDP-8CD3;
     (=daikanwa		. 02680)	; &I-M-02680;
     ))
 (define-char
-  '((morohashi-daikanwa	2680 0 1)
+  '((<-denotational
+     ((=ucs		  . #x533B)	; 医
+      ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6E50)	; &GT-53782; [78-48]
-      (=ks-x1001	  . #x6C22)	; &I-K0-6C22; [76-02]
-      (=daikanwa	  . 40006)	; &I-M-40006;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
      ((=ucs		  . #x531A)	; 匚
       )
-     ((=ucs		  . #x77E2)	; 矢
+     ((=gt-k		  . 01013)	; &GT-K01013;
       ))
     (shinjigen-1	. 8537)
     (shinjigen-2	. 8537)
-    (=ucs		. #x533B)	; 医
-    (=jis-x0208		. #x3065)	; &I-J90-3065; [16-69]
+    (=jis-x0208		. #x3065)	; &GT-03344; [16-69]
     (=gb2312		. #x523D)	; &I-G0-523D; [50-29]
     (=gt		. 03344)	; &I-GT-03344;
     (=gt-k		. 02502)	; &I-GT-K02502;
     (=gt-pj-1		. #x3065)	; &I-GT-03344; [16-69]
+    (=ucs@unicode	. #x533B)	; &GT-03344;
+    (<-simplified@CN
+     ((=gb12345		  . #x523D)	; 醫 [50-29]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6E50)	; &GT-53782; [78-48]
+      (=ks-x1001	  . #x6C22)	; &I-K0-6C22; [76-02]
+      (=daikanwa	  . 40006)	; &I-M-40006;
+      ))
     ))
 (define-char
   '((ideographic-radical . 23)	; ⼖
diff --git a/lisp/utf-2000/Ideograph-R024-Ten.el b/lisp/utf-2000/Ideograph-R024-Ten.el
index c5535df..0d34c9f 100644
--- a/lisp/utf-2000/Ideograph-R024-Ten.el
+++ b/lisp/utf-2000/Ideograph-R024-Ten.el
@@ -176,21 +176,6 @@
   '((ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (<-vulgar
-     ((shinjigen-1	  . 823)
-      (=jis-x0208	  . #x4234)	; &GT-03504; [34-20]
-      (=ks-x1001	  . #x706F)	; &I-K0-706F; [80-79]
-      (=daikanwa	  . 02740)	; &I-M-02740;
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
-    (<-wrong
-     ((=jis-x0208	  . #x4234)	; &GT-03504; [34-20]
-      (=ks-x1001	  . #x706F)	; &I-K0-706F; [80-79]
-      (=daikanwa	  . 02740)	; &I-M-02740;
-      ))
-    (<-wrong*sources
-     pianhai daikanwa)
     (hanyu-dazidian	1 59 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -210,6 +195,21 @@
     (=gt-pj-1		. #x5240)	; &I-GT-03461; [50-32]
     (=daikanwa		. 02701)	; &I-M-02701;
     (=hanziku-1		. #xB047)	; &I-HZK01-B047;
+    (<-vulgar
+     ((shinjigen-1	  . 823)
+      (=jis-x0208	  . #x4234)	; &GT-03504; [34-20]
+      (=ks-x1001	  . #x706F)	; &I-K0-706F; [80-79]
+      (=daikanwa	  . 02740)	; &I-M-02740;
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
+    (<-wrong
+     ((=jis-x0208	  . #x4234)	; &GT-03504; [34-20]
+      (=ks-x1001	  . #x706F)	; &I-K0-706F; [80-79]
+      (=daikanwa	  . 02740)	; &I-M-02740;
+      ))
+    (<-wrong*sources
+     pianhai daikanwa)
     ))
 (define-char
   '((ideographic-radical . 24)	; ⼗
@@ -363,11 +363,11 @@
     (ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x534A)	; 半
-      ))
     (=gt-k		. 01097)	; &GT-K01097;
     (=gt-pj-k1		. #x3B21)	; &GT-K01097; [27-01]
+    (<-formed@component/connect-right
+     ((=ucs		  . #x534A)	; 半
+      ))
     ))
 (define-char
   '((ideographic-radical . 24)	; ⼗
@@ -425,41 +425,33 @@
   '((ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
+    (=gt-k		. 01380)	; &GT-K01380;
+    (=gt-pj-k2		. #x4769)	; &GT-K01380; [39-73]
     (<-simplified
      ((=ucs		  . #x5C70)	; å±°
       ))
-    (mojikyo		. 071896)	; &MCS-600118D8;
-    ))
-(define-char
-  '((ideographic-radical . 24)	; ⼗
-    (ideographic-strokes . 3)
-    (total-strokes	 . 5)
-    (<-simplified
-     ((=ucs		  . #x5C70)	; å±°
-      ))
-    (=gt-k		. 01380)	; &GT-K01380;
-    (=gt-pj-k2		. #x4769)	; &GT-K01380; [39-73]
     ))
 (define-char
   '((ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
+    (=gt-k		. 01438)	; &GT-K01438;
+    (=gt-pj-k1		. #x3648)	; &GT-K01438; [22-40]
+    (mojikyo		. 071896)	; &MCS-600118D8;
     (<-simplified
      ((=ucs		  . #x5C70)	; å±°
       ))
-    (=gt-k		. 01438)	; &GT-K01438;
-    (=gt-pj-k1		. #x3648)	; &GT-K01438; [22-40]
     ))
 (define-char
   '((ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (<-simplified
-     ((=ucs		  . #x5C70)	; å±°
-      ))
     (sources		bos=A016219-00020)
     (=big5-cdp		. #x8B75)	; &RUI6-E00E;
     (=ruimoku-v6	. #xE00E)	; &I-RUI6-E00E;
+    (<-simplified
+     ((=ucs		  . #x5C70)	; å±°
+      ))
     ))
 (define-char
   '((ideographic-radical . 24)	; ⼗
@@ -537,6 +529,12 @@
   '((ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (hanyu-dazidian	1 60 8)
+    (shinjigen-1	. 815)
+    (=ucs		. #x20983)	; 𠦃
+    (=cns11643-4	. #x2244)	; &I-C4-2244; [02-36]
+    (=big5-cdp		. #x88F7)	; &I-CDP-88F7;
+    (=daikanwa		. 02719)	; &I-M-02719;
     (<-original
      ((shinjigen-1	  . 814)
       (=ucs		  . #x5345)	; 卅
@@ -544,18 +542,17 @@
       (=daikanwa	  . 02700)	; &I-M-02700;
       ))
     (<-original*sources
-     zhengzi-tong daikanwa shinjigen-1)
-    (hanyu-dazidian	1 60 8)
-    (shinjigen-1	. 815)
-    (=ucs		. #x20983)	; 𠦃
-    (=cns11643-4	. #x2244)	; &I-C4-2244; [02-36]
-    (=big5-cdp		. #x88F7)	; &I-CDP-88F7;
-    (=daikanwa		. 02719)	; &I-M-02719;
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (shinjigen-1	. 818)
+    (shinjigen-2	. 818)
+    (=ucs		. #x2F82C)	; 卉
+    (=cns11643-3	. #x2329)	; &I-C3-2329; [03-09]
+    (=daikanwa		. 02720)	; &I-M-02720;
     (<-formed
      ((shinjigen-1	  . 816)
       (=ucs		  . #x5349)	; 卉
@@ -569,11 +566,6 @@
       ))
     (<-vulgar*sources
      zhengzitong daikanwa)
-    (shinjigen-1	. 818)
-    (shinjigen-2	. 818)
-    (=ucs		. #x2F82C)	; 卉
-    (=cns11643-3	. #x2329)	; &I-C3-2329; [03-09]
-    (=daikanwa		. 02720)	; &I-M-02720;
     ))
 (define-char
   '((ideographic-radical . 24)	; ⼗
@@ -739,6 +731,12 @@
   '((ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (hanyu-dazidian	1 515 9)
+    (shinjigen-1	. 911)
+    (=ucs		. #x20991)	; 𠦑
+    (=cns11643-6	. #x2639)	; &I-C6-2639; [06-25]
+    (=big5-cdp		. #x88D8)	; &I-CDP-88D8;
+    (=daikanwa		. 02732)	; &I-M-02732;
     (<-vulgar
      ((shinjigen-1	  . 910)
       (=ucs		  . #x53D4)	; 叔
@@ -747,12 +745,6 @@
       ))
     (<-vulgar*sources
      yupian daikanwa shinjigen-1)
-    (hanyu-dazidian	1 515 9)
-    (shinjigen-1	. 911)
-    (=ucs		. #x20991)	; 𠦑
-    (=cns11643-6	. #x2639)	; &I-C6-2639; [06-25]
-    (=big5-cdp		. #x88D8)	; &I-CDP-88D8;
-    (=daikanwa		. 02732)	; &I-M-02732;
     ))
 (define-char
   '((ideographic-radical . 24)	; ⼗
@@ -871,17 +863,6 @@
     (ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA35)	; 卑
-      (=jis-x0213-1-2000  . #x2E6E)	; &I-JX1-2E6E; [14-78]
-      ))
-    (<-vulgar
-     ((shinjigen-1	  . 830)
-      (=ucs		  . #xFA35)	; 卑
-      (=jis-x0213-1-2000  . #x2E6E)	; &I-JX1-2E6E; [14-78]
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (shinjigen-1	. 829)
     (shinjigen-2	. 829)
     (=jis-x0208		. #x485C)	; &GT-03516; [40-60]
@@ -891,44 +872,61 @@
     (=gt-pj-1		. #x485C)	; &I-GT-03516; [40-60]
     (=ucs@jis		. #x5351)	; &GT-03516;
     (mojikyo		. 054313)	; &MCS-6000D429;
-    ))
-(define-char
-  '((ideographic-radical . 24)	; ⼗
-    (ideographic-strokes . 6)
-    (total-strokes	 . 8)
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA35)	; 卑
+      (=jis-x0213-1-2000  . #x2E6E)	; &I-JX1-2E6E; [14-78]
+      ))
     (<-vulgar
      ((shinjigen-1	  . 830)
       (=ucs		  . #xFA35)	; 卑
       (=jis-x0213-1-2000  . #x2E6E)	; &I-JX1-2E6E; [14-78]
-      (=daikanwa	  . 02738)	; &I-M-02738;
       ))
     (<-vulgar*sources
-     zhengzi-tong daikanwa shinjigen-1)
-    (shinjigen-1	. 831)
-    (shinjigen-2	. 831)
+     shinjigen-1)
+    ))
+(define-char
+  '((ideographic-radical . 24)	; ⼗
     (=ucs		. #x24C1E)	; 𤰞
-    (=cns11643-4	. #x2553)	; &I-C4-2553; [05-51]
-    (=daikanwa		. 02739)	; &I-M-02739;
     ))
 (define-char
-  '((=>ucs		. #x24C1E)	; 𤰞
-    (morohashi-daikanwa	2739 0 1)
+  '((<-denotational
+     ((=ucs		  . #x24C1E)	; 𤰞
+      ))
     (ideographic-radical . 24)	; ⼗
-    (ideographic-strokes . 5)
-    (total-strokes	 . 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=big5-cdp	  . #x8775)	; &CDP-8775;
+    (->subsumptive
+     ((ideographic-strokes . 6)
+      (total-strokes	   . 8)
+      (shinjigen-1	  . 831)
+      (shinjigen-2	  . 831)
+      (=cns11643-4	  . #x2553)	; &M-02739; [05-51]
+      (=daikanwa	  . 02739)	; &I-M-02739;
+      (=ucs@iso		  . #x24C1E)	; &M-02739;
+      (<-vulgar
+       ((shinjigen-1	    . 830)
+	(=ucs		    . #xFA35)	; 卑
+	(=jis-x0213-1-2000  . #x2E6E)	; &I-JX1-2E6E; [14-78]
+	(=daikanwa	    . 02738)	; &I-M-02738;
+	))
+      (<-vulgar*sources
+       zhengzitong daikanwa shinjigen-1)
       )
-     ((=ucs		  . #x5341)	; 十
+     ((ideographic-strokes . 5)
+      (total-strokes	   . 7)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=big5-cdp	    . #x8775)	; &CDP-8775;
+	)
+       ((=ucs		    . #x5341)	; 十
+	))
+      (=big5-cdp	  . #x887E)	; &CDP-887E;
       ))
-    (=big5-cdp		. #x887E)	; &CDP-887E;
     ))
 (define-char
-  '((=>ucs		. #x24C1E)	; 𤰞
-    (morohashi-daikanwa	2739 0 3)
+  '((<-denotational
+     ((=ucs		  . #x24C1E)	; 𤰞
+      ))
     (ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
@@ -936,51 +934,43 @@
     (=hanziku-1		. #xB0A8)	; &HZK01-B0A8;
     ))
 (define-char
-  '((=>ucs		. #x5352)	; 卒
-    (ideographic-radical . 24)	; ⼗
+  '((ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (hanyu-dazidian	1 63 2)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=jis-x0208	  . #x5035)	; &GT-00376; [48-21]
-      )
-     ((=ucs		  . #x4ECE)	; 从
-      )
-     ((=ucs		  . #x5341)	; 十
-      ))
-    (shinjigen-1	. 823)
-    (shinjigen-2	. 823)
-    (=jis-x0208		. #x4234)	; &GT-03504; [34-20]
-    (=ks-x1001		. #x706F)	; &I-K0-706F; [80-79]
+    (=ucs		. #x5352)	; 卒
     (=big5		. #xA8F2)	; &I-B-A8F2;
-    (=gt		. 03504)	; &I-GT-03504;
-    (=gt-k		. 03763)	; &I-GT-K03763;
-    (=gt-pj-1		. #x4234)	; &I-GT-03504; [34-20]
-    (=daikanwa		. 02740)	; &I-M-02740;
-    (=ucs@jis		. #x5352)	; &GT-03504;
-    (=ucs@big5		. #x5352)	; &GT-03504;
-    ))
-(define-char
-  '((morohashi-daikanwa	2740 0 0)
-    (ideographic-radical . 24)	; ⼗
-    (ideographic-strokes . 6)
-    (total-strokes	 . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=ucs		  . #x4EA0)	; 亠
-      )
-     ((=ucs		  . #x4ECE)	; 从
+    (->subsumptive
+     ((hanyu-dazidian	  1 63 2)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=daikanwa	    . 00294)	; &M-00294;
+	)
+       ((=ucs		    . #x5341)	; 十
+	))
+      (shinjigen-1	  . 823)
+      (shinjigen-2	  . 823)
+      (=jis-x0208	  . #x4234)	; &GT-03504; [34-20]
+      (=ks-x1001	  . #x706F)	; &I-K0-706F; [80-79]
+      (=gt		  . 03504)	; &I-GT-03504;
+      (=gt-k		  . 03763)	; &I-GT-K03763;
+      (=gt-pj-1		  . #x4234)	; &I-GT-03504; [34-20]
+      (=daikanwa	  . 02740)	; &I-M-02740;
+      (=ucs@jis		  . #x5352)	; &GT-03504;
       )
-     ((=ucs		  . #x5341)	; 十
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=cns11643-6	    . #x234A)	; &HZK01-E06C; [03-42]
+	)
+       ((=ucs		    . #x5341)	; 十
+	))
+      (=gb2312		  . #x5764)	; &C1-4C35; [55-68]
+      (=cns11643-1	  . #x4C35)	; &I-C1-4C35; [44-21]
+      (=ucs@unicode	  . #x5352)	; &C1-4C35;
       ))
-    (=ucs		. #x5352)	; 卒
-    (=gb2312		. #x5764)	; &I-G0-5764; [55-68]
-    (=cns11643-1	. #x4C35)	; &I-C1-4C35; [44-21]
     ))
 (define-char
   '((ideographic-radical . 24)	; ⼗
@@ -1152,10 +1142,10 @@
     (ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (<-ideographic-component-forms
+    (=ucs		. #x9FBA)	; 龺
+    (<-identical@component/connect-right
      ((=ucs		  . #x2099D)	; 𠦝
       ))
-    (=ucs		. #x9FBA)	; 龺
     ))
 (define-char
   '((ideographic-radical . 24)	; ⼗
@@ -1212,14 +1202,6 @@
     (ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((shinjigen-1	  . 1170)
-      (=ucs		  . #x55AE)	; 單
-      (=jis-x0208	  . #x5345)	; &I-J90-5345; [51-37]
-      (=daikanwa	  . 03993)	; &I-M-03993;
-      ))
-    (<-simplified@JP/Jouyou*sources
-     daikanwa shinjigen-1 JP/Jouyou)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1237,6 +1219,14 @@
     (=gt-k		. 05137)	; &I-GT-K05137;
     (=gt-pj-1		. #x4331)	; &I-GT-12985; [35-17]
     (=daikanwa		. 02752)	; &I-M-02752;
+    (<-simplified@JP/Jouyou
+     ((shinjigen-1	  . 1170)
+      (=ucs		  . #x55AE)	; 單
+      (=jis-x0208	  . #x5345)	; &I-J90-5345; [51-37]
+      (=daikanwa	  . 03993)	; &I-M-03993;
+      ))
+    (<-simplified@JP/Jouyou*sources
+     daikanwa shinjigen-1 JP/Jouyou)
     ))
 (define-char
   '((=>ucs		. #x209A3)	; 𠦣
@@ -1272,6 +1262,10 @@
   '((ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
+    (shinjigen-1	. 1171)
+    (=ucs		. #x209A4)	; 𠦤
+    (=cns11643-6	. #x3566)	; &I-C6-3566; [21-70]
+    (=daikanwa		. 02756)	; &I-M-02756;
     (<-simplified@misc
      ((=ucs		  . #x55AE)	; 單
       (=daikanwa	  . 03993)	; &I-M-03993;
@@ -1285,10 +1279,6 @@
       ))
     (<-vulgar*sources
      shinjigen-1)
-    (shinjigen-1	. 1171)
-    (=ucs		. #x209A4)	; 𠦤
-    (=cns11643-6	. #x3566)	; &I-C6-3566; [21-70]
-    (=daikanwa		. 02756)	; &I-M-02756;
     ))
 (define-char
   '((=>ucs		. #x5359)	; 卙
diff --git a/lisp/utf-2000/Ideograph-R025-Divination.el b/lisp/utf-2000/Ideograph-R025-Divination.el
index 4abe28f..80106d1 100644
--- a/lisp/utf-2000/Ideograph-R025-Divination.el
+++ b/lisp/utf-2000/Ideograph-R025-Divination.el
@@ -29,18 +29,18 @@
     ))
 (define-char
   '((total-strokes	 . 2)
-    (<-ancient
-     ((=ucs		  . #x535C)	; 卜
-      (=daikanwa	  . 02774)	; &I-M-02774;
-      ))
-    (<-ancient*sources
-     shuowen daikanwa)
     (hanyu-dazidian	1 28 4)
     (=ucs		. #x20061)	; 𠁡
     (=cns11643-6	. #x212C)	; &I-C6-212C; [01-12]
     (=big5-cdp		. #x87B1)	; &I-CDP-87B1;
     (=gt		. 00103)	; &I-GT-00103;
     (=gt-pj-2		. #x3055)	; &I-GT-00103; [16-53]
+    (<-ancient
+     ((=ucs		  . #x535C)	; 卜
+      (=daikanwa	  . 02774)	; &I-M-02774;
+      ))
+    (<-ancient*sources
+     shuowen daikanwa)
     (->subsumptive
      ((ideographic-radical . 2)	; ⼁
       (ideographic-strokes . 1)
@@ -332,15 +332,15 @@
     (total-strokes	 . 7)
     (=ucs		. #x209DC)	; 𠧜
     (->subsumptive
-     ((<-same
+     ((=daikanwa	  . 02793)	; &M-02793;
+      (=ucs@iso		  . #x209DC)	; &M-02793;
+      (<-same
        ((=jis-x0208	    . #x403E)	; &GT-46803; [32-30]
 	(=ks-x1001	    . #x6024)	; &I-K0-6024; [64-04]
 	(=daikanwa	    . 34763)	; &I-M-34763;
 	))
       (<-same*sources
        zihui-bu daikanwa)
-      (=daikanwa	  . 02793)	; &M-02793;
-      (=ucs@iso		  . #x209DC)	; &M-02793;
       )
      ((=cns11643-6	  . #x263C)	; &C6-263C; [06-28]
       ))
@@ -349,6 +349,19 @@
   '((ideographic-radical . 25)	; ⼘
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x5360)	; 占
+      )
+     ((=ucs		  . #x3405)	; 㐅
+      ))
+    (=ucs		. #x5364)	; 卤
+    (=gb2312		. #x4231)	; &I-G0-4231; [34-17]
+    (=cns11643-4	. #x234D)	; &I-C4-234D; [03-45]
+    (=big5-cdp		. #x8A56)	; &I-CDP-8A56;
+    (=daikanwa		. 02794)	; &I-M-02794;
     (<-Zhouwen
      ((=ucs		  . #x38B4)	; 㢴
       (=daikanwa	  . 09776)	; &I-M-09776;
@@ -369,19 +382,6 @@
      ((=ucs		  . #x6EF7)	; æ»·
       (=gb12345		  . #x4231)	; æ»· [34-17]
       ))
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (=ucs		  . #x2FF4)	; â¿´
-      )
-     ((=ucs		  . #x5360)	; 占
-      )
-     ((=ucs		  . #x3405)	; 㐅
-      ))
-    (=ucs		. #x5364)	; 卤
-    (=gb2312		. #x4231)	; &I-G0-4231; [34-17]
-    (=cns11643-4	. #x234D)	; &I-C4-234D; [03-45]
-    (=big5-cdp		. #x8A56)	; &I-CDP-8A56;
-    (=daikanwa		. 02794)	; &I-M-02794;
     ))
 (define-char
   '((<-denotational
@@ -391,10 +391,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE7)	; ⻧
     (<-identical@component
      ((=ucs		  . #x5364)	; 卤
       ))
-    (=ucs		. #x2EE7)	; ⻧
     ))
 (define-char
   '((ideographic-radical . 25)	; ⼘
@@ -615,6 +615,11 @@
   '((ideographic-radical . 25)	; ⼘
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
+    (shinjigen-1	. 840)
+    (=ucs		. #x209EA)	; 𠧪
+    (=cns11643-4	. #x2851)	; &I-C4-2851; [08-49]
+    (=big5-cdp		. #x8AA6)	; &I-CDP-8AA6;
+    (=daikanwa		. 02810)	; &I-M-02810;
     (<-ancient
      ((shinjigen-1	  . 839)
       (=ucs		  . #x5363)	; 卣
@@ -624,11 +629,6 @@
     (<-ancient*denied	shuowen-tongxun-dingsheng daikanwa)
     (<-ancient*sources
      shinjigen-1)
-    (shinjigen-1	. 840)
-    (=ucs		. #x209EA)	; 𠧪
-    (=cns11643-4	. #x2851)	; &I-C4-2851; [08-49]
-    (=big5-cdp		. #x8AA6)	; &I-CDP-8AA6;
-    (=daikanwa		. 02810)	; &I-M-02810;
     ))
 (define-char
   '((=>ucs		. #x209EB)	; 𠧫
diff --git a/lisp/utf-2000/Ideograph-R026-Seal.el b/lisp/utf-2000/Ideograph-R026-Seal.el
index 975e090..37b9d7b 100644
--- a/lisp/utf-2000/Ideograph-R026-Seal.el
+++ b/lisp/utf-2000/Ideograph-R026-Seal.el
@@ -20,12 +20,6 @@
   '((ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (<-same
-     ((=ucs		  . #x5369)	; 卩
-      (=daikanwa	  . 02836)	; &I-M-02836;
-      ))
-    (<-same*sources
-     zihui daikanwa)
     (hanyu-dazidian	1 310 10)
     (=ucs		. #x353E)	; 㔾
     (=cns11643-4	. #x212B)	; &I-C4-212B; [01-11]
@@ -33,6 +27,12 @@
     (=gt-k		. 00101)	; &I-GT-K00101;
     (=gt-pj-k1		. #x3570)	; 㔾 [21-80]
     (=daikanwa		. 02837)	; &I-M-02837;
+    (<-same
+     ((=ucs		  . #x5369)	; 卩
+      (=daikanwa	  . 02836)	; &I-M-02836;
+      ))
+    (<-same*sources
+     zihui daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -42,13 +42,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E8B)	; ⺋
     (<-formed@component/connect-above
      ((=ucs		  . #x5369)	; 卩
       ))
     (<-identical@component/connect-above
      ((=ucs		  . #x353E)	; 㔾
       ))
-    (=ucs		. #x2E8B)	; ⺋
     ))
 (define-char
   '((<-denotational
@@ -61,11 +61,11 @@
     (ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
+    (=big5-cdp		. #x8A60)	; &CDP-8A60;
+    (mojikyo		. 070838)	; &MCS-600114B6;
     (<-formed@component
      ((=ucs		  . #x5369)	; 卩
       ))
-    (=big5-cdp		. #x8A60)	; &CDP-8A60;
-    (mojikyo		. 070838)	; &MCS-600114B6;
     ))
 (define-char
   '((ideographic-radical . 26)	; ⼙
@@ -393,9 +393,6 @@
   '((ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (<-error@abos/2001
-     ((=ruimoku-v6	  . #xE00F)	; &RUI6-E00F;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -405,6 +402,9 @@
      ((=ucs		  . #x5369)	; 卩
       ))
     (=ruimoku-v6	. #xE007)	; &RUI6-E007;
+    (<-error@abos/2001
+     ((=ruimoku-v6	  . #xE00F)	; &RUI6-E00F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 26)	; ⼙
@@ -431,17 +431,6 @@
     (ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x716D)	; &M-02872; [81-77]
-      (=cns11643-3	  . #x2B4B)	; &I-C3-2B4B; [11-43]
-      (=jis-x0213-1-2000  . #x2E71)	; &I-JX1-2E71; [14-81]
-      (=daikanwa	  . 02872)	; &I-M-02872;
-      ))
-    (<-vulgar
-     ((=daikanwa	  . 02873)	; &M-02873;
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (hanyu-dazidian	1 314 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -462,17 +451,22 @@
     (=gt-k		. 02596)	; &I-GT-K02596;
     (=gt-pj-1		. #x4228)	; &I-GT-03633; [34-08]
     (=daikanwa		. 02855)	; &I-M-02855;
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x716D)	; &M-02872; [81-77]
+      (=cns11643-3	  . #x2B4B)	; &I-C3-2B4B; [11-43]
+      (=jis-x0213-1-2000  . #x2E71)	; &I-JX1-2E71; [14-81]
+      (=daikanwa	  . 02872)	; &I-M-02872;
+      ))
+    (<-vulgar
+     ((=daikanwa	  . 02873)	; &M-02873;
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-vulgar
-     ((=jis-x0208	  . #x524A)	; &GT-03647; [50-42]
-      (=daikanwa	  . 02867)	; &I-M-02867;
-      ))
-    (<-vulgar*sources
-     guangyun zhengzitong daikanwa)
     (hanyu-dazidian	1 313 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -495,6 +489,12 @@
     (=daikanwa		. 02856)	; &I-M-02856;
     (=hanziku-1		. #xE6A1)	; &I-HZK01-E6A1;
     (=cbeta		. 00230)	; &I-CB00230;
+    (<-vulgar
+     ((=jis-x0208	  . #x524A)	; &GT-03647; [50-42]
+      (=daikanwa	  . 02867)	; &I-M-02867;
+      ))
+    (<-vulgar*sources
+     guangyun zhengzitong daikanwa)
     ))
 (define-char
   '((ideographic-radical . 26)	; ⼙
@@ -549,7 +549,16 @@
     (=hanziku-1		. #xE6E1)	; &I-HZK01-E6E1;
     ))
 (define-char
-  '((=>ucs		. #x5377)	; 卷
+  '((ideographic-radical . 26)	; ⼙
+    (ideographic-strokes . 6)
+    (total-strokes	 . 8)
+    (=ucs		. #x5377)	; 卷
+    (=big5		. #xA8F7)	; &I-B-A8F7;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5377)	; 卷
+      ))
     (ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
@@ -565,16 +574,16 @@
     (shinjigen-2	. 864)
     (=jis-x0208		. #x524B)	; &GT-03636; [50-43]
     (=ks-x1001		. #x4F69)	; &I-K0-4F69; [47-73]
-    (=big5		. #xA8F7)	; &I-B-A8F7;
     (=gt		. 03636)	; &I-GT-03636;
     (=gt-k		. 03864)	; &I-GT-K03864;
     (=gt-pj-1		. #x524B)	; &I-GT-03636; [50-43]
     (=daikanwa		. 02860)	; &I-M-02860;
     (=ucs@jis		. #x5377)	; &GT-03636;
-    (=ucs@big5		. #x5377)	; &GT-03636;
     ))
 (define-char
-  '((morohashi-daikanwa	2860 0 1)
+  '((<-denotational
+     ((=ucs		  . #x5377)	; 卷
+      ))
     (ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
@@ -587,9 +596,9 @@
       )
      ((=ucs		  . #x353E)	; 㔾
       ))
-    (=ucs		. #x5377)	; 卷
-    (=gb2312		. #x3E6D)	; &I-G0-3E6D; [30-77]
+    (=gb2312		. #x3E6D)	; &C1-4C3A; [30-77]
     (=cns11643-1	. #x4C3A)	; &I-C1-4C3A; [44-26]
+    (=ucs@unicode	. #x5377)	; &C1-4C3A;
     ))
 (define-char
   '((ideographic-radical . 26)	; ⼙
@@ -650,12 +659,18 @@
   '((ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (hanyu-dazidian	1 315 1)
+    (shinjigen-1	. 857)
+    (=ucs		. #x3541)	; 㕁
+    (=cns11643-4	. #x2556)	; &I-C4-2556; [05-54]
+    (=daikanwa		. 02863)	; &I-M-02863;
+    (=hanziku-1		. #xE6E0)	; &I-HZK01-E6E0;
     (<-vulgar
      ((=jis-x0208	  . #x524A)	; &GT-03647; [50-42]
       (=daikanwa	  . 02867)	; &I-M-02867;
       ))
     (<-vulgar*sources
-     zhengzi-tong daikanwa)
+     zhengzitong daikanwa)
     (<-wrong
      ((shinjigen-1	  . 855)
       (=ucs		  . #x5374)	; 却
@@ -663,14 +678,9 @@
       ))
     (<-wrong*sources
      shinjigen-1)
-    (hanyu-dazidian	1 315 1)
-    (shinjigen-1	. 857)
-    (=ucs		. #x3541)	; 㕁
-    (=cns11643-4	. #x2556)	; &I-C4-2556; [05-54]
-    (=daikanwa		. 02863)	; &I-M-02863;
-    (=hanziku-1		. #xE6E0)	; &I-HZK01-E6E0;
     (->mistakable
-     ((=daikanwa	  . 39379)	; &I-M-39379;
+     ((=ucs		  . #x90C4)	; 郄
+      (=daikanwa	  . 39379)	; &I-M-39379;
       ))
     (->mistakable*sources
      zihui daikanwa)
@@ -743,14 +753,7 @@
     (hanyu-dazidian	1 317 2)
     (=ucs		. #x537B)	; 卻
     (->subsumptive
-     ((<-formed
-       ((shinjigen-1	    . 855)
-	(=ucs		    . #x5374)	; 却
-	(=jis-x0208	    . #x3551)	; &I-J90-3551; [21-49]
-	))
-      (<-formed*sources
-       shinjigen-1)
-      (shinjigen-1	  . 856)
+     ((shinjigen-1	  . 856)
       (shinjigen-2	  . 856)
       (=jis-x0208	  . #x524A)	; &GT-03647; [50-42]
       (=gt		  . 03647)	; &I-GT-03647;
@@ -758,6 +761,13 @@
       (=gt-pj-1		  . #x524A)	; &I-GT-03647; [50-42]
       (=daikanwa	  . 02867)	; &I-M-02867;
       (=ucs@jis		  . #x537B)	; &GT-03647;
+      (<-formed
+       ((shinjigen-1	    . 855)
+	(=ucs		    . #x5374)	; 却
+	(=jis-x0208	    . #x3551)	; &I-J90-3551; [21-49]
+	))
+      (<-formed*sources
+       shinjigen-1)
       (->vulgar
        ((=ucs		    . #x5374)	; 却
 	(=daikanwa	    . 02856)	; &I-M-02856;
@@ -857,18 +867,13 @@
     (total-strokes	 . 9)
     (=ucs		. #x537D)	; 卽
     (->subsumptive
-     ((<-formed
-       ((shinjigen-1	    . 859)
-	(=ucs		    . #x5373)	; 即
-	(=jis-x0208	    . #x4228)	; &I-J90-4228; [34-08]
-	))
-      (<-formed*sources
-       shinjigen-1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs@unicode	    . #x7680)	; &GT-29075;
+       ((=jis-x0208	    . #x6225)	; &GT-29075; [66-05]
+	(=cns11643-3	    . #x2674)	; &I-C3-2674; [06-84]
+	(=daikanwa	    . 22683)	; &I-M-22683;
 	)
        ((=ucs		    . #x5369)	; 卩
 	))
@@ -880,6 +885,13 @@
       (=daikanwa	  . 02872)	; &I-M-02872;
       (=jef-china3	  . #x45D4)	; &I-JC3-45D4;
       (=ucs@unicode	  . #x537D)	; &M-02872;
+      (<-formed
+       ((shinjigen-1	    . 859)
+	(=ucs		    . #x5373)	; 即
+	(=jis-x0208	    . #x4228)	; &I-J90-4228; [34-08]
+	))
+      (<-formed*sources
+       shinjigen-1)
       )
      ((=cns11643-6	  . #x2F3D)	; &C6-2F3D; [15-29]
       )
@@ -896,40 +908,34 @@
     (=daikanwa		. 02873)	; &M-02873;
     ))
 (define-char
-  '((=>ucs		. #x20A1B)	; 𠨛
-    (ideographic-radical . 26)	; ⼙
-    (ideographic-strokes . 7)
-    (total-strokes	 . 9)
-    (=daikanwa		. 02874)	; &M-02874;
-    ))
-(define-char
-  '((morohashi-daikanwa	2874 0 0)
-    (ideographic-radical . 26)	; ⼙
+  '((ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
     (=ucs		. #x20A1B)	; 𠨛
-    (=cns11643-6	. #x2F3A)	; &I-C6-2F3A; [15-26]
-    ))
-(define-char
-  '((=>ucs		. #x20A1E)	; 𠨞
-    (ideographic-radical . 26)	; ⼙
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
-    (<-same
-     ((=ucs		  . #x2F833)	; 卿
-      (=daikanwa	  . 02879)	; &I-M-02879;
+    (->subsumptive
+     ((=daikanwa	  . 02874)	; &M-02874;
+      )
+     ((=cns11643-6	  . #x2F3A)	; &C6-2F3A; [15-26]
+      (=ucs@iso		  . #x20A1B)	; &C6-2F3A;
       ))
-    (<-same*sources
-     zhonghua-dazidian daikanwa)
-    (=daikanwa		. 02875)	; &M-02875;
     ))
 (define-char
-  '((morohashi-daikanwa	2875 0 1)
-    (ideographic-radical . 26)	; ⼙
+  '((ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
     (=ucs		. #x20A1E)	; 𠨞
-    (=cns11643-6	. #x2F3C)	; &I-C6-2F3C; [15-28]
+    (->subsumptive
+     ((=daikanwa	  . 02875)	; &M-02875;
+      (=ucs@iso		  . #x20A1E)	; &M-02875;
+      (<-same
+       ((=ucs		    . #x2F833)	; 卿
+	(=daikanwa	    . 02879)	; &I-M-02879;
+	))
+      (<-same*sources
+       zhonghua-dazidian daikanwa)
+      )
+     ((=cns11643-6	  . #x2F3C)	; &C6-2F3C; [15-28]
+      ))
     ))
 (define-char
   '((ideographic-radical . 26)	; ⼙
@@ -979,13 +985,13 @@
     (total-strokes	 . 11)
     (=ucs		. #x2F831)	; 卿
     (->subsumptive
-     ((<-vulgar
+     ((=daikanwa	  . 02877)	; &M-02877;
+      (<-vulgar
        ((=ucs		    . #x2F833)	; 卿
 	(=daikanwa	    . 02879)	; &I-M-02879;
 	))
       (<-vulgar*sources
        daikanwa)
-      (=daikanwa	  . 02877)	; &M-02877;
       )
      ((=cns11643-6	  . #x3D59)	; &C6-3D59; [29-57]
       (=ucs@iso		  . #x2F831)	; &C6-3D59;
@@ -999,19 +1005,6 @@
     (ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x362A)	; &M-02880; [22-10]
-      (=ks-x1001	  . #x4C4F)	; &I-K0-4C4F; [44-47]
-      (=daikanwa	  . 02880)	; &I-M-02880;
-      ))
-    (<-vulgar
-     ((shinjigen-1	  . 868)
-      (=jis-x0208@1978	  . #x362A)	; &M-02880; [22-10]
-      (=ks-x1001	  . #x4C4F)	; &I-K0-4C4F; [44-47]
-      (=daikanwa	  . 02880)	; &I-M-02880;
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -1031,6 +1024,19 @@
     (=jef-china3	. #x45D5)	; &I-JC3-45D5;
     (=ucs@unicode	. #x537F)	; &GT-03656;
     (mojikyo		. 054486)	; &MCS-6000D4D6;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x362A)	; &M-02880; [22-10]
+      (=ks-x1001	  . #x4C4F)	; &I-K0-4C4F; [44-47]
+      (=daikanwa	  . 02880)	; &I-M-02880;
+      ))
+    (<-vulgar
+     ((shinjigen-1	  . 868)
+      (=jis-x0208@1978	  . #x362A)	; &M-02880; [22-10]
+      (=ks-x1001	  . #x4C4F)	; &I-K0-4C4F; [44-47]
+      (=daikanwa	  . 02880)	; &I-M-02880;
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((<-denotational
@@ -1040,15 +1046,15 @@
     (ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
+    (=ucs		. #x2F832)	; 卿
+    (=cns11643-6	. #x3D5A)	; &I-C6-3D5A; [29-58]
+    (=daikanwa		. 02878)	; &I-M-02878;
     (<-vulgar
      ((=ucs		  . #x2F833)	; 卿
       (=daikanwa	  . 02879)	; &I-M-02879;
       ))
     (<-vulgar*sources
      daikanwa)
-    (=ucs		. #x2F832)	; 卿
-    (=cns11643-6	. #x3D5A)	; &I-C6-3D5A; [29-58]
-    (=daikanwa		. 02878)	; &I-M-02878;
     ))
 (define-char
   '((<-denotational
@@ -1058,6 +1064,11 @@
     (ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
+    (shinjigen-1	. 869)
+    (shinjigen-2	. 869)
+    (=ucs		. #x2F833)	; 卿
+    (=cns11643-3	. #x3A26)	; &I-C3-3A26; [26-06]
+    (=daikanwa		. 02879)	; &I-M-02879;
     (<-same
      ((shinjigen-1	  . 868)
       (=jis-x0208@1978	  . #x362A)	; &M-02880; [22-10]
@@ -1066,11 +1077,6 @@
       ))
     (<-same*sources
      shinjigen-1)
-    (shinjigen-1	. 869)
-    (shinjigen-2	. 869)
-    (=ucs		. #x2F833)	; 卿
-    (=cns11643-3	. #x3A26)	; &I-C3-3A26; [26-06]
-    (=daikanwa		. 02879)	; &I-M-02879;
     ))
 (define-char
   '((<-denotational
@@ -1079,18 +1085,18 @@
     (ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (<-same
-     ((=ucs		  . #x2F833)	; 卿
-      (=daikanwa	  . 02879)	; &I-M-02879;
-      ))
-    (<-same*sources
-     zhengzi-tong daikanwa)
     (shinjigen-1	. 868)
     (shinjigen-2	. 868)
     (=jis-x0208@1978	. #x362A)	; &M-02880; [22-10]
     (=ks-x1001		. #x4C4F)	; &I-K0-4C4F; [44-47]
     (=daikanwa		. 02880)	; &I-M-02880;
     (=ucs@ks		. #x537F)	; &M-02880;
+    (<-same
+     ((=ucs		  . #x2F833)	; 卿
+      (=daikanwa	  . 02879)	; &I-M-02879;
+      ))
+    (<-same*sources
+     zhengzitong daikanwa)
     ))
 (define-char
   '((ideographic-radical . 26)	; ⼙
diff --git a/lisp/utf-2000/Ideograph-R027-Cliff.el b/lisp/utf-2000/Ideograph-R027-Cliff.el
index 8bd1914..ab0602f 100644
--- a/lisp/utf-2000/Ideograph-R027-Cliff.el
+++ b/lisp/utf-2000/Ideograph-R027-Cliff.el
@@ -566,7 +566,7 @@
 	)
        ((=ucs		    . #x5382)	; 厂
 	)
-       ((=ucs@unicode	    . #x6C10)	; &G0-5835;
+       ((=gb2312	    . #x5835)	; &G0-5835; [56-21]
 	))
       (=ucs@unicode	  . #x538E)	; &UU+538E;
       ))
@@ -759,7 +759,8 @@
     (total-strokes	 . 8)
     (=ucs		. #x20A4A)	; 𠩊
     (->subsumptive
-     ((<-ancient
+     ((=daikanwa	  . 02932)	; &M-02932;
+      (<-ancient
        ((=jis-x0208	    . #x3B5D)	; &GT-17370; [27-61]
 	(=gb2312	    . #x563C)	; &I-G0-563C; [54-28]
 	(=ks-x1001	    . #x7229)	; &I-K0-7229; [82-09]
@@ -767,7 +768,6 @@
 	))
       (<-ancient*sources
        jiyun daikanwa)
-      (=daikanwa	  . 02932)	; &M-02932;
       )
      ((=cns11643-6	  . #x2A27)	; &C6-2A27; [10-07]
       )
@@ -817,7 +817,9 @@
     (total-strokes	 . 8)
     (=ucs		. #x20A4C)	; 𠩌
     (->subsumptive
-     ((<-ancient
+     ((=daikanwa	  . 02935)	; &M-02935;
+      (mojikyo		  . 002935)	; &MCS-60000B77;
+      (<-ancient
        ((=jis-x0208	    . #x404A)	; &GT-11229; [32-42]
 	(=ks-x1001	    . #x602C)	; &I-K0-602C; [64-12]
 	(=iso-ir165	    . #x4F2F)	; &I-EGB-4F2F; [47-15]
@@ -825,8 +827,6 @@
 	))
       (<-ancient*sources
        zihui daikanwa)
-      (=daikanwa	  . 02935)	; &M-02935;
-      (mojikyo		  . 002935)	; &MCS-60000B77;
       )
      ((=cns11643-6	  . #x2A29)	; &C6-2A29; [10-09]
       (=ucs@iso		  . #x20A4C)	; &C6-2A29;
@@ -1214,7 +1214,23 @@
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs		  . #x5382)	; 厂
+      )
+     ((=ucs		  . #x653C)	; 攼
+      ))
+    (sources		bos=A2003-10271-00006)
+    (=ruimoku-v6	. #xE022)	; &RUI6-E022;
+    ))
+(define-char
+  '((ideographic-radical . 27)	; ⼚
     (=ucs		. #x539C)	; 厜
+    (=big5		. #xD470)	; &I-B-D470;
     ))
 (define-char
   '((<-denotational
@@ -1235,8 +1251,7 @@
       (=ks-x1001	  . #x6177)	; &I-K0-6177; [65-87]
       (=daikanwa	  . 05012)	; &I-M-05012;
       ))
-    (=big5		. #xD470)	; &M-02960;
-    (=daikanwa		. 02960)	; &I-M-02960;
+    (=daikanwa		. 02960)	; &M-02960;
     (=ucs@unicode	. #x539C)	; &M-02960;
     ))
 (define-char
@@ -1582,13 +1597,6 @@
   '((ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (<-vulgar
-     ((shinjigen-1	  . 2191)
-      (=jis-x0208	  . #x567A)	; &GT-11840; [54-90]
-      (=daikanwa	  . 09410)	; &I-M-09410;
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (hanyu-dazidian	1 75 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
@@ -1609,6 +1617,13 @@
     (=gt-pj-1		. #x524E)	; &I-GT-03778; [50-46]
     (=daikanwa		. 02981)	; &I-M-02981;
     (=hanziku-1		. #xB378)	; &I-HZK01-B378;
+    (<-vulgar
+     ((shinjigen-1	  . 2191)
+      (=jis-x0208	  . #x567A)	; &GT-11840; [54-90]
+      (=daikanwa	  . 09410)	; &I-M-09410;
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
@@ -1853,6 +1868,14 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (=ucs		. #x53A6)	; 厦
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x53A6)	; 厦
+      ))
+    (ideographic-radical . 27)	; ⼚
+    (ideographic-strokes . 10)
+    (total-strokes	 . 12)
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
@@ -1873,51 +1896,57 @@
        ((=cns11643-1	    . #x546E)	; &C1-546E; [52-78]
 	))
       (=cns11643-3	  . #x3A28)	; &C3-3A28; [26-08]
-      )
-     ((<-vulgar
-       ((shinjigen-1	    . 2199)
-	(=jis-x0208	    . #x567C)	; &GT-11869; [54-92]
-	(=ks-x1001	    . #x793F)	; &I-K0-793F; [89-31]
-	))
-      (<-vulgar*sources
-       shinjigen-1)
-      (hanyu-dazidian	  1 75 25)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	(=ucs		    . #x2FF8)	; ⿸
-	)
-       ((=ucs		    . #x5382)	; 厂
-	)
-       ((=ucs		    . #x590F)	; 夏
-	))
-      (shinjigen-1	  . 2200)
-      (shinjigen-2	  . 2200)
-      (=jis-x0208	  . #x524F)	; &GT-03789; [50-47]
-      (=gb2312		  . #x4F43)	; &I-G0-4F43; [47-35]
-      (=ks-x1001	  . #x793D)	; &I-K0-793D; [89-29]
-      (=gt		  . 03789)	; &I-GT-03789;
-      (=gt-k		  . 09168)	; &I-GT-K09168;
-      (=gt-pj-1		  . #x524F)	; &I-GT-03789; [50-47]
-      (=hanziku-1	  . #xB3A7)	; &I-HZK01-B3A7;
-      (=ucs@unicode	  . #x53A6)	; &GT-03789;
       ))
     ))
 (define-char
-  '((=>ucs		. #x20A87)	; 𠪇
+  '((<-denotational
+     ((=ucs		  . #x53A6)	; 厦
+      ))
     (ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (=daikanwa		. 02994)	; &M-02994;
+    (hanyu-dazidian	1 75 25)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs		  . #x5382)	; 厂
+      )
+     ((=jis-x0208	  . #x3246)	; &GT-07217; [18-38]
+      (=gb2312		  . #x4F44)	; &I-G0-4F44; [47-36]
+      (=ks-x1001	  . #x793E)	; &I-K0-793E; [89-30]
+      ))
+    (shinjigen-1	. 2200)
+    (shinjigen-2	. 2200)
+    (=jis-x0208		. #x524F)	; &GT-03789; [50-47]
+    (=gb2312		. #x4F43)	; &I-G0-4F43; [47-35]
+    (=ks-x1001		. #x793D)	; &I-K0-793D; [89-29]
+    (=gt		. 03789)	; &I-GT-03789;
+    (=gt-k		. 09168)	; &I-GT-K09168;
+    (=gt-pj-1		. #x524F)	; &I-GT-03789; [50-47]
+    (=hanziku-1		. #xB3A7)	; &I-HZK01-B3A7;
+    (=ucs@unicode	. #x53A6)	; &GT-03789;
+    (<-vulgar
+     ((shinjigen-1	  . 2199)
+      (=jis-x0208	  . #x567C)	; &GT-11869; [54-92]
+      (=ks-x1001	  . #x793F)	; &I-K0-793F; [89-31]
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
-  '((morohashi-daikanwa	2994 0 0)
-    (ideographic-radical . 27)	; ⼚
+  '((ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 76 3)
     (=ucs		. #x20A87)	; 𠪇
-    (=cns11643-4	. #x3652)	; &I-C4-3652; [22-50]
-    (=hanziku-1		. #xB3B1)	; &I-HZK01-B3B1;
+    (->subsumptive
+     ((=daikanwa	  . 02994)	; &M-02994;
+      )
+     ((hanyu-dazidian	  1 76 3)
+      (=cns11643-4	  . #x3652)	; &HZK01-B3B1; [22-50]
+      (=hanziku-1	  . #xB3B1)	; &I-HZK01-B3B1;
+      (=ucs@iso		  . #x20A87)	; &HZK01-B3B1;
+      ))
     ))
 (define-char
   '((=>ucs		. #x20A87)	; 𠪇
@@ -2053,7 +2082,10 @@
   '((ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (=daikanwa		. 03003)	; &M-03003;
+    (hanyu-dazidian	1 76 9)
+    (=ucs		. #x20A90)	; 𠪐
+    (=daikanwa		. 03003)	; &I-M-03003;
+    (=hanziku-1		. #xB3B7)	; &I-HZK01-B3B7;
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
@@ -2084,14 +2116,6 @@
   '((ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (<-vulgar
-     ((shinjigen-1	  . 2216)
-      (=jis-x0208	  . #x5724)	; &GT-11949; [55-04]
-      (=ks-x1001	  . #x7137)	; &I-K0-7137; [81-23]
-      (=daikanwa	  . 09479)	; &I-M-09479;
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (hanyu-dazidian	1 75 24)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
@@ -2120,6 +2144,14 @@
     (=daikanwa		. 03005)	; &I-M-03005;
     (=hanziku-1		. #xB3A6)	; &I-HZK01-B3A6;
     (=cbeta		. 00634)	; &I-CB00634;
+    (<-vulgar
+     ((shinjigen-1	  . 2216)
+      (=jis-x0208	  . #x5724)	; &GT-11949; [55-04]
+      (=ks-x1001	  . #x7137)	; &I-K0-7137; [81-23]
+      (=daikanwa	  . 09479)	; &I-M-09479;
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
@@ -2173,12 +2205,6 @@
     (ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (<-vulgar
-     ((shinjigen-1	  . 2207)
-      (=gt		  . 11902)	; &GT-11902;
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
       (=ucs		  . #x2FF8)	; ⿸
@@ -2191,6 +2217,12 @@
     (shinjigen-2	. 2208)
     (=gt		. 03811)	; &GT-03811;
     (=gt-pj-11		. #x3B44)	; &GT-03811; [27-36]
+    (<-vulgar
+     ((shinjigen-1	  . 2207)
+      (=gt		  . 11902)	; &GT-11902;
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((<-denotational
@@ -2475,6 +2507,7 @@
      ((=ucs		  . #x5382)	; 厂
       )
      ((=ks-x1001	  . #x4A72)	; &GT-16742; [42-82]
+      (=jis-x0208@1990	  . #x343A)	; &I-J90-343A; [20-26]
       (=cns11643-1	  . #x5F56)	; &I-C1-5F56; [63-54]
       (=daikanwa	  . 13260)	; &I-M-13260;
       ))
@@ -2511,7 +2544,7 @@
 	)
        ((=ucs		    . #x5382)	; 厂
 	)
-       ((=ucs@unicode	    . #x6677)	; &G0-6A50;
+       ((=gb2312	    . #x6A50)	; &G0-6A50; [74-48]
 	))
       (=ucs@unicode	  . #x53AC)	; &UU+53AC;
       ))
@@ -2520,18 +2553,16 @@
   '((ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 77 16)
     (=ucs		. #x20A9B)	; 𠪛
-    (=daikanwa		. 03021)	; &I-M-03021;
-    (=hanziku-1		. #xB3DE)	; &I-HZK01-B3DE;
-    ))
-(define-char
-  '((=>ucs		. #x20A9B)	; 𠪛
-    (morohashi-daikanwa	3021 0 0)
-    (ideographic-radical . 27)	; ⼚
-    (ideographic-strokes . 12)
-    (total-strokes	 . 14)
-    (=cns11643-6	. #x5B34)	; &C6-5B34; [59-20]
+    (->subsumptive
+     ((=daikanwa	  . 03021)	; &M-03021;
+      )
+     ((hanyu-dazidian	  1 77 16)
+      (=hanziku-1	  . #xB3DE)	; &HZK01-B3DE;
+      (=ucs@iso		  . #x20A9B)	; &HZK01-B3DE;
+      )
+     ((=cns11643-6	  . #x5B34)	; &C6-5B34; [59-20]
+      ))
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
@@ -2555,14 +2586,22 @@
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
+    (=ucs		. #x3550)	; 㕐
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3550)	; 㕐
+      ))
+    (ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (=ucs		. #x3550)	; 㕐
-    (=daikanwa		. 03024)	; &I-M-03024;
+    (=daikanwa		. 03024)	; &M-03024;
+    (=ucs@unicode	. #x3550)	; &M-03024;
     ))
 (define-char
-  '((=>ucs		. #x3550)	; 㕐
-    (morohashi-daikanwa	3024 0 3)
+  '((<-denotational
+     ((=ucs		  . #x3550)	; 㕐
+      ))
     (ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
@@ -2581,7 +2620,8 @@
 	)
        ((=ucs		    . #x5382)	; 厂
 	)
-       ((=ucs@unicode	    . #x7312)	; &GT-26257;
+       ((=jis-x0212	    . #x4B28)	; &GT-26257; [43-08]
+	(=jis-x0213-2-2000  . #x7046)	; &I-JX2-7046; [80-38]
 	))
       (shinjigen-1	  . 886)
       (shinjigen-2	  . 886)
@@ -2610,13 +2650,6 @@
   '((ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (<-vulgar
-     ((shinjigen-1	  . 2212)
-      (=jis-x0208	  . #x5723)	; &GT-11939; [55-03]
-      (=daikanwa	  . 09487)	; &I-M-09487;
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (hanyu-dazidian	1 77 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
@@ -2637,6 +2670,13 @@
     (=daikanwa		. 03026)	; &I-M-03026;
     (=hanziku-1		. #xB3DB)	; &I-HZK01-B3DB;
     (=cbeta		. 00637)	; &I-CB00637;
+    (<-vulgar
+     ((shinjigen-1	  . 2212)
+      (=jis-x0208	  . #x5723)	; &GT-11939; [55-03]
+      (=daikanwa	  . 09487)	; &I-M-09487;
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((=>ucs		. #x20A9D)	; 𠪝
@@ -2711,13 +2751,23 @@
   '((ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (=daikanwa		. 03031)	; &M-03031;
+    (=ucs		. #x20AA7)	; 𠪧
+    (->subsumptive
+     ((=daikanwa	  . 03031)	; &M-03031;
+      )
+     ((hanyu-dazidian	  1 80 7)
+      (=hanziku-1	  . #xB476)	; &HZK01-B476;
+      (=ucs@iso		  . #x20AA7)	; &HZK01-B476;
+      ))
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (=daikanwa		. 03032)	; &M-03032;
+    (hanyu-dazidian	1 77 14)
+    (=ucs		. #x20AA3)	; 𠪣
+    (=daikanwa		. 03032)	; &I-M-03032;
+    (=hanziku-1		. #xB3DC)	; &I-HZK01-B3DC;
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
@@ -2725,7 +2775,9 @@
     (total-strokes	 . 14)
     (=ucs		. #x3551)	; 㕑
     (->subsumptive
-     ((<-vulgar
+     ((shinjigen-1	  . 2218)
+      (=daikanwa	  . 03033)	; &M-03033;
+      (<-vulgar
        ((shinjigen-1	    . 2216)
 	(=jis-x0208	    . #x5724)	; &GT-11949; [55-04]
 	(=ks-x1001	    . #x7137)	; &I-K0-7137; [81-23]
@@ -2733,8 +2785,6 @@
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 2218)
-      (=daikanwa	  . 03033)	; &M-03033;
       )
      ((=cns11643-3	  . #x4624)	; &C3-4624; [38-04]
       (=ucs@unicode	  . #x3551)	; &C3-4624;
@@ -2745,47 +2795,61 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
     (=ucs		. #x53B0)	; 厰
-    (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 2214)
-	(=jis-x0208@1978    . #x3E33)	; &GT-11941; [30-19]
-	(=ks-x1001	    . #x735F)	; &I-K0-735F; [83-63]
-	(=daikanwa	    . 09490)	; &I-M-09490;
-	))
-      (<-vulgar*sources
-       shinjigen-1)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	(=ucs		    . #x2FF8)	; ⿸
-	)
-       ((=ucs		    . #x5382)	; 厂
-	)
-       ((=jis-x0208	    . #x5A48)	; &GT-16763; [58-40]
-	(=ks-x1001	    . #x7362)	; &I-K0-7362; [83-66]
-	(=daikanwa	    . 13246)	; &I-M-13246;
-	))
-      (shinjigen-1	  . 2215)
-      (shinjigen-2	  . 2215)
-      (=jis-x0208	  . #x5252)	; &GT-03839; [50-50]
-      (=gt		  . 03839)	; &I-GT-03839;
-      (=gt-pj-1		  . #x5252)	; &I-GT-03839; [50-50]
-      (=daikanwa	  . 03034)	; &I-M-03034;
-      (=cbeta		  . 01927)	; &I-CB01927;
-      (=ucs@jis		  . #x53B0)	; &GT-03839;
-      )
-     ((hanyu-dazidian	  1 78 2)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	(=ucs		    . #x2FF8)	; ⿸
-	)
-       ((=ucs		    . #x5382)	; 厂
-	)
-       ((=ucs		    . #x655E)	; 敞
-	))
-      (=cns11643-3	  . #x4626)	; &HZK01-B3F0; [38-06]
-      (=hanziku-1	  . #xB3F0)	; &I-HZK01-B3F0;
-      (=ucs@unicode	  . #x53B0)	; &HZK01-B3F0;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x53B0)	; 厰
       ))
+    (ideographic-radical . 27)	; ⼚
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs		  . #x5382)	; 厂
+      )
+     ((=jis-x0208	  . #x5A48)	; &GT-16763; [58-40]
+      (=ks-x1001	  . #x7362)	; &I-K0-7362; [83-66]
+      (=daikanwa	  . 13246)	; &I-M-13246;
+      ))
+    (shinjigen-1	. 2215)
+    (shinjigen-2	. 2215)
+    (=jis-x0208		. #x5252)	; &GT-03839; [50-50]
+    (=gt		. 03839)	; &I-GT-03839;
+    (=gt-pj-1		. #x5252)	; &I-GT-03839; [50-50]
+    (=daikanwa		. 03034)	; &I-M-03034;
+    (=cbeta		. 01927)	; &I-CB01927;
+    (=ucs@jis		. #x53B0)	; &GT-03839;
+    (<-vulgar
+     ((shinjigen-1	  . 2214)
+      (=jis-x0208@1978	  . #x3E33)	; &GT-11941; [30-19]
+      (=ks-x1001	  . #x735F)	; &I-K0-735F; [83-63]
+      (=daikanwa	  . 09490)	; &I-M-09490;
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x53B0)	; 厰
+      ))
+    (ideographic-radical . 27)	; ⼚
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (hanyu-dazidian	1 78 2)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs		  . #x5382)	; 厂
+      )
+     ((=gb2312		  . #x3328)	; &C1-5F54; [19-08]
+      (=cns11643-1	  . #x5F54)	; &I-C1-5F54; [63-52]
+      ))
+    (=cns11643-3	. #x4626)	; &HZK01-B3F0; [38-06]
+    (=hanziku-1		. #xB3F0)	; &I-HZK01-B3F0;
+    (=ucs@unicode	. #x53B0)	; &HZK01-B3F0;
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
@@ -3036,83 +3100,89 @@
     (=hanziku-1		. #xB4A3)	; &HZK01-B4A3;
     ))
 (define-char
-  '((=>ucs		. #x20ABC)	; 𠪼
-    (ideographic-radical . 27)	; ⼚
-    (ideographic-strokes . 14)
-    (total-strokes	 . 16)
-    (=daikanwa		. 03048)	; &M-03048;
-    ))
-(define-char
-  '((morohashi-daikanwa	3048 0 1)
-    (ideographic-radical . 27)	; ⼚
+  '((ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
-    (hanyu-dazidian	1 80 16)
     (=ucs		. #x20ABC)	; 𠪼
-    (=cns11643-7	. #x2C52)	; &I-C7-2C52; [12-50]
-    (=hanziku-1		. #xB4A1)	; &I-HZK01-B4A1;
+    (->subsumptive
+     ((=daikanwa	  . 03048)	; &M-03048;
+      )
+     ((hanyu-dazidian	  1 80 16)
+      (=cns11643-7	  . #x2C52)	; &HZK01-B4A1; [12-50]
+      (=hanziku-1	  . #xB4A1)	; &I-HZK01-B4A1;
+      (=ucs@iso		  . #x20ABC)	; &HZK01-B4A1;
+      ))
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
     (=ucs		. #x53B3)	; 厳
-    (->subsumptive
-     ((script		JP Jouyou Ideograph)
-      (morohashi-daikanwa	3048 1)
-      (ideographic-strokes . 15)
-      (total-strokes	   . 17)
-      (<-simplified@JP/Jouyou
-       ((shinjigen-1	    . 1286)
-	(=jis-x0208	    . #x536E)	; &GT-05771; [51-78]
-	(=ks-x1001	    . #x6571)	; &I-K0-6571; [69-81]
-	(=cns11643-1	    . #x7964)	; &I-C1-7964; [89-68]
-	(=daikanwa	    . 04589)	; &I-M-04589;
-	))
-      (<-simplified@JP/Jouyou*sources
-       daikanwa shinjigen-1 JP/Jouyou)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	(=ucs		    . #x2FF8)	; ⿸
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x53B3)	; 厳
+      ))
+    (script		JP Jouyou Ideograph)
+    (morohashi-daikanwa	3048 1)
+    (ideographic-radical . 27)	; ⼚
+    (ideographic-strokes . 15)
+    (total-strokes	 . 17)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	  (=ucs		      . #x2FF1)	; ⿱
-	  )
-	 ((=big5-cdp	      . #x89B2)	; &CDP-89B2;
-	  )
-	 ((=ucs		      . #x5382)	; 厂
-	  ))
+       ((=big5-cdp	    . #x89B2)	; &CDP-89B2;
 	)
-       ((=jis-x0208@1978    . #x343A)	; &J83-343A; [20-26]
-	(=jis-x0208@1983    . #x343A)	; &I-J83-343A; [20-26]
+       ((=ucs		    . #x5382)	; 厂
 	))
-      (shinjigen-1	  . 1285)
-      (shinjigen-2	  . 1285)
-      (=jis-x0208	  . #x3837)	; &GT-12988; [24-23]
-      (=cns11643-3	  . #x5445)	; &I-C3-5445; [52-37]
-      (=gt		  . 12988)	; &I-GT-12988;
-      (=gt-pj-1		  . #x3837)	; &I-GT-12988; [24-23]
-      (=ucs@jis		  . #x53B3)	; &GT-12988;
-      (mojikyo		  . 050115)	; &MCS-6000C3C3;
-      )
-     ((ideographic-strokes . 14)
-      (total-strokes	   . 16)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	(=ucs		    . #x2FF8)	; ⿸
+      )
+     ((=jis-x0208@1978	  . #x343A)	; &J83-343A; [20-26]
+      (=jis-x0208@1983	  . #x343A)	; &I-J83-343A; [20-26]
+      ))
+    (shinjigen-1	. 1285)
+    (shinjigen-2	. 1285)
+    (=jis-x0208		. #x3837)	; &GT-12988; [24-23]
+    (=cns11643-3	. #x5445)	; &I-C3-5445; [52-37]
+    (=gt		. 12988)	; &I-GT-12988;
+    (=gt-pj-1		. #x3837)	; &I-GT-12988; [24-23]
+    (=ucs@jis		. #x53B3)	; &GT-12988;
+    (mojikyo		. 050115)	; &MCS-6000C3C3;
+    (<-simplified@JP/Jouyou
+     ((shinjigen-1	  . 1286)
+      (=jis-x0208	  . #x536E)	; &GT-05771; [51-78]
+      (=ks-x1001	  . #x6571)	; &I-K0-6571; [69-81]
+      (=cns11643-1	  . #x7964)	; &I-C1-7964; [89-68]
+      (=daikanwa	  . 04589)	; &I-M-04589;
+      ))
+    (<-simplified@JP/Jouyou*sources
+     daikanwa shinjigen-1 JP/Jouyou)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x53B3)	; 厳
+      ))
+    (ideographic-radical . 27)	; ⼚
+    (ideographic-strokes . 14)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	  (=ucs		      . #x2FF1)	; ⿱
-	  )
-	 ((=big5-cdp	      . #x89B2)	; &CDP-89B2;
-	  )
-	 ((=ucs		      . #x5382)	; 厂
-	  ))
+       ((=big5-cdp	    . #x89B2)	; &CDP-89B2;
 	)
-       ((=ucs@unicode	    . #x6562)	; &G0-3852;
+       ((=ucs		    . #x5382)	; 厂
 	))
-      (=ucs@unicode	  . #x53B3)	; &UU+53B3;
+      )
+     ((=gb2312		  . #x3852)	; &G0-3852; [24-50]
       ))
+    (=ucs@unicode	. #x53B3)	; &UU+53B3;
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
@@ -3414,12 +3484,6 @@
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
-    (hanyu-dazidian	1 76 9)
-    (=ucs		. #x20A90)	; 𠪐
-    (=hanziku-1		. #xB3B7)	; &I-HZK01-B3B7;
-    ))
-(define-char
-  '((ideographic-radical . 27)	; ⼚
     (hanyu-dazidian	1 77 7)
     (=ucs		. #x20A97)	; 𠪗
     (=hanziku-1		. #xB3D5)	; &I-HZK01-B3D5;
@@ -3432,18 +3496,6 @@
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
-    (hanyu-dazidian	1 77 14)
-    (=ucs		. #x20AA3)	; 𠪣
-    (=hanziku-1		. #xB3DC)	; &I-HZK01-B3DC;
-    ))
-(define-char
-  '((ideographic-radical . 27)	; ⼚
-    (hanyu-dazidian	1 80 7)
-    (=ucs		. #x20AA7)	; 𠪧
-    (=hanziku-1		. #xB476)	; &I-HZK01-B476;
-    ))
-(define-char
-  '((ideographic-radical . 27)	; ⼚
     (hanyu-dazidian	8 7 21)
     (=ucs		. #x20AA8)	; 𠪨
     (=hanziku-12	. #xEB54)	; &I-HZK12-EB54;
diff --git a/lisp/utf-2000/Ideograph-R028-Private.el b/lisp/utf-2000/Ideograph-R028-Private.el
index d7235b6..884d192 100644
--- a/lisp/utf-2000/Ideograph-R028-Private.el
+++ b/lisp/utf-2000/Ideograph-R028-Private.el
@@ -233,14 +233,6 @@
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (<-original
-     ((shinjigen-1	  . 890)
-      (=ucs		  . #x53BB)	; 去
-      (=jis-x0208	  . #x356E)	; &I-J90-356E; [21-78]
-      (=daikanwa	  . 03070)	; &I-M-03070;
-      ))
-    (<-original*sources
-     zhengzi-tong daikanwa shinjigen-1)
     (hanyu-dazidian	1 385 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -256,6 +248,14 @@
     (=cns11643-3	. #x222A)	; &I-C3-222A; [02-10]
     (=daikanwa		. 03069)	; &I-M-03069;
     (=hanziku-1		. #xF54B)	; &I-HZK01-F54B;
+    (<-original
+     ((shinjigen-1	  . 890)
+      (=ucs		  . #x53BB)	; 去
+      (=jis-x0208	  . #x356E)	; &I-J90-356E; [21-78]
+      (=daikanwa	  . 03070)	; &I-M-03070;
+      ))
+    (<-original*sources
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
@@ -492,7 +492,18 @@
     (=ucs		. #x20AE3)	; ð «£
     ))
 (define-char
-  '((=>ucs		. #x20AE3)	; ð «£
+  '((<-denotational
+     ((=ucs		  . #x20AE3)	; ð «£
+      ))
+    (ideographic-radical . 28)	; ⼛
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (=ucs@iso		. #x20AE3)	; &U-00020AE3;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20AE3)	; ð «£
+      ))
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
@@ -510,7 +521,16 @@
     (=hanziku-1		. #xF574)	; &I-HZK01-F574;
     ))
 (define-char
-  '((=>ucs		. #x2128F)	; 𡊏
+  '((ideographic-radical@ucs . 32)	; ⼟
+    (ideographic-radical@cns . 28)	; ⼛
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (=ucs		. #x2128F)	; 𡊏
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2128F)	; 𡊏
+      ))
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
@@ -637,18 +657,10 @@
     (=hanziku-1		. #xF577)	; &I-HZK01-F577;
     ))
 (define-char
-  '((script		JP-Jouyou Ideograph)
+  '((script		JP Jouyou CN Simplified Ideograph)
     (ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((shinjigen-1	  . 893)
-      (=ucs		  . #x53C3)	; 參
-      (=jis-x0208	  . #x5254)	; &I-J90-5254; [50-52]
-      (=daikanwa	  . 03098)	; &I-M-03098;
-      ))
-    (<-simplified@JP/Jouyou*sources
-     daikanwa shinjigen-1 JP/Jouyou)
     (hanyu-dazidian	1 386 15)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -676,6 +688,20 @@
     (=gt-pj-1		. #x3B32)	; &I-GT-03909; [27-18]
     (=daikanwa		. 03090)	; &I-M-03090;
     (=hanziku-1		. #xF579)	; &I-HZK01-F579;
+    (<-simplified@CN
+     ((=gb12345		  . #x324E)	; 參 [18-46]
+      ))
+    (<-simplified@JP/Jouyou
+     ((shinjigen-1	  . 893)
+      (=ucs		  . #x53C3)	; 參
+      (=jis-x0208	  . #x5254)	; &I-J90-5254; [50-52]
+      (=daikanwa	  . 03098)	; &I-M-03098;
+      ))
+    (<-simplified@JP/Jouyou*sources
+     daikanwa shinjigen-1 JP/Jouyou)
+    (<-simplified@ucs
+     ((=ucs		  . #x53C3)	; 參
+      ))
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
@@ -866,14 +892,6 @@
   '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (<-vulgar
-     ((shinjigen-1	  . 893)
-      (=ucs		  . #x53C3)	; 參
-      (=jis-x0208	  . #x5254)	; &I-J90-5254; [50-52]
-      (=daikanwa	  . 03098)	; &I-M-03098;
-      ))
-    (<-vulgar*sources
-     guangyun daikanwa shinjigen-1)
     (hanyu-dazidian	1 389 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -891,23 +909,29 @@
     (=hanziku-1		. #xF5F1)	; &I-HZK01-F5F1;
     (=cbeta		. 03744)	; &I-CB03744;
     (=jef-china3	. #x45E9)	; &I-JC3-45E9;
+    (<-vulgar
+     ((shinjigen-1	  . 893)
+      (=ucs		  . #x53C3)	; 參
+      (=jis-x0208	  . #x5254)	; &I-J90-5254; [50-52]
+      (=daikanwa	  . 03098)	; &I-M-03098;
+      ))
+    (<-vulgar*sources
+     guangyun daikanwa shinjigen-1)
     ))
 (define-char
-  '((=>ucs		. #x20AFF)	; ð «¿
-    (ideographic-radical . 28)	; ⼛
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (=daikanwa		. 03101)	; &M-03101;
-    ))
-(define-char
-  '((morohashi-daikanwa	3101 0 0)
-    (ideographic-radical . 28)	; ⼛
+  '((ideographic-radical . 28)	; ⼛
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 389 1)
     (=ucs		. #x20AFF)	; ð «¿
-    (=cns11643-5	. #x366C)	; &I-C5-366C; [22-76]
-    (=hanziku-1		. #xF5ED)	; &I-HZK01-F5ED;
+    (->subsumptive
+     ((=daikanwa	  . 03101)	; &M-03101;
+      )
+     ((=cns11643-5	  . #x366C)	; &C5-366C; [22-76]
+      )
+     ((hanyu-dazidian	  1 389 1)
+      (=hanziku-1	  . #xF5ED)	; &HZK01-F5ED;
+      (=ucs@iso		  . #x20AFF)	; &HZK01-F5ED;
+      ))
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el
index c0ed0a8..10de177 100644
--- a/lisp/utf-2000/Ideograph-R029-Again.el
+++ b/lisp/utf-2000/Ideograph-R029-Again.el
@@ -35,11 +35,11 @@
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x53C8)	; 又
-      ))
     (=gt-k		. 00064)	; &GT-K00064;
     (=gt-pj-k1		. #x345A)	; &GT-K00064; [20-58]
+    (<-formed@component
+     ((=ucs		  . #x53C8)	; 又
+      ))
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -74,11 +74,11 @@
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x53C9)	; 叉
-      ))
     (=gt-k		. 00255)	; &GT-K00255;
     (=gt-pj-k1		. #x6B71)	; &GT-K00255; [75-81]
+    (<-formed@component
+     ((=ucs		  . #x53C9)	; 叉
+      ))
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -215,6 +215,25 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x20B1B)	; 𠬛
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=big5-cdp	  . #x8B6C)	; &CDP-8B6C;
+      )
+     ((=jis-x0208	  . #x4B74)	; &GT-03944; [43-84]
+      (=gb2312		  . #x5356)	; &I-G0-5356; [51-54]
+      (=cns11643-1	  . #x4434)	; &I-C1-4434; [36-20]
+      ))
+    (=big5-cdp		. #x8BA1)	; &CDP-8BA1;
+    ))
+(define-char
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
@@ -274,22 +293,10 @@
     (=daikanwa		. 03124)	; &I-M-03124;
     ))
 (define-char
-  '((script		JP Jouyou Ideograph)
+  '((script		JP Jouyou CN Simplified Ideograph)
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208@1990	  . #x5256)	; &GT-56567; [50-54]
-      ))
-    (<-vulgar
-     ((shinjigen-1	  . 903)
-      (=jis-x0208@1978	  . #x5256)	; &M-42116; [50-54]
-      (=jis-x0208@1983	  . #x5256)	; &I-J83-5256; [50-54]
-      (=ks-x1001	  . #x642A)	; &I-K0-642A; [68-10]
-      (=daikanwa	  . 42116)	; &I-M-42116;
-      ))
-    (<-vulgar*sources
-     yunhai daikanwa shinjigen-1)
     (hanyu-dazidian	1 393 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -311,6 +318,21 @@
     (=daikanwa		. 03125)	; &I-M-03125;
     (=hanziku-1		. #xF6D8)	; &I-HZK01-F6D8;
     (=cbeta		. 04639)	; &I-CB04639;
+    (<-simplified@CN
+     ((=gb12345		  . #x4B2B)	; &C1-7764; [43-11]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208@1990	  . #x5256)	; &GT-56567; [50-54]
+      ))
+    (<-vulgar
+     ((shinjigen-1	  . 903)
+      (=jis-x0208@1978	  . #x5256)	; &M-42116; [50-54]
+      (=jis-x0208@1983	  . #x5256)	; &I-J83-5256; [50-54]
+      (=ks-x1001	  . #x642A)	; &I-K0-642A; [68-10]
+      (=daikanwa	  . 42116)	; &I-M-42116;
+      ))
+    (<-vulgar*sources
+     yunhai daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -392,22 +414,14 @@
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (=ucs		. #x53CE)	; 収
+    (=jis-x0208@1997	. #x3C7D)	; 収 [28-93]
     (<-simplified@JP/Jouyou
      ((=ucs		  . #x6536)	; 收
       (=jis-x0208	  . #x5A40)	; &I-J90-5A40; [58-32]
       ))
-    (=ucs		. #x53CE)	; 収
-    (=jis-x0208@1997	. #x3C7D)	; 収 [28-93]
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 907)
-	(=ucs		    . #x6536)	; 收
-	(=jis-x0208	    . #x5A40)	; &I-J90-5A40; [58-32]
-	(=daikanwa	    . 13110)	; &I-M-13110;
-	))
-      (<-vulgar*sources
-       daikanwa shinjigen-1)
-      (hanyu-dazidian	  1 393 3)
+     ((hanyu-dazidian	  1 393 3)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
@@ -427,6 +441,14 @@
       (=hanziku-1	  . #xF6D2)	; &I-HZK01-F6D2;
       (=cbeta		  . 01495)	; &I-CB01495;
       (=ucs@unicode	  . #x53CE)	; &GT-03952;
+      (<-vulgar
+       ((shinjigen-1	    . 907)
+	(=ucs		    . #x6536)	; 收
+	(=jis-x0208	    . #x5A40)	; &I-J90-5A40; [58-32]
+	(=daikanwa	    . 13110)	; &I-M-13110;
+	))
+      (<-vulgar*sources
+       daikanwa shinjigen-1)
       )
      ((mojikyo		  . 003128)	; &MCS-60000C38;
       )
@@ -667,17 +689,20 @@
     (total-strokes	 . 6)
     (=ucs		. #x355C)	; 㕜
     (->subsumptive
-     ((<-original
+     ((=daikanwa	  . 03140)	; &M-03140;
+      (<-original
        ((=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;
 	))
       (<-original*sources
-       zhengzi-tong daikanwa)
-      (=daikanwa	  . 03140)	; &M-03140;
+       zhengzitong daikanwa)
       )
-     ((<-original
+     ((hanyu-dazidian	  1 394 3)
+      (shinjigen-1	  . 945)
+      (=hanziku-1	  . #xF6F2)	; &HZK01-F6F2;
+      (<-original
        ((shinjigen-1	    . 943)
 	(=gb2312	    . #x4A37)	; &GT-04122; [42-23]
 	(=jis-x0208@1990    . #x3B4B)	; &I-J90-3B4B; [27-43]
@@ -685,9 +710,6 @@
 	))
       (<-original*sources
        shinjigen-1)
-      (hanyu-dazidian	  1 394 3)
-      (shinjigen-1	  . 945)
-      (=hanziku-1	  . #xF6F2)	; &HZK01-F6F2;
       )
      ((=cns11643-3	  . #x2332)	; &C3-2332; [03-18]
       (=ucs@unicode	  . #x355C)	; &C3-2332;
@@ -1187,18 +1209,6 @@
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x654D)	; 敍
-      (=jis-x0208	  . #x5A46)	; &I-J90-5A46; [58-38]
-      ))
-    (<-vulgar
-     ((shinjigen-1	  . 915)
-      (=ucs		  . #x654D)	; 敍
-      (=jis-x0208	  . #x5A46)	; &I-J90-5A46; [58-38]
-      (=daikanwa	  . 13205)	; &I-M-13205;
-      ))
-    (<-vulgar*sources
-     zhengzi-tong daikanwa shinjigen-1)
     (hanyu-dazidian	1 397 15)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -1218,6 +1228,18 @@
     (=gt-pj-1		. #x3D76)	; &I-GT-04007; [29-86]
     (=daikanwa		. 03163)	; &I-M-03163;
     (=hanziku-1		. #xF7C1)	; &I-HZK01-F7C1;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x654D)	; 敍
+      (=jis-x0208	  . #x5A46)	; &I-J90-5A46; [58-38]
+      ))
+    (<-vulgar
+     ((shinjigen-1	  . 915)
+      (=ucs		  . #x654D)	; 敍
+      (=jis-x0208	  . #x5A46)	; &I-J90-5A46; [58-38]
+      (=daikanwa	  . 13205)	; &I-M-13205;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -1795,12 +1817,12 @@
     (total-strokes	 . 11)
     (=ucs		. #x2F838)	; 𠭣
     (->subsumptive
-     ((<-same
+     ((=daikanwa	  . 48962)	; &M-48962;
+      (<-same
        ((=daikanwa	    . 38983)	; &M-38983;
 	))
       (<-same*sources
        daikanwa)
-      (=daikanwa	  . 48962)	; &M-48962;
       )
      ((=cns11643-5	  . #x3131)	; &C5-3131; [17-17]
       (=ucs@iso		  . #x2F838)	; &C5-3131;
@@ -1885,6 +1907,10 @@
     (ideographic-radical@shinjigen*sources
      shinjigen-1 jisx0208/a jisx0208/b)
     (total-strokes	 . 12)
+    (hanyu-dazidian	2 1516 8)
+    (shinjigen-1	. 926)
+    (=cns11643-1	. #x5E32)	; &M-01597; [62-18]
+    (=daikanwa		. 01597)	; &I-M-01597;
     (<-original
      ((shinjigen-1	  . 925)
       (=jis-x0208	  . #x3A47)	; &GT-18101; [26-39]
@@ -1893,11 +1919,7 @@
       (=daikanwa	  . 14301)	; &I-M-14301;
       ))
     (<-original*sources
-     zhengzi-tong daikanwa shinjigen-1)
-    (hanyu-dazidian	2 1516 8)
-    (shinjigen-1	. 926)
-    (=cns11643-1	. #x5E32)	; &M-01597; [62-18]
-    (=daikanwa		. 01597)	; &I-M-01597;
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el
index edd5199..7b3260c 100644
--- a/lisp/utf-2000/Ideograph-R030-Mouth.el
+++ b/lisp/utf-2000/Ideograph-R030-Mouth.el
@@ -141,21 +141,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (<-formed
-     ((shinjigen-1	  . 515)
-      (=jis-x0212	  . #x3273)	; &GT-01997; [18-83]
-      (=cns11643-4	  . #x2236)	; &I-C4-2236; [02-22]
-      (=daikanwa	  . 01525)	; &I-M-01525;
-      ))
-    (<-formed*sources
-     jiyun shinjigen-1)
-    (<-same
-     ((=jis-x0212	  . #x3273)	; &GT-01997; [18-83]
-      (=cns11643-4	  . #x2236)	; &I-C4-2236; [02-22]
-      (=daikanwa	  . 01525)	; &I-M-01525;
-      ))
-    (<-same*sources
-     jiyun daikanwa)
     (hanyu-dazidian	1 574 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -175,6 +160,21 @@
     (=daikanwa		. 03236)	; &I-M-03236;
     (=hanziku-2		. #xC5E9)	; &I-HZK02-C5E9;
     (=jef-china3	. #x91AE)	; &I-JC3-91AE;
+    (<-formed
+     ((shinjigen-1	  . 515)
+      (=jis-x0212	  . #x3273)	; &GT-01997; [18-83]
+      (=cns11643-4	  . #x2236)	; &I-C4-2236; [02-22]
+      (=daikanwa	  . 01525)	; &I-M-01525;
+      ))
+    (<-formed*sources
+     jiyun shinjigen-1)
+    (<-same
+     ((=jis-x0212	  . #x3273)	; &GT-01997; [18-83]
+      (=cns11643-4	  . #x2236)	; &I-C4-2236; [02-22]
+      (=daikanwa	  . 01525)	; &I-M-01525;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -449,10 +449,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x81FA)	; 臺
-      (=jis-x0208	  . #x674A)	; &I-J90-674A; [71-42]
-      ))
     (hanyu-dazidian	1 575 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -462,6 +458,7 @@
       )
      ((=ucs		  . #x53E3)	; 口
       ))
+    (shinjigen-1	. 949)
     (shinjigen-2	. 949)
     (=ucs		. #x53F0)	; 台
     (=jis-x0208		. #x4266)	; &I-J90-4266; [34-70]
@@ -473,6 +470,23 @@
     (=gt-k		. 00973)	; &I-GT-K00973;
     (=gt-pj-1		. #x4266)	; &I-GT-04130; [34-70]
     (=daikanwa		. 03246)	; &I-M-03246;
+    (<-simplified@CN
+     ((=ucs		  . #x81FA)	; 臺
+      (=gb12345		  . #x4C28)	; 臺 [44-08]
+      )
+     ((=ucs		  . #x6AAF)	; 檯
+      (=gb12345		  . #x786D)	; 檯 [88-77]
+      )
+     ((=ucs		  . #x98B1)	; 颱
+      (=gb12345		  . #x786C)	; 颱 [88-76]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x81FA)	; 臺
+      (=jis-x0208	  . #x674A)	; &I-J90-674A; [71-42]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x81FA)	; 臺
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -672,14 +686,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (<-ancient
-     ((shinjigen-1	  . 721)
-      (=ucs		  . #x5354)	; 協
-      (=jis-x0208	  . #x3628)	; &I-J90-3628; [22-08]
-      (=daikanwa	  . 02742)	; &I-M-02742;
-      ))
-    (<-ancient*sources
-     shuowen jiyun daikanwa shinjigen-1)
     (hanyu-dazidian	1 568 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -700,15 +706,19 @@
     (=daikanwa		. 03255)	; &I-M-03255;
     (=hanziku-2		. #xC4C6)	; &I-HZK02-C4C6;
     (=cbeta		. 00048)	; &I-CB00048;
+    (<-ancient
+     ((shinjigen-1	  . 721)
+      (=ucs		  . #x5354)	; 協
+      (=jis-x0208	  . #x3628)	; &I-J90-3628; [22-08]
+      (=daikanwa	  . 02742)	; &I-M-02742;
+      ))
+    (<-ancient*sources
+     shuowen jiyun daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x694B)	; &GT-44229; [73-43]
-      (=daikanwa	  . 32726)	; &I-M-32726;
-      ))
     (hanyu-dazidian	1 570 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -718,6 +728,7 @@
       )
      ((=ucs		  . #x4E02)	; 丂
       ))
+    (shinjigen-1	. 939)
     (shinjigen-2	. 939)
     (=ucs		. #x53F7)	; 号
     (=jis-x0208		. #x3966)	; &I-J90-3966; [25-70]
@@ -729,6 +740,17 @@
     (=gt-pj-1		. #x3966)	; &I-GT-04117; [25-70]
     (=daikanwa		. 03256)	; &I-M-03256;
     (=cbeta		. 00561)	; &I-CB00561;
+    (<-simplified@CN
+     ((=ks-x1001	  . #x7B5C)	; &K0-7B5C; [91-60]
+      (=gb12345		  . #x3A45)	; &K0-7B5C; [26-37]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x694B)	; &GT-44229; [73-43]
+      (=daikanwa	  . 32726)	; &I-M-32726;
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x865F)	; 號
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -993,9 +1015,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (<-original
-     ((=ucs		  . #x5B50)	; 子
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1006,6 +1025,9 @@
       ))
     (=gt-k		. 01160)	; &GT-K01160;
     (=gt-pj-k1		. #x3850)	; &GT-K01160; [24-48]
+    (<-original
+     ((=ucs		  . #x5B50)	; 子
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -1644,14 +1666,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (<-original
-     ((shinjigen-1	  . 1074)
-      (=jis-x0208	  . #x5323)	; &GT-04510; [51-03]
-      (=ks-x1001	  . #x7663)	; &I-K0-7663; [86-67]
-      (=daikanwa	  . 03533)	; &I-M-03533;
-      ))
-    (<-original*sources
-     shinjigen-1)
     (hanyu-dazidian	1 579 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -1670,6 +1684,14 @@
     (=big5		. #xA65C)	; &I-B-A65C;
     (=daikanwa		. 03302)	; &I-M-03302;
     (=jef-china3	. #x46AA)	; &I-JC3-46AA;
+    (<-original
+     ((shinjigen-1	  . 1074)
+      (=jis-x0208	  . #x5323)	; &GT-04510; [51-03]
+      (=ks-x1001	  . #x7663)	; &I-K0-7663; [86-67]
+      (=daikanwa	  . 03533)	; &I-M-03533;
+      ))
+    (<-original*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -1910,9 +1932,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (<-original
-     ((=ucs		  . #x5B50)	; 子
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1930,6 +1949,9 @@
       ))
     (=gt-k		. 01881)	; &GT-K01881;
     (=gt-pj-k1		. #x3732)	; &GT-K01881; [23-18]
+    (<-original
+     ((=ucs		  . #x5B50)	; 子
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -2162,7 +2184,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs@unicode	    . #x6587)	; &C1-4546;
+       ((=gb2312	    . #x4E44)	; &C1-4546; [46-36]
+	(=cns11643-1	    . #x4546)	; &I-C1-4546; [37-38]
 	)
        ((=ucs		    . #x53E3)	; 口
 	))
@@ -2244,7 +2267,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x4ECA)	; &UU+4ECA;
+       ((=gb2312	    . #x3D71)	; &G0-3D71; [29-81]
 	))
       (=gb2312		  . #x5277)	; &G0-5277; [50-87]
       (=ucs@unicode	  . #x541F)	; &G0-5277;
@@ -2493,7 +2516,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5C6F)	; &C1-453A;
+       ((=gb2312	    . #x4D4D)	; &C1-453A; [45-45]
+	(=cns11643-1	    . #x453A)	; &I-C1-453A; [37-26]
 	))
       (=gb2312		  . #x3656)	; &C2-2344; [22-54]
       (=cns11643-2	  . #x2344)	; &I-C2-2344; [03-36]
@@ -2666,7 +2690,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs@unicode	    . #x4ECA)	; &UU+4ECA;
+       ((=gb2312	    . #x3D71)	; &G0-3D71; [29-81]
 	)
        ((=ucs		    . #x53E3)	; 口
 	))
@@ -2675,20 +2699,13 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x20BD3)	; 𠯓
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=daikanwa		. 03351)	; &M-03351;
-    ))
-(define-char
-  '((morohashi-daikanwa	3351 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (hanyu-dazidian	1 591 3)
     (=ucs		. #x20BD3)	; 𠯓
     (=cns11643-5	. #x235B)	; &I-C5-235B; [03-59]
+    (=daikanwa		. 03351)	; &I-M-03351;
     (=hanziku-2		. #xCBF4)	; &I-HZK02-CBF4;
     ))
 (define-char
@@ -2990,7 +3007,11 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (->subsumptive
-     ((<-formed
+     ((=cns11643-1	  . #x4947)	; &M-03363; [41-39]
+      (=big5		  . #xA765)	; &I-B-A765;
+      (=daikanwa	  . 03363)	; &I-M-03363;
+      (=ucs@big5	  . #x5448)	; &M-03363;
+      (<-formed
        ((=ks-x1001	    . #x5641)	; &M-38896; [54-33]
 	(=daikanwa	    . 38896)	; &I-M-38896;
 	))
@@ -3002,10 +3023,6 @@
 	))
       (<-same*sources
        jiyun shiwen daikanwa)
-      (=cns11643-1	  . #x4947)	; &M-03363; [41-39]
-      (=big5		  . #xA765)	; &I-B-A765;
-      (=daikanwa	  . 03363)	; &I-M-03363;
-      (=ucs@big5	  . #x5448)	; &M-03363;
       (->original
        ((=ks-x1001	    . #x5641)	; &M-38896; [54-33]
 	(=daikanwa	    . 38896)	; &I-M-38896;
@@ -3127,13 +3144,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-vulgar
-     ((shinjigen-1	  . 988)
-      (=ks-x1001	  . #x676F)	; &M-03365; [71-79]
-      (=daikanwa	  . 03365)	; &I-M-03365;
-      ))
-    (<-vulgar*sources
-     zhengzi-tong daikanwa shinjigen-1)
     (hanyu-dazidian	1 585 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -3150,6 +3160,13 @@
     (=cns11643-3	. #x247B)	; &I-C3-247B; [04-91]
     (=daikanwa		. 03366)	; &I-M-03366;
     (=hanziku-2		. #xCAD1)	; &I-HZK02-CAD1;
+    (<-vulgar
+     ((shinjigen-1	  . 988)
+      (=ks-x1001	  . #x676F)	; &M-03365; [71-79]
+      (=daikanwa	  . 03365)	; &I-M-03365;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -3157,13 +3174,13 @@
     (total-strokes	 . 7)
     (=ucs		. #x20BF5)	; 𠯵
     (->subsumptive
-     ((<-vulgar
+     ((=daikanwa	  . 03367)	; &M-03367;
+      (<-vulgar
        ((=ks-x1001	    . #x676F)	; &M-03365; [71-79]
 	(=daikanwa	    . 03365)	; &I-M-03365;
 	))
       (<-vulgar*sources
        songyuan-yilai-suzipu daikanwa)
-      (=daikanwa	  . 03367)	; &M-03367;
       )
      ((hanyu-dazidian	  1 596 2)
       (=hanziku-2	  . #xCCF6)	; &HZK02-CCF6;
@@ -3348,7 +3365,6 @@
     (=cns11643-1	. #x494E)	; &I-C1-494E; [41-46]
     (=daikanwa		. 03372)	; &I-M-03372;
     (=jef-china3	. #x46B0)	; &I-JC3-46B0;
-    (=ucs@big5		. #x5438)	; &M-03372;
     ))
 (define-char
   '((<-denotational
@@ -3412,7 +3428,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x6B20)	; &G0-4737;
+       ((=gb2312	    . #x4737)	; &G0-4737; [39-23]
 	))
       (=gb2312		  . #x3435)	; &G0-3435; [20-21]
       (=big5		  . #xA76A)	; &I-B-A76A;
@@ -3572,7 +3588,10 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x6BDB)	; &GT-21495;
+       ((=jis-x0208	    . #x4C53)	; &GT-21495; [44-51]
+	(=gb2312	    . #x432B)	; &I-G0-432B; [35-11]
+	(=ks-x1001	    . #x593E)	; &I-K0-593E; [57-30]
+	(=daikanwa	    . 16772)	; &I-M-16772;
 	))
       (=daikanwa	  . 03380)	; &M-03380;
       (=cbeta		  . 03302)	; &I-CB03302;
@@ -3590,7 +3609,11 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 30)	; ⼝
+  '((<-denotational
+     ((=big5		  . #xA769)	; &B-A769;
+      (=jis-x0208@1997	  . #x3970)	; &B-A769; [25-80]
+      ))
+    (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (ideographic-structure
@@ -3608,7 +3631,19 @@
     (=jef-china3	. #x45FC)	; &I-JC3-45FC;
     ))
 (define-char
-  '((morohashi-daikanwa	3381 1)
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=big5		. #xA769)	; &B-A769;
+    (=jis-x0208@1997	. #x3970)	; &B-A769; [25-80]
+    (=ucs@big5		. #x544A)	; &B-A769;
+    ))
+(define-char
+  '((<-denotational
+     ((=big5		  . #xA769)	; &B-A769;
+      (=jis-x0208@1997	  . #x3970)	; &B-A769; [25-80]
+      ))
+    (morohashi-daikanwa	3381 1)
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
@@ -3629,7 +3664,6 @@
     (=gb2312		. #x3866)	; &I-G0-3866; [24-70]
     (=ks-x1001		. #x4D31)	; &I-K0-4D31; [45-17]
     (=cns11643-1	. #x494B)	; &I-C1-494B; [41-43]
-    (=big5		. #xA769)	; &I-B-A769;
     (=gt		. 04244)	; &I-GT-04244;
     (=gt-k		. 02742)	; &I-GT-K02742;
     (=gt-pj-1		. #x3970)	; &I-GT-04244; [25-80]
@@ -3854,12 +3888,22 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x20BD8)	; 𠯘
-    (=cns11643-4	. #x2358)	; &I-C4-2358; [03-56]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20BD8)	; 𠯘
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=cns11643-4	. #x2358)	; &M-03388; [03-56]
     (=daikanwa		. 03388)	; &I-M-03388;
+    (=ucs@iso		. #x20BD8)	; &M-03388;
     ))
 (define-char
-  '((=>ucs		. #x20BD8)	; 𠯘
-    (morohashi-daikanwa	3388 0 1)
+  '((<-denotational
+     ((=ucs		  . #x20BD8)	; 𠯘
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
@@ -3891,8 +3935,13 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x3571)	; 㕱
-    (=cns11643-3	. #x246F)	; &I-C3-246F; [04-79]
-    (=daikanwa		. 03390)	; &I-M-03390;
+    (->subsumptive
+     ((=daikanwa	  . 03390)	; &M-03390;
+      )
+     ((=ucs@unicode	  . #x3571)	; &UU+3571;
+      )
+     ((=cns11643-3	  . #x246F)	; &C3-246F; [04-79]
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -3919,35 +3968,27 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x6587)	; &C1-4546;
+       ((=gb2312	    . #x4E44)	; &C1-4546; [46-36]
+	(=cns11643-1	    . #x4546)	; &I-C1-4546; [37-38]
 	))
       (=cns11643-2	  . #x233C)	; &C2-233C; [03-28]
       (=ucs@unicode	  . #x5445)	; &C2-233C;
       ))
     ))
 (define-char
-  '((=>ucs		. #x20BD9)	; 𠯙
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=daikanwa		. 03392)	; &M-03392;
-    ))
-(define-char
-  '((morohashi-daikanwa	3392 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 588 9)
     (=ucs		. #x20BD9)	; 𠯙
-    (=hanziku-2		. #xCB78)	; &I-HZK02-CB78;
-    ))
-(define-char
-  '((=>ucs		. #x20BD9)	; 𠯙
-    (morohashi-daikanwa	3392 0 1)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=cns11643-5	. #x2358)	; &C5-2358; [03-56]
+    (->subsumptive
+     ((=daikanwa	  . 03392)	; &M-03392;
+      )
+     ((hanyu-dazidian	  1 588 9)
+      (=hanziku-2	  . #xCB78)	; &HZK02-CB78;
+      (=ucs@iso		  . #x20BD9)	; &HZK02-CB78;
+      )
+     ((=cns11643-5	  . #x2358)	; &C5-2358; [03-56]
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -4270,21 +4311,14 @@
     (total-strokes	 . 7)
     (=ucs		. #x544C)	; 呌
     (->subsumptive
-     ((<-wrong
-       ((shinjigen-1	    . 965)
-	(=gb2312	    . #x3D50)	; &M-03240; [29-48]
-	(=daikanwa	    . 03240)	; &I-M-03240;
-	))
-      (<-wrong*sources
-       zhengzi-tong daikanwa shinjigen-1)
-      (hanyu-dazidian	  1 594 8)
+     ((hanyu-dazidian	  1 594 8)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x6597)	; &UU+6597;
+       ((=ucs		    . #x6597)	; 斗
 	))
       (shinjigen-1	  . 966)
       (=daikanwa	  . 03419)	; &M-03419;
@@ -4292,6 +4326,13 @@
       (=cbeta		  . 00054)	; &I-CB00054;
       (=jef-china3	  . #x46B2)	; &I-JC3-46B2;
       (=ucs@unicode	  . #x544C)	; &M-03419;
+      (<-wrong
+       ((shinjigen-1	    . 965)
+	(=gb2312	    . #x3D50)	; &M-03240; [29-48]
+	(=daikanwa	    . 03240)	; &I-M-03240;
+	))
+      (<-wrong*sources
+       zhengzitong daikanwa shinjigen-1)
       )
      ((=cns11643-3	  . #x2474)	; &C3-2474; [04-84]
       ))
@@ -4381,12 +4422,6 @@
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-vulgar
-     ((=ucs		  . #x541E)	; 吞
-      (=daikanwa	  . 03329)	; &I-M-03329;
-      ))
-    (<-vulgar*sources
-     daikanwa)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -4405,6 +4440,12 @@
     (=gt-pj-1		. #x465D)	; &I-GT-04276; [38-61]
     (=daikanwa		. 48970)	; &I-M-48970;
     (mojikyo		. 048970)	; &MCS-6000BF4A;
+    (<-vulgar
+     ((=ucs		  . #x541E)	; 吞
+      (=daikanwa	  . 03329)	; &I-M-03329;
+      ))
+    (<-vulgar*sources
+     daikanwa)
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -4915,36 +4956,49 @@
     (total-strokes	 . 8)
     (hanyu-dazidian	1 607 1)
     (=ucs		. #x5467)	; 呧
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x53E3)	; 口
-	)
-       ((=jis-x0212	    . #x4649)	; &M-17027; [38-41]
-	(=cns11643-1	    . #x4662)	; &I-C1-4662; [38-66]
-	(=jis-x0213-1-2000  . #x764F)	; &I-JX1-764F; [86-47]
-	(=daikanwa	    . 17027)	; &I-M-17027;
-	))
-      (=jis-x0212	  . #x3478)	; &M-03438; [20-88]
-      (=cns11643-2	  . #x256E)	; &I-C2-256E; [05-78]
-      (=big5		  . #xCBEE)	; &I-B-CBEE;
-      (=daikanwa	  . 03438)	; &I-M-03438;
-      (=ucs@cns		  . #x5467)	; &M-03438;
-      (=ucs@jis		  . #x5467)	; &M-03438;
-      (=ucs@big5	  . #x5467)	; &M-03438;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5467)	; 呧
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x53E3)	; 口
-	)
-       ((=ucs@unicode	    . #x6C10)	; &G0-5835;
-	))
-      (=ucs@unicode	  . #x5467)	; &UU+5467;
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=jis-x0212	  . #x4649)	; &M-17027; [38-41]
+      (=cns11643-1	  . #x4662)	; &I-C1-4662; [38-66]
+      (=jis-x0213-1-2000  . #x764F)	; &I-JX1-764F; [86-47]
+      (=daikanwa	  . 17027)	; &I-M-17027;
+      ))
+    (=jis-x0212		. #x3478)	; &M-03438; [20-88]
+    (=cns11643-2	. #x256E)	; &I-C2-256E; [05-78]
+    (=big5		. #xCBEE)	; &I-B-CBEE;
+    (=daikanwa		. 03438)	; &I-M-03438;
+    (=ucs@cns		. #x5467)	; &M-03438;
+    (=ucs@jis		. #x5467)	; &M-03438;
+    (=ucs@big5		. #x5467)	; &M-03438;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5467)	; 呧
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=gb2312		  . #x5835)	; &G0-5835; [56-21]
       ))
+    (=ucs@unicode	. #x5467)	; &UU+5467;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -5238,7 +5292,9 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x5E73)	; &GT-11551;
+     ((=jis-x0208	  . #x4A3F)	; &GT-11551; [42-31]
+      (=gb2312		  . #x463D)	; &I-G0-463D; [38-29]
+      (=cns11643-1	  . #x464D)	; &I-C1-464D; [38-45]
       ))
     (=cns11643-2	. #x2569)	; &C2-2569; [05-73]
     (=ucs@unicode	. #x546F)	; &C2-2569;
@@ -5254,7 +5310,10 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs@unicode	    . #x6B64)	; &GT-20888;
+       ((=jis-x0208	    . #x3A21)	; &GT-20888; [26-01]
+	(=gb2312	    . #x344B)	; &I-G0-344B; [20-43]
+	(=ks-x1001	    . #x732E)	; &I-K0-732E; [83-14]
+	(=daikanwa	    . 16259)	; &I-M-16259;
 	)
        ((=ucs		    . #x53E3)	; 口
 	))
@@ -5293,7 +5352,10 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x6B64)	; &GT-20888;
+       ((=jis-x0208	    . #x3A21)	; &GT-20888; [26-01]
+	(=gb2312	    . #x344B)	; &I-G0-344B; [20-43]
+	(=ks-x1001	    . #x732E)	; &I-K0-732E; [83-14]
+	(=daikanwa	    . 16259)	; &I-M-16259;
 	))
       (=gb2312		  . #x5F5A)	; &M-03453; [63-58]
       (=big5		  . #xCE4D)	; &I-B-CE4D;
@@ -5316,43 +5378,49 @@
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (hanyu-dazidian	1 604 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (=ucs		. #x5471)	; 呱
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5471)	; 呱
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (=big5		. #xA94B)	; &B-A94B;
+    (->subsumptive
+     ((ideographic-strokes . 5)
+      (total-strokes	   . 8)
+      (hanyu-dazidian	  1 604 10)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=daikanwa	    . 21371)	; &M-21371;
+	))
+      (=gb2312		  . #x5F49)	; &M-03454; [63-41]
+      (=daikanwa	  . 03454)	; &I-M-03454;
+      (=ucs@unicode	  . #x5471)	; &M-03454;
       )
-     ((=ucs		  . #x74DC)	; 瓜
+     ((ideographic-strokes . 6)
+      (total-strokes	   . 9)
+      (=jis-x0208	  . #x526D)	; &GT-04453; [50-77]
+      (=ks-x1001	  . #x4D32)	; &I-K0-4D32; [45-18]
+      (=gt		  . 04453)	; &I-GT-04453;
+      (=gt-pj-1		  . #x526D)	; &I-GT-04453; [50-77]
+      (=ucs@jis		  . #x5471)	; &GT-04453;
       ))
-    (=ucs		. #x5471)	; 呱
-    (=gb2312		. #x5F49)	; &I-G0-5F49; [63-41]
-    (=big5		. #xA94B)	; &I-B-A94B;
-    (=daikanwa		. 03454)	; &I-M-03454;
     ))
 (define-char
-  '((=>ucs		. #x5471)	; 呱
-    (morohashi-daikanwa	3454 0 0)
+  '((<-denotational
+     ((=ucs		  . #x5471)	; 呱
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=cns11643-1	. #x4C4D)	; &C1-4C4D; [44-45]
     ))
 (define-char
-  '((=>ucs		. #x5471)	; 呱
-    (morohashi-daikanwa	3454 0 2)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=jis-x0208		. #x526D)	; &GT-04453; [50-77]
-    (=ks-x1001		. #x4D32)	; &I-K0-4D32; [45-18]
-    (=gt		. 04453)	; &I-GT-04453;
-    (=gt-pj-1		. #x526D)	; &I-GT-04453; [50-77]
-    (=ucs@jis		. #x5471)	; &GT-04453;
-    ))
-(define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
@@ -6650,13 +6718,13 @@
     (ideographic-radical@cns . 30)	; ⼝
     (ideographic-strokes@cns . 5)
     (total-strokes	 . 8)
-    (<-simplified@CN
-     ((=gb12345		  . #x763C)	; &GT-65951; [86-28]
-      ))
     (=ucs		. #x9EFE)	; 黾
     (=gb2312		. #x763C)	; &I-G0-763C; [86-28]
     (=cns11643-3	. #x2772)	; &I-C3-2772; [07-82]
     (mojikyo		. 051084)	; &MCS-6000C78C;
+    (<-simplified@CN
+     ((=gb12345		  . #x763C)	; &GT-65951; [86-28]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -6666,10 +6734,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EEA)	; ⻪
     (<-identical@component
      ((=ucs		  . #x9EFE)	; 黾
       ))
-    (=ucs		. #x2EEA)	; ⻪
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -6678,13 +6746,6 @@
     (=ucs		. #x549C)	; 咜
     (->subsumptive
      ((morohashi-daikanwa	ho 64)
-      (<-vulgar
-       ((=jis-x0208	    . #x5323)	; &GT-04510; [51-03]
-	(=ks-x1001	    . #x7663)	; &I-K0-7663; [86-67]
-	(=daikanwa	    . 03533)	; &I-M-03533;
-	))
-      (<-vulgar*sources
-       daikanwa)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
@@ -6700,6 +6761,13 @@
       (=jef-china3	  . #x46C4)	; &I-JC3-46C4;
       (=ucs@jis		  . #x549C)	; &CB00059;
       (mojikyo		  . 050005)	; &MCS-6000C355;
+      (<-vulgar
+       ((=jis-x0208	    . #x5323)	; &GT-04510; [51-03]
+	(=ks-x1001	    . #x7663)	; &I-K0-7663; [86-67]
+	(=daikanwa	    . 03533)	; &I-M-03533;
+	))
+      (<-vulgar*sources
+       daikanwa)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -6707,7 +6775,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5B83)	; &UU+5B83;
+       ((=gb2312	    . #x4B7C)	; &C1-4646; [43-92]
+	(=cns11643-1	    . #x4646)	; &I-C1-4646; [38-38]
 	))
       (=ucs@unicode	  . #x549C)	; &UU+549C;
       ))
@@ -7137,7 +7206,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5B85)	; &UU+5B85;
+       ((=gb2312	    . #x552C)	; &G0-552C; [53-12]
 	))
       (=gb2312		  . #x5F65)	; &HZK02-D2A8; [63-69]
       (=hanziku-2	  . #xD2A8)	; &I-HZK02-D2A8;
@@ -9009,7 +9078,7 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x827E)	; &G0-302C;
+     ((=gb2312		  . #x302C)	; &G0-302C; [16-12]
       ))
     (=gb2312		. #x3025)	; &JSP-353C; [16-05]
     (=jis-x0212		. #x353C)	; &I-JSP-353C; [21-28]
@@ -9840,7 +9909,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x8EAB)	; &G0-496D;
+       ((=gb2312	    . #x496D)	; &G0-496D; [41-77]
 	))
       (=hanziku-2	  . #xD44F)	; &HZK02-D44F;
       ))
@@ -9850,53 +9919,65 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x54EA)	; 哪
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x53E3)	; 口
-	)
-       ((=jis-x0208@1978    . #x4661)	; &M-39305; [38-65]
-	(=ks-x1001	    . #x5161)	; &I-K0-5161; [49-65]
-	(=daikanwa	    . 39305)	; &I-M-39305;
-	))
-      (=jis-x0212	  . #x353E)	; &M-03651; [21-30]
-      (=daikanwa	  . 03651)	; &I-M-03651;
-      (=ucs@jis		  . #x54EA)	; &M-03651;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x54EA)	; 哪
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((hanyu-dazidian	  1 623 7)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x53E3)	; 口
-	)
-       ((=ucs@unicode	    . #x90A3)	; &GT-52927;
-	))
-      (=gb2312		  . #x4444)	; &C1-5461; [36-36]
-      (=cns11643-1	  . #x5461)	; &I-C1-5461; [52-65]
-      (=big5		  . #xADFE)	; &I-B-ADFE;
-      (=jef-china3	  . #x46D4)	; &I-JC3-46D4;
-      (=ucs@unicode	  . #x54EA)	; &C1-5461;
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=jis-x0208@1978	  . #x4661)	; &M-39305; [38-65]
+      (=ks-x1001	  . #x5161)	; &I-K0-5161; [49-65]
+      (=daikanwa	  . 39305)	; &I-M-39305;
       ))
+    (=jis-x0212		. #x353E)	; &M-03651; [21-30]
+    (=daikanwa		. 03651)	; &I-M-03651;
+    (=ucs@jis		. #x54EA)	; &M-03651;
     ))
 (define-char
-  '((=>ucs		. #x20CB4)	; ð ²´
+  '((<-denotational
+     ((=ucs		  . #x54EA)	; 哪
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=daikanwa		. 03652)	; &M-03652;
+    (hanyu-dazidian	1 623 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=gb2312		  . #x4447)	; &GT-52927; [36-39]
+      (=jis-x0208@1983	  . #x4661)	; &I-J83-4661; [38-65]
+      (=cns11643-1	  . #x4B5B)	; &I-C1-4B5B; [43-59]
+      ))
+    (=gb2312		. #x4444)	; &C1-5461; [36-36]
+    (=cns11643-1	. #x5461)	; &I-C1-5461; [52-65]
+    (=big5		. #xADFE)	; &I-B-ADFE;
+    (=jef-china3	. #x46D4)	; &I-JC3-46D4;
+    (=ucs@unicode	. #x54EA)	; &C1-5461;
     ))
 (define-char
-  '((morohashi-daikanwa	3652 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (hanyu-dazidian	1 625 5)
     (=ucs		. #x20CB4)	; ð ²´
-    (=cns11643-5	. #x2C41)	; &I-C5-2C41; [12-33]
-    (=hanziku-2		. #xD2EB)	; &I-HZK02-D2EB;
+    (->subsumptive
+     ((=daikanwa	  . 03652)	; &M-03652;
+      )
+     ((hanyu-dazidian	  1 625 5)
+      (=cns11643-5	  . #x2C41)	; &HZK02-D2EB; [12-33]
+      (=hanziku-2	  . #xD2EB)	; &I-HZK02-D2EB;
+      (=ucs@iso		  . #x20CB4)	; &HZK02-D2EB;
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -10762,7 +10843,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x8A00)	; &C1-4B46;
+       ((=gb2312	    . #x5154)	; &C1-4B46; [49-52]
+	(=cns11643-1	    . #x4B46)	; &I-C1-4B46; [43-38]
 	))
       (=gb2312		  . #x5164)	; &C1-5454; [49-68]
       (=cns11643-1	  . #x5454)	; &I-C1-5454; [52-52]
@@ -10803,35 +10885,48 @@
     (total-strokes	 . 10)
     (hanyu-dazidian	1 632 10)
     (=ucs		. #x5503)	; 唃
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x53E3)	; 口
-	)
-       ((=jis-x0208	    . #x3351)	; &GT-47107; [19-49]
-	(=ks-x1001	    . #x4A47)	; &I-K0-4A47; [42-39]
-	(=cns11643-1	    . #x4B45)	; &I-C1-4B45; [43-37]
-	(=daikanwa	    . 35003)	; &I-M-35003;
-	))
-      (=cns11643-2	  . #x2E48)	; &M-03693; [14-40]
-      (=big5		  . #xD146)	; &I-B-D146;
-      (=daikanwa	  . 03693)	; &I-M-03693;
-      (=jef-china3	  . #x91B3)	; &I-JC3-91B3;
-      (=ucs@cns		  . #x5503)	; &M-03693;
-      (=ucs@big5	  . #x5503)	; &M-03693;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5503)	; 唃
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x53E3)	; 口
-	)
-       ((=ucs@unicode	    . #x89D2)	; &G0-3D47;
-	))
-      (=ucs@unicode	  . #x5503)	; &UU+5503;
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=jis-x0208	  . #x3351)	; &GT-47107; [19-49]
+      (=ks-x1001	  . #x4A47)	; &I-K0-4A47; [42-39]
+      (=cns11643-1	  . #x4B45)	; &I-C1-4B45; [43-37]
+      (=daikanwa	  . 35003)	; &I-M-35003;
       ))
+    (=cns11643-2	. #x2E48)	; &M-03693; [14-40]
+    (=big5		. #xD146)	; &I-B-D146;
+    (=daikanwa		. 03693)	; &I-M-03693;
+    (=jef-china3	. #x91B3)	; &I-JC3-91B3;
+    (=ucs@cns		. #x5503)	; &M-03693;
+    (=ucs@big5		. #x5503)	; &M-03693;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5503)	; 唃
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=gb2312		  . #x3D47)	; &G0-3D47; [29-39]
+      ))
+    (=ucs@unicode	. #x5503)	; &UU+5503;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -11057,7 +11152,10 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x77E3)	; &GT-30619;
+       ((=jis-x0208	    . #x6263)	; &GT-30619; [66-67]
+	(=gb2312	    . #x5253)	; &I-G0-5253; [50-51]
+	(=ks-x1001	    . #x6B78)	; &I-K0-6B78; [75-88]
+	(=daikanwa	    . 23931)	; &I-M-23931;
 	))
       (=gb2312		  . #x3026)	; &M-03701; [16-06]
       (=jis-x0212	  . #x3549)	; &I-JSP-3549; [21-41]
@@ -11143,7 +11241,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5EF6)	; &G0-5153;
+       ((=gb2312	    . #x5153)	; &G0-5153; [49-51]
 	))
       (=ucs@unicode	  . #x550C)	; &UU+550C;
       )
@@ -11155,7 +11253,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=cns11643-1	    . #x4D37)	; &I-C1-4D37; [45-23]
+       ((=jis-x0208@1990    . #x3164)	; &GT-12058; [17-68]
+	(=cns11643-1	    . #x4D37)	; &I-C1-4D37; [45-23]
 	))
       (=cns11643-2	  . #x3424)	; &C2-3424; [20-04]
       (=ucs@cns		  . #x550C)	; &C2-3424;
@@ -11190,7 +11289,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5B8C)	; &UU+5B8C;
+       ((=gb2312	    . #x4D6A)	; &C1-4979; [45-74]
+	(=cns11643-1	    . #x4979)	; &I-C1-4979; [41-89]
 	))
       (=cns11643-3	  . #x2F73)	; &HZK02-D4D2; [15-83]
       (=hanziku-2	  . #xD4D2)	; &I-HZK02-D4D2;
@@ -11853,22 +11953,46 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (=ucs		. #x5519)	; 唙
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x603F)	; &GT-26001; [64-31]
+	(=gb2312	    . #x3552)	; &I-G0-3552; [21-50]
+	(=ks-x1001	    . #x6E5A)	; &I-K0-6E5A; [78-58]
+	(=daikanwa	    . 20290)	; &I-M-20290;
+	))
+      (=daikanwa	  . 03747)	; &M-03747;
+      (=ucs@unicode	  . #x5519)	; &M-03747;
       )
-     ((=ucs		  . #x72C4)	; 狄
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x4B29)	; &C1-4B29; [43-09]
+	))
+      (=cns11643-3	  . #x3025)	; &C3-3025; [16-05]
       ))
-    (=ucs		. #x5519)	; 唙
-    (=cns11643-3	. #x3025)	; &I-C3-3025; [16-05]
-    (=daikanwa		. 03747)	; &I-M-03747;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (=ucs		. #x551A)	; 唚
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x551A)	; 唚
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
     (hanyu-dazidian	1 634 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -11878,53 +12002,84 @@
       )
      ((=big5-cdp	  . #x8D4C)	; &CDP-8D4C;
       ))
-    (=ucs		. #x551A)	; 唚
-    (=cns11643-2	. #x2E3A)	; &I-C2-2E3A; [14-26]
+    (=cns11643-2	. #x2E3A)	; &M-03748; [14-26]
     (=big5		. #xD0F7)	; &I-B-D0F7;
     (=daikanwa		. 03748)	; &I-M-03748;
     ))
 (define-char
-  '((=>ucs		. #x20CF9)	; ð ³¹
+  '((<-denotational
+     ((=ucs		  . #x551A)	; 唚
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=daikanwa		. 03749)	; &M-03749;
+    (=ucs@unicode	. #x551A)	; &UU+551A;
     ))
 (define-char
-  '((morohashi-daikanwa	3749 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (hanyu-dazidian	1 633 1)
     (=ucs		. #x20CF9)	; ð ³¹
-    (=cns11643-5	. #x2C39)	; &I-C5-2C39; [12-25]
-    (=hanziku-2		. #xD4AD)	; &I-HZK02-D4AD;
+    (->subsumptive
+     ((=daikanwa	  . 03749)	; &M-03749;
+      )
+     ((hanyu-dazidian	  1 633 1)
+      (=cns11643-5	  . #x2C39)	; &HZK02-D4AD; [12-25]
+      (=hanziku-2	  . #xD4AD)	; &I-HZK02-D4AD;
+      (=ucs@iso		  . #x20CF9)	; &HZK02-D4AD;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x20CFD)	; ð ³½
-    (morohashi-daikanwa	ho 67)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical@ucs . 30)	; ⼝
+    (ideographic-strokes@ucs . 7)
+    (ideographic-radical@cns . 101)	; ⽤
+    (ideographic-strokes@cns . 5)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (total-strokes	 . 10)
+    (=ucs		. #x20CEB)	; 𠳫
+    (->subsumptive
+     ((hanyu-dazidian	  1 626 2)
+      (=daikanwa	  . 21715)	; &M-21715;
+      (=hanziku-2	  . #xD349)	; &I-HZK02-D349;
+      (=ucs@iso		  . #x20CEB)	; &M-21715;
+      )
+     ((ideographic-radical . 101)	; ⽤
+      (ideographic-strokes . 5)
+      (=cns11643-6	  . #x395E)	; &C6-395E; [25-62]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=gt		. 04643)	; &GT-04643;
-    (=gt-pj-11		. #x4376)	; &GT-04643; [35-86]
-    (mojikyo		. 085256)	; &MCS-60014D08;
+    (=ucs		. #x20CFD)	; ð ³½
     ))
 (define-char
-  '((=>ucs		. #x20CFD)	; ð ³½
-    (morohashi-daikanwa	ho 67 0)
+  '((<-denotational
+     ((=ucs		  . #x20CFD)	; ð ³½
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (hanyu-dazidian	1 634 9)
-    (=hanziku-2		. #xD4D5)	; &HZK02-D4D5;
+    (->subsumptive
+     ((morohashi-daikanwa	ho 67)
+      (=gt		  . 04643)	; &GT-04643;
+      (=gt-pj-11	  . #x4376)	; &GT-04643; [35-86]
+      (mojikyo		  . 085256)	; &MCS-60014D08;
+      )
+     ((hanyu-dazidian	  1 634 9)
+      (=hanziku-2	  . #xD4D5)	; &HZK02-D4D5;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	ho 67 1)
+  '((<-denotational
+     ((=ucs		  . #x20CFD)	; ð ³½
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=ucs		. #x20CFD)	; ð ³½
+    (=ucs@iso		. #x20CFD)	; &U-00020CFD;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -12123,7 +12278,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x6C99)	; &UU+6C99;
+       ((=gb2312	    . #x4933)	; &C1-4A67; [41-19]
+	(=cns11643-1	    . #x4A67)	; &I-C1-4A67; [42-71]
 	))
       (=cns11643-2	  . #x2E33)	; &C2-2E33; [14-19]
       (=ucs@unicode	  . #x5526)	; &C2-2E33;
@@ -12152,18 +12308,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-same
-     ((=cns11643-6	  . #x395E)	; &M-21715; [25-62]
-      (=daikanwa	  . 21715)	; &I-M-21715;
-      ))
-    (hanyu-dazidian	1 626 2)
-    (=ucs		. #x20CEB)	; 𠳫
-    (=hanziku-2		. #xD349)	; &I-HZK02-D349;
-    ))
-(define-char
-  '((ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
     (hanyu-dazidian	2 1112 8)
     (=ucs		. #x20D26)	; ð ´¦
     (=cns11643-5	. #x2C5A)	; &I-C5-2C5A; [12-58]
@@ -12374,7 +12518,7 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x864E)	; &G0-3B22;
+     ((=gb2312		  . #x3B22)	; &G0-3B22; [27-02]
       ))
     (=gb2312		. #x3B23)	; &G0-3B23; [27-03]
     (=ucs@unicode	. #x552C)	; &G0-3B23;
@@ -12469,7 +12613,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs@unicode	    . #x96B9)	; &C1-4F63;
+       ((=gb2312	    . #x763F)	; &C1-4F63; [86-31]
+	(=cns11643-1	    . #x4F63)	; &I-C1-4F63; [47-67]
 	)
        ((=ucs		    . #x53E3)	; 口
 	))
@@ -12510,7 +12655,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x96B9)	; &C1-4F63;
+       ((=gb2312	    . #x763F)	; &C1-4F63; [86-31]
+	(=cns11643-1	    . #x4F63)	; &I-C1-4F63; [47-67]
 	))
       (=gb2312		  . #x4E28)	; &C1-5944; [46-08]
       (=cns11643-1	  . #x5944)	; &I-C1-5944; [57-36]
@@ -12659,7 +12805,7 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x623E)	; &G0-6C65;
+     ((=gb2312		  . #x6C65)	; &G0-6C65; [76-69]
       ))
     (=gb2312		. #x6026)	; &G0-6026; [64-06]
     (=ucs@unicode	. #x5533)	; &G0-6026;
@@ -12679,32 +12825,31 @@
     (=ucs@jis		. #x5533)	; &GT-04665;
     ))
 (define-char
-  '((=>ucs		. #x20D2C)	; ð ´¬
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=daikanwa		. 03768)	; &M-03768;
-    (mojikyo		. 003768)	; &MCS-60000EB8;
-    ))
-(define-char
-  '((morohashi-daikanwa	3768 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 645 9)
     (=ucs		. #x20D2C)	; ð ´¬
-    (=hanziku-2		. #xD6FB)	; &I-HZK02-D6FB;
+    (->subsumptive
+     ((=daikanwa	  . 03768)	; &M-03768;
+      (mojikyo		  . 003768)	; &MCS-60000EB8;
+      )
+     ((hanyu-dazidian	  1 645 9)
+      (=hanziku-2	  . #xD6FB)	; &HZK02-D6FB;
+      (=ucs@iso		  . #x20D2C)	; &HZK02-D6FB;
+      )
+     ((=cns11643-6	  . #x3D6F)	; &C6-3D6F; [29-79]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x20D2C)	; ð ´¬
-    (morohashi-daikanwa	3768 0 1)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=cns11643-6	. #x3D6F)	; &C6-3D6F; [29-79]
+  '((ideographic-radical . 30)	; ⼝
+    (hanyu-dazidian	1 645 11)
+    (=ucs		. #x5534)	; 唴
     ))
 (define-char
-  '((ideographic-radical . 30)	; ⼝
+  '((<-denotational
+     ((=ucs		  . #x5534)	; 唴
+      ))
+    (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (hanyu-dazidian	1 645 11)
@@ -12714,34 +12859,69 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs		  . #x7F8C)	; 羌
+     ((=jis-x0208	  . #x6635)	; &GT-36602; [70-21]
+      (=ks-x1001	  . #x4B36)	; &I-K0-4B36; [43-22]
+      (=cns11643-1	  . #x4F2D)	; &I-C1-4F2D; [47-13]
+      (=daikanwa	  . 28429)	; &I-M-28429;
       ))
-    (=ucs		. #x5534)	; 唴
-    (=cns11643-2	. #x3379)	; &I-C2-3379; [19-89]
+    (=cns11643-2	. #x3379)	; &M-03769; [19-89]
     (=big5		. #xD476)	; &I-B-D476;
     (=daikanwa		. 03769)	; &I-M-03769;
     ))
 (define-char
-  '((ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (hanyu-dazidian	1 638 14)
+  '((<-denotational
+     ((=ucs		  . #x5534)	; 唴
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (hanyu-dazidian	1 645 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs		  . #x5944)	; 奄
+     ((=gb2312		  . #x473C)	; &G0-473C; [39-28]
       ))
+    (=ucs@unicode	. #x5534)	; &UU+5534;
+    ))
+(define-char
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (hanyu-dazidian	1 638 14)
     (=ucs		. #x5535)	; 唵
-    (=ks-x1001		. #x645A)	; &I-K0-645A; [68-58]
-    (=jis-x0212		. #x3551)	; &I-JSP-3551; [21-49]
-    (=cns11643-2	. #x337E)	; &I-C2-337E; [19-94]
-    (=jis-x0213-1-2000	. #x2F26)	; &I-JX1-2F26; [15-06]
-    (=big5		. #xD47B)	; &I-B-D47B;
-    (=daikanwa		. 03770)	; &I-M-03770;
-    (=jef-china3	. #x46DF)	; &I-JC3-46DF;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x3162)	; &GT-07418; [17-66]
+	(=gb2312	    . #x5159)	; &I-G0-5159; [49-57]
+	(=ks-x1001	    . #x6572)	; &I-K0-6572; [69-82]
+	(=daikanwa	    . 05881)	; &I-M-05881;
+	))
+      (=ks-x1001	  . #x645A)	; &M-03770; [68-58]
+      (=jis-x0212	  . #x3551)	; &I-JSP-3551; [21-49]
+      (=jis-x0213-1-2000  . #x2F26)	; &I-JX1-2F26; [15-06]
+      (=big5		  . #xD47B)	; &I-B-D47B;
+      (=daikanwa	  . 03770)	; &I-M-03770;
+      (=jef-china3	  . #x46DF)	; &I-JC3-46DF;
+      (=ucs@unicode	  . #x5535)	; &M-03770;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x4C63)	; &C1-4C63; [44-67]
+	))
+      (=cns11643-2	  . #x337E)	; &C2-337E; [19-94]
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -12765,29 +12945,49 @@
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (hanyu-dazidian	1 645 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x5537)	; 唷
+    (=big5		. #xADF2)	; &I-B-ADF2;
+    (->subsumptive
+     ((ideographic-strokes . 8)
+      (total-strokes	   . 11)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x3069)	; &GT-37901; [16-73]
+	(=ks-x1001	    . #x6B40)	; &I-K0-6B40; [75-32]
+	(=daikanwa	    . 29318)	; &I-M-29318;
+	))
+      (=daikanwa	  . 03772)	; &M-03772;
       )
-     ((=ucs		  . #x53E3)	; 口
+     ((ideographic-strokes . 8)
+      (total-strokes	   . 11)
+      (hanyu-dazidian	  1 645 10)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=gb2312	    . #x537D)	; &G0-537D; [51-93]
+	))
+      (=gb2312		  . #x6021)	; &G0-6021; [64-01]
+      (=ucs@unicode	  . #x5537)	; &G0-6021;
       )
-     ((=ucs		  . #x80B2)	; 育
+     ((ideographic-strokes . 7)
+      (total-strokes	   . 10)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x4B3F)	; &C1-4B3F; [43-31]
+	))
+      (=cns11643-1	  . #x5455)	; &C1-5455; [52-53]
       ))
-    (=ucs		. #x5537)	; 唷
-    (=gb2312		. #x6021)	; &I-G0-6021; [64-01]
-    (=big5		. #xADF2)	; &I-B-ADF2;
-    (=daikanwa		. 03772)	; &I-M-03772;
-    ))
-(define-char
-  '((=>ucs		. #x5537)	; 唷
-    (morohashi-daikanwa	3772 0 1)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=cns11643-1	. #x5455)	; &C1-5455; [52-53]
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -12822,7 +13022,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5FF5)	; &UU+5FF5;
+       ((=gb2312	    . #x446E)	; &G0-446E; [36-78]
 	))
       (=ucs@unicode	  . #x5538)	; &UU+5538;
       ))
@@ -13027,7 +13227,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x59BE)	; &UU+59BE;
+       ((=gb2312	    . #x662A)	; &G0-662A; [70-10]
 	))
       (=gb2312		  . #x5F7E)	; &G0-5F7E; [63-94]
       (=ucs@unicode	  . #x553C)	; &G0-5F7E;
@@ -13795,7 +13995,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x91C7)	; &GT-53946;
+       ((=gb2312	    . #x3249)	; &GT-53946; [18-41]
+	(=jis-x0208@1983    . #x3A53)	; &I-J83-3A53; [26-51]
 	))
       (=ucs@unicode	  . #x554B)	; &UU+554B;
       )
@@ -13812,45 +14013,51 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x554C)	; 啌
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=jis-x0208	  . #x3675)	; &GT-32804; [22-85]
-      (=ks-x1001	  . #x4D76)	; &I-K0-4D76; [45-86]
-      (=daikanwa	  . 25415)	; &I-M-25415;
-      ))
-    (=jis-x0208		. #x5333)	; &GT-04735; [51-19]
-    (=gt		. 04735)	; &I-GT-04735;
-    (=gt-pj-1		. #x5333)	; &I-GT-04735; [51-19]
-    (=daikanwa		. 03810)	; &I-M-03810;
-    (=cbeta		. 03978)	; &I-CB03978;
-    (=ucs@jis		. #x554C)	; &GT-04735;
+    (=ucs		. #x554C)	; 啌
     ))
 (define-char
-  '((=>ucs		. #x554C)	; 啌
-    (morohashi-daikanwa	3810 0 0)
+  '((<-denotational
+     ((=ucs		  . #x554C)	; 啌
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x3675)	; &GT-32804; [22-85]
+	(=ks-x1001	    . #x4D76)	; &I-K0-4D76; [45-86]
+	(=daikanwa	    . 25415)	; &I-M-25415;
+	))
+      (=jis-x0208	  . #x5333)	; &GT-04735; [51-19]
+      (=gt		  . 04735)	; &I-GT-04735;
+      (=gt-pj-1		  . #x5333)	; &I-GT-04735; [51-19]
+      (=daikanwa	  . 03810)	; &I-M-03810;
+      (=cbeta		  . 03978)	; &I-CB03978;
+      (=ucs@jis		  . #x554C)	; &GT-04735;
       )
-     ((=cns11643-1	  . #x4F28)	; &C1-4F28; [47-08]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x4F28)	; &C1-4F28; [47-08]
+	))
+      (=cns11643-3	  . #x3458)	; &C3-3458; [20-56]
       ))
-    (=cns11643-3	. #x3458)	; &C3-3458; [20-56]
     ))
 (define-char
-  '((morohashi-daikanwa	3810 0 1)
+  '((<-denotational
+     ((=ucs		  . #x554C)	; 啌
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
@@ -13861,10 +14068,10 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs		  . #x7A7A)	; 空
+     ((=gb2312		  . #x3F55)	; &G0-3F55; [31-53]
       ))
-    (=ucs		. #x554C)	; 啌
-    (=hanziku-2		. #xD75A)	; &I-HZK02-D75A;
+    (=hanziku-2		. #xD75A)	; &HZK02-D75A;
+    (=ucs@unicode	. #x554C)	; &HZK02-D75A;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -13879,20 +14086,36 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (hanyu-dazidian	1 644 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=ucs		  . #x4EAB)	; 享
-      ))
     (=ucs		. #x554D)	; 啍
-    (=jis-x0212		. #x355A)	; &I-JSP-355A; [21-58]
-    (=iso-ir165		. #x7A64)	; &I-EGB-7A64; [90-68]
-    (=cns11643-2	. #x3377)	; &I-C2-3377; [19-87]
     (=big5		. #xD474)	; &I-B-D474;
-    (=daikanwa		. 03812)	; &I-M-03812;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x357D)	; &GT-00396; [21-93]
+	(=ks-x1001	    . #x7A3D)	; &I-K0-7A3D; [90-29]
+	(=daikanwa	    . 00298)	; &I-M-00298;
+	))
+      (=jis-x0212	  . #x355A)	; &M-03812; [21-58]
+      (=daikanwa	  . 03812)	; &I-M-03812;
+      (=ucs@jis		  . #x554D)	; &M-03812;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=gb2312	    . #x4F6D)	; &C1-4B6A; [47-77]
+	(=cns11643-1	    . #x4B6A)	; &I-C1-4B6A; [43-74]
+	))
+      (=iso-ir165	  . #x7A64)	; &C2-3377; [90-68]
+      (=cns11643-2	  . #x3377)	; &I-C2-3377; [19-87]
+      (=ucs@unicode	  . #x554D)	; &C2-3377;
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -13977,7 +14200,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5352)	; &UU+5352;
+       ((=gb2312	    . #x5764)	; &C1-4C35; [55-68]
+	(=cns11643-1	    . #x4C35)	; &I-C1-4C35; [44-21]
 	))
       (=gb2312		  . #x5F7D)	; &C2-3378; [63-93]
       (=cns11643-2	  . #x3378)	; &I-C2-3378; [19-88]
@@ -13988,19 +14212,58 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (=ucs		. #x35A8)	; 㖨
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x35A8)	; 㖨
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0212	    . #x3C78)	; &M-09918; [28-88]
+	(=jis-x0213-1-2000  . #x743B)	; &I-JX1-743B; [84-27]
+	(=daikanwa	    . 09918)	; &I-M-09918;
+	))
+      (=jis-x0213-2-2000  . #x2426)	; &M-03817; [04-06]
+      (=daikanwa	  . 03817)	; &I-M-03817;
+      (=cbeta		  . 04015)	; &I-CB04015;
+      (=ucs@jis		  . #x35A8)	; &M-03817;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-2	    . #x2655)	; &C2-2655; [06-53]
+	))
+      (=cns11643-4	  . #x3071)	; &C4-3071; [16-81]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x35A8)	; 㖨
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs		  . #x5F54)	; 彔
+     ((=gb2312		  . #x423C)	; &G0-423C; [34-28]
       ))
-    (=ucs		. #x35A8)	; 㖨
-    (=cns11643-4	. #x3071)	; &I-C4-3071; [16-81]
-    (=jis-x0213-2-2000	. #x2426)	; &I-JX2-2426; [04-06]
-    (=daikanwa		. 03817)	; &I-M-03817;
-    (=cbeta		. 04015)	; &I-CB04015;
+    (=ucs@unicode	. #x35A8)	; &UU+35A8;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -14154,14 +14417,6 @@
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-vulgar
-     ((shinjigen-1	  . 1108)
-      (=ks-x1001	  . #x4C76)	; &M-03820; [44-86]
-      (=cns11643-3	  . #x3462)	; &I-C3-3462; [20-66]
-      (=daikanwa	  . 03820)	; &I-M-03820;
-      ))
-    (<-vulgar*sources
-     zhengzi-tong daikanwa shinjigen-1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -14180,6 +14435,14 @@
     (shinjigen-1	. 1109)
     (=cns11643-3	. #x3461)	; &M-03822; [20-65]
     (=daikanwa		. 03822)	; &I-M-03822;
+    (<-vulgar
+     ((shinjigen-1	  . 1108)
+      (=ks-x1001	  . #x4C76)	; &M-03820; [44-86]
+      (=cns11643-3	  . #x3462)	; &I-C3-3462; [20-66]
+      (=daikanwa	  . 03820)	; &I-M-03820;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((<-denotational
@@ -15493,7 +15756,10 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x8005)	; &GT-37308;
+     ((=jis-x0208	  . #x3C54)	; &GT-37308; [28-52]
+      (=gb2312		  . #x555F)	; &I-G0-555F; [53-63]
+      (=cns11643-1	  . #x4F2F)	; &I-C1-4F2F; [47-15]
+      (=daikanwa	  . 28852)	; &I-M-28852;
       ))
     (=gb12345		. #x7C2F)	; &UU+556B; [92-15]
     (=ucs@unicode	. #x556B)	; &UU+556B;
@@ -15730,6 +15996,30 @@
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
+    (=ucs		. #x20E04)	; 𠸄
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20E04)	; 𠸄
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (hanyu-dazidian	8 13 19)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=jis-x0208	  . #x3151)	; &GT-39838; [17-49]
+      (=gb2312		  . #x5322)	; &I-G0-5322; [51-02]
+      (=ks-x1001	  . #x6748)	; &I-K0-6748; [71-40]
+      ))
+    (=hanziku-12	. #xEC4A)	; &HZK12-EC4A;
+    ))
+(define-char
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (ideographic-structure
@@ -15881,7 +16171,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs@unicode	    . #x5E1D)	; &C1-5074;
+       ((=gb2312	    . #x355B)	; &C1-5074; [21-59]
+	(=cns11643-1	    . #x5074)	; &I-C1-5074; [48-84]
 	)
        ((=ucs		    . #x53E3)	; 口
 	))
@@ -15924,7 +16215,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5E1D)	; &C1-5074;
+       ((=gb2312	    . #x355B)	; &C1-5074; [21-59]
+	(=cns11643-1	    . #x5074)	; &I-C1-5074; [48-84]
 	))
       (=gb2312		  . #x4C64)	; &C1-5E40; [44-68]
       (=cns11643-1	  . #x5E40)	; &I-C1-5E40; [62-32]
@@ -16001,55 +16293,105 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 656 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (=ucs		. #x557E)	; 啾
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x3D29)	; &GT-32182; [29-09]
+	(=gb2312	    . #x476F)	; &I-G0-476F; [39-79]
+	(=ks-x1001	    . #x7555)	; &I-K0-7555; [85-53]
+	(=daikanwa	    . 24940)	; &I-M-24940;
+	))
+      (shinjigen-1	  . 1161)
+      (shinjigen-2	  . 1161)
+      (=jis-x0208	  . #x5342)	; &GT-04949; [51-34]
+      (=gb2312		  . #x6031)	; &I-G0-6031; [64-17]
+      (=big5		  . #xB3EE)	; &I-B-B3EE;
+      (=gt		  . 04949)	; &I-GT-04949;
+      (=gt-pj-1		  . #x5342)	; &I-GT-04949; [51-34]
+      (=daikanwa	  . 03892)	; &I-M-03892;
+      (=ucs@unicode	  . #x557E)	; &GT-04949;
       )
-     ((=ucs		  . #x79CB)	; 秋
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x5271)	; &C1-5271; [50-81]
+	))
+      (=cns11643-1	  . #x5E54)	; &C1-5E54; [62-52]
       ))
-    (shinjigen-2	. 1161)
-    (=ucs		. #x557E)	; 啾
-    (=jis-x0208		. #x5342)	; &I-J90-5342; [51-34]
-    (=gb2312		. #x6031)	; &I-G0-6031; [64-17]
-    (=cns11643-1	. #x5E54)	; &I-C1-5E54; [62-52]
-    (=big5		. #xB3EE)	; &I-B-B3EE;
-    (=gt		. 04949)	; &I-GT-04949;
-    (=gt-pj-1		. #x5342)	; &I-GT-04949; [51-34]
-    (=daikanwa		. 03892)	; &I-M-03892;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 661 6)
     (=ucs		. #x20DD8)	; 𠷘
-    (=cns11643-6	. #x472F)	; &I-C6-472F; [39-15]
-    (=daikanwa		. 03893)	; &I-M-03893;
-    (=hanziku-2		. #xDA62)	; &I-HZK02-DA62;
+    (->subsumptive
+     ((hanyu-dazidian	  1 661 6)
+      (=daikanwa	  . 03893)	; &M-03893;
+      (=hanziku-2	  . #xDA62)	; &I-HZK02-DA62;
+      (=ucs@iso		  . #x20DD8)	; &M-03893;
+      )
+     ((=cns11643-6	  . #x472F)	; &C6-472F; [39-15]
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 649 4)
+    (=ucs		. #x557F)	; 啿
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x557F)	; 啿
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs		  . #x751A)	; 甚
+     ((=jis-x0208	  . #x3F53)	; &GT-27811; [31-51]
+      (=ks-x1001	  . #x6424)	; &I-K0-6424; [68-04]
+      (=daikanwa	  . 21648)	; &I-M-21648;
       ))
-    (=ucs		. #x557F)	; 啿
-    (=jis-x0212		. #x3565)	; &I-JSP-3565; [21-69]
-    (=cns11643-2	. #x3A5C)	; &I-C2-3A5C; [26-60]
+    (=jis-x0212		. #x3565)	; &M-03894; [21-69]
     (=big5		. #xD878)	; &I-B-D878;
     (=daikanwa		. 03894)	; &I-M-03894;
+    (=ucs@jis		. #x557F)	; &M-03894;
     ))
 (define-char
-  '((ideographic-radical . 30)	; ⼝
+  '((<-denotational
+     ((=ucs		  . #x557F)	; 啿
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=gb2312		  . #x4975)	; &G0-4975; [41-85]
+      ))
+    (=ucs@unicode	. #x557F)	; &UU+557F;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x557F)	; 啿
+      ))
+    (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (ideographic-structure
@@ -16058,12 +16400,40 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs		  . #x8650)	; 虐
+     ((=cns11643-1	  . #x5249)	; &C1-5249; [50-41]
       ))
+    (=cns11643-2	. #x3A5C)	; &C2-3A5C; [26-60]
+    ))
+(define-char
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
     (=ucs		. #x35B8)	; 㖸
-    (=cns11643-4	. #x3667)	; &I-C4-3667; [22-71]
-    (=daikanwa		. 03895)	; &I-M-03895;
-    (=cbeta		. 01224)	; &I-CB01224;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=gb2312	    . #x4530)	; &M-32678; [37-16]
+	(=ks-x1001	    . #x794B)	; &I-K0-794B; [89-43]
+	(=daikanwa	    . 32678)	; &I-M-32678;
+	))
+      (=daikanwa	  . 03895)	; &M-03895;
+      (=cbeta		  . 01224)	; &I-CB01224;
+      (=ucs@unicode	  . #x35B8)	; &M-03895;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x534B)	; &C1-534B; [51-43]
+	))
+      (=cns11643-4	  . #x3667)	; &C4-3667; [22-71]
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -16097,7 +16467,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5BA2)	; &UU+5BA2;
+       ((=gb2312	    . #x3F4D)	; &C1-506A; [31-45]
+	(=cns11643-1	    . #x506A)	; &I-C1-506A; [48-74]
 	))
       (=gb2312		  . #x3F26)	; &C1-5E3E; [31-06]
       (=cns11643-1	  . #x5E3E)	; &I-C1-5E3E; [62-30]
@@ -16108,19 +16479,34 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (=ucs		. #x20DB9)	; 𠶹
+    (->subsumptive
+     ((hanyu-dazidian	  1 663 11)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=ks-x1001	    . #x7D60)	; &M-27246; [93-64]
+	(=jis-x0212	    . #x534C)	; &I-JSP-534C; [51-44]
+	(=jis-x0213-1-2000  . #x7979)	; &I-JX1-7979; [89-89]
+	(=daikanwa	    . 27246)	; &I-M-27246;
+	))
+      (=daikanwa	  . 03897)	; &M-03897;
+      (=hanziku-2	  . #xDAC9)	; &I-HZK02-DAC9;
+      (=cbeta		  . 03314)	; &I-CB03314;
       )
-     ((=ks-x1001	  . #x7D60)	; &M-27246; [93-64]
-      (=jis-x0212	  . #x534C)	; &I-JSP-534C; [51-44]
-      (=jis-x0213-1-2000  . #x7979)	; &I-JX1-7979; [89-89]
-      (=daikanwa	  . 27246)	; &I-M-27246;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x527B)	; &C1-527B; [50-91]
+	))
+      (=ucs@iso		  . #x20DB9)	; &U-00020DB9;
       ))
-    (=daikanwa		. 03897)	; &M-03897;
-    (=cbeta		. 03314)	; &I-CB03314;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -16525,38 +16911,36 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 649 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=ucs		  . #x67BC)	; 枼
-      ))
-    (shinjigen-2	. 1172)
     (=ucs		. #x558B)	; 喋
-    (=jis-x0208		. #x437D)	; &I-J90-437D; [35-93]
-    (=gb2312		. #x6029)	; &I-G0-6029; [64-09]
-    (=big5		. #xB3E3)	; &I-B-B3E3;
-    (=gt		. 04987)	; &I-GT-04987;
-    (=gt-pj-1		. #x437D)	; &I-GT-04987; [35-93]
-    (=daikanwa		. 03917)	; &I-M-03917;
-    ))
-(define-char
-  '((=>ucs		. #x558B)	; 喋
-    (morohashi-daikanwa	3917 0 1)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0212	    . #x4336)	; &M-14593; [35-22]
+	(=daikanwa	    . 14593)	; &I-M-14593;
+	))
+      (shinjigen-2	  . 1172)
+      (=jis-x0208	  . #x437D)	; &GT-04987; [35-93]
+      (=gb2312		  . #x6029)	; &I-G0-6029; [64-09]
+      (=big5		  . #xB3E3)	; &I-B-B3E3;
+      (=gt		  . 04987)	; &I-GT-04987;
+      (=gt-pj-1		  . #x437D)	; &I-GT-04987; [35-93]
+      (=daikanwa	  . 03917)	; &I-M-03917;
+      (=ucs@unicode	  . #x558B)	; &GT-04987;
       )
-     ((=cns11643-3	  . #x2D2E)	; &CDP-8CAD; [13-14]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-3	    . #x2D2E)	; &CDP-8CAD; [13-14]
+	))
+      (=cns11643-1	  . #x5E49)	; &C1-5E49; [62-41]
       ))
-    (=cns11643-1	. #x5E49)	; &C1-5E49; [62-41]
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -16571,7 +16955,10 @@
 	)
        ((=ucs		    . #x5405)	; 吅
 	)
-       ((=ucs@unicode	    . #x5DDE)	; &UU+5DDE;
+       ((=jis-x0208	    . #x3D23)	; &GT-10952; [29-03]
+	(=gb2312	    . #x565D)	; &I-G0-565D; [54-61]
+	(=ks-x1001	    . #x7136)	; &I-K0-7136; [81-22]
+	(=daikanwa	    . 08678)	; &I-M-08678;
 	))
       (=big5		  . #xD876)	; &M-03918;
       (=daikanwa	  . 03918)	; &I-M-03918;
@@ -16594,15 +16981,12 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x35BC)	; 㖼
-    (=daikanwa		. 03919)	; &I-M-03919;
-    ))
-(define-char
-  '((=>ucs		. #x35BC)	; 㖼
-    (morohashi-daikanwa	3919 0 1)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=cns11643-4	. #x3659)	; &C4-3659; [22-57]
+    (->subsumptive
+     ((=daikanwa	  . 03919)	; &M-03919;
+      (=ucs@unicode	  . #x35BC)	; &M-03919;
+      )
+     ((=cns11643-4	  . #x3659)	; &C4-3659; [22-57]
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -16826,7 +17210,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=cns11643-1	    . #x5326)	; &I-C1-5326; [51-06]
+       ((=jis-x0208@1990    . #x4C6D)	; &GT-37579; [44-77]
+	(=cns11643-1	    . #x5326)	; &I-C1-5326; [51-06]
 	(=daikanwa	    . 29008)	; &I-M-29008;
 	))
       (=cns11643-3	  . #x3A2D)	; &M-03929; [26-13]
@@ -16839,7 +17224,10 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x8036)	; &J83-4C6D;
+       ((=jis-x0208@1978    . #x4C6D)	; &J83-4C6D; [44-77]
+	(=gb2312	    . #x522E)	; &I-G0-522E; [50-14]
+	(=jis-x0208@1983    . #x4C6D)	; &I-J83-4C6D; [44-77]
+	(=ks-x1001	    . #x652D)	; &I-K0-652D; [69-13]
 	))
       (=ucs@unicode	  . #x35BF)	; &UU+35BF;
       ))
@@ -16958,6 +17346,7 @@
     (total-strokes	 . 12)
     (hanyu-dazidian	1 659 6)
     (=ucs		. #x5591)	; 喑
+    (=big5		. #xD866)	; &I-B-D866;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -16980,11 +17369,11 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x97F3)	; &C1-5376;
+       ((=gb2312	    . #x5274)	; &C1-5376; [50-84]
+	(=cns11643-1	    . #x5376)	; &I-C1-5376; [51-86]
 	))
       (=gb2312		  . #x6033)	; &C2-3A4A; [64-19]
       (=cns11643-2	  . #x3A4A)	; &I-C2-3A4A; [26-42]
-      (=big5		  . #xD866)	; &I-B-D866;
       (=ucs@unicode	  . #x5591)	; &C2-3A4A;
       ))
     ))
@@ -17002,23 +17391,45 @@
     (total-strokes	 . 12)
     (hanyu-dazidian	1 658 9)
     (=ucs		. #x5592)	; 喒
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x53E3)	; 口
-	)
-       ((=ucs@unicode	    . #x661D)	; &G0-6A43;
-	))
-      (=jis-x0212	  . #x356D)	; &M-03936; [21-77]
-      (=daikanwa	  . 03936)	; &I-M-03936;
-      (=ucs@unicode	  . #x5592)	; &M-03936;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5592)	; 喒
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (=jis-x0212		. #x356D)	; &M-03936; [21-77]
+    (=daikanwa		. 03936)	; &I-M-03936;
+    (=ucs@jis		. #x5592)	; &M-03936;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5592)	; 喒
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=cns11643-2	  . #x3A57)	; &C2-3A57; [26-55]
-      (=big5		  . #xD873)	; &I-B-D873;
-      (=ucs@cns		  . #x5592)	; &C2-3A57;
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=gb2312		  . #x6A43)	; &G0-6A43; [74-35]
+      ))
+    (=ucs@unicode	. #x5592)	; &UU+5592;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5592)	; 喒
       ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (=cns11643-2	. #x3A57)	; &C2-3A57; [26-55]
+    (=big5		. #xD873)	; &I-B-D873;
+    (=ucs@cns		. #x5592)	; &C2-3A57;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -17226,11 +17637,21 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x35C2)	; 㗂
-    (=cns11643-4	. #x365F)	; &I-C4-365F; [22-63]
-    (=daikanwa		. 03948)	; &I-M-03948;
+    (->subsumptive
+     ((=daikanwa	  . 03948)	; &M-03948;
+      )
+     ((=cns11643-4	  . #x365F)	; &C4-365F; [22-63]
+      (=ucs@unicode	  . #x35C2)	; &C4-365F;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 30)	; ⼝
+    (=ucs		. #x20DC9)	; 𠷉
     ))
 (define-char
-  '((=>ucs		. #x20DC9)	; 𠷉
+  '((<-denotational
+     ((=ucs		  . #x20DC9)	; 𠷉
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -17239,19 +17660,22 @@
     (=hanziku-2		. #xDAC2)	; &I-HZK02-DAC2;
     ))
 (define-char
-  '((=>ucs		. #x20DC9)	; 𠷉
-    (morohashi-daikanwa	3949 0 2)
+  '((<-denotational
+     ((=ucs		  . #x20DC9)	; 𠷉
+      ))
     (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=cns11643-5	. #x367E)	; &C5-367E; [22-94]
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=ucs@iso		. #x20DC9)	; &U-00020DC9;
     ))
 (define-char
-  '((morohashi-daikanwa	3949 0 3)
+  '((<-denotational
+     ((=ucs		  . #x20DC9)	; 𠷉
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs		. #x20DC9)	; 𠷉
+    (=cns11643-5	. #x367E)	; &C5-367E; [22-94]
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -17266,24 +17690,49 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 663 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x5599)	; 喙
+    (=big5		. #xB3F1)	; &I-B-B3F1;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x5741)	; &GT-12518; [55-33]
+	(=ks-x1001	    . #x5327)	; &I-K0-5327; [51-07]
+	(=daikanwa	    . 09920)	; &I-M-09920;
+	))
+      (shinjigen-1	  . 1137)
+      (shinjigen-2	  . 1139)
+      (=jis-x0208	  . #x533C)	; &GT-04869; [51-28]
+      (=ks-x1001	  . #x7D42)	; &I-K0-7D42; [93-34]
+      (=gt		  . 04869)	; &I-GT-04869;
+      (=gt-pj-1		  . #x533C)	; &I-GT-04869; [51-28]
+      (=daikanwa	  . 03951)	; &I-M-03951;
+      (=ucs@jis		  . #x5599)	; &GT-04869;
       )
-     ((=ucs		  . #x53E3)	; 口
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=gb2312	    . #x6568)	; &G0-6568; [69-72]
+	))
+      (=gb2312		  . #x6039)	; &G0-6039; [64-25]
+      (=ucs@unicode	  . #x5599)	; &G0-6039;
       )
-     ((=ucs		  . #x5F56)	; 彖
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-2	    . #x2A3E)	; &C2-2A3E; [10-30]
+	))
+      (=cns11643-1	  . #x5E57)	; &C1-5E57; [62-55]
       ))
-    (shinjigen-2	. 1139)
-    (=ucs		. #x5599)	; 喙
-    (=jis-x0208		. #x533C)	; &I-J90-533C; [51-28]
-    (=gb2312		. #x6039)	; &I-G0-6039; [64-25]
-    (=ks-x1001		. #x7D42)	; &I-K0-7D42; [93-34]
-    (=cns11643-1	. #x5E57)	; &I-C1-5E57; [62-55]
-    (=big5		. #xB3F1)	; &I-B-B3F1;
-    (=gt		. 04869)	; &I-GT-04869;
-    (=gt-pj-1		. #x533C)	; &I-GT-04869; [51-28]
-    (=daikanwa		. 03951)	; &I-M-03951;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -17298,39 +17747,68 @@
     (total-strokes	 . 12)
     (=ucs		. #x559A)	; 喚
     (=big5		. #xB3EA)	; &I-B-B3EA;
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x53E3)	; 口
-	)
-       ((=jis-x0208	    . #x5476)	; &GT-07458; [52-86]
-	(=ks-x1001	    . #x7C31)	; &I-K0-7C31; [92-17]
-	(=daikanwa	    . 05916)	; &I-M-05916;
-	))
-      (shinjigen-2	  . 1144)
-      (=jis-x0208	  . #x342D)	; &GT-04881; [20-13]
-      (=ks-x1001	  . #x7C30)	; &I-K0-7C30; [92-16]
-      (=gt		  . 04881)	; &I-GT-04881;
-      (=gt-pj-1		  . #x342D)	; &I-GT-04881; [20-13]
-      (=daikanwa	  . 03953)	; &I-M-03953;
-      (=ucs@jis		  . #x559A)	; &GT-04881;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x559A)	; 喚
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((hanyu-dazidian	  1 632 8)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x53E3)	; 口
-	)
-       ((=ucs@unicode	    . #x5950)	; &UU+5950;
-	))
-      (=gb12345		  . #x3B3D)	; &UU+559A; [27-29]
-      (=ucs@unicode	  . #x559A)	; &UU+559A;
+     ((=ucs		  . #x53E3)	; 口
       )
-     ((=cns11643-1	  . #x5E50)	; &C1-5E50; [62-48]
+     ((=jis-x0208	  . #x5476)	; &GT-07458; [52-86]
+      (=ks-x1001	  . #x7C31)	; &I-K0-7C31; [92-17]
+      (=daikanwa	  . 05916)	; &I-M-05916;
       ))
+    (shinjigen-1	. 1144)
+    (shinjigen-2	. 1144)
+    (=jis-x0208		. #x342D)	; &GT-04881; [20-13]
+    (=ks-x1001		. #x7C30)	; &I-K0-7C30; [92-16]
+    (=gt		. 04881)	; &I-GT-04881;
+    (=gt-pj-1		. #x342D)	; &I-GT-04881; [20-13]
+    (=daikanwa		. 03953)	; &I-M-03953;
+    (=ucs@jis		. #x559A)	; &GT-04881;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x559A)	; 喚
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (hanyu-dazidian	1 632 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=gb12345		  . #x5B3C)	; &UU+5950; [59-28]
+      ))
+    (=gb12345		. #x3B3D)	; &UU+559A; [27-29]
+    (=ucs@unicode	. #x559A)	; &UU+559A;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x559A)	; 喚
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=cns11643-1	  . #x5059)	; &C1-5059; [48-57]
+      ))
+    (=cns11643-1	. #x5E50)	; &C1-5E50; [62-48]
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -17372,7 +17850,8 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x7230)	; &UU+7230;
+     ((=gb2312		  . #x6B3C)	; &C1-523B; [75-28]
+      (=cns11643-1	  . #x523B)	; &I-C1-523B; [50-27]
       ))
     (=cns11643-3	. #x3A33)	; &C3-3A33; [26-19]
     (=ucs@unicode	. #x559B)	; &C3-3A33;
@@ -17497,11 +17976,6 @@
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA36)	; 喝
-      (=jis-x0208@1978	  . #x3365)	; &I-J78-3365; [19-69]
-      (=jis-x0213-1-2000  . #x2F2C)	; &I-JX1-2F2C; [15-12]
-      ))
     (shinjigen-2	. 1108)
     (=ucs		. #xFA78)	; 喝
     (=jis-x0208@1983	. #x3365)	; &I-J83-3365; [19-69]
@@ -17511,6 +17985,11 @@
     (=gt-pj-1		. #x3365)	; &I-GT-04705; [19-69]
     (=jef-china3	. #x47B8)	; &I-JC3-47B8;
     (=ucs@jis		. #x559D)	; 喝
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA36)	; 喝
+      (=jis-x0208@1978	  . #x3365)	; &I-J78-3365; [19-69]
+      (=jis-x0213-1-2000  . #x2F2C)	; &I-JX1-2F2C; [15-12]
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -17672,7 +18151,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x97CB)	; &GT-57812;
+       ((=gb12345	    . #x4E24)	; &GT-57812; [46-04]
+	(=daikanwa	    . 43108)	; &GT-57812;
 	))
       (=daikanwa	  . 03967)	; &M-03967;
       (=ucs@unicode	  . #x55A1)	; &M-03967;
@@ -17763,8 +18243,12 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x35C8)	; 㗈
-    (=cns11643-4	. #x3658)	; &I-C4-3658; [22-56]
-    (=daikanwa		. 03972)	; &I-M-03972;
+    (->subsumptive
+     ((=daikanwa	  . 03972)	; &M-03972;
+      (=ucs@unicode	  . #x35C8)	; &M-03972;
+      )
+     ((=cns11643-4	  . #x3658)	; &C4-3658; [22-56]
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -17802,6 +18286,7 @@
 	)
        ((=jis-x0208	    . #x4559)	; &GT-11725; [37-57]
 	(=ks-x1001	    . #x5378)	; &I-K0-5378; [51-88]
+	(=daikanwa	    . 09313)	; &I-M-09313;
 	))
       (=daikanwa	  . 03974)	; &M-03974;
       )
@@ -17812,7 +18297,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5EA6)	; &UU+5EA6;
+       ((=gb2312	    . #x3648)	; &C1-5079; [22-40]
+	(=cns11643-1	    . #x5079)	; &I-C1-5079; [48-89]
 	))
       (=cns11643-2	  . #x3A4C)	; &C2-3A4C; [26-44]
       (=ucs@unicode	  . #x55A5)	; &C2-3A4C;
@@ -17835,6 +18321,12 @@
     (=cns11643-2	. #x3A5B)	; &I-C2-3A5B; [26-59]
     (=big5		. #xD877)	; &I-B-D877;
     (=daikanwa		. 03975)	; &I-M-03975;
+    (->mistakable
+     ((=ucs		  . #x5D52)	; 嵒
+      (=daikanwa	  . 08294)	; &I-M-08294;
+      ))
+    (->mistakable*sources
+     shuowen-tongxun-dingsheng daikanwa)
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -17854,6 +18346,7 @@
 	(=ks-x1001	    . #x603E)	; &I-K0-603E; [64-30]
 	(=daikanwa	    . 07132)	; &I-M-07132;
 	))
+      (shinjigen-1	  . 1155)
       (shinjigen-2	  . 1155)
       (=jis-x0208	  . #x3776)	; &GT-04910; [23-86]
       (=ks-x1001	  . #x7D3D)	; &I-K0-7D3D; [93-29]
@@ -17868,7 +18361,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5BA3)	; &C1-5067;
+       ((=gb2312	    . #x507B)	; &C1-5067; [48-91]
+	(=cns11643-1	    . #x5067)	; &I-C1-5067; [48-71]
 	))
       (=gb2312		  . #x507A)	; &C1-5E3F; [48-90]
       (=cns11643-1	  . #x5E3F)	; &I-C1-5E3F; [62-31]
@@ -17876,21 +18370,18 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x20DCF)	; 𠷏
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=daikanwa		. 03977)	; &M-03977;
-    ))
-(define-char
-  '((morohashi-daikanwa	3977 0 1)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 658 8)
     (=ucs		. #x20DCF)	; 𠷏
-    (=cns11643-5	. #x3730)	; &I-C5-3730; [23-16]
-    (=hanziku-2		. #xD9C3)	; &I-HZK02-D9C3;
+    (->subsumptive
+     ((=daikanwa	  . 03977)	; &M-03977;
+      )
+     ((hanyu-dazidian	  1 658 8)
+      (=cns11643-5	  . #x3730)	; &HZK02-D9C3; [23-16]
+      (=hanziku-2	  . #xD9C3)	; &I-HZK02-D9C3;
+      (=ucs@iso		  . #x20DCF)	; &HZK02-D9C3;
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -18194,7 +18685,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=gt		    . 07464)	; &I-GT-07464;
+       ((=gt		    . 07464)	; &GT-07464;
 	(=daikanwa	    . 05917)	; &I-M-05917;
 	))
       (=big5		  . #xB3F0)	; &GT-04889;
@@ -18233,7 +18724,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5951)	; &UU+5951;
+       ((=gb2312	    . #x4675)	; &G0-4675; [38-85]
 	))
       (=jef-china3	  . #x46EC)	; &JC3-46EC;
       (=ucs@unicode	  . #x55AB)	; &JC3-46EC;
@@ -18267,35 +18758,34 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 658 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=ucs		  . #x98A8)	; 風
-      ))
     (=ucs		. #x20DD5)	; 𠷕
-    (=daikanwa		. 03988)	; &I-M-03988;
-    (=hanziku-2		. #xD9C2)	; &I-HZK02-D9C2;
-    (=cbeta		. 03504)	; &I-CB03504;
-    ))
-(define-char
-  '((=>ucs		. #x20DD5)	; 𠷕
-    (morohashi-daikanwa	3988 0 1)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (->subsumptive
+     ((hanyu-dazidian	  1 658 7)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x4977)	; &GT-58717; [41-87]
+	(=ks-x1001	    . #x7926)	; &I-K0-7926; [89-06]
+	(=daikanwa	    . 43756)	; &I-M-43756;
+	))
+      (=daikanwa	  . 03988)	; &M-03988;
+      (=hanziku-2	  . #xD9C2)	; &I-HZK02-D9C2;
+      (=cbeta		  . 03504)	; &I-CB03504;
+      (=ucs@iso		  . #x20DD5)	; &M-03988;
       )
-     ((=cns11643-1	  . #x5378)	; &C1-5378; [51-88]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x5378)	; &C1-5378; [51-88]
+	))
+      (=cns11643-6	  . #x473C)	; &C6-473C; [39-28]
       ))
-    (=cns11643-6	. #x473C)	; &C6-473C; [39-28]
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -18802,7 +19292,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5EFA)	; &GT-12065;
+       ((=gb2312	    . #x3D28)	; &GT-12065; [29-08]
+	(=cns11643-1	    . #x507A)	; &I-C1-507A; [48-90]
 	))
       (=cns11643-5	  . #x3672)	; &HZK02-D775; [22-82]
       (=hanziku-2	  . #xD775)	; &I-HZK02-D775;
@@ -18856,14 +19347,26 @@
     (=daikanwa		. 04019)	; &I-M-04019;
     ))
 (define-char
-  '((ideographic-	(:radical	30 ; ⼝
-			 :strokes	9)
-			(:radical	1 ; ⼀
-			 :strokes	11))
+  '((ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 11)
+    (ideographic-radical@cns . 30)	; ⼝
+    (ideographic-strokes@cns . 9)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 12)
-    (<-same
-     ((=cns11643-6	  . #x472D)	; &C6-472D; [39-13]
+    (=ucs		. #x20048)	; 𠁈
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20048)	; 𠁈
       ))
+    (ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 11)
+    (ideographic-radical@cns . 30)	; ⼝
+    (ideographic-strokes@cns . 9)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (total-strokes	 . 12)
     (hanyu-dazidian	1 26 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -18888,13 +19391,14 @@
 	  ))
 	))
       ))
-    (=ucs		. #x20048)	; 𠁈
-    (=daikanwa		. 04020)	; &I-M-04020;
+    (=daikanwa		. 04020)	; &M-04020;
     (=hanziku-1		. #xA979)	; &I-HZK01-A979;
+    (=ucs@iso		. #x20048)	; &M-04020;
     ))
 (define-char
-  '((=>ucs		. #x20048)	; 𠁈
-    (morohashi-daikanwa	4020 0 1)
+  '((<-denotational
+     ((=ucs		  . #x20048)	; 𠁈
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -18954,7 +19458,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x7D04)	; &C1-527C;
+       ((=cns11643-1	    . #x527C)	; &C1-527C; [50-92]
 	))
       (=cns11643-1	  . #x5E4F)	; &C1-5E4F; [62-47]
       (=gb12345		  . #x5334)	; &C1-5E4F; [51-20]
@@ -19114,14 +19618,6 @@
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((shinjigen-1	  . 1135)
-      (=jis-x0208	  . #x535B)	; &GT-24957; [51-59]
-      (=ks-x1001	  . #x673D)	; &I-K0-673D; [71-29]
-      (=daikanwa	  . 19457)	; &I-M-19457;
-      ))
-    (<-simplified@JP/Jouyou*sources
-     JP/Jouyou shinjigen-1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -19139,6 +19635,14 @@
     (=gt-pj-1		. #x3144)	; &I-GT-12987; [17-36]
     (=daikanwa		. 04025)	; &I-M-04025;
     (=ucs@jis		. #x55B6)	; &GT-12987;
+    (<-simplified@JP/Jouyou
+     ((shinjigen-1	  . 1135)
+      (=jis-x0208	  . #x535B)	; &GT-24957; [51-59]
+      (=ks-x1001	  . #x673D)	; &I-K0-673D; [71-29]
+      (=daikanwa	  . 19457)	; &I-M-19457;
+      ))
+    (<-simplified@JP/Jouyou*sources
+     JP/Jouyou shinjigen-1)
     ))
 (define-char
   '((<-denotational
@@ -19235,7 +19739,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x90CE)	; &UU+90CE;
+       ((=gb2312	    . #x4049)	; &C1-5367; [32-41]
+	(=cns11643-1	    . #x5367)	; &I-C1-5367; [51-71]
 	))
       (=gb2312		  . #x6025)	; &C2-3A4E; [64-05]
       (=cns11643-2	  . #x3A4E)	; &I-C2-3A4E; [26-46]
@@ -19381,6 +19886,36 @@
     (=cns11643-5	. #x3673)	; &I-C5-3673; [22-83]
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x20E04)	; 𠸄
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=daikanwa	    . 30808)	; &M-30808;
+	))
+      (sources		  bos=A021761-00005)
+      (=ruimoku-v6	  . #xE01A)	; &RUI6-E01A;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x5341)	; &C1-5341; [51-33]
+	))
+      (=ucs@iso		  . #x20E04)	; &U-00020E04;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -20416,7 +20951,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5BB3)	; &UU+5BB3;
+       ((=gb2312	    . #x3A26)	; &G0-3A26; [26-06]
 	))
       (=ucs@unicode	  . #x55D0)	; &UU+55D0;
       ))
@@ -20500,7 +21035,8 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x8345)	; &UU+8345;
+     ((=jis-x0208	  . #x6829)	; &GT-40184; [72-09]
+      (=iso-ir165	  . #x7E3E)	; &I-EGB-7E3E; [94-30]
       ))
     (=gb2312		. #x602A)	; &JX2-2430; [64-10]
     (=jis-x0212		. #x357E)	; &I-JSP-357E; [21-94]
@@ -20521,7 +21057,10 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x6851)	; &UU+6851;
+       ((=jis-x0208	    . #x372C)	; &GT-18778; [23-12]
+	(=gb2312	    . #x4923)	; &I-G0-4923; [41-03]
+	(=ks-x1001	    . #x5F4D)	; &I-K0-5F4D; [63-45]
+	(=daikanwa	    . 14772)	; &I-M-14772;
 	))
       (=gb2312		  . #x4924)	; &M-04070; [41-04]
       (=jis-x0212	  . #x3621)	; &I-JSP-3621; [22-01]
@@ -20566,23 +21105,29 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x20E50)	; 𠹐
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=daikanwa		. 04073)	; &M-04073;
+    (=ucs		. #x20E50)	; 𠹐
     ))
 (define-char
-  '((morohashi-daikanwa	4073 0 0)
+  '((<-denotational
+     ((=ucs		  . #x20E50)	; 𠹐
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs		. #x20E50)	; 𠹐
-    (=cns11643-5	. #x3E34)	; &I-C5-3E34; [30-20]
+    (->subsumptive
+     ((=daikanwa	  . 04073)	; &M-04073;
+      )
+     ((=cns11643-5	  . #x3E34)	; &C5-3E34; [30-20]
+      (=ucs@iso		  . #x20E50)	; &C5-3E34;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x20E50)	; 𠹐
-    (morohashi-daikanwa	4073 0 1)
+  '((<-denotational
+     ((=ucs		  . #x20E50)	; 𠹐
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
@@ -20635,7 +21180,8 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x771F)	; &UU+771F;
+     ((=gb2312		  . #x5566)	; &C1-5678; [53-70]
+      (=cns11643-1	  . #x5678)	; &I-C1-5678; [54-88]
       ))
     (=gb2312		. #x6041)	; &C2-4177; [64-33]
     (=cns11643-2	. #x4177)	; &I-C2-4177; [33-87]
@@ -20827,7 +21373,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x595A)	; &G0-5E49;
+       ((=gb2312	    . #x5E49)	; &G0-5E49; [62-41]
 	))
       (=ucs@unicode	  . #x55D8)	; &UU+55D8;
       )
@@ -20847,12 +21393,25 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x35D7)	; 㗗
-    (->subsumptive
-     ((=cns11643-5	  . #x3E3D)	; &M-04082; [30-29]
-      (=daikanwa	  . 04082)	; &I-M-04082;
-      )
-     ((=ucs@unicode	  . #x35D7)	; &UU+35D7;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x35D7)	; 㗗
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=cns11643-5	. #x3E3D)	; &M-04082; [30-29]
+    (=daikanwa		. 04082)	; &I-M-04082;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x35D7)	; 㗗
       ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs@unicode	. #x35D7)	; &UU+35D7;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -20880,7 +21439,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x65C1)	; &UU+65C1;
+       ((=gb2312	    . #x4554)	; &C1-5569; [37-52]
+	(=cns11643-1	    . #x5569)	; &I-C1-5569; [53-73]
 	))
       (=cns11643-2	  . #x4226)	; &C2-4226; [34-06]
       (=ucs@unicode	  . #x55D9)	; &C2-4226;
@@ -21034,7 +21594,9 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x517C)	; &UU+517C;
+     ((=jis-x0208	  . #x3773)	; &GT-01935; [23-83]
+      (=gb2312		  . #x3C66)	; &I-G0-3C66; [28-70]
+      (=cns11643-1	  . #x5440)	; &I-C1-5440; [52-32]
       ))
     (=cns11643-2	. #x4170)	; &C2-4170; [33-80]
     (=ucs@unicode	. #x55DB)	; &C2-4170;
@@ -21203,6 +21765,7 @@
     (total-strokes	 . 13)
     (hanyu-dazidian	1 666 4)
     (=ucs		. #x55DD)	; 嗝
+    (=big5		. #xDCD0)	; &I-B-DCD0;
     ))
 (define-char
   '((<-denotational
@@ -21241,9 +21804,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=jis-x0213-2-2000	. #x2437)	; &JX2-2437; [04-23]
-    (=big5		. #xDCD0)	; &I-B-DCD0;
     (=ucs@jis		. #x55DD)	; &JX2-2437;
-    (=ucs@big5		. #x55DD)	; &JX2-2437;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -21256,7 +21817,15 @@
     (=hanziku-2		. #xDBC2)	; &I-HZK02-DBC2;
     ))
 (define-char
-  '((=>ucs		. #x55DE)	; 嗞
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs		. #x55DE)	; 嗞
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x55DE)	; 嗞
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
@@ -21273,8 +21842,9 @@
     (=cbeta		. 00071)	; &I-CB00071;
     ))
 (define-char
-  '((=>ucs		. #x55DE)	; 嗞
-    (morohashi-daikanwa	4099 0 1)
+  '((<-denotational
+     ((=ucs		  . #x55DE)	; 嗞
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -21284,13 +21854,15 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs		  . #x8332)	; 茲
+     ((=jis-x0208	  . #x6824)	; &GT-40113; [72-04]
       ))
     (=jis-x0212		. #x3625)	; &JSP-3625; [22-05]
     (=ucs@jis		. #x55DE)	; &JSP-3625;
     ))
 (define-char
-  '((morohashi-daikanwa	4099 0 2)
+  '((<-denotational
+     ((=ucs		  . #x55DE)	; 嗞
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -21303,51 +21875,55 @@
       )
      ((=ucs		  . #x5179)	; 兹
       ))
-    (=ucs		. #x55DE)	; 嗞
-    (=cns11643-3	. #x3A2B)	; &I-C3-3A2B; [26-11]
+    (=cns11643-3	. #x3A2B)	; &CB01003; [26-11]
     (=hanziku-2		. #xDA60)	; &I-HZK02-DA60;
     (=cbeta		. 01003)	; &I-CB01003;
+    (=ucs@unicode	. #x55DE)	; &CB01003;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x35DC)	; 㗜
-    (=cns11643-6	. #x5132)	; &I-C6-5132; [49-18]
-    (=daikanwa		. 04100)	; &I-M-04100;
-    ))
-(define-char
-  '((ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (->subsumptive
+     ((=daikanwa	  . 04100)	; &M-04100;
       )
-     ((=ucs		  . #x6817)	; 栗
+     ((=cns11643-6	  . #x5132)	; &C6-5132; [49-18]
+      (=ucs@unicode	  . #x35DC)	; &C6-5132;
       ))
-    (=ucs		. #x35DA)	; 㗚
-    (=jis-x0213-2-2000	. #x2438)	; &I-JX2-2438; [04-24]
-    (=daikanwa		. 04101)	; &I-M-04101;
-    (=cbeta		. 00069)	; &I-CB00069;
     ))
 (define-char
-  '((=>ucs		. #x35DA)	; 㗚
-    (morohashi-daikanwa	4101 0 1)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (=ucs		. #x35DA)	; 㗚
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x372A)	; &GT-18817; [23-10]
+	(=gb2312	    . #x4075)	; &I-G0-4075; [32-85]
+	(=ks-x1001	    . #x574A)	; &I-K0-574A; [55-42]
+	(=daikanwa	    . 14695)	; &I-M-14695;
+	))
+      (=jis-x0213-2-2000  . #x2438)	; &M-04101; [04-24]
+      (=daikanwa	  . 04101)	; &I-M-04101;
+      (=cbeta		  . 00069)	; &I-CB00069;
+      (=ucs@unicode	  . #x35DA)	; &M-04101;
       )
-     ((=cns11643-1	  . #x5623)	; &C1-5623; [54-03]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x5623)	; &C1-5623; [54-03]
+	))
+      (=cns11643-3	  . #x404D)	; &C3-404D; [32-45]
       ))
-    (=cns11643-3	. #x404D)	; &C3-404D; [32-45]
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -21386,7 +21962,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5DEE)	; &UU+5DEE;
+       ((=gb2312	    . #x326E)	; &G0-326E; [18-78]
 	))
       (=gb2312		  . #x6035)	; &G0-6035; [64-21]
       (=ucs@unicode	  . #x55DF)	; &G0-6035;
@@ -21511,7 +22087,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x7FC1)	; &GT-36866;
+       ((=gb2312	    . #x4E4C)	; &GT-36866; [46-44]
 	))
       (=gb2312		  . #x4E4B)	; &G0-4E4B; [46-43]
       (=ucs@unicode	  . #x55E1)	; &G0-4E4B;
@@ -21648,7 +22224,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x86A9)	; &C1-582A;
+       ((=gb2312	    . #x723F)	; &C1-582A; [82-31]
+	(=cns11643-1	    . #x582A)	; &I-C1-582A; [56-10]
 	))
       (=gb2312		  . #x604D)	; &C1-6348; [64-45]
       (=cns11643-1	  . #x6348)	; &I-C1-6348; [67-40]
@@ -21656,6 +22233,15 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x55E4)	; 嗤
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=cbeta		. 06695)	; &CB06695;
+    ))
+(define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
@@ -21666,21 +22252,18 @@
     (=hanziku-2		. #xDBCB)	; &I-HZK02-DBCB;
     ))
 (define-char
-  '((=>ucs		. #x20E62)	; ð ¹¢
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=daikanwa		. 04112)	; &M-04112;
-    ))
-(define-char
-  '((morohashi-daikanwa	4112 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (hanyu-dazidian	1 664 14)
     (=ucs		. #x20E62)	; ð ¹¢
-    (=cns11643-5	. #x3E3B)	; &I-C5-3E3B; [30-27]
-    (=hanziku-2		. #xDAEC)	; &I-HZK02-DAEC;
+    (->subsumptive
+     ((=daikanwa	  . 04112)	; &M-04112;
+      )
+     ((hanyu-dazidian	  1 664 14)
+      (=cns11643-5	  . #x3E3B)	; &HZK02-DAEC; [30-27]
+      (=hanziku-2	  . #xDAEC)	; &I-HZK02-DAEC;
+      (=ucs@iso		  . #x20E62)	; &HZK02-DAEC;
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -22131,10 +22714,6 @@
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA37)	; 嘆
-      (=jis-x0213-1-2000  . #x2F2F)	; &I-JX1-2F2F; [15-15]
-      ))
     (shinjigen-1	. 1199)
     (shinjigen-2	. 1199)
     (=jis-x0208		. #x4332)	; &GT-05142; [35-18]
@@ -22143,6 +22722,10 @@
     (=gt-pj-1		. #x4332)	; &I-GT-05142; [35-18]
     (=ucs@jis		. #x5606)	; &GT-05142;
     (mojikyo		. 050123)	; &MCS-6000C3CB;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA37)	; 嘆
+      (=jis-x0213-1-2000  . #x2F2F)	; &I-JX1-2F2F; [15-15]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -22266,7 +22849,9 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x8377)	; &UU+8377;
+     ((=jis-x0208	  . #x3259)	; &GT-40271; [18-57]
+      (=gb2312		  . #x3A49)	; &I-G0-3A49; [26-41]
+      (=ks-x1001	  . #x7943)	; &I-K0-7943; [89-35]
       ))
     (=gb2312		. #x6040)	; &HZK02-DB47; [64-32]
     (=hanziku-2		. #xDB47)	; &I-HZK02-DB47;
@@ -22493,7 +23078,8 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x7562)	; &UU+7562;
+     ((=gb12345		  . #x314F)	; &GT-28043; [17-47]
+      (=daikanwa	  . 21829)	; &GT-28043;
       ))
     (=jis-x0212		. #x3628)	; &JSP-3628; [22-08]
     (=gb12345		. #x5F59)	; &JSP-3628; [63-57]
@@ -22511,34 +23097,24 @@
     (=hanziku-2		. #xDD50)	; &I-HZK02-DD50;
     ))
 (define-char
-  '((=>ucs		. #x20ED5)	; 𠻕
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=daikanwa		. 04141)	; &M-04141;
-    ))
-(define-char
-  '((morohashi-daikanwa	4141 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x20ED5)	; 𠻕
-    (=cns11643-6	. #x5B40)	; &I-C6-5B40; [59-32]
-    ))
-(define-char
-  '((=>ucs		. #x20ED5)	; 𠻕
-    (morohashi-daikanwa	4141 0 1)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (hanyu-dazidian	1 679 3)
-    (=hanziku-2		. #xDDEA)	; &HZK02-DDEA;
+    (->subsumptive
+     ((=daikanwa	  . 04141)	; &M-04141;
+      )
+     ((=cns11643-6	  . #x5B40)	; &C6-5B40; [59-32]
+      (=ucs@iso		  . #x20ED5)	; &C6-5B40;
+      )
+     ((hanyu-dazidian	  1 679 3)
+      (=hanziku-2	  . #xDDEA)	; &HZK02-DDEA;
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (hanyu-dazidian	1 664 4)
     (=ucs		. #x55F7)	; 嗷
-    (=big5		. #xB9C8)	; &I-B-B9C8;
     ))
 (define-char
   '((<-denotational
@@ -22569,39 +23145,43 @@
      ((=ucs		  . #x55F7)	; 嗷
       ))
     (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (=big5		. #xB9C8)	; &B-B9C8;
+    (=ucs@big5		. #x55F7)	; &B-B9C8;
+    (->subsumptive
+     ((ideographic-strokes . 10)
+      (total-strokes	   . 13)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=gb2312	    . #x303D)	; &G0-303D; [16-29]
+	))
+      (=gb2312		  . #x603B)	; &G0-603B; [64-27]
+      (=ucs@unicode	  . #x55F7)	; &G0-603B;
       )
-     ((=ucs@unicode	  . #x6556)	; &UU+6556;
+     ((ideographic-strokes . 11)
+      (total-strokes	   . 14)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x5A72)	; &C1-5A72; [58-82]
+	))
+      (=cns11643-1	  . #x6830)	; &C1-6830; [72-16]
       ))
-    (=gb2312		. #x603B)	; &G0-603B; [64-27]
-    (=ucs@unicode	. #x55F7)	; &G0-603B;
     ))
 (define-char
-  '((<-denotational
-     ((=ucs		  . #x55F7)	; 嗷
-      ))
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=cns11643-1	  . #x5A72)	; &C1-5A72; [58-82]
-      ))
-    (=cns11643-1	. #x6830)	; &C1-6830; [72-16]
-    (=ucs@big5		. #x55F7)	; &C1-6830;
+  '((ideographic-radical . 30)	; ⼝
+    (=ucs		. #x55F8)	; 嗸
     ))
 (define-char
-  '((=>ucs		. #x55F8)	; 嗸
+  '((<-denotational
+     ((=ucs		  . #x55F8)	; 嗸
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
@@ -22618,37 +23198,37 @@
     (=daikanwa		. 04143)	; &M-04143;
     ))
 (define-char
-  '((=>ucs		. #x55F8)	; 嗸
-    (morohashi-daikanwa	4143 0 2)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=cns11643-1	  . #x5A72)	; &C1-5A72; [58-82]
-      )
-     ((=ucs		  . #x53E3)	; 口
+  '((<-denotational
+     ((=ucs		  . #x55F8)	; 嗸
       ))
-    (=cns11643-3	. #x462E)	; &C3-462E; [38-14]
-    ))
-(define-char
-  '((morohashi-daikanwa	4143 0 3)
     (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (hanyu-dazidian	1 664 5)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x6556)	; 敖
+    (->subsumptive
+     ((ideographic-strokes . 11)
+      (total-strokes	   . 14)
+      (hanyu-dazidian	  1 664 5)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=gb2312	    . #x303D)	; &G0-303D; [16-29]
+	)
+       ((=ucs		    . #x53E3)	; 口
+	))
+      (=hanziku-2	  . #xDAE3)	; &HZK02-DAE3;
+      (=ucs@unicode	  . #x55F8)	; &HZK02-DAE3;
       )
-     ((=ucs		  . #x53E3)	; 口
+     ((ideographic-strokes . 11)
+      (total-strokes	   . 14)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=cns11643-1	    . #x5A72)	; &C1-5A72; [58-82]
+	)
+       ((=ucs		    . #x53E3)	; 口
+	))
+      (=cns11643-3	  . #x462E)	; &C3-462E; [38-14]
       ))
-    (=ucs		. #x55F8)	; 嗸
-    (=hanziku-2		. #xDAE3)	; &I-HZK02-DAE3;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -22784,7 +23364,7 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x9023)	; &GT-52060;
+     ((=jis-x0208	  . #x4F22)	; &GT-52060; [47-02]
       ))
     (=ucs@unicode	. #x55F9)	; &UU+55F9;
     ))
@@ -22832,7 +23412,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5D14)	; &UU+5D14;
+       ((=gb2312	    . #x345E)	; &C1-597E; [20-62]
+	(=cns11643-1	    . #x597E)	; &I-C1-597E; [57-94]
 	))
       (=cns11643-2	  . #x4938)	; &C2-4938; [41-24]
       (=ucs@unicode	  . #x55FA)	; &C2-4938;
@@ -23085,19 +23666,33 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (hanyu-dazidian	1 678 13)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=ucs		  . #x5547)	; 啇
-      ))
     (=ucs		. #x5600)	; 嘀
-    (=gb2312		. #x6056)	; &I-G0-6056; [64-54]
-    (=cns11643-1	. #x6827)	; &I-C1-6827; [72-07]
     (=big5		. #xB9BF)	; &I-B-B9BF;
-    (=daikanwa		. 04164)	; &I-M-04164;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0212	    . #x3557)	; &M-03804; [21-55]
+	(=jis-x0213-2-2000  . #x2424)	; &I-JX2-2424; [04-04]
+	(=daikanwa	    . 03804)	; &I-M-03804;
+	))
+      (=daikanwa	  . 04164)	; &M-04164;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-4	    . #x3074)	; &C4-3074; [16-84]
+	))
+      (=gb2312		  . #x6056)	; &C1-6827; [64-54]
+      (=cns11643-1	  . #x6827)	; &I-C1-6827; [72-07]
+      (=ucs@unicode	  . #x5600)	; &C1-6827;
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -23123,95 +23718,92 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (hanyu-dazidian	1 676 13)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
-      (=ucs		  . #x2FF2)	; ⿲
-      )
-     ((=ucs		  . #x5415)	; 吕
-      )
-     ((=ucs		  . #x4E29)	; 丩
-      )
-     ((=ucs		  . #x5415)	; 吕
-      ))
     (=ucs		. #x5602)	; 嘂
-    (=cns11643-2	. #x4937)	; &I-C2-4937; [41-23]
     (=big5		. #xE150)	; &I-B-E150;
-    (=daikanwa		. 04166)	; &I-M-04166;
-    ))
-(define-char
-  '((=>ucs		. #x5603)	; 嘃
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (->subsumptive
+     ((=daikanwa	  . 04166)	; &M-04166;
+      (=ucs@unicode	  . #x5602)	; &M-04166;
       )
-     ((=ucs		  . #x5EB8)	; 庸
+     ((=cns11643-2	  . #x4937)	; &C2-4937; [41-23]
       ))
-    (=daikanwa		. 04167)	; &M-04167;
     ))
 (define-char
-  '((morohashi-daikanwa	4167 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 678 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (=ucs		. #x5603)	; 嘃
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x4D47)	; &GT-11819; [45-39]
+	(=ks-x1001	    . #x693C)	; &I-K0-693C; [73-28]
+	(=daikanwa	    . 09378)	; &I-M-09378;
+	))
+      (=daikanwa	  . 04167)	; &M-04167;
       )
-     ((=ucs		  . #x5EB8)	; 庸
+     ((hanyu-dazidian	  1 678 11)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=gb2312	    . #x5339)	; &C1-5A2B; [51-25]
+	(=cns11643-1	    . #x5A2B)	; &I-C1-5A2B; [58-11]
+	))
+      (=cns11643-3	  . #x4629)	; &HZK02-DDD2; [38-09]
+      (=hanziku-2	  . #xDDD2)	; &I-HZK02-DDD2;
+      (=ucs@unicode	  . #x5603)	; &HZK02-DDD2;
       ))
-    (=ucs		. #x5603)	; 嘃
-    (=cns11643-3	. #x4629)	; &I-C3-4629; [38-09]
-    (=hanziku-2		. #xDDD2)	; &I-HZK02-DDD2;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (hanyu-dazidian	1 677 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=ucs		  . #x689F)	; 梟
-      ))
     (=ucs		. #x5604)	; 嘄
-    (=cns11643-2	. #x493A)	; &I-C2-493A; [41-26]
     (=big5		. #xE153)	; &I-B-E153;
-    (=daikanwa		. 04168)	; &I-M-04168;
-    ))
-(define-char
-  '((=>ucs		. #x20EE0)	; ð » 
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=daikanwa		. 04169)	; &M-04169;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=gb12345	    . #x6849)	; &UU+689F; [72-41]
+	))
+      (=daikanwa	  . 04168)	; &M-04168;
+      (=ucs@unicode	  . #x5604)	; &M-04168;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x5B40)	; &C1-5B40; [59-32]
+	))
+      (=cns11643-2	  . #x493A)	; &C2-493A; [41-26]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	4169 0 1)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x20EE0)	; ð » 
-    (=cns11643-5	. #x4475)	; &I-C5-4475; [36-85]
-    ))
-(define-char
-  '((=>ucs		. #x20EE0)	; ð » 
-    (morohashi-daikanwa	4169 0 2)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (hanyu-dazidian	1 673 4)
-    (=hanziku-2		. #xDCC8)	; &HZK02-DCC8;
+    (->subsumptive
+     ((=daikanwa	  . 04169)	; &M-04169;
+      )
+     ((=cns11643-5	  . #x4475)	; &C5-4475; [36-85]
+      (=ucs@iso		  . #x20EE0)	; &C5-4475;
+      )
+     ((hanyu-dazidian	  1 673 4)
+      (=hanziku-2	  . #xDCC8)	; &HZK02-DCC8;
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -23280,7 +23872,7 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x65E2)	; &G0-3C48;
+     ((=gb2312		  . #x3C48)	; &G0-3C48; [28-40]
       ))
     (=gb12345		. #x7C31)	; &HZK02-DAA7; [92-17]
     (=hanziku-2		. #xDAA7)	; &HZK02-DAA7;
@@ -23290,6 +23882,8 @@
   '((<-denotational
      ((=ucs		  . #x5606)	; 嘆
       ))
+    (=>ucs@gb		. #x5606)	; 嘆
+    (=>ucs@cns		. #x5606)	; &C1-682C;
     (=>ucs@jis		. #xFA37)	; 嘆
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 11)
@@ -23324,55 +23918,71 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 680 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (=ucs		. #x5607)	; 嘇
+    (->subsumptive
+     ((hanyu-dazidian	  1 680 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=ucs		    . #x53C3)	; 參
+	))
+      (=jis-x0213-2-2000  . #x243E)	; &M-04172; [04-30]
+      (=daikanwa	  . 04172)	; &I-M-04172;
+      (=hanziku-2	  . #xDE4B)	; &I-HZK02-DE4B;
+      (=ucs@unicode	  . #x5607)	; &M-04172;
       )
-     ((=ucs		  . #x53C3)	; 參
+     ((=cns11643-3	  . #x462C)	; &CB00072; [38-12]
+      (=cbeta		  . 00072)	; &I-CB00072;
       ))
-    (=ucs		. #x5607)	; 嘇
-    (=cns11643-3	. #x462C)	; &I-C3-462C; [38-12]
-    (=jis-x0213-2-2000	. #x243E)	; &I-JX2-243E; [04-30]
-    (=daikanwa		. 04172)	; &I-M-04172;
-    (=hanziku-2		. #xDE4B)	; &I-HZK02-DE4B;
-    (=cbeta		. 00072)	; &I-CB00072;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (=ucs		. #x35E5)	; 㗥
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x3354)	; &GT-53074; [19-52]
+	(=ks-x1001	    . #x4E2C)	; &I-K0-4E2C; [46-12]
+	(=daikanwa	    . 39474)	; &I-M-39474;
+	))
+      (=daikanwa	  . 04173)	; &M-04173;
+      (=cbeta		  . 00943)	; &I-CB00943;
       )
-     ((=ucs		  . #x90ED)	; 郭
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=gb2312	    . #x3979)	; &C1-5D66; [25-89]
+	(=cns11643-1	    . #x5D66)	; &I-C1-5D66; [61-70]
+	))
+      (=cns11643-3	  . #x462D)	; &C3-462D; [38-13]
+      (=ucs@unicode	  . #x35E5)	; &C3-462D;
       ))
-    (=ucs		. #x35E5)	; 㗥
-    (=cns11643-3	. #x462D)	; &I-C3-462D; [38-13]
-    (=daikanwa		. 04173)	; &I-M-04173;
-    (=cbeta		. 00943)	; &I-CB00943;
     ))
 (define-char
-  '((=>ucs		. #x20EE1)	; ð »¡
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=daikanwa		. 04174)	; &M-04174;
-    ))
-(define-char
-  '((morohashi-daikanwa	4174 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 679 8)
     (=ucs		. #x20EE1)	; ð »¡
-    (=cns11643-5	. #x447C)	; &I-C5-447C; [36-92]
-    (=hanziku-2		. #xDDEF)	; &I-HZK02-DDEF;
+    (->subsumptive
+     ((=daikanwa	  . 04174)	; &M-04174;
+      )
+     ((hanyu-dazidian	  1 679 8)
+      (=cns11643-5	  . #x447C)	; &HZK02-DDEF; [36-92]
+      (=hanziku-2	  . #xDDEF)	; &I-HZK02-DDEF;
+      (=ucs@iso		  . #x20EE1)	; &HZK02-DDEF;
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -23806,7 +24416,9 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x8656)	; &M-32698;
+       ((=jis-x0212	    . #x5A3B)	; &M-32698; [58-27]
+	(=jis-x0213-2-2000  . #x773A)	; &I-JX2-773A; [87-26]
+	(=daikanwa	    . 32698)	; &I-M-32698;
 	))
       (=jis-x0212	  . #x3631)	; &M-04195; [22-17]
       (=daikanwa	  . 04195)	; &I-M-04195;
@@ -23920,7 +24532,9 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x796D)	; &GT-31678;
+       ((=jis-x0208	    . #x3A57)	; &GT-31678; [26-55]
+	(=gb2312	    . #x3C40)	; &I-G0-3C40; [28-32]
+	(=ks-x1001	    . #x702E)	; &I-K0-702E; [80-14]
 	))
       (=cbeta		  . 05356)	; &CB05356;
       (=ucs@unicode	  . #x35EB)	; &CB05356;
@@ -24155,40 +24769,21 @@
     (=daikanwa		. 04207)	; &I-M-04207;
     ))
 (define-char
-  '((=>ucs		. #x20EEB)	; ð »«
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=daikanwa		. 04208)	; &M-04208;
-    ))
-(define-char
-  '((morohashi-daikanwa	4208 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 678 5)
     (=ucs		. #x20EEB)	; ð »«
-    (=cns11643-5	. #x4472)	; &I-C5-4472; [36-82]
-    (=hanziku-2		. #xDDCC)	; &I-HZK02-DDCC;
-    ))
-(define-char
-  '((=>ucs		. #x20EEC)	; 𠻬
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (->subsumptive
+     ((=daikanwa	  . 04208)	; &M-04208;
       )
-     ((=ucs		  . #x837C)	; 荼
+     ((hanyu-dazidian	  1 678 5)
+      (=cns11643-5	  . #x4472)	; &HZK02-DDCC; [36-82]
+      (=hanziku-2	  . #xDDCC)	; &I-HZK02-DDCC;
+      (=ucs@iso		  . #x20EEB)	; &HZK02-DDCC;
       ))
-    (=daikanwa		. 04209)	; &M-04209;
     ))
 (define-char
-  '((morohashi-daikanwa	4209 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (hanyu-dazidian	1 673 12)
@@ -24198,10 +24793,12 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs		  . #x837C)	; 荼
+     ((=cns11643-1	  . #x5D25)	; &M-31008; [61-05]
+      (=daikanwa	  . 31008)	; &I-M-31008;
       ))
     (=ucs		. #x20EEC)	; 𠻬
     (=cns11643-5	. #x4479)	; &I-C5-4479; [36-89]
+    (=daikanwa		. 04209)	; &I-M-04209;
     (=hanziku-2		. #xDCD0)	; &I-HZK02-DCD0;
     (=cbeta		. 01021)	; &I-CB01021;
     ))
@@ -24218,7 +24815,10 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x5A46)	; &GT-08077;
+       ((=jis-x0208	    . #x474C)	; &GT-08077; [39-44]
+	(=gb2312	    . #x4645)	; &I-G0-4645; [38-37]
+	(=ks-x1001	    . #x7768)	; &I-K0-7768; [87-72]
+	(=daikanwa	    . 06390)	; &I-M-06390;
 	))
       (=jis-x0212	  . #x3633)	; &M-04210; [22-19]
       (=daikanwa	  . 04210)	; &I-M-04210;
@@ -24238,21 +24838,19 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x20EED)	; ð »­
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=daikanwa		. 04211)	; &M-04211;
-    ))
-(define-char
-  '((morohashi-daikanwa	4211 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 794 8)
     (=ucs		. #x20EED)	; ð »­
-    (=cns11643-6	. #x5B52)	; &I-C6-5B52; [59-50]
-    (=hanziku-2		. #xF575)	; &I-HZK02-F575;
+    (->subsumptive
+     ((=daikanwa	  . 04211)	; &M-04211;
+      )
+     ((hanyu-dazidian	  1 794 8)
+      (=hanziku-2	  . #xF575)	; &HZK02-F575;
+      (=ucs@iso		  . #x20EED)	; &HZK02-F575;
+      )
+     ((=cns11643-6	  . #x5B52)	; &C6-5B52; [59-50]
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -25331,11 +25929,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5376)	; &GT-05875; [51-86]
-      (=ks-x1001	  . #x7536)	; &I-K0-7536; [85-22]
-      (=daikanwa	  . 04654)	; &I-M-04654;
-      ))
     (hanyu-dazidian	1 687 10)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -25345,6 +25938,7 @@
       )
      ((=ucs		  . #x5C5E)	; 属
       ))
+    (shinjigen-1	. 1237)
     (shinjigen-2	. 1237)
     (=ucs		. #x5631)	; 嘱
     (=jis-x0208		. #x3E7C)	; &I-J90-3E7C; [30-92]
@@ -25354,6 +25948,18 @@
     (=gt-pj-1		. #x3E7C)	; &I-GT-05399; [30-92]
     (=daikanwa		. 04249)	; &I-M-04249;
     (=hanziku-2		. #xDFB7)	; &I-HZK02-DFB7;
+    (<-simplified@CN
+     ((=cns11643-1	  . #x7C5D)	; &C1-7C5D; [92-61]
+      (=gb12345		  . #x5676)	; &C1-7C5D; [54-86]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5376)	; &GT-05875; [51-86]
+      (=ks-x1001	  . #x7536)	; &I-K0-7536; [85-22]
+      (=daikanwa	  . 04654)	; &I-M-04654;
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x56D1)	; 囑
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -25444,7 +26050,7 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x671D)	; &UU+671D;
+     ((=ucs		  . #x671D)	; 朝
       ))
     (=gb2312		. #x3330)	; &GT-05428; [19-16]
     (=jis-x0208@1983	. #x535E)	; &I-J83-535E; [51-62]
@@ -26338,65 +26944,116 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x35F5)	; 㗵
-    (=cns11643-3	. #x4B36)	; &I-C3-4B36; [43-22]
-    (=daikanwa		. 04295)	; &I-M-04295;
+    (->subsumptive
+     ((=daikanwa	  . 04295)	; &M-04295;
+      )
+     ((=ucs@unicode	  . #x35F5)	; &UU+35F5;
+      )
+     ((=cns11643-3	  . #x4B36)	; &C3-4B36; [43-22]
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (hanyu-dazidian	1 682 15)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=ucs		  . #x6701)	; 朁
-      ))
     (=ucs		. #x5646)	; 噆
-    (=jis-x0212		. #x3642)	; &I-JSP-3642; [22-34]
-    (=cns11643-2	. #x4F65)	; &I-C2-4F65; [47-69]
-    (=big5		. #xE4FD)	; &I-B-E4FD;
-    (=daikanwa		. 04296)	; &I-M-04296;
     ))
 (define-char
-  '((=>ucs		. #x5647)	; 噇
+  '((<-denotational
+     ((=ucs		  . #x5646)	; 噆
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=daikanwa	    . 14302)	; &M-14302;
+	))
+      (=daikanwa	  . 04296)	; &M-04296;
       )
-     ((=jis-x0208	  . #x4638)	; &GT-33246; [38-24]
-      (=ks-x1001	  . #x545B)	; &I-K0-545B; [52-59]
-      (=daikanwa	  . 25775)	; &I-M-25775;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0213-2-2000  . #x2E37)	; &JX2-2E37; [14-23]
+	))
+      (=jis-x0212	  . #x3642)	; &JSP-3642; [22-34]
+      (=ucs@jis		  . #x5646)	; &JSP-3642;
       ))
-    (=jis-x0213-2-2000	. #x2446)	; &M-04297; [04-38]
-    (=daikanwa		. 04297)	; &I-M-04297;
-    (=cbeta		. 01229)	; &I-CB01229;
-    (=ucs@jis		. #x5647)	; &M-04297;
     ))
 (define-char
-  '((morohashi-daikanwa	4297 0 0)
+  '((<-denotational
+     ((=ucs		  . #x5646)	; 噆
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (hanyu-dazidian	1 686 2)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (=big5		. #xE4FD)	; &B-E4FD;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=ucs@unicode	    . #x6701)	; &UU+6701;
+	))
+      (=ucs@unicode	  . #x5646)	; &UU+5646;
       )
-     ((=ucs		  . #x7AE5)	; ç«¥
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-2	    . #x3C4C)	; &C2-3C4C; [28-44]
+	))
+      (=cns11643-2	  . #x4F65)	; &C2-4F65; [47-69]
       ))
+    ))
+(define-char
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
     (=ucs		. #x5647)	; 噇
-    (=cns11643-3	. #x4B37)	; &I-C3-4B37; [43-23]
-    (=hanziku-2		. #xDF6D)	; &I-HZK02-DF6D;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x4638)	; &GT-33246; [38-24]
+	(=ks-x1001	    . #x545B)	; &I-K0-545B; [52-59]
+	(=daikanwa	    . 25775)	; &I-M-25775;
+	))
+      (=jis-x0213-2-2000  . #x2446)	; &M-04297; [04-38]
+      (=daikanwa	  . 04297)	; &I-M-04297;
+      (=cbeta		  . 01229)	; &I-CB01229;
+      (=ucs@jis		  . #x5647)	; &M-04297;
+      )
+     ((hanyu-dazidian	  1 686 2)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=gb2312	    . #x4D2F)	; &C1-6129; [45-15]
+	(=cns11643-1	    . #x6129)	; &I-C1-6129; [65-09]
+	))
+      (=cns11643-3	  . #x4B37)	; &HZK02-DF6D; [43-23]
+      (=hanziku-2	  . #xDF6D)	; &I-HZK02-DF6D;
+      (=ucs@unicode	  . #x5647)	; &HZK02-DF6D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -26412,7 +27069,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=daikanwa	    . 07599)	; &I-M-07599;
+       ((=jis-x0208	    . #x3D22)	; &GT-09571; [29-02]
+	(=ks-x1001	    . #x7626)	; &I-K0-7626; [86-06]
 	))
       (=daikanwa	  . 04298)	; &M-04298;
       )
@@ -26422,10 +27080,19 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=gb2312	    . #x3E4D)	; &G0-3E4D; [30-45]
+       ((=cns11643-1	    . #x5E73)	; &C1-5E73; [62-83]
 	))
       (=cns11643-2	  . #x4F5E)	; &C2-4F5E; [47-62]
-      (=ucs@unicode	  . #x5648)	; &C2-4F5E;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=gb2312	    . #x3E4D)	; &G0-3E4D; [30-45]
+	))
+      (=ucs@unicode	  . #x5648)	; &UU+5648;
       ))
     ))
 (define-char
@@ -26446,7 +27113,10 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=jis-x0208@1990	  . #x343A)	; &I-J90-343A; [20-26]
+     ((=ks-x1001	  . #x4A72)	; &GT-16742; [42-82]
+      (=jis-x0208@1990	  . #x343A)	; &I-J90-343A; [20-26]
+      (=cns11643-1	  . #x5F56)	; &I-C1-5F56; [63-54]
+      (=daikanwa	  . 13260)	; &I-M-13260;
       ))
     (=jis-x0212		. #x3643)	; &M-04299; [22-35]
     (=cns11643-2	. #x4F64)	; &I-C2-4F64; [47-68]
@@ -26470,7 +27140,7 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x6562)	; &G0-3852;
+     ((=gb2312		  . #x3852)	; &G0-3852; [24-50]
       ))
     (=ucs@unicode	. #x5649)	; &UU+5649;
     ))
@@ -26480,6 +27150,15 @@
     (total-strokes	 . 15)
     (hanyu-dazidian	1 687 16)
     (=ucs		. #x564A)	; 噊
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x564A)	; 噊
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=big5		. #xE4FB)	; &B-E4FB;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -26491,8 +27170,7 @@
 	(=jis-x0213-2-2000  . #x7233)	; &I-JX2-7233; [82-19]
 	(=daikanwa	    . 23863)	; &I-M-23863;
 	))
-      (=big5		  . #xE4FB)	; &M-04300;
-      (=daikanwa	  . 04300)	; &I-M-04300;
+      (=daikanwa	  . 04300)	; &M-04300;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -26504,20 +27182,12 @@
 	))
       (=cns11643-2	  . #x4F63)	; &C2-4F63; [47-67]
       (=ucs@cns		  . #x564A)	; &C2-4F63;
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x53E3)	; 口
-	)
-       ((=ucs@unicode	    . #x77DE)	; &EGB-7D75;
-	))
-      (=ucs@unicode	  . #x564A)	; &UU+564A;
       ))
     ))
 (define-char
-  '((=>ucs		. #x564B)	; 噋
+  '((<-denotational
+     ((=ucs		  . #x564A)	; 噊
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
@@ -26527,54 +27197,60 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs		  . #x6566)	; 敦
+     ((=iso-ir165	  . #x7D75)	; &EGB-7D75; [93-85]
       ))
-    (=jis-x0212		. #x3644)	; &M-04301; [22-36]
-    (=daikanwa		. 04301)	; &I-M-04301;
-    (=ucs@jis		. #x564B)	; &M-04301;
+    (=ucs@unicode	. #x564A)	; &UU+564A;
     ))
 (define-char
-  '((morohashi-daikanwa	4301 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (hanyu-dazidian	1 685 18)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (=ucs		. #x564B)	; 噋
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x4658)	; &GT-16781; [38-56]
+	(=ks-x1001	    . #x5444)	; &I-K0-5444; [52-36]
+	(=daikanwa	    . 13276)	; &I-M-13276;
+	))
+      (=jis-x0212	  . #x3644)	; &M-04301; [22-36]
+      (=daikanwa	  . 04301)	; &I-M-04301;
+      (=jef-china3	  . #x47A7)	; &I-JC3-47A7;
+      (=ucs@jis		  . #x564B)	; &M-04301;
       )
-     ((=ucs		  . #x6566)	; 敦
+     ((hanyu-dazidian	  1 685 18)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=gb2312	    . #x3658)	; &C1-5F55; [22-56]
+	(=cns11643-1	    . #x5F55)	; &I-C1-5F55; [63-53]
+	))
+      (=cns11643-3	  . #x4B3B)	; &HZK02-DF5D; [43-27]
+      (=hanziku-2	  . #xDF5D)	; &I-HZK02-DF5D;
+      (=ucs@unicode	  . #x564B)	; &HZK02-DF5D;
       ))
-    (=ucs		. #x564B)	; 噋
-    (=cns11643-3	. #x4B3B)	; &I-C3-4B3B; [43-27]
-    (=hanziku-2		. #xDF5D)	; &I-HZK02-DF5D;
-    (=jef-china3	. #x47A7)	; &I-JC3-47A7;
-    ))
-(define-char
-  '((=>ucs		. #x20F7D)	; ð ½½
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=daikanwa		. 04302)	; &M-04302;
     ))
 (define-char
-  '((morohashi-daikanwa	4302 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x20F7D)	; ð ½½
-    (=cns11643-7	. #x215A)	; &I-C7-215A; [01-58]
-    ))
-(define-char
-  '((=>ucs		. #x20F7D)	; ð ½½
-    (morohashi-daikanwa	4302 0 1)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (hanyu-dazidian	1 683 9)
-    (=hanziku-2		. #xDED3)	; &HZK02-DED3;
+    (->subsumptive
+     ((=daikanwa	  . 04302)	; &M-04302;
+      )
+     ((=cns11643-7	  . #x215A)	; &C7-215A; [01-58]
+      (=ucs@iso		  . #x20F7D)	; &C7-215A;
+      )
+     ((hanyu-dazidian	  1 683 9)
+      (=hanziku-2	  . #xDED3)	; &HZK02-DED3;
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -26621,11 +27297,11 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x66FE)	; &UU+66FE;
+     ((=gb2312		  . #x5478)	; &C1-5F64; [52-88]
+      (=cns11643-1	  . #x5F64)	; &I-C1-5F64; [63-68]
       ))
     (=gb2312		. #x6061)	; &C2-4F60; [64-65]
     (=cns11643-2	. #x4F60)	; &I-C2-4F60; [47-64]
-    (=jef-china3	. #x70B8)	; &I-JC3-70B8;
     (=ucs@unicode	. #x564C)	; &C2-4F60;
     ))
 (define-char
@@ -26639,6 +27315,7 @@
     (=jis-x0208@1990	. #x4139)	; &I-J90-4139; [33-25]
     (=gt		. 05268)	; &I-GT-05268;
     (=gt-pj-1		. #x4139)	; &I-GT-05268; [33-25]
+    (=jef-china3	. #x70B8)	; &I-JC3-70B8;
     (=ucs@jis		. #x564C)	; &GT-05268;
     ))
 (define-char
@@ -26664,76 +27341,71 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=ucs		  . #x767C)	; 發
-      ))
     (=ucs		. #x35F6)	; 㗶
-    (=daikanwa		. 04305)	; &I-M-04305;
-    (=cbeta		. 03308)	; &I-CB03308;
-    ))
-(define-char
-  '((=>ucs		. #x35F6)	; 㗶
-    (morohashi-daikanwa	4305 0 0)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=jis-x0208	  . #x6224)	; &GT-29057; [66-04]
-      (=ks-x1001	  . #x5B21)	; &I-K0-5B21; [59-01]
-      (=cns11643-1	  . #x6075)	; &I-C1-6075; [64-85]
-      (=daikanwa	  . 22669)	; &I-M-22669;
-      ))
-    (=cns11643-7	. #x214E)	; &C7-214E; [01-46]
-    ))
-(define-char
-  '((=>ucs		. #x564D)	; 噍
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=gb12345	    . #x3722)	; &UU+767C; [23-02]
+	))
+      (=daikanwa	  . 04305)	; &M-04305;
+      (=cbeta		  . 03308)	; &I-CB03308;
+      (=ucs@unicode	  . #x35F6)	; &M-04305;
       )
-     ((=jis-x0208	  . #x3E47)	; &GT-24496; [30-39]
-      (=ks-x1001	  . #x7525)	; &I-K0-7525; [85-05]
-      (=daikanwa	  . 19119)	; &I-M-19119;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x6224)	; &GT-29057; [66-04]
+	(=ks-x1001	    . #x5B21)	; &I-K0-5B21; [59-01]
+	(=cns11643-1	    . #x6075)	; &I-C1-6075; [64-85]
+	(=daikanwa	    . 22669)	; &I-M-22669;
+	))
+      (=cns11643-7	  . #x214E)	; &C7-214E; [01-46]
       ))
-    (=jis-x0212		. #x3645)	; &M-04306; [22-37]
-    (=daikanwa		. 04306)	; &I-M-04306;
-    (=cbeta		. 00076)	; &I-CB00076;
-    (=jef-china3	. #x47A9)	; &I-JC3-47A9;
-    (=ucs@jis		. #x564D)	; &M-04306;
     ))
 (define-char
-  '((morohashi-daikanwa	4306 0 1)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (hanyu-dazidian	1 684 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (=ucs		. #x564D)	; 噍
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x3E47)	; &GT-24496; [30-39]
+	(=ks-x1001	    . #x7525)	; &I-K0-7525; [85-05]
+	(=daikanwa	    . 19119)	; &I-M-19119;
+	))
+      (=jis-x0212	  . #x3645)	; &M-04306; [22-37]
+      (=daikanwa	  . 04306)	; &I-M-04306;
+      (=cbeta		  . 00076)	; &I-CB00076;
+      (=jef-china3	  . #x47A9)	; &I-JC3-47A9;
+      (=ucs@jis		  . #x564D)	; &M-04306;
       )
-     ((=ucs		  . #x7126)	; 焦
+     ((hanyu-dazidian	  1 684 10)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=gb2312	    . #x3D39)	; &C1-6050; [29-25]
+	(=cns11643-1	    . #x6050)	; &I-C1-6050; [64-48]
+	))
+      (=gb2312		  . #x605D)	; &HZK02-DEF4; [64-61]
+      (=cns11643-3	  . #x4B43)	; &I-C3-4B43; [43-35]
+      (=hanziku-2	  . #xDEF4)	; &I-HZK02-DEF4;
+      (=ucs@unicode	  . #x564D)	; &HZK02-DEF4;
       ))
-    (=ucs		. #x564D)	; 噍
-    (=gb2312		. #x605D)	; &I-G0-605D; [64-61]
-    (=cns11643-3	. #x4B43)	; &I-C3-4B43; [43-35]
-    (=hanziku-2		. #xDEF4)	; &I-HZK02-DEF4;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -26861,14 +27533,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (<-vulgar
-     ((shinjigen-1	  . 1225)
-      (=ucs		  . #xFA38)	; 器
-      (=jis-x0213-1-2000  . #x2F36)	; &I-JX1-2F36; [15-22]
-      (=daikanwa	  . 04376)	; &I-M-04376;
-      ))
-    (<-vulgar*sources
-     yupian daikanwa shinjigen-1)
     (hanyu-dazidian	1 683 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
@@ -26889,23 +27553,28 @@
     (=gt-pj-1		. #x535A)	; &I-GT-05355; [51-58]
     (=daikanwa		. 04311)	; &I-M-04311;
     (=hanziku-2		. #xDECB)	; &I-HZK02-DECB;
+    (<-vulgar
+     ((shinjigen-1	  . 1225)
+      (=ucs		  . #xFA38)	; 器
+      (=jis-x0213-1-2000  . #x2F36)	; &I-JX1-2F36; [15-22]
+      (=daikanwa	  . 04376)	; &I-M-04376;
+      ))
+    (<-vulgar*sources
+     yupian daikanwa shinjigen-1)
     ))
 (define-char
-  '((=>ucs		. #x20F81)	; 𠾁
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=daikanwa		. 04312)	; &M-04312;
-    ))
-(define-char
-  '((morohashi-daikanwa	4312 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (hanyu-dazidian	1 681 2)
     (=ucs		. #x20F81)	; 𠾁
-    (=cns11643-7	. #x2153)	; &I-C7-2153; [01-51]
-    (=hanziku-2		. #xDE6A)	; &I-HZK02-DE6A;
+    (->subsumptive
+     ((=daikanwa	  . 04312)	; &M-04312;
+      )
+     ((hanyu-dazidian	  1 681 2)
+      (=cns11643-7	  . #x2153)	; &HZK02-DE6A; [01-51]
+      (=hanziku-2	  . #xDE6A)	; &I-HZK02-DE6A;
+      (=ucs@iso		  . #x20F81)	; &HZK02-DE6A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -27541,18 +28210,26 @@
     (=ucs		. #x5674)	; 噴
     (=big5		. #xBC51)	; &I-B-BC51;
     (->subsumptive
-     ((<-vulgar
-       ((=ucs		    . #x2F84F)	; 噴
-	(=daikanwa	    . 04409)	; &I-M-04409;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x6235)	; &C1-6235; [66-21]
 	))
-      (<-vulgar*sources
-       kangxi daikanwa)
       (shinjigen-1	  . 1247)
       (shinjigen-2	  . 1247)
       (=jis-x0208@1978	  . #x4A2E)	; &M-04345; [42-14]
       (=jis-x0208@1983	  . #x4A2E)	; &I-J83-4A2E; [42-14]
       (=ks-x1001	  . #x5D44)	; &I-K0-5D44; [61-36]
       (=daikanwa	  . 04345)	; &I-M-04345;
+      (<-vulgar
+       ((=ucs		    . #x2F84F)	; 噴
+	(=daikanwa	    . 04409)	; &I-M-04409;
+	))
+      (<-vulgar*sources
+       kangxi daikanwa)
       )
      ((hanyu-dazidian	  1 680 9)
       (ideographic-structure
@@ -27561,7 +28238,9 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs		    . #x8CC1)	; 賁
+       ((=jis-x0208	    . #x6C4C)	; &GT-49201; [76-44]
+	(=ks-x1001	    . #x5D53)	; &I-K0-5D53; [61-51]
+	(=daikanwa	    . 36727)	; &I-M-36727;
 	))
       (=jis-x0208@1990	  . #x4A2E)	; &GT-05461; [42-14]
       (=cns11643-1	  . #x6C3B)	; &I-C1-6C3B; [76-27]
@@ -27576,27 +28255,34 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (hanyu-dazidian	1 682 18)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (=ucs		. #x5657)	; 噗
+    (->subsumptive
+     ((hanyu-dazidian	  1 682 18)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0212	    . #x583A)	; &CDP-8D48; [56-26]
+	(=jis-x0213-2-2000  . #x763C)	; &I-JX2-763C; [86-28]
+	(=daikanwa	    . 31164)	; &I-M-31164;
+	))
+      (=gb2312		  . #x605B)	; &M-04346; [64-59]
+      (=big5		  . #xBC50)	; &I-B-BC50;
+      (=daikanwa	  . 04346)	; &I-M-04346;
+      (=ucs@unicode	  . #x5657)	; &M-04346;
       )
-     ((=ucs		  . #x83D0)	; 菐
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-5	    . #x3B6F)	; &C5-3B6F; [27-79]
+	))
+      (=cns11643-1	  . #x6C3A)	; &C1-6C3A; [76-26]
       ))
-    (=ucs		. #x5657)	; 噗
-    (=gb2312		. #x605B)	; &I-G0-605B; [64-59]
-    (=big5		. #xBC50)	; &I-B-BC50;
-    (=daikanwa		. 04346)	; &I-M-04346;
-    ))
-(define-char
-  '((=>ucs		. #x5657)	; 噗
-    (morohashi-daikanwa	4346 0 0)
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=cns11643-1	. #x6C3A)	; &C1-6C3A; [76-26]
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -27619,28 +28305,57 @@
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
+    (=ucs		. #x5659)	; 噙
+    (=big5		. #xBEB2)	; &I-B-BEB2;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5659)	; 噙
+      ))
+    (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (hanyu-dazidian	1 685 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x3659)	; &GT-32101; [22-57]
+	(=ks-x1001	    . #x5058)	; &I-K0-5058; [48-56]
+	(=daikanwa	    . 24893)	; &I-M-24893;
+	))
+      (=daikanwa	  . 04348)	; &M-04348;
       )
-     ((=ucs		  . #x79BD)	; 禽
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=gb2312	    . #x475D)	; &G0-475D; [39-61]
+	))
+      (=gb2312		  . #x605F)	; &G0-605F; [64-63]
+      (=ucs@unicode	  . #x5659)	; &G0-605F;
       ))
-    (=ucs		. #x5659)	; 噙
-    (=gb2312		. #x605F)	; &I-G0-605F; [64-63]
-    (=big5		. #xBEB2)	; &I-B-BEB2;
-    (=daikanwa		. 04348)	; &I-M-04348;
     ))
 (define-char
-  '((=>ucs		. #x5659)	; 噙
-    (morohashi-daikanwa	4348 0 1)
+  '((<-denotational
+     ((=ucs		  . #x5659)	; 噙
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=cns11643-1	  . #x655D)	; &C1-655D; [69-61]
+      ))
     (=cns11643-1	. #x703B)	; &C1-703B; [80-27]
     ))
 (define-char
@@ -27648,20 +28363,47 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (hanyu-dazidian	1 687 5)
+    (=ucs		. #x565A)	; 噚
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x565A)	; 噚
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs		  . #x5C0B)	; 尋
+     ((=ks-x1001	  . #x637C)	; &GT-09374; [67-92]
+      (=cns11643-1	  . #x5E72)	; &I-C1-5E72; [62-82]
+      (=daikanwa	  . 07447)	; &I-M-07447;
       ))
-    (=ucs		. #x565A)	; 噚
-    (=cns11643-2	. #x4F67)	; &I-C2-4F67; [47-71]
+    (=cns11643-2	. #x4F67)	; &M-04349; [47-71]
     (=big5		. #xE540)	; &I-B-E540;
     (=daikanwa		. 04349)	; &I-M-04349;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x565A)	; 噚
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=jis-x0208	  . #x3F52)	; &GT-09375; [31-50]
+      ))
+    (=ucs@unicode	. #x565A)	; &UU+565A;
+    ))
+(define-char
   '((ideographic-radical . 30)	; ⼝
     (hanyu-dazidian	1 690 7)
     (=ucs		. #x5668)	; 器
@@ -27674,10 +28416,6 @@
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA38)	; 器
-      (=jis-x0213-1-2000  . #x2F36)	; &I-JX1-2F36; [15-22]
-      ))
     (shinjigen-1	. 1224)
     (shinjigen-2	. 1224)
     (=ucs		. #x20F96)	; 𠾖
@@ -27687,6 +28425,10 @@
     (=gt-pj-1		. #x346F)	; &I-GT-05357; [20-79]
     (=ucs@jis		. #x5668)	; 𠾖
     (mojikyo		. 050124)	; &MCS-6000C3CC;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA38)	; 器
+      (=jis-x0213-1-2000  . #x2F36)	; &I-JX1-2F36; [15-22]
+      ))
     ))
 (define-char
   '((ideographic-radical@ucs . 30)	; ⼝
@@ -28123,23 +28865,54 @@
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
+    (hanyu-dazidian	1 685 2)
+    (=ucs		. #x5662)	; 噢
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5662)	; 噢
+      ))
+    (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (hanyu-dazidian	1 685 2)
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x547C)	; &GT-07553; [52-92]
+	(=ks-x1001	    . #x6773)	; &I-K0-6773; [71-83]
+	(=daikanwa	    . 05985)	; &I-M-05985;
+	))
+      (=jis-x0212	  . #x364B)	; &M-04359; [22-43]
+      (=big5		  . #xBEBE)	; &I-B-BEBE;
+      (=daikanwa	  . 04359)	; &I-M-04359;
+      (=ucs@jis		  . #x5662)	; &M-04359;
+      )
+     ((=cns11643-1	  . #x7047)	; &C1-7047; [80-39]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5662)	; 噢
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs		  . #x5967)	; 奧
+     ((=jis-x0208	  . #x317C)	; &GT-07520; [17-92]
+      (=gb2312		  . #x3042)	; &I-G0-3042; [16-34]
+      (=daikanwa	  . 05981)	; &I-M-05981;
       ))
-    (=ucs		. #x5662)	; 噢
-    (=gb2312		. #x605E)	; &I-G0-605E; [64-62]
-    (=jis-x0212		. #x364B)	; &I-JSP-364B; [22-43]
-    (=cns11643-1	. #x7047)	; &I-C1-7047; [80-39]
-    (=big5		. #xBEBE)	; &I-B-BEBE;
-    (=daikanwa		. 04359)	; &I-M-04359;
+    (=gb2312		. #x605E)	; &G0-605E; [64-62]
+    (=ucs@unicode	. #x5662)	; &G0-605E;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -29762,14 +30535,6 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (<-vulgar
-     ((shinjigen-1	  . 1142)
-      (=ucs		  . #xFA36)	; 喝
-      (=jis-x0208@1978	  . #x3365)	; &I-J78-3365; [19-69]
-      (=jis-x0213-1-2000  . #x2F2C)	; &I-JX1-2F2C; [15-12]
-      ))
-    (<-vulgar*sources
-     jiyun danchuu daikanwa/p1 shinjigen-1)
     (hanyu-dazidian	1 695 13)
     (shinjigen-1	. 1143)
     (sound@ja/on/p1	"ai")
@@ -29779,6 +30544,14 @@
     (=cns11643-4	. #x557A)	; &I-C4-557A; [53-90]
     (=daikanwa		. 04434)	; &I-M-04434;
     (=hanziku-2		. #xE15E)	; &I-HZK02-E15E;
+    (<-vulgar
+     ((shinjigen-1	  . 1142)
+      (=ucs		  . #xFA36)	; 喝
+      (=jis-x0208@1978	  . #x3365)	; &I-J78-3365; [19-69]
+      (=jis-x0213-1-2000  . #x2F2C)	; &I-JX1-2F2C; [15-12]
+      ))
+    (<-vulgar*sources
+     jiyun danchuu daikanwa/p1 shinjigen-1)
     ))
 (define-char
   '((=>ucs		. #x2103F)	; 𡀿
@@ -31490,28 +32263,42 @@
     (=cns11643-4	. #x5A77)	; &I-C4-5A77; [58-87]
     ))
 (define-char
-  '((=>ucs		. #x21099)	; 𡂙
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (hanyu-dazidian	1 701 5)
-    (=daikanwa		. 04514)	; &M-04514;
-    (=hanziku-2		. #xE279)	; &I-HZK02-E279;
+    (=ucs		. #x21099)	; 𡂙
     ))
 (define-char
-  '((=>ucs		. #x21099)	; 𡂙
-    (morohashi-daikanwa	4514 0 2)
+  '((<-denotational
+     ((=ucs		  . #x21099)	; 𡂙
+      ))
     (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 16)
-    (total-strokes	 . 19)
-    (=cns11643-5	. #x6758)	; &C5-6758; [71-56]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (->subsumptive
+     ((=daikanwa	  . 04514)	; &M-04514;
+      )
+     ((hanyu-dazidian	  1 701 5)
+      (=hanziku-2	  . #xE279)	; &HZK02-E279;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	4514 0 3)
+  '((<-denotational
+     ((=ucs		  . #x21099)	; 𡂙
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x21099)	; 𡂙
+    (=ucs@iso		. #x21099)	; &U-00021099;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21099)	; 𡂙
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (=cns11643-5	. #x6758)	; &C5-6758; [71-56]
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -31519,6 +32306,7 @@
     (total-strokes	 . 18)
     (hanyu-dazidian	1 699 10)
     (=ucs		. #x5698)	; 嚘
+    (=big5		. #xEFBA)	; &I-B-EFBA;
     ))
 (define-char
   '((<-denotational
@@ -31550,10 +32338,10 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=cns11643-1	  . #x6C68)	; &C1-6C68; [76-72]
+     ((=jis-x0208	  . #x4D2B)	; &GT-14181; [45-11]
+      (=ks-x1001	  . #x6958)	; &I-K0-6958; [73-56]
       ))
-    (=cns11643-2	. #x6146)	; &C2-6146; [65-38]
-    (=ucs@cns		. #x5698)	; &C2-6146;
+    (=ucs@unicode	. #x5698)	; &UU+5698;
     ))
 (define-char
   '((<-denotational
@@ -31568,10 +32356,10 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x6182)	; &UU+6182;
+     ((=cns11643-1	  . #x6C68)	; &C1-6C68; [76-72]
       ))
-    (=big5		. #xEFBA)	; &B-EFBA;
-    (=ucs@unicode	. #x5698)	; &B-EFBA;
+    (=cns11643-2	. #x6146)	; &C2-6146; [65-38]
+    (=ucs@cns		. #x5698)	; &C2-6146;
     ))
 (define-char
   '((<-denotational
@@ -32251,18 +33039,18 @@
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (<-simplified
-     ((=ucs		  . #x56CA)	; 囊
-      (=daikanwa	  . 04633)	; &I-M-04633;
-      ))
-    (<-simplified*sources
-     daikanwa)
     (=ucs		. #x56A2)	; 嚢
     (=jis-x0208@1983	. #x4739)	; &I-J83-4739; [39-25]
     (=jis-x0208@1990	. #x4739)	; &I-J90-4739; [39-25]
     (=gt		. 05701)	; &I-GT-05701;
     (=gt-pj-1		. #x4739)	; &I-GT-05701; [39-25]
     (mojikyo		. 054288)	; &MCS-6000D410;
+    (<-simplified
+     ((=ucs		  . #x56CA)	; 囊
+      (=daikanwa	  . 04633)	; &I-M-04633;
+      ))
+    (<-simplified*sources
+     daikanwa)
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -33437,6 +34225,7 @@
 	  ))
 	)
        ((=ks-x1001	    . #x4A72)	; &GT-16742; [42-82]
+	(=jis-x0208@1990    . #x343A)	; &I-J90-343A; [20-26]
 	(=cns11643-1	    . #x5F56)	; &I-C1-5F56; [63-54]
 	(=daikanwa	    . 13260)	; &I-M-13260;
 	))
@@ -33497,79 +34286,102 @@
     (=ucs@unicode	. #x56B4)	; &UU+56B4;
     ))
 (define-char
-  '((=>ucs		. #x21117)	; 𡄗
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 17)
-    (total-strokes	 . 20)
-    (=daikanwa		. 04590)	; &M-04590;
-    ))
-(define-char
-  '((morohashi-daikanwa	4590 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
-    (hanyu-dazidian	1 704 2)
     (=ucs		. #x21117)	; 𡄗
-    (=cns11643-7	. #x4D49)	; &I-C7-4D49; [45-41]
-    (=hanziku-2		. #xE2F8)	; &I-HZK02-E2F8;
+    (->subsumptive
+     ((=daikanwa	  . 04590)	; &M-04590;
+      )
+     ((hanyu-dazidian	  1 704 2)
+      (=cns11643-7	  . #x4D49)	; &HZK02-E2F8; [45-41]
+      (=hanziku-2	  . #xE2F8)	; &I-HZK02-E2F8;
+      (=ucs@iso		  . #x21117)	; &HZK02-E2F8;
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (hanyu-dazidian	1 704 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=ucs		  . #x6BDA)	; 毚
-      ))
     (=ucs		. #x56B5)	; 嚵
-    (=cns11643-2	. #x686C)	; &I-C2-686C; [72-76]
     (=big5		. #xF440)	; &I-B-F440;
-    (=daikanwa		. 04591)	; &I-M-04591;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0212	    . #x4639)	; &M-16767; [38-25]
+	(=iso-ir165	    . #x7A3B)	; &I-EGB-7A3B; [90-27]
+	(=jis-x0213-2-2000  . #x6E29)	; &I-JX2-6E29; [78-09]
+	(=daikanwa	    . 16767)	; &I-M-16767;
+	))
+      (=daikanwa	  . 04591)	; &M-04591;
+      (=ucs@unicode	  . #x56B5)	; &M-04591;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x737E)	; &C1-737E; [83-94]
+	))
+      (=cns11643-2	  . #x686C)	; &C2-686C; [72-76]
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (hanyu-dazidian	1 704 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
+    (=ucs		. #x56B6)	; 嚶
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x3145)	; &GT-08565; [17-37]
+	(=daikanwa	    . 06828)	; &I-M-06828;
+	))
+      (shinjigen-1	  . 1284)
+      (shinjigen-2	  . 1284)
+      (=jis-x0208	  . #x536D)	; &GT-05762; [51-77]
+      (=gb12345		  . #x6053)	; &GT-05762; [64-51]
+      (=big5		  . #xC458)	; &I-B-C458;
+      (=gt		  . 05762)	; &I-GT-05762;
+      (=gt-pj-1		  . #x536D)	; &I-GT-05762; [51-77]
+      (=daikanwa	  . 04592)	; &I-M-04592;
+      (=ucs@unicode	  . #x56B6)	; &GT-05762;
       )
-     ((=ucs		  . #x5B30)	; 嬰
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x734F)	; &C1-734F; [83-47]
+	))
+      (=cns11643-1	  . #x7963)	; &C1-7963; [89-67]
       ))
-    (shinjigen-2	. 1284)
-    (=ucs		. #x56B6)	; 嚶
-    (=jis-x0208		. #x536D)	; &I-J90-536D; [51-77]
-    (=cns11643-1	. #x7963)	; &I-C1-7963; [89-67]
-    (=gb12345		. #x6053)	; 嚶 [64-51]
-    (=big5		. #xC458)	; &I-B-C458;
-    (=gt		. 05762)	; &I-GT-05762;
-    (=gt-pj-1		. #x536D)	; &I-GT-05762; [51-77]
-    (=daikanwa		. 04592)	; &I-M-04592;
     ))
 (define-char
-  '((=>ucs		. #x21118)	; 𡄘
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 17)
-    (total-strokes	 . 20)
-    (=daikanwa		. 04593)	; &M-04593;
-    ))
-(define-char
-  '((morohashi-daikanwa	4593 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
-    (hanyu-dazidian	1 704 6)
     (=ucs		. #x21118)	; 𡄘
-    (=cns11643-7	. #x4D4B)	; &I-C7-4D4B; [45-43]
-    (=hanziku-2		. #xE2FC)	; &I-HZK02-E2FC;
+    (->subsumptive
+     ((=daikanwa	  . 04593)	; &M-04593;
+      )
+     ((hanyu-dazidian	  1 704 6)
+      (=cns11643-7	  . #x4D4B)	; &HZK02-E2FC; [45-43]
+      (=hanziku-2	  . #xE2FC)	; &I-HZK02-E2FC;
+      (=ucs@iso		  . #x21118)	; &HZK02-E2FC;
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -33582,28 +34394,34 @@
     (=hanziku-2		. #xE2EC)	; &I-HZK02-E2EC;
     ))
 (define-char
-  '((=>ucs		. #x2111A)	; 𡄚
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
-    (=daikanwa		. 04595)	; &M-04595;
+    (=ucs		. #x2111A)	; 𡄚
     ))
 (define-char
-  '((morohashi-daikanwa	4595 0 1)
+  '((<-denotational
+     ((=ucs		  . #x2111A)	; 𡄚
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
-    (hanyu-dazidian	1 704 10)
-    (=ucs		. #x2111A)	; 𡄚
-    (=hanziku-2		. #xE341)	; &I-HZK02-E341;
+    (->subsumptive
+     ((=daikanwa	  . 04595)	; &M-04595;
+      )
+     ((=cns11643-7	  . #x4D46)	; &C7-4D46; [45-38]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x2111A)	; 𡄚
-    (morohashi-daikanwa	4595 0 2)
+  '((<-denotational
+     ((=ucs		  . #x2111A)	; 𡄚
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
-    (=cns11643-7	. #x4D46)	; &C7-4D46; [45-38]
+    (hanyu-dazidian	1 704 10)
+    (=hanziku-2		. #xE341)	; &HZK02-E341;
+    (=ucs@iso		. #x2111A)	; &HZK02-E341;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -33646,18 +34464,55 @@
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
+    (=ucs		. #x21122)	; 𡄢
+    (=cbeta		. 03537)	; &I-CB03537;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21122)	; 𡄢
+      ))
+    (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=daikanwa	    . 41434)	; &M-41434;
+	))
+      (=daikanwa	  . 04599)	; &M-04599;
+      )
+     ((hanyu-dazidian	  1 705 6)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208	    . #x6F6B)	; &GT-55680; [79-75]
+	))
+      (=hanziku-2	  . #xE35D)	; &HZK02-E35D;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21122)	; 𡄢
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=daikanwa	  . 41434)	; &M-41434;
+     ((=cns11643-2	  . #x5B53)	; &GT-55641; [59-51]
       ))
-    (=daikanwa		. 04599)	; &M-04599;
-    (=cbeta		. 03537)	; &I-CB03537;
+    (=ucs@iso		. #x21122)	; &U-00021122;
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -33687,7 +34542,8 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x8944)	; &UU+8944;
+       ((=gb2312	    . #x4F65)	; &C1-7543; [47-69]
+	(=cns11643-1	    . #x7543)	; &I-C1-7543; [85-35]
 	))
       (=gb2312		  . #x4842)	; &C1-7962; [40-34]
       (=cns11643-1	  . #x7962)	; &I-C1-7962; [89-66]
@@ -33826,10 +34682,10 @@
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 19)
     (total-strokes	 . 22)
+    (=cbeta		. 00771)	; &CB00771;
     (<-unknown
      ((=ucs		  . #x3615)	; 㘕
       ))
-    (=cbeta		. 00771)	; &CB00771;
     ))
 (define-char
   '((<-denotational
@@ -34774,21 +35630,18 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x21159)	; 𡅙
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 19)
-    (total-strokes	 . 22)
-    (=daikanwa		. 04632)	; &M-04632;
-    ))
-(define-char
-  '((morohashi-daikanwa	4632 0 0)
-    (ideographic-radical . 30)	; ⼝
+  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 19)
     (total-strokes	 . 22)
-    (hanyu-dazidian	1 708 8)
     (=ucs		. #x21159)	; 𡅙
-    (=cns11643-5	. #x7333)	; &I-C5-7333; [83-19]
-    (=hanziku-2		. #xE3E1)	; &I-HZK02-E3E1;
+    (->subsumptive
+     ((=daikanwa	  . 04632)	; &M-04632;
+      )
+     ((hanyu-dazidian	  1 708 8)
+      (=cns11643-5	  . #x7333)	; &HZK02-E3E1; [83-19]
+      (=hanziku-2	  . #xE3E1)	; &I-HZK02-E3E1;
+      (=ucs@iso		  . #x21159)	; &HZK02-E3E1;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -35018,7 +35871,7 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x8D08)	; &UU+8D08;
+     ((=cns11643-1	  . #x7925)	; &C1-7925; [89-05]
       ))
     (=ucs@unicode	. #x56CE)	; &UU+56CE;
     ))
@@ -35359,6 +36212,7 @@
 	(=ks-x1001	    . #x6155)	; &I-K0-6155; [65-53]
 	(=daikanwa	    . 07821)	; &I-M-07821;
 	))
+      (shinjigen-1	  . 1238)
       (shinjigen-2	  . 1238)
       (=jis-x0208	  . #x5376)	; &GT-05875; [51-86]
       (=ks-x1001	  . #x7536)	; &I-K0-7536; [85-22]
@@ -35479,7 +36333,7 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x862D)	; &UU+862D;
+     ((=ks-x1001	  . #x5535)	; &GT-43788; [53-21]
       ))
     (=hanziku-2		. #xE441)	; &HZK02-E441;
     (=ucs@unicode	. #x56D2)	; &HZK02-E441;
@@ -36399,12 +37253,6 @@
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
-    (hanyu-dazidian	1 663 11)
-    (=ucs		. #x20DB9)	; 𠶹
-    (=hanziku-2		. #xDAC9)	; &I-HZK02-DAC9;
-    ))
-(define-char
-  '((ideographic-radical . 30)	; ⼝
     (hanyu-dazidian	8 14 5)
     (=ucs		. #x20DE2)	; ð ·¢
     (=hanziku-12	. #xEC54)	; &I-HZK12-EC54;
@@ -36453,12 +37301,6 @@
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
-    (hanyu-dazidian	8 13 19)
-    (=ucs		. #x20E04)	; 𠸄
-    (=hanziku-12	. #xEC4A)	; &I-HZK12-EC4A;
-    ))
-(define-char
-  '((ideographic-radical . 30)	; ⼝
     (hanyu-dazidian	8 13 20)
     (=ucs		. #x20E05)	; 𠸅
     (=hanziku-12	. #xEC4B)	; &I-HZK12-EC4B;
@@ -37017,12 +37859,6 @@
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
-    (hanyu-dazidian	1 705 6)
-    (=ucs		. #x21122)	; 𡄢
-    (=hanziku-2		. #xE35D)	; &I-HZK02-E35D;
-    ))
-(define-char
-  '((ideographic-radical . 30)	; ⼝
     (hanyu-dazidian	8 15 12)
     (=ucs		. #x21124)	; 𡄤
     (=hanziku-12	. #xEC76)	; &I-HZK12-EC76;
diff --git a/lisp/utf-2000/Ideograph-R031-Enclosure.el b/lisp/utf-2000/Ideograph-R031-Enclosure.el
index b02966f..01cf23b 100644
--- a/lisp/utf-2000/Ideograph-R031-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R031-Enclosure.el
@@ -222,26 +222,24 @@
     (=jef-china3	. #x47BD)	; &I-JC3-47BD;
     ))
 (define-char
-  '((=>ucs		. #x20064)	; 𠁤
-    (ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
-    (=daikanwa		. 04684)	; &M-04684;
-    ))
-(define-char
-  '((morohashi-daikanwa	4684 0 0)
-    (ideographic-	(:radical	31 ; ⼞
-			 :strokes	2)
-			(:radical	2 ; ⼁
-			 :strokes	4))
+  '((ideographic-radical@ucs . 2)	; ⼁
+    (ideographic-strokes@ucs . 4)
+    (ideographic-radical@cns . 31)	; ⼞
+    (ideographic-strokes@cns . 2)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 5)
-    (<-same
-     ((=daikanwa	  . 04684)	; &M-04684;
-      ))
     (hanyu-dazidian	1 29 3)
     (=ucs		. #x20064)	; 𠁤
-    (=cns11643-6	. #x225F)	; &I-C6-225F; [02-63]
-    (=big5-cdp		. #x87E5)	; &I-CDP-87E5;
+    (->subsumptive
+     ((ideographic-radical . 31)	; ⼞
+      (ideographic-strokes . 2)
+      (=daikanwa	  . 04684)	; &M-04684;
+      )
+     ((=cns11643-6	  . #x225F)	; &CDP-87E5; [02-63]
+      (=big5-cdp	  . #x87E5)	; &I-CDP-87E5;
+      (=ucs@iso		  . #x20064)	; &CDP-87E5;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -498,7 +496,25 @@
     (=hanziku-2		. #xE4DE)	; &HZK02-E4DE;
     ))
 (define-char
-  '((ideographic-radical . 31)	; ⼞
+  '((=>ucs		. #x56E2)	; 团
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=jis-x0208	  . #x3A4D)	; &GT-14886; [26-45]
+      (=ks-x1001	  . #x6E26)	; &I-K0-6E26; [78-06]
+      (=daikanwa	  . 11769)	; &I-M-11769;
+      ))
+    (=daikanwa		. 04701)	; &M-04701;
+    ))
+(define-char
+  '((=>daikanwa		. 04701)	; &M-04701;
+    (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (hanyu-dazidian	1 711 8)
@@ -512,30 +528,31 @@
       ))
     (=ucs		. #x56E2)	; 团
     (=gb2312		. #x4D45)	; &I-G0-4D45; [45-37]
-    (=daikanwa		. 04701)	; &I-M-04701;
     (=hanziku-2		. #xE4A4)	; &I-HZK02-E4A4;
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (=daikanwa		. 04702)	; &M-04702;
+    (hanyu-dazidian	1 713 4)
+    (=ucs		. #x211B1)	; 𡆱
+    (=daikanwa		. 04702)	; &I-M-04702;
+    (=hanziku-2		. #xE4E0)	; &I-HZK02-E4E0;
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (=daikanwa		. 04703)	; &M-04703;
+    (hanyu-dazidian	1 713 1)
+    (=ucs		. #x211AF)	; 𡆯
+    (=daikanwa		. 04703)	; &I-M-04703;
+    (=hanziku-2		. #xE4DD)	; &I-HZK02-E4DD;
     ))
 (define-char
   '((morohashi-daikanwa	4703 1)
     (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5718)	; 團
-      (=jis-x0208	  . #x5425)	; &I-J90-5425; [52-05]
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (=ucs		  . #x2FF4)	; â¿´
@@ -550,6 +567,10 @@
     (=gt		. 05918)	; &I-GT-05918;
     (=gt-pj-1		. #x4344)	; &I-GT-05918; [35-36]
     (mojikyo		. 050127)	; &MCS-6000C3CF;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x5718)	; 團
+      (=jis-x0208	  . #x5425)	; &I-J90-5425; [52-05]
+      ))
     ))
 (define-char
   '((=>ucs		. #x56E4)	; 囤
@@ -790,40 +811,24 @@
     (mojikyo		. 004711)	; &MCS-60001267;
     ))
 (define-char
-  '((=>ucs		. #x211B4)	; 𡆴
-    (ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=daikanwa		. 04712)	; &M-04712;
-    ))
-(define-char
-  '((=>ucs		. #x211B4)	; 𡆴
-    (morohashi-daikanwa	4712 0 0)
-    (ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (hanyu-dazidian	1 716 4)
-    (=hanziku-2		. #xE5A3)	; &HZK02-E5A3;
-    ))
-(define-char
-  '((morohashi-daikanwa	4712 0 1)
-    (ideographic-radical . 31)	; ⼞
+  '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x211B4)	; 𡆴
-    (=cns11643-6	. #x2654)	; &I-C6-2654; [06-52]
+    (->subsumptive
+     ((=daikanwa	  . 04712)	; &M-04712;
+      )
+     ((hanyu-dazidian	  1 716 4)
+      (=hanziku-2	  . #xE5A3)	; &HZK02-E5A3;
+      )
+     ((=cns11643-6	  . #x2654)	; &C6-2654; [06-52]
+      (=ucs@iso		  . #x211B4)	; &C6-2654;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-vulgar
-     ((shinjigen-1	  . 1302)
-      (=ucs		  . #x56DE)	; 回
-      (=jis-x0208	  . #x3273)	; &I-J90-3273; [18-83]
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (hanyu-dazidian	1 715 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
@@ -838,6 +843,13 @@
     (=cns11643-3	. #x252B)	; &I-C3-252B; [05-11]
     (=daikanwa		. 04713)	; &I-M-04713;
     (=hanziku-2		. #xE55E)	; &I-HZK02-E55E;
+    (<-vulgar
+     ((shinjigen-1	  . 1302)
+      (=ucs		  . #x56DE)	; 回
+      (=jis-x0208	  . #x3273)	; &I-J90-3273; [18-83]
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -920,48 +932,75 @@
       )
      ((=ucs		  . #x738B)	; 王
       ))
+    (shinjigen-1	. 1321)
     (=ucs		. #x56EF)	; 囯
     (=cns11643-3	. #x2529)	; &I-C3-2529; [05-09]
     (=daikanwa		. 04716)	; &I-M-04716;
     (=hanziku-2		. #xE4E6)	; &I-HZK02-E4E6;
+    (<-vulgar
+     ((shinjigen-1	  . 1319)
+      (=ucs		  . #x570B)	; 國
+      (=jis-x0208	  . #x5422)	; &I-J90-5422; [52-02]
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (hanyu-dazidian	1 714 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (=ucs		  . #x2FF4)	; â¿´
-      )
-     ((=ucs		  . #x56D7)	; 囗
-      )
-     ((=ucs		  . #x6728)	; 木
-      ))
-    (shinjigen-2	. 1312)
     (=ucs		. #x56F0)	; 困
-    (=jis-x0208		. #x3A24)	; &I-J90-3A24; [26-04]
-    (=gb2312		. #x4027)	; &I-G0-4027; [32-07]
-    (=ks-x1001		. #x4D5D)	; &I-K0-4D5D; [45-61]
-    (=cns11643-1	. #x495A)	; &I-C1-495A; [41-58]
-    (=big5		. #xA778)	; &I-B-A778;
-    (=gt		. 05945)	; &I-GT-05945;
-    (=gt-k		. 02551)	; &I-GT-K02551;
-    (=gt-pj-1		. #x3A24)	; &I-GT-05945; [26-04]
-    (=daikanwa		. 04717)	; &I-M-04717;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(=ucs		    . #x2FF4)	; â¿´
+	)
+       ((=ucs		    . #x56D7)	; 囗
+	)
+       ((=ucs		    . #x6728)	; 木
+	))
+      (shinjigen-1	  . 1312)
+      (shinjigen-2	  . 1312)
+      (=jis-x0208	  . #x3A24)	; &GT-05945; [26-04]
+      (=ks-x1001	  . #x4D5D)	; &I-K0-4D5D; [45-61]
+      (=cns11643-1	  . #x495A)	; &I-C1-495A; [41-58]
+      (=big5		  . #xA778)	; &I-B-A778;
+      (=gt		  . 05945)	; &I-GT-05945;
+      (=gt-k		  . 02551)	; &I-GT-K02551;
+      (=gt-pj-1		  . #x3A24)	; &I-GT-05945; [26-04]
+      (=daikanwa	  . 04717)	; &I-M-04717;
+      (=ucs@jis		  . #x56F0)	; &GT-05945;
+      )
+     ((=gb2312		  . #x4027)	; &G0-4027; [32-07]
+      (=ucs@unicode	  . #x56F0)	; &G0-4027;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 714 3)
     (=ucs		. #x211B6)	; 𡆶
-    (=daikanwa		. 04718)	; &I-M-04718;
-    (=hanziku-2		. #xE540)	; &I-HZK02-E540;
     ))
 (define-char
-  '((=>ucs		. #x211B6)	; 𡆶
-    (morohashi-daikanwa	4718 0 2)
+  '((<-denotational
+     ((=ucs		  . #x211B6)	; 𡆶
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (->subsumptive
+     ((=daikanwa	  . 04718)	; &M-04718;
+      )
+     ((hanyu-dazidian	  1 714 3)
+      (=hanziku-2	  . #xE540)	; &HZK02-E540;
+      (=ucs@iso		  . #x211B6)	; &HZK02-E540;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x211B6)	; 𡆶
+      ))
     (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
@@ -988,29 +1027,23 @@
     (=hanziku-2		. #xE543)	; &I-HZK02-E543;
     ))
 (define-char
-  '((=>ucs		. #x211C6)	; 𡇆
-    (ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (hanyu-dazidian	1 716 3)
-    (=daikanwa		. 04721)	; &M-04721;
-    (=hanziku-2		. #xE5A2)	; &I-HZK02-E5A2;
-    ))
-(define-char
-  '((morohashi-daikanwa	4721 0 0)
-    (ideographic-radical . 31)	; ⼞
+  '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x211C6)	; 𡇆
-    (=cns11643-6	. #x2653)	; &I-C6-2653; [06-51]
+    (->subsumptive
+     ((hanyu-dazidian	  1 716 3)
+      (=daikanwa	  . 04721)	; &M-04721;
+      (=hanziku-2	  . #xE5A2)	; &I-HZK02-E5A2;
+      )
+     ((=cns11643-6	  . #x2653)	; &C6-2653; [06-51]
+      (=ucs@iso		  . #x211C6)	; &C6-2653;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208@1990	  . #x5423)	; &J90-5423; [52-03]
-      ))
     (hanyu-dazidian	1 714 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
@@ -1029,23 +1062,24 @@
     (=gt-pj-1		. #x304F)	; &I-GT-05925; [16-47]
     (=daikanwa		. 04722)	; &I-M-04722;
     (=hanziku-2		. #xE4FD)	; &I-HZK02-E4FD;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208@1990	  . #x5423)	; &J90-5423; [52-03]
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x211C7)	; 𡇇
-    (=daikanwa		. 04723)	; &I-M-04723;
-    ))
-(define-char
-  '((=>ucs		. #x211C7)	; 𡇇
-    (morohashi-daikanwa	4723 0 0)
-    (ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (hanyu-dazidian	1 715 9)
-    (=cns11643-6	. #x265B)	; &HZK02-E566; [06-59]
-    (=hanziku-2		. #xE566)	; &I-HZK02-E566;
+    (->subsumptive
+     ((=daikanwa	  . 04723)	; &M-04723;
+      (=ucs@iso		  . #x211C7)	; &M-04723;
+      )
+     ((hanyu-dazidian	  1 715 9)
+      (=cns11643-6	  . #x265B)	; &C6-265B; [06-59]
+      )
+     ((=hanziku-2	  . #xE566)	; &HZK02-E566;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -1140,8 +1174,10 @@
     (=hanziku-2		. #xE546)	; &I-HZK02-E546;
     ))
 (define-char
-  '((ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 4)
+  '((ideographic-radical@ucs . 72)	; ⽇
+    (ideographic-strokes@ucs . 3)
+    (ideographic-radical@daikanwa . 31)	; ⼞
+    (ideographic-strokes@daikanwa . 4)
     (total-strokes	 . 7)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
@@ -1151,62 +1187,81 @@
       )
      ((=ucs		  . #x65E5)	; 日
       ))
-    (=daikanwa		. 04731)	; &M-04731;
+    (=ucs		. #x2314D)	; 𣅍
+    (=daikanwa		. 04731)	; &I-M-04731;
     (=cbeta		. 03191)	; &I-CB03191;
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=daikanwa		. 04732)	; &M-04732;
+    (=ucs		. #x211C2)	; 𡇂
+    (->subsumptive
+     ((=daikanwa	  . 04732)	; &M-04732;
+      )
+     ((hanyu-dazidian	  1 716 2)
+      (=hanziku-2	  . #xE5A1)	; &HZK02-E5A1;
+      (=ucs@iso		  . #x211C2)	; &HZK02-E5A1;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=daikanwa		. 04733)	; &M-04733;
+    (=ucs		. #x211C0)	; 𡇀
+    (->subsumptive
+     ((=daikanwa	  . 04733)	; &M-04733;
+      )
+     ((hanyu-dazidian	  1 715 14)
+      (=hanziku-2	  . #xE56B)	; &HZK02-E56B;
+      (=ucs@iso		  . #x211C0)	; &HZK02-E56B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=daikanwa		. 04734)	; &M-04734;
+    (=ucs		. #x211BD)	; 𡆽
+    (->subsumptive
+     ((=daikanwa	  . 04734)	; &M-04734;
+      )
+     ((hanyu-dazidian	  1 715 7)
+      (=hanziku-2	  . #xE564)	; &HZK02-E564;
+      (=ucs@iso		  . #x211BD)	; &HZK02-E564;
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	4734 1)
     (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5426)	; &GT-06082; [52-06]
-      (=ks-x1001	  . #x5371)	; &I-K0-5371; [51-81]
-      (=daikanwa	  . 04832)	; &I-M-04832;
-      ))
     (=ucs		. #x56F3)	; 図
     (=jis-x0208		. #x3F5E)	; &I-J90-3F5E; [31-62]
     (=cns11643-3	. #x2528)	; &I-C3-2528; [05-08]
     (=gt		. 05950)	; &I-GT-05950;
     (=gt-pj-1		. #x3F5E)	; &I-GT-05950; [31-62]
     (mojikyo		. 050128)	; &MCS-6000C3D0;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5426)	; &GT-06082; [52-06]
+      (=ks-x1001	  . #x5371)	; &I-K0-5371; [51-81]
+      (=daikanwa	  . 04832)	; &I-M-04832;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x211C5)	; 𡇅
-    (morohashi-daikanwa	ho 78)
-    (ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=gt		. 05941)	; &GT-05941;
-    (=gt-pj-11		. #x433E)	; &GT-05941; [35-30]
-    (mojikyo		. 060072)	; &MCS-6000EAA8;
-    ))
-(define-char
-  '((morohashi-daikanwa	ho 78 0)
-    (ideographic-radical . 31)	; ⼞
+  '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (hanyu-dazidian	8 15 19)
     (=ucs		. #x211C5)	; 𡇅
-    (=hanziku-12	. #xEC7D)	; &I-HZK12-EC7D;
+    (->subsumptive
+     ((morohashi-daikanwa	ho 78)
+      (=gt		  . 05941)	; &GT-05941;
+      (=gt-pj-11	  . #x433E)	; &GT-05941; [35-30]
+      (mojikyo		  . 060072)	; &MCS-6000EAA8;
+      )
+     ((hanyu-dazidian	  8 15 19)
+      (=hanziku-12	  . #xEC7D)	; &HZK12-EC7D;
+      (=ucs@iso		  . #x211C5)	; &HZK12-EC7D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -1244,13 +1299,10 @@
     (=hanziku-2		. #xE541)	; &I-HZK02-E541;
     ))
 (define-char
-  '((script		C-Simplified Ideograph)
+  '((script		CN Simplified Ideograph)
     (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-simplified
-     ((=ucs		  . #x5707)	; 圇
-      ))
     (hanyu-dazidian	1 715 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
@@ -1263,6 +1315,10 @@
     (=ucs		. #x56F5)	; 囵
     (=gb2312		. #x6070)	; &I-G0-6070; [64-80]
     (=hanziku-2		. #xE565)	; &I-HZK02-E565;
+    (<-simplified@CN
+     ((=ucs		  . #x5707)	; 圇
+      (=gb12345		  . #x6070)	; 圇 [64-80]
+      ))
     ))
 (define-char
   '((=>ucs		. #x56F6)	; 囶
@@ -1618,10 +1674,6 @@
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x570B)	; 國
-      (=jis-x0208	  . #x5422)	; &I-J90-5422; [52-02]
-      ))
     (hanyu-dazidian	1 716 7)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
@@ -1631,6 +1683,7 @@
       )
      ((=ucs		  . #x7389)	; 玉
       ))
+    (shinjigen-1	. 1318)
     (shinjigen-2	. 1318)
     (=ucs		. #x56FD)	; 国
     (=jis-x0208		. #x3971)	; &I-J90-3971; [25-81]
@@ -1641,6 +1694,17 @@
     (=gt-pj-1		. #x3971)	; &I-GT-05968; [25-81]
     (=daikanwa		. 04752)	; &I-M-04752;
     (=hanziku-2		. #xE5A6)	; &I-HZK02-E5A6;
+    (<-simplified@CN
+     ((=ucs		  . #x570B)	; 國
+      (=gb12345		  . #x397A)	; 國 [25-90]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x570B)	; 國
+      (=jis-x0208	  . #x5422)	; &I-J90-5422; [52-02]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x570B)	; 國
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -1661,21 +1725,19 @@
     (=jef-china3	. #x81D5)	; &I-JC3-81D5;
     ))
 (define-char
-  '((=>ucs		. #x211D2)	; 𡇒
-    (ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (hanyu-dazidian	1 718 10)
-    (=daikanwa		. 04753)	; &M-04753;
-    (=hanziku-2		. #xE5E9)	; &I-HZK02-E5E9;
-    ))
-(define-char
-  '((morohashi-daikanwa	4753 0 0)
-    (ideographic-radical . 31)	; ⼞
+  '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x211D2)	; 𡇒
-    (=cns11643-5	. #x2854)	; &I-C5-2854; [08-52]
+    (->subsumptive
+     ((=daikanwa	  . 04753)	; &M-04753;
+      )
+     ((hanyu-dazidian	  1 718 10)
+      (=hanziku-2	  . #xE5E9)	; &HZK02-E5E9;
+      )
+     ((=cns11643-5	  . #x2854)	; &C5-2854; [08-52]
+      (=ucs@iso		  . #x211D2)	; &C5-2854;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -1700,114 +1762,123 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (hanyu-dazidian	1 717 20)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (=ucs		  . #x2FF4)	; â¿´
-      )
-     ((=ucs		  . #x56D7)	; 囗
-      )
-     ((=ucs		  . #x6709)	; 有
-      ))
-    (shinjigen-2	. 1323)
     (=ucs		. #x56FF)	; 囿
-    (=jis-x0208		. #x537C)	; &I-J90-537C; [51-92]
-    (=gb2312		. #x6073)	; &I-G0-6073; [64-83]
-    (=cns11643-1	. #x504C)	; &I-C1-504C; [48-44]
-    (=big5		. #xABAA)	; &I-B-ABAA;
-    (=gt		. 05992)	; &I-GT-05992;
-    (=gt-pj-1		. #x537C)	; &I-GT-05992; [51-92]
-    (=daikanwa		. 04756)	; &I-M-04756;
-    ))
-(define-char
-  '((=>ucs		. #x211D4)	; 𡇔
-    (ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (hanyu-dazidian	1 718 11)
-    (=daikanwa		. 04757)	; &M-04757;
-    (=hanziku-2		. #xE5EA)	; &I-HZK02-E5EA;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(=ucs		    . #x2FF4)	; â¿´
+	)
+       ((=ucs		    . #x56D7)	; 囗
+	)
+       ((=ucs@unicode	    . #x6709)	; &GT-18146;
+	))
+      (shinjigen-1	  . 1323)
+      (shinjigen-2	  . 1323)
+      (=jis-x0208	  . #x537C)	; &GT-05992; [51-92]
+      (=gb2312		  . #x6073)	; &I-G0-6073; [64-83]
+      (=big5		  . #xABAA)	; &I-B-ABAA;
+      (=gt		  . 05992)	; &I-GT-05992;
+      (=gt-pj-1		  . #x537C)	; &I-GT-05992; [51-92]
+      (=daikanwa	  . 04756)	; &I-M-04756;
+      (=ucs@unicode	  . #x56FF)	; &GT-05992;
+      )
+     ((=cns11643-1	  . #x504C)	; &C1-504C; [48-44]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	4757 0 0)
-    (ideographic-radical . 31)	; ⼞
+  '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x211D4)	; 𡇔
-    (=cns11643-6	. #x2F60)	; &I-C6-2F60; [15-64]
+    (->subsumptive
+     ((hanyu-dazidian	  1 718 11)
+      (=daikanwa	  . 04757)	; &M-04757;
+      (=hanziku-2	  . #xE5EA)	; &I-HZK02-E5EA;
+      )
+     ((=cns11643-6	  . #x2F60)	; &C6-2F60; [15-64]
+      (=ucs@iso		  . #x211D4)	; &C6-2F60;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x211D5)	; 𡇕
-    (ideographic-radical . 31)	; ⼞
+  '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=daikanwa		. 04758)	; &M-04758;
+    (=ucs		. #x211D5)	; 𡇕
+    (->subsumptive
+     ((=daikanwa	  . 04758)	; &M-04758;
+      )
+     ((mojikyo		  . 004758)	; &MCS-60001296;
+      )
+     ((hanyu-dazidian	  1 718 7)
+      (=hanziku-2	  . #xE5E6)	; &HZK02-E5E6;
+      (=ucs@iso		  . #x211D5)	; &HZK02-E5E6;
+      )
+     ((=cns11643-6	  . #x2F5F)	; &C6-2F5F; [15-63]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	4758 0 0)
-    (ideographic-radical . 31)	; ⼞
+  '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (hanyu-dazidian	1 718 7)
-    (=ucs		. #x211D5)	; 𡇕
-    (=cns11643-6	. #x2F5F)	; &I-C6-2F5F; [15-63]
-    (=hanziku-2		. #xE5E6)	; &I-HZK02-E5E6;
-    (mojikyo		. 004758)	; &MCS-60001296;
+    (=ucs		. #x5700)	; 圀
     ))
 (define-char
-  '((=>ucs		. #x5700)	; 圀
+  '((<-denotational
+     ((=ucs		  . #x5700)	; 圀
+      ))
     (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (=ucs		  . #x2FF4)	; â¿´
-      )
-     ((=ucs		  . #x56D7)	; 囗
-      )
+    (->subsumptive
      ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(=ucs		    . #x2FF4)	; â¿´
 	)
-       ((=ucs		    . #x513F)	; 儿
+       ((=ucs		    . #x56D7)	; 囗
 	)
-       ((=jis-x0208	    . #x4A7D)	; &GT-17214; [42-93]
-	(=ks-x1001	    . #x5B30)	; &I-K0-5B30; [59-16]
-	(=daikanwa	    . 13620)	; &I-M-13620;
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=ucs		      . #x513F)	; 儿
+	  )
+	 ((=jis-x0208	      . #x4A7D)	; &GT-17214; [42-93]
+	  (=ks-x1001	      . #x5B30)	; &I-K0-5B30; [59-16]
+	  (=daikanwa	      . 13620)	; &I-M-13620;
+	  ))
 	))
-      ))
-    (shinjigen-2	. 1320)
-    (=jis-x0208		. #x537B)	; &GT-05983; [51-91]
-    (=gt		. 05983)	; &I-GT-05983;
-    (=gt-pj-1		. #x537B)	; &I-GT-05983; [51-91]
-    (=daikanwa		. 04759)	; &I-M-04759;
-    (=cbeta		. 03344)	; &I-CB03344;
-    (=ucs@jis		. #x5700)	; &GT-05983;
-    ))
-(define-char
-  '((=>ucs		. #x5700)	; 圀
-    (morohashi-daikanwa	4759 0 0)
-    (ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (=ucs		  . #x2FF4)	; â¿´
-      )
-     ((=ucs		  . #x56D7)	; 囗
+      (shinjigen-1	  . 1320)
+      (shinjigen-2	  . 1320)
+      (=jis-x0208	  . #x537B)	; &GT-05983; [51-91]
+      (=gt		  . 05983)	; &I-GT-05983;
+      (=gt-pj-1		  . #x537B)	; &I-GT-05983; [51-91]
+      (=daikanwa	  . 04759)	; &I-M-04759;
+      (=cbeta		  . 03344)	; &I-CB03344;
+      (=ucs@jis		  . #x5700)	; &GT-05983;
       )
      ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(=ucs		    . #x2FF4)	; â¿´
 	)
-       ((=ucs		    . #x513F)	; 儿
+       ((=ucs		    . #x56D7)	; 囗
 	)
-       ((=ucs		    . #x65B9)	; 方
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=gb2312	      . #x304B)	; &G0-304B; [16-43]
+	  )
+	 ((=gb2312	      . #x373D)	; &C1-4549; [23-29]
+	  (=cns11643-1	      . #x4549)	; &I-C1-4549; [37-41]
+	  ))
 	))
+      (=cns11643-3	  . #x2B65)	; &C3-2B65; [11-69]
       ))
-    (=cns11643-3	. #x2B65)	; &C3-2B65; [11-69]
     ))
 (define-char
-  '((morohashi-daikanwa	4759 0 2)
+  '((<-denotational
+     ((=ucs		  . #x5700)	; 圀
+      ))
     (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
@@ -1822,13 +1893,14 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x516B)	; 八
+       ((=gt-k		    . 00059)	; &GT-K00059;
 	)
-       ((=ucs		    . #x65B9)	; 方
+       ((=gb2312	    . #x373D)	; &C1-4549; [23-29]
+	(=cns11643-1	    . #x4549)	; &I-C1-4549; [37-41]
 	))
       ))
-    (=ucs		. #x5700)	; 圀
-    (=hanziku-2		. #xE5E7)	; &I-HZK02-E5E7;
+    (=hanziku-2		. #xE5E7)	; &HZK02-E5E7;
+    (=ucs@unicode	. #x5700)	; &HZK02-E5E7;
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -2396,42 +2468,55 @@
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 720 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (=ucs		  . #x2FF4)	; â¿´
-      )
-     ((=ucs		  . #x56D7)	; 囗
-      )
-     ((=ucs		  . #x5E78)	; 幸
-      ))
-    (shinjigen-2	. 1327)
     (=ucs		. #x5709)	; 圉
-    (=jis-x0208		. #x537E)	; &I-J90-537E; [51-94]
-    (=gb2312		. #x6076)	; &I-G0-6076; [64-86]
-    (=cns11643-1	. #x5950)	; &I-C1-5950; [57-48]
-    (=big5		. #xB0EB)	; &I-B-B0EB;
-    (=gt		. 06021)	; &I-GT-06021;
-    (=gt-k		. 07916)	; &I-GT-K07916;
-    (=gt-pj-1		. #x537E)	; &I-GT-06021; [51-94]
-    (=daikanwa		. 04793)	; &I-M-04793;
-    ))
-(define-char
-  '((=>ucs		. #x211F5)	; 𡇵
-    (ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=daikanwa		. 04794)	; &M-04794;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(=ucs		    . #x2FF4)	; â¿´
+	)
+       ((=ucs		    . #x56D7)	; 囗
+	)
+       ((=jis-x0208	    . #x392C)	; &GT-11561; [25-12]
+	(=ks-x1001	    . #x7A39)	; &I-K0-7A39; [90-25]
+	(=daikanwa	    . 09176)	; &I-M-09176;
+	))
+      (=jis-x0208	  . #x537E)	; &GT-06021; [51-94]
+      (=big5		  . #xB0EB)	; &I-B-B0EB;
+      (=gt		  . 06021)	; &I-GT-06021;
+      (=gt-k		  . 07916)	; &I-GT-K07916;
+      (=gt-pj-1		  . #x537E)	; &I-GT-06021; [51-94]
+      (=daikanwa	  . 04793)	; &I-M-04793;
+      (=ucs@jis		  . #x5709)	; &GT-06021;
+      )
+     ((hanyu-dazidian	  1 720 7)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(=ucs		    . #x2FF4)	; â¿´
+	)
+       ((=ucs		    . #x56D7)	; 囗
+	)
+       ((=gb2312	    . #x5052)	; &C1-4D31; [48-50]
+	(=cns11643-1	    . #x4D31)	; &I-C1-4D31; [45-17]
+	))
+      (shinjigen-2	  . 1327)
+      (=gb2312		  . #x6076)	; &C1-5950; [64-86]
+      (=cns11643-1	  . #x5950)	; &I-C1-5950; [57-48]
+      (=ucs@unicode	  . #x5709)	; &C1-5950;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	4794 0 0)
-    (ideographic-radical . 31)	; ⼞
+  '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 722 1)
     (=ucs		. #x211F5)	; 𡇵
-    (=cns11643-6	. #x3E23)	; &I-C6-3E23; [30-03]
-    (=hanziku-2		. #xE6C3)	; &I-HZK02-E6C3;
+    (->subsumptive
+     ((=daikanwa	  . 04794)	; &M-04794;
+      )
+     ((hanyu-dazidian	  1 722 1)
+      (=cns11643-6	  . #x3E23)	; &HZK02-E6C3; [30-03]
+      (=hanziku-2	  . #xE6C3)	; &I-HZK02-E6C3;
+      (=ucs@iso		  . #x211F5)	; &HZK02-E6C3;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -2473,7 +2558,8 @@
       )
      ((=ucs		  . #x56D7)	; 囗
       )
-     ((=ucs@unicode	  . #x9751)	; &M-42564;
+     ((=ks-x1001	  . #x746C)	; &M-42564; [84-76]
+      (=daikanwa	  . 42564)	; &I-M-42564;
       ))
     (=jis-x0212		. #x3726)	; &M-04797; [23-06]
     (=jis-x0213-1-2000	. #x2F41)	; &I-JX1-2F41; [15-33]
@@ -2496,7 +2582,8 @@
 	)
        ((=ucs		    . #x56D7)	; 囗
 	)
-       ((=ucs@unicode	    . #x9752)	; &GT-57125;
+       ((=jis-x0208	    . #x4044)	; &GT-57125; [32-36]
+	(=gb2312	    . #x4760)	; &I-G0-4760; [39-64]
 	))
       (=gb2312		  . #x6075)	; &G0-6075; [64-85]
       (=ucs@unicode	  . #x570A)	; &G0-6075;
@@ -2526,6 +2613,7 @@
       )
      ((=ucs		  . #x6216)	; 或
       ))
+    (shinjigen-1	. 1319)
     (shinjigen-2	. 1319)
     (=ucs		. #x570B)	; 國
     (=jis-x0208		. #x5422)	; &I-J90-5422; [52-02]
@@ -2616,22 +2704,19 @@
     (mojikyo		. 004804)	; &MCS-600012C4;
     ))
 (define-char
-  '((=>ucs		. #x211FD)	; 𡇽
-    (ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=daikanwa		. 04805)	; &M-04805;
-    (mojikyo		. 004805)	; &MCS-600012C5;
-    ))
-(define-char
-  '((morohashi-daikanwa	4805 0 0)
-    (ideographic-radical . 31)	; ⼞
+  '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 722 9)
     (=ucs		. #x211FD)	; 𡇽
-    (=cns11643-6	. #x4740)	; &I-C6-4740; [39-32]
-    (=hanziku-2		. #xE6CB)	; &I-HZK02-E6CB;
+    (->subsumptive
+     ((=daikanwa	  . 04805)	; &M-04805;
+      )
+     ((hanyu-dazidian	  1 722 9)
+      (=cns11643-6	  . #x4740)	; &HZK02-E6CB; [39-32]
+      (=hanziku-2	  . #xE6CB)	; &I-HZK02-E6CB;
+      (=ucs@iso		  . #x211FD)	; &HZK02-E6CB;
+      (mojikyo		  . 004805)	; &MCS-600012C5;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -2646,7 +2731,8 @@
 	)
        ((=ucs		    . #x56D7)	; 囗
 	)
-       ((=ucs@unicode	    . #x97CB)	; &GT-57812;
+       ((=gb12345	    . #x4E24)	; &GT-57812; [46-04]
+	(=daikanwa	    . 43108)	; &GT-57812;
 	))
       (shinjigen-2	  . 1309)
       (=jis-x0208@1978	  . #x5423)	; &GT-06038; [52-03]
@@ -2666,21 +2752,18 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x211FE)	; 𡇾
-    (ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (hanyu-dazidian	1 722 6)
-    (=daikanwa		. 04807)	; &M-04807;
-    (=hanziku-2		. #xE6C8)	; &I-HZK02-E6C8;
-    ))
-(define-char
-  '((morohashi-daikanwa	4807 0 0)
-    (ideographic-radical . 31)	; ⼞
+  '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x211FE)	; 𡇾
-    (=cns11643-6	. #x4741)	; &I-C6-4741; [39-33]
+    (->subsumptive
+     ((hanyu-dazidian	  1 722 6)
+      (=daikanwa	  . 04807)	; &M-04807;
+      (=hanziku-2	  . #xE6C8)	; &I-HZK02-E6C8;
+      )
+     ((=cns11643-6	  . #x4741)	; &C6-4741; [39-33]
+      (=ucs@iso		  . #x211FE)	; &C6-4741;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -2779,13 +2862,6 @@
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-vulgar
-     ((shinjigen-1	  . 1332)
-      (=ucs		  . #x5713)	; 圓
-      (=jis-x0208	  . #x5424)	; &I-J90-5424; [52-04]
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (hanyu-dazidian	1 723 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
@@ -2809,6 +2885,13 @@
     (=hanziku-2		. #xE6E3)	; &I-HZK02-E6E3;
     (=jef-china3	. #x8FB5)	; &I-JC3-8FB5;
     (mojikyo		. 004813)	; &MCS-600012CD;
+    (<-vulgar
+     ((shinjigen-1	  . 1332)
+      (=ucs		  . #x5713)	; 圓
+      (=jis-x0208	  . #x5424)	; &I-J90-5424; [52-04]
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -2833,11 +2916,6 @@
     (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5421)	; &GT-06024; [52-01]
-      (=ks-x1001	  . #x4F6A)	; &I-K0-4F6A; [47-74]
-      (=daikanwa	  . 04789)	; &I-M-04789;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (=ucs		  . #x2FF4)	; â¿´
@@ -2853,6 +2931,11 @@
     (=gt-k		. 09046)	; &I-GT-K09046;
     (=gt-pj-1		. #x3777)	; &I-GT-06048; [23-87]
     (mojikyo		. 050130)	; &MCS-6000C3D2;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5421)	; &GT-06024; [52-01]
+      (=ks-x1001	  . #x4F6A)	; &I-K0-4F6A; [47-74]
+      (=daikanwa	  . 04789)	; &I-M-04789;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -3905,36 +3988,6 @@
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
-    (hanyu-dazidian	1 713 1)
-    (=ucs		. #x211AF)	; 𡆯
-    (=hanziku-2		. #xE4DD)	; &I-HZK02-E4DD;
-    ))
-(define-char
-  '((ideographic-radical . 31)	; ⼞
-    (hanyu-dazidian	1 713 4)
-    (=ucs		. #x211B1)	; 𡆱
-    (=hanziku-2		. #xE4E0)	; &I-HZK02-E4E0;
-    ))
-(define-char
-  '((ideographic-radical . 31)	; ⼞
-    (hanyu-dazidian	1 715 7)
-    (=ucs		. #x211BD)	; 𡆽
-    (=hanziku-2		. #xE564)	; &I-HZK02-E564;
-    ))
-(define-char
-  '((ideographic-radical . 31)	; ⼞
-    (hanyu-dazidian	1 715 14)
-    (=ucs		. #x211C0)	; 𡇀
-    (=hanziku-2		. #xE56B)	; &I-HZK02-E56B;
-    ))
-(define-char
-  '((ideographic-radical . 31)	; ⼞
-    (hanyu-dazidian	1 716 2)
-    (=ucs		. #x211C2)	; 𡇂
-    (=hanziku-2		. #xE5A1)	; &I-HZK02-E5A1;
-    ))
-(define-char
-  '((ideographic-radical . 31)	; ⼞
     (hanyu-dazidian	8 15 20)
     (=ucs		. #x211CF)	; 𡇏
     (=hanziku-12	. #xEC7E)	; &I-HZK12-EC7E;
diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el
index b0d03cb..797123b 100644
--- a/lisp/utf-2000/Ideograph-R032-Earth.el
+++ b/lisp/utf-2000/Ideograph-R032-Earth.el
@@ -4,6 +4,7 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
     (hanyu-dazidian	1 415 1)
+    (shinjigen-1	. 1337)
     (shinjigen-2	. 1337)
     (=ucs		. #x571F)	; 土
     (=jis-x0208		. #x455A)	; &I-J90-455A; [37-58]
@@ -23,11 +24,11 @@
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x571F)	; 土
-      ))
     (=gt-k		. 00199)	; &GT-K00199;
     (=gt-pj-k1		. #x3522)	; &GT-K00199; [21-02]
+    (<-formed@component/connect-right
+     ((=ucs		  . #x571F)	; 土
+      ))
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
@@ -189,10 +190,6 @@
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x58D3)	; 壓
-      (=jis-x0208	  . #x545A)	; &I-J90-545A; [52-58]
-      ))
     (shinjigen-1	. 1339)
     (shinjigen-2	. 1339)
     (=ucs		. #x5727)	; 圧
@@ -201,12 +198,17 @@
     (=gt		. 06129)	; &I-GT-06129;
     (=gt-pj-1		. #x3035)	; &I-GT-06129; [16-21]
     (mojikyo		. 050135)	; &MCS-6000C3D7;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x58D3)	; 壓
+      (=jis-x0208	  . #x545A)	; &I-J90-545A; [52-58]
+      ))
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (hanyu-dazidian	1 418 7)
+    (shinjigen-1	. 1347)
     (shinjigen-2	. 1347)
     (=ucs		. #x5728)	; 在
     (=jis-x0208		. #x3A5F)	; &I-J90-3A5F; [26-63]
@@ -2372,16 +2374,22 @@
     (=cns11643-6	. #x2A4A)	; &I-C6-2A4A; [10-42]
     ))
 (define-char
-  '((ideographic-radical . 32)	; ⼟
+  '((ideographic-radical@ucs . 32)	; ⼟
+    (ideographic-radical@cns . 28)	; ⼛
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (=ucs		. #x2128F)	; 𡊏
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2128F)	; 𡊏
+      ))
+    (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-same
-     ((=cns11643-6	  . #x2641)	; &M-48957; [06-33]
-      (=daikanwa	  . 48957)	; &I-M-48957;
-      ))
     (hanyu-dazidian	1 436 7)
-    (=ucs		. #x2128F)	; 𡊏
-    (=hanziku-2		. #xA9DA)	; &I-HZK02-A9DA;
+    (=hanziku-2		. #xA9DA)	; &HZK02-A9DA;
+    (=ucs@iso		. #x2128F)	; &HZK02-A9DA;
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
@@ -3179,14 +3187,6 @@
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (<-same
-     ((=daikanwa	  . 05120)	; &I-M-05120;
-      ))
-    (<-same*sources
-     daikanwa)
-    (<-simplified
-     ((=ucs		  . #x2F852)	; 城
-      ))
     (shinjigen-1	. 1392)
     (shinjigen-2	. 1392)
     (=ucs		. #x57CE)	; 城
@@ -3200,6 +3200,15 @@
     (=gt-pj-1		. #x3E6B)	; &I-GT-06357; [30-75]
     (=jef-china3	. #x47F9)	; &I-JC3-47F9;
     (mojikyo		. 050136)	; &MCS-6000C3D8;
+    (<-same
+     ((=ucs		  . #x2F852)	; 城
+      (=daikanwa	  . 05120)	; &I-M-05120;
+      ))
+    (<-same*sources
+     daikanwa)
+    (<-simplified
+     ((=ucs		  . #x2F852)	; 城
+      ))
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
@@ -5642,15 +5651,15 @@
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (=ucs		. #x2F855)	; 型
+    (=cns11643-3	. #x3470)	; &I-C3-3470; [20-80]
+    (=daikanwa		. 05234)	; &I-M-05234;
     (<-original
      ((=ucs		  . #x578B)	; 型
       (=daikanwa	  . 05030)	; &I-M-05030;
       ))
     (<-original*sources
-     zhengzi-tong daikanwa)
-    (=ucs		. #x2F855)	; 型
-    (=cns11643-3	. #x3470)	; &I-C3-3470; [20-80]
-    (=daikanwa		. 05234)	; &I-M-05234;
+     zhengzitong daikanwa)
     ))
 (define-char
   '((morohashi-daikanwa	ho 86)
@@ -6340,7 +6349,14 @@
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs@unicode	. #x5829)	; &UU+5829;
+    (=ucs		. #x21377)	; 𡍷
+    (=cns11643-4	. #x3673)	; &I-C4-3673; [22-83]
+    (=ucs@unicode	. #x5829)	; 𡍷
+    (=ucs@cns		. #x21377)	; 𡍷
+    (<-simplified
+     ((=cns11643-2	  . #x3A61)	; &M-05265; [26-65]
+      (=daikanwa	  . 05265)	; &I-M-05265;
+      ))
     ))
 (define-char
   '((=>ucs		. #x582A)	; å ª
@@ -6635,11 +6651,6 @@
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4548)	; &M-05279; [37-40]
-      (=ks-x1001	  . #x5372)	; &I-K0-5372; [51-82]
-      (=daikanwa	  . 05279)	; &I-M-05279;
-      ))
     (hanyu-dazidian	1 448 7)
     (=gb2312		. #x3642)	; &GT-06554; [22-34]
     (=jis-x0208@1983	. #x4548)	; &I-J83-4548; [37-40]
@@ -6649,6 +6660,11 @@
     (=gt-pj-1		. #x4548)	; &I-GT-06554; [37-40]
     (=jef-china3	. #x47CB)	; &I-JC3-47CB;
     (=ucs@unicode	. #x5835)	; &GT-06554;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x4548)	; &M-05279; [37-40]
+      (=ks-x1001	  . #x5372)	; &I-K0-5372; [51-82]
+      (=daikanwa	  . 05279)	; &I-M-05279;
+      ))
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
@@ -6764,14 +6780,7 @@
     (total-strokes	 . 12)
     (=ucs		. #x583A)	; å º
     (->subsumptive
-     ((<-formed
-       ((shinjigen-1	    . 5031)
-	(=jis-x0208	    . #x3326)	; &M-21775; [19-06]
-	(=daikanwa	    . 21775)	; &I-M-21775;
-	))
-      (<-formed*sources
-       shinjigen-1)
-      (shinjigen-1	  . 5033)
+     ((shinjigen-1	  . 5033)
       (shinjigen-2	  . 5033)
       (=jis-x0208	  . #x3A66)	; &GT-06605; [26-70]
       (=ks-x1001	  . #x4C77)	; &I-K0-4C77; [44-87]
@@ -6779,6 +6788,13 @@
       (=gt-pj-1		  . #x3A66)	; &I-GT-06605; [26-70]
       (=daikanwa	  . 05289)	; &I-M-05289;
       (=ucs@jis		  . #x583A)	; &GT-06605;
+      (<-formed
+       ((shinjigen-1	    . 5031)
+	(=jis-x0208	    . #x3326)	; &M-21775; [19-06]
+	(=daikanwa	    . 21775)	; &I-M-21775;
+	))
+      (<-formed*sources
+       shinjigen-1)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -7063,14 +7079,11 @@
   '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0213-1-2000  . #x2F5A)	; &JX1-2F5A; [15-58]
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x571F)	; 土
+     ((=gt-k		  . 00199)	; &GT-K00199;
       )
      ((=ucs		  . #x5C4F)	; 屏
       ))
@@ -7081,6 +7094,9 @@
     (=gt-pj-1		. #x4A3D)	; &I-GT-06679; [42-29]
     (=daikanwa		. 05316)	; &I-M-05316;
     (=cbeta		. 06237)	; &I-CB06237;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0213-1-2000  . #x2F5A)	; &JX1-2F5A; [15-58]
+      ))
     ))
 (define-char
   '((=>ucs*		. #x5840)	; 塀
@@ -7094,7 +7110,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x571F)	; 土
+       ((=gt-k		    . 00199)	; &GT-K00199;
 	)
        ((=ks-x1001	    . #x5C34)	; &CDP-88EB; [60-20]
 	(=daikanwa	    . 09175)	; &I-M-09175;
@@ -7106,7 +7122,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x571F)	; 土
+       ((=gt-k		    . 00199)	; &GT-K00199;
 	)
        ((=ucs@unicode	    . #x5C5B)	; &C3-3543;
 	))
@@ -7118,6 +7134,13 @@
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (shinjigen-1	. 1452)
+    (shinjigen-2	. 1452)
+    (=ucs		. #x5841)	; 塁
+    (=jis-x0208		. #x4E5D)	; &I-J90-4E5D; [46-61]
+    (=gt		. 06689)	; &I-GT-06689;
+    (=gt-k		. 09161)	; &I-GT-K09161;
+    (=gt-pj-1		. #x4E5D)	; &I-GT-06689; [46-61]
     (<-simplified@JP/Jouyou
      ((shinjigen-1	  . 1451)
       (=ucs		  . #x58D8)	; 壘
@@ -7126,13 +7149,6 @@
       ))
     (<-simplified@JP/Jouyou*sources
      JP/Jouyou daikanwa shinjigen-1)
-    (shinjigen-1	. 1452)
-    (shinjigen-2	. 1452)
-    (=ucs		. #x5841)	; 塁
-    (=jis-x0208		. #x4E5D)	; &I-J90-4E5D; [46-61]
-    (=gt		. 06689)	; &I-GT-06689;
-    (=gt-k		. 09161)	; &I-GT-K09161;
-    (=gt-pj-1		. #x4E5D)	; &I-GT-06689; [46-61]
     ))
 (define-char
   '((=>ucs		. #x5841)	; 塁
@@ -7143,26 +7159,32 @@
     (mojikyo		. 050137)	; &MCS-6000C3D9;
     ))
 (define-char
-  '((=>ucs		. #x21390)	; 𡎐
-    (ideographic-radical . 32)	; ⼟
+  '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=daikanwa		. 48990)	; &M-48990;
+    (=ucs		. #x21390)	; 𡎐
     ))
 (define-char
-  '((=>ucs		. #x21390)	; 𡎐
-    (morohashi-daikanwa	48990 0 0)
+  '((<-denotational
+     ((=ucs		  . #x21390)	; 𡎐
+      ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=cns11643-6	. #x474A)	; &C6-474A; [39-42]
+    (->subsumptive
+     ((=daikanwa	  . 48990)	; &M-48990;
+      )
+     ((=cns11643-6	  . #x474A)	; &C6-474A; [39-42]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	48990 0 1)
+  '((<-denotational
+     ((=ucs		  . #x21390)	; 𡎐
+      ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs		. #x21390)	; 𡎐
+    (=ucs@iso		. #x21390)	; &U-00021390;
     ))
 (define-char
   '((morohashi-daikanwa	ho 91)
@@ -7178,6 +7200,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x3657)	; 㙗
+    (=hanziku-2		. #xAF69)	; &I-HZK02-AF69;
     (=cbeta		. 06468)	; &I-CB06468;
     (mojikyo		. 081613)	; &MCS-60013ECD;
     ))
@@ -7185,10 +7208,6 @@
   '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x58AE)	; 墮
-      (=jis-x0208	  . #x5458)	; &I-J90-5458; [52-56]
-      ))
     (hanyu-dazidian	1 459 3)
     (shinjigen-1	. 1436)
     (shinjigen-2	. 1436)
@@ -7199,6 +7218,17 @@
     (=gt-pj-1		. #x4244)	; &I-GT-06653; [34-36]
     (=hanziku-2		. #xAEA5)	; &I-HZK02-AEA5;
     (mojikyo		. 054209)	; &MCS-6000D3C1;
+    (<-simplified@CN
+     ((=ucs		  . #x58AE)	; 墮
+      (=gb12345		  . #x3669)	; 墮 [22-73]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x58AE)	; 墮
+      (=jis-x0208	  . #x5458)	; &I-J90-5458; [52-56]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x58AE)	; 墮
+      ))
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
@@ -7215,11 +7245,22 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5842)	; 塂
-    (=iso-ir165		. #x2F68)	; &I-EGB-2F68; [15-72]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5842)	; 塂
+      ))
+    (ideographic-radical . 32)	; ⼟
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (=iso-ir165		. #x2F68)	; &EGB-2F68; [15-72]
+    (=ucs@unicode	. #x5842)	; &EGB-2F68;
     (mojikyo		. 059318)	; &MCS-6000E7B6;
     ))
 (define-char
-  '((=>ucs		. #x5842)	; 塂
+  '((<-denotational
+     ((=ucs		  . #x5842)	; 塂
+      ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -7296,27 +7337,6 @@
   '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified
-     ((=ucs		  . #x588D)	; 墍
-      ))
-    (hanyu-dazidian	1 468 4)
-    (=ucs		. #x5848)	; 塈
-    (=iso-ir165		. #x2C31)	; &I-EGB-2C31; [12-17]
-    (=cns11643-2	. #x3A69)	; &I-C2-3A69; [26-73]
-    (=big5		. #xD8A7)	; &I-B-D8A7;
-    (mojikyo		. 059321)	; &MCS-6000E7B9;
-    ))
-(define-char
-  '((ideographic-radical . 32)	; ⼟
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=ucs		. #x21377)	; 𡍷
-    (=cns11643-4	. #x3673)	; &I-C4-3673; [22-83]
-    ))
-(define-char
-  '((ideographic-radical . 32)	; ⼟
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
     (=ucs		. #x21396)	; 𡎖
     (=cns11643-4	. #x3674)	; &I-C4-3674; [22-84]
     (mojikyo		. 086744)	; &MCS-600152D8;
@@ -7781,7 +7801,8 @@
 	)
        ((=ucs		    . #x571F)	; 土
 	)
-       ((=ucs@unicode	    . #x5C03)	; &M-07433;
+       ((=jis-x0213-2-2000  . #x282D)	; &M-07433; [08-13]
+	(=daikanwa	    . 07433)	; &I-M-07433;
 	))
       (=daikanwa	  . 05337)	; &M-05337;
       (=cbeta		  . 01243)	; &I-CB01243;
@@ -7864,11 +7885,6 @@
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4564)	; &GT-06766; [37-68]
-      (=ks-x1001	  . #x5352)	; &I-K0-5352; [51-50]
-      (=daikanwa	  . 05340)	; &I-M-05340;
-      ))
     (=jis-x0208@1983	. #x4564)	; &GT-06767; [37-68]
     (=jis-x0208@1990	. #x4564)	; &I-J90-4564; [37-68]
     (=gt		. 06767)	; &I-GT-06767;
@@ -7877,29 +7893,32 @@
     (=jef-china3	. #x48C7)	; &I-JC3-48C7;
     (=ucs@jis		. #x5858)	; &GT-06767;
     (mojikyo		. 054257)	; &MCS-6000D3F1;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x4564)	; &GT-06766; [37-68]
+      (=ks-x1001	  . #x5352)	; &I-K0-5352; [51-50]
+      (=daikanwa	  . 05340)	; &I-M-05340;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5859)	; 塙
-    (ideographic-radical . 32)	; ⼟
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (shinjigen-2	. 1459)
-    (=jis-x0208		. #x4839)	; &GT-06721; [40-25]
-    (=big5		. #xDCEC)	; &I-B-DCEC;
-    (=gt		. 06721)	; &I-GT-06721;
-    (=gt-pj-1		. #x4839)	; &I-GT-06721; [40-25]
-    (=daikanwa		. 05341)	; &I-M-05341;
-    (=ucs@jis		. #x5859)	; &GT-06721;
-    (=ucs@big5		. #x5859)	; &GT-06721;
-    ))
-(define-char
-  '((morohashi-daikanwa	5341 0 0)
-    (ideographic-radical . 32)	; ⼟
+  '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (hanyu-dazidian	1 473 15)
     (=ucs		. #x5859)	; 塙
-    (=cns11643-2	. #x4233)	; &I-C2-4233; [34-19]
+    (=big5		. #xDCEC)	; &I-B-DCEC;
+    (->subsumptive
+     ((shinjigen-1	  . 1456)
+      (shinjigen-2	  . 1459)
+      (=jis-x0208	  . #x4839)	; &GT-06721; [40-25]
+      (=gt		  . 06721)	; &I-GT-06721;
+      (=gt-pj-1		  . #x4839)	; &I-GT-06721; [40-25]
+      (=daikanwa	  . 05341)	; &I-M-05341;
+      (=ucs@jis		  . #x5859)	; &GT-06721;
+      (=ucs@big5	  . #x5859)	; &GT-06721;
+      )
+     ((hanyu-dazidian	  1 473 15)
+      (=cns11643-2	  . #x4233)	; &C2-4233; [34-19]
+      (=ucs@unicode	  . #x5859)	; &C2-4233;
+      ))
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
@@ -7995,19 +8014,19 @@
     (total-strokes	 . 12)
     (=ucs		. #xFA7C)	; 塚
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208@1978    . #x444D)	; &GT-06756; [36-45]
-	(=ks-x1001	    . #x7540)	; &I-K0-7540; [85-32]
-	(=jis-x0213-1-2000  . #x2F57)	; &I-JX1-2F57; [15-55]
-	(=daikanwa	    . 05345)	; &I-M-05345;
-	))
-      (shinjigen-2	  . 1440)
+     ((shinjigen-2	  . 1440)
       (=jis-x0208@1983	  . #x444D)	; &GT-06661; [36-45]
       (=jis-x0208@1990	  . #x444D)	; &I-J90-444D; [36-45]
       (=gt		  . 06661)	; &I-GT-06661;
       (=gt-pj-1		  . #x444D)	; &I-GT-06661; [36-45]
       (=ucs@jis		  . #x585A)	; &GT-06661;
       (mojikyo		  . 054239)	; &MCS-6000D3DF;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208@1978    . #x444D)	; &GT-06756; [36-45]
+	(=ks-x1001	    . #x7540)	; &I-K0-7540; [85-32]
+	(=jis-x0213-1-2000  . #x2F57)	; &I-JX1-2F57; [15-55]
+	(=daikanwa	    . 05345)	; &I-M-05345;
+	))
       )
      ((=ucs@unicode	  . #xFA7C)	; &UU+FA7C;
       )
@@ -8213,6 +8232,7 @@
 (define-char
   '((<-denotational
      ((=big5		  . #xB6F1)	; &B-B6F1;
+      (=jis-x0208@1997	  . #x4536)	; &B-B6F1; [37-22]
       ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 10)
@@ -8240,25 +8260,23 @@
     (=ucs@big5		. #x586B)	; &B-B6F1;
     ))
 (define-char
-  '((=>ucs		. #x213B7)	; 𡎷
-    (ideographic-radical . 32)	; ⼟
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=daikanwa		. 05356)	; &M-05356;
-    ))
-(define-char
-  '((morohashi-daikanwa	5356 0 0)
-    (ideographic-radical . 32)	; ⼟
+  '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x213B7)	; 𡎷
-    (=cns11643-5	. #x3E4C)	; &I-C5-3E4C; [30-44]
+    (->subsumptive
+     ((=daikanwa	  . 05356)	; &M-05356;
+      )
+     ((=cns11643-5	  . #x3E4C)	; &C5-3E4C; [30-44]
+      (=ucs@iso		  . #x213B7)	; &C5-3E4C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (hanyu-dazidian	1 472 14)
+    (shinjigen-1	. 8916)
     (shinjigen-2	. 8916)
     (=ucs		. #x5862)	; å¡¢
     (=jis-x0208		. #x5449)	; &I-J90-5449; [52-41]
@@ -8642,10 +8660,7 @@
   '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9E7D)	; é¹½
-      (=jis-x0208	  . #x7345)	; &I-J90-7345; [83-37]
-      ))
+    (shinjigen-1	. 9769)
     (shinjigen-2	. 9769)
     (=ucs		. #x5869)	; å¡©
     (=jis-x0208		. #x3176)	; &I-J90-3176; [17-86]
@@ -8654,6 +8669,10 @@
     (=gt-pj-1		. #x3176)	; &I-GT-06701; [17-86]
     (=daikanwa		. 05382)	; &I-M-05382;
     (=cbeta		. 02183)	; &I-CB02183;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x9E7D)	; é¹½
+      (=jis-x0208	  . #x7345)	; &I-J90-7345; [83-37]
+      ))
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
@@ -8708,6 +8727,7 @@
 (define-char
   '((<-denotational
      ((=big5		  . #xB6F1)	; &B-B6F1;
+      (=jis-x0208@1997	  . #x4536)	; &B-B6F1; [37-22]
       ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 10)
@@ -9490,76 +9510,118 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x588C)	; 墌
-    (ideographic-radical . 32)	; ⼟
+  '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x571F)	; 土
+    (=ucs		. #x588C)	; 墌
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00199)	; &GT-K00199;
+	)
+       ((=jis-x0208	    . #x3D6E)	; &GT-11788; [29-78]
+	(=ks-x1001	    . #x5F6E)	; &I-K0-5F6E; [63-78]
+	(=daikanwa	    . 09373)	; &I-M-09373;
+	))
+      (=jis-x0212	  . #x3841)	; &M-05422; [24-33]
+      (=daikanwa	  . 05422)	; &I-M-05422;
+      (=jef-china3	  . #x48B7)	; &I-JC3-48B7;
+      (=ucs@jis		  . #x588C)	; &M-05422;
       )
-     ((=jis-x0208	  . #x3D6E)	; &GT-11788; [29-78]
-      (=ks-x1001	  . #x5F6E)	; &I-K0-5F6E; [63-78]
-      (=daikanwa	  . 09373)	; &I-M-09373;
+     ((hanyu-dazidian	  1 481 11)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00199)	; &GT-K00199;
+	)
+       ((=gb2312	    . #x4A7C)	; &C1-5A2C; [42-92]
+	(=cns11643-1	    . #x5A2C)	; &I-C1-5A2C; [58-12]
+	))
+      (=cns11643-3	  . #x463A)	; &HZK02-B2F9; [38-26]
+      (=hanziku-2	  . #xB2F9)	; &I-HZK02-B2F9;
+      (=ucs@unicode	  . #x588C)	; &HZK02-B2F9;
       ))
-    (=jis-x0212		. #x3841)	; &M-05422; [24-33]
-    (=daikanwa		. 05422)	; &I-M-05422;
-    (=cbeta		. 01838)	; &I-CB01838;
-    (=jef-china3	. #x48B7)	; &I-JC3-48B7;
-    (=ucs@jis		. #x588C)	; &M-05422;
     ))
 (define-char
-  '((morohashi-daikanwa	5422 0 0)
+  '((<-denotational
+     ((=ucs		  . #x588C)	; 墌
+      ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 481 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=cbeta		. 01838)	; &CB01838;
+    ))
+(define-char
+  '((<-denotational
+     ((=big5		  . #xD8A7)	; &B-D8A7;
+      ))
+    (ideographic-radical . 32)	; ⼟
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=ucs		. #x588D)	; 墍
+    (->subsumptive
+     ((=jis-x0212	  . #x3842)	; &M-05423; [24-34]
+      (=jis-x0213-2-2000  . #x252B)	; &I-JX2-252B; [05-11]
+      (=daikanwa	  . 05423)	; &I-M-05423;
+      (=ucs@jis		  . #x588D)	; &M-05423;
       )
-     ((=ucs		  . #x571F)	; 土
+     ((=cns11643-3	  . #x4645)	; &C3-4645; [38-37]
       )
-     ((=ucs		  . #x5EB6)	; 庶
+     ((=ucs@unicode	  . #x588D)	; &UU+588D;
       ))
-    (=ucs		. #x588C)	; 墌
-    (=cns11643-3	. #x463A)	; &I-C3-463A; [38-26]
-    (=hanziku-2		. #xB2F9)	; &I-HZK02-B2F9;
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=ucs		. #x588D)	; 墍
-    (=jis-x0212		. #x3842)	; &I-JSP-3842; [24-34]
-    (=cns11643-3	. #x4645)	; &I-C3-4645; [38-37]
-    (=jis-x0213-2-2000	. #x252B)	; &I-JX2-252B; [05-11]
-    (=daikanwa		. 05423)	; &I-M-05423;
+    (=big5		. #xD8A7)	; &B-D8A7;
+    (=ucs@big5		. #x5848)	; &B-D8A7;
     ))
 (define-char
-  '((=>ucs		. #x588D)	; 墍
-    (morohashi-daikanwa	5423 0 2)
+  '((<-denotational
+     ((=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
-  '((=>ucs		. #x213F2)	; 𡏲
+  '((<-denotational
+     ((=big5		  . #xD8A7)	; &B-D8A7;
+      ))
     (ideographic-radical . 32)	; ⼟
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=daikanwa		. 05424)	; &M-05424;
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (hanyu-dazidian	1 468 4)
+    (=ucs		. #x5848)	; 塈
+    (<-simplified
+     ((=ucs		  . #x588D)	; 墍
+      ))
+    (->subsumptive
+     ((mojikyo		  . 059321)	; &MCS-6000E7B9;
+      )
+     ((=iso-ir165	  . #x2C31)	; &EGB-2C31; [12-17]
+      (=ucs@unicode	  . #x5848)	; &EGB-2C31;
+      )
+     ((=cns11643-2	  . #x3A69)	; &C2-3A69; [26-73]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	5424 0 0)
-    (ideographic-radical . 32)	; ⼟
+  '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x213F2)	; 𡏲
-    (=cns11643-6	. #x5B64)	; &I-C6-5B64; [59-68]
+    (->subsumptive
+     ((=daikanwa	  . 05424)	; &M-05424;
+      )
+     ((=ucs@iso		  . #x213F2)	; &U-000213F2;
+      )
+     ((=cns11643-6	  . #x5B64)	; &C6-5B64; [59-68]
+      ))
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
@@ -9883,11 +9945,6 @@
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x7172)	; &M-05454; [81-82]
-      (=jis-x0213-1-2000  . #x2F5D)	; &I-JX1-2F5D; [15-61]
-      (=daikanwa	  . 05454)	; &I-M-05454;
-      ))
     (shinjigen-1	. 1482)
     (shinjigen-2	. 1482)
     (=ucs		. #x5897)	; 増
@@ -9896,24 +9953,26 @@
     (=gt		. 06835)	; &I-GT-06835;
     (=gt-pj-1		. #x417D)	; &I-GT-06835; [33-93]
     (mojikyo		. 050139)	; &MCS-6000C3DB;
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x7172)	; &M-05454; [81-82]
+      (=jis-x0213-1-2000  . #x2F5D)	; &I-JX1-2F5D; [15-61]
+      (=daikanwa	  . 05454)	; &I-M-05454;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x21414)	; 𡐔
-    (morohashi-daikanwa	ho 97)
-    (ideographic-radical . 32)	; ⼟
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=gt		. 06793)	; &GT-06793;
-    (=gt-pj-11		. #x454F)	; &GT-06793; [37-47]
-    (mojikyo		. 085405)	; &MCS-60014D9D;
-    ))
-(define-char
-  '((morohashi-daikanwa	ho 97 0)
-    (ideographic-radical . 32)	; ⼟
+  '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x21414)	; 𡐔
-    (=cns11643-4	. #x425A)	; &I-C4-425A; [34-58]
+    (->subsumptive
+     ((morohashi-daikanwa	ho 97)
+      (=gt		  . 06793)	; &GT-06793;
+      (=gt-pj-11	  . #x454F)	; &GT-06793; [37-47]
+      (mojikyo		  . 085405)	; &MCS-60014D9D;
+      )
+     ((=cns11643-4	  . #x425A)	; &C4-425A; [34-58]
+      (=ucs@iso		  . #x21414)	; &C4-425A;
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	ho 98)
@@ -10378,10 +10437,6 @@
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA3A)	; 墨
-      (=jis-x0213-1-2000  . #x2F5E)	; &I-JX1-2F5E; [15-62]
-      ))
     (shinjigen-1	. 1487)
     (shinjigen-2	. 1487)
     (=jis-x0208		. #x4B4F)	; &GT-06861; [43-47]
@@ -10389,6 +10444,10 @@
     (=gt-k		. 11176)	; &I-GT-K11176;
     (=gt-pj-1		. #x4B4F)	; &I-GT-06861; [43-47]
     (=ucs@jis		. #x58A8)	; &GT-06861;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA3A)	; 墨
+      (=jis-x0213-1-2000  . #x2F5E)	; &I-JX1-2F5E; [15-62]
+      ))
     ))
 (define-char
   '((=>ucs		. #x58A9)	; 墩
@@ -10635,17 +10694,17 @@
     (total-strokes	 . 15)
     (=ucs		. #x21426)	; 𡐦
     (->subsumptive
-     ((<-same
+     ((shinjigen-1	  . 1438)
+      (=daikanwa	  . 05482)	; &M-05482;
+      (=ucs@iso		  . #x21426)	; &M-05482;
+      (<-same
        ((shinjigen-1	    . 1437)
 	(=ucs		    . #x58AE)	; 墮
 	(=jis-x0208	    . #x5458)	; &I-J90-5458; [52-56]
 	(=daikanwa	    . 05481)	; &I-M-05481;
 	))
       (<-same*sources
-       zhengzi-tong daikanwa shinjigen-1)
-      (shinjigen-1	  . 1438)
-      (=daikanwa	  . 05482)	; &M-05482;
-      (=ucs@iso		  . #x21426)	; &M-05482;
+       zhengzitong daikanwa shinjigen-1)
       )
      ((=cns11643-7	  . #x216B)	; &C7-216B; [01-75]
       ))
@@ -10656,7 +10715,12 @@
     (total-strokes	 . 15)
     (=ucs		. #x58AF)	; 墯
     (->subsumptive
-     ((<-same
+     ((hanyu-dazidian	  1 489 4)
+      (shinjigen-1	  . 1439)
+      (=big5		  . #xE54F)	; &M-05483;
+      (=daikanwa	  . 05483)	; &I-M-05483;
+      (=ucs@unicode	  . #x58AF)	; &M-05483;
+      (<-same
        ((=daikanwa	    . 05482)	; &M-05482;
 	))
       (<-same*sources
@@ -10668,32 +10732,37 @@
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (hanyu-dazidian	  1 489 4)
-      (shinjigen-1	  . 1439)
-      (=big5		  . #xE54F)	; &M-05483;
-      (=daikanwa	  . 05483)	; &I-M-05483;
-      (=ucs@unicode	  . #x58AF)	; &M-05483;
       )
      ((=cns11643-2	  . #x4F76)	; &C2-4F76; [47-86]
       (=ucs@cns		  . #x58AF)	; &C2-4F76;
       ))
     ))
 (define-char
-  '((=>ucs		. #x58B0)	; 墰
+  '((ideographic-radical . 32)	; ⼟
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x58B0)	; 墰
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x58B0)	; 墰
+      ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=daikanwa		. 05484)	; &M-05484;
     ))
 (define-char
-  '((morohashi-daikanwa	5484 0 4)
+  '((<-denotational
+     ((=ucs		  . #x58B0)	; 墰
+      ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (hanyu-dazidian	1 486 9)
-    (=ucs		. #x58B0)	; 墰
-    (=cns11643-3	. #x4B4D)	; &I-C3-4B4D; [43-45]
+    (=cns11643-3	. #x4B4D)	; &HZK02-B3FA; [43-45]
     (=hanziku-2		. #xB3FA)	; &I-HZK02-B3FA;
+    (=ucs@unicode	. #x58B0)	; &HZK02-B3FA;
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
@@ -11256,7 +11325,8 @@
     (=ucs		. #x58BF)	; 墿
     (=big5		. #xE94C)	; &I-B-E94C;
     (->subsumptive
-     ((<-formed
+     ((=daikanwa	  . 05511)	; &M-05511;
+      (<-formed
        ((=ks-x1001	    . #x5432)	; &M-38882; [52-18]
 	(=daikanwa	    . 38882)	; &I-M-38882;
 	))
@@ -11268,7 +11338,6 @@
 	))
       (<-same*sources
        jiyun daikanwa)
-      (=daikanwa	  . 05511)	; &M-05511;
       )
      ((hanyu-dazidian	  1 491 13)
       (=cns11643-2	  . #x5656)	; &C2-5656; [54-54]
@@ -11729,11 +11798,6 @@
     (=ucs		. #x58CA)	; 壊
     (->subsumptive
      ((morohashi-daikanwa	5541 1)
-      (<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x5455)	; &GT-07073; [52-53]
-	(=ks-x1001	    . #x4E55)	; &I-K0-4E55; [46-53]
-	(=daikanwa	    . 05590)	; &I-M-05590;
-	))
       (shinjigen-1	  . 1501)
       (shinjigen-2	  . 1501)
       (=jis-x0208	  . #x3275)	; &GT-06958; [18-85]
@@ -11741,6 +11805,11 @@
       (=gt-pj-1		  . #x3275)	; &I-GT-06958; [18-85]
       (=ucs@jis		  . #x58CA)	; &GT-06958;
       (mojikyo		  . 050140)	; &MCS-6000C3DC;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5455)	; &GT-07073; [52-53]
+	(=ks-x1001	    . #x4E55)	; &I-K0-4E55; [46-53]
+	(=daikanwa	    . 05590)	; &I-M-05590;
+	))
       )
      ((=ucs@unicode	  . #x58CA)	; &UU+58CA;
       )
@@ -11748,21 +11817,18 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x21485)	; 𡒅
-    (morohashi-daikanwa	ho 101)
-    (ideographic-radical . 32)	; ⼟
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=gt		. 06975)	; &GT-06975;
-    (=gt-pj-11		. #x463B)	; &GT-06975; [38-27]
-    (mojikyo		. 085485)	; &MCS-60014DED;
-    ))
-(define-char
-  '((morohashi-daikanwa	ho 101 0)
-    (ideographic-radical . 32)	; ⼟
+  '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (=ucs		. #x21485)	; 𡒅
+    (->subsumptive
+     ((morohashi-daikanwa	ho 101)
+      (=gt		  . 06975)	; &GT-06975;
+      (=gt-pj-11	  . #x463B)	; &GT-06975; [38-27]
+      (mojikyo		  . 085485)	; &MCS-60014DED;
+      )
+     ((=ucs@iso		  . #x21485)	; &U-00021485;
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	ho 103)
@@ -11816,18 +11882,18 @@
     (total-strokes	 . 16)
     (=ucs		. #x58CC)	; 壌
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x5461)	; &GT-07097; [52-65]
-	(=ks-x1001	    . #x653D)	; &I-K0-653D; [69-29]
-	(=daikanwa	    . 05608)	; &I-M-05608;
-	))
-      (shinjigen-1	  . 1504)
+     ((shinjigen-1	  . 1504)
       (shinjigen-2	  . 1504)
       (=jis-x0208	  . #x3E6D)	; &GT-06976; [30-77]
       (=gt		  . 06976)	; &I-GT-06976;
       (=gt-pj-1		  . #x3E6D)	; &I-GT-06976; [30-77]
       (=ucs@jis		  . #x58CC)	; &GT-06976;
       (mojikyo		  . 054173)	; &MCS-6000D39D;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5461)	; &GT-07097; [52-65]
+	(=ks-x1001	    . #x653D)	; &I-K0-653D; [69-29]
+	(=daikanwa	    . 05608)	; &I-M-05608;
+	))
       )
      ((=ucs@unicode	  . #x58CC)	; &UU+58CC;
       ))
diff --git a/lisp/utf-2000/Ideograph-R033-Scholar.el b/lisp/utf-2000/Ideograph-R033-Scholar.el
index b6aa3a3..ef32500 100644
--- a/lisp/utf-2000/Ideograph-R033-Scholar.el
+++ b/lisp/utf-2000/Ideograph-R033-Scholar.el
@@ -76,11 +76,6 @@
   '((ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5463)	; &GT-07142; [52-67]
-      (=ks-x1001	  . #x6D60)	; &I-K0-6D60; [77-64]
-      (=daikanwa	  . 05643)	; &I-M-05643;
-      ))
     (hanyu-dazidian	1 420 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -101,6 +96,17 @@
     (=gt-pj-1		. #x4154)	; &I-GT-07139; [33-52]
     (=daikanwa		. 05642)	; &I-M-05642;
     (=hanziku-2		. #xA6B0)	; &I-HZK02-A6B0;
+    (<-simplified@CN
+     ((=gb12345		  . #x5733)	; &GT-07142; [55-19]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5463)	; &GT-07142; [52-67]
+      (=ks-x1001	  . #x6D60)	; &I-K0-6D60; [77-64]
+      (=daikanwa	  . 05643)	; &I-M-05643;
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x58EF)	; 壯
+      ))
     ))
 (define-char
   '((ideographic-radical . 33)	; â¼ 
@@ -119,6 +125,7 @@
 	)
        ((=ucs		    . #x58EB)	; 士
 	))
+      (shinjigen-1	  . 1527)
       (shinjigen-2	  . 1527)
       (=jis-x0208	  . #x5463)	; &GT-07142; [52-67]
       (=ks-x1001	  . #x6D60)	; &I-K0-6D60; [77-64]
@@ -154,10 +161,6 @@
   '((ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6661)	; &J90-6661; [70-65]
-      (=ks-x1001	  . #x6122)	; &I-K0-6122; [65-02]
-      ))
     (hanyu-dazidian	1 429 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -167,6 +170,7 @@
       )
      ((=ucs		  . #x200DC)	; 𠃜
       ))
+    (shinjigen-1	. 6398)
     (shinjigen-2	. 6398)
     (=ucs		. #x58F0)	; 声
     (=jis-x0208		. #x403C)	; &I-J90-403C; [32-28]
@@ -177,24 +181,40 @@
     (=gt-k		. 02590)	; &I-GT-K02590;
     (=gt-pj-1		. #x403C)	; &I-GT-07143; [32-28]
     (=daikanwa		. 05645)	; &I-M-05645;
+    (<-simplified@CN
+     ((=gb12345		  . #x4979)	; &UU+8072; [41-89]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6661)	; &J90-6661; [70-65]
+      (=ks-x1001	  . #x6122)	; &I-K0-6122; [65-02]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x8072)	; 聲
+      ))
     ))
 (define-char
-  '((=>ucs		. #x2151E)	; 𡔞
-    (ideographic-radical . 33)	; â¼ 
+  '((ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=daikanwa		. 05646)	; &M-05646;
+    (=ucs		. #x2151E)	; 𡔞
     ))
 (define-char
-  '((morohashi-daikanwa	5646 0 0)
+  '((<-denotational
+     ((=ucs		  . #x2151E)	; 𡔞
+      ))
     (ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=ucs		. #x2151E)	; 𡔞
+    (->subsumptive
+     ((=daikanwa	  . 05646)	; &M-05646;
+      )
+     ((=ucs@iso		  . #x2151E)	; &U-0002151E;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x2151E)	; 𡔞
-    (morohashi-daikanwa	5646 0 1)
+  '((<-denotational
+     ((=ucs		  . #x2151E)	; 𡔞
+      ))
     (ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
@@ -204,10 +224,6 @@
   '((ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x58F9)	; 壹
-      (=jis-x0208	  . #x5465)	; &I-J90-5465; [52-69]
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (=ucs		  . #x2FF3)	; ⿳
@@ -218,6 +234,7 @@
       )
      ((=ucs		  . #x5315)	; 匕
       ))
+    (shinjigen-1	. 1528)
     (shinjigen-2	. 1528)
     (=ucs		. #x58F1)	; 壱
     (=jis-x0208		. #x306D)	; &I-J90-306D; [16-77]
@@ -225,16 +242,16 @@
     (=gt		. 07140)	; &I-GT-07140;
     (=gt-pj-1		. #x306D)	; &I-GT-07140; [16-77]
     (=daikanwa		. 05647)	; &I-M-05647;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x58F9)	; 壹
+      (=jis-x0208	  . #x5465)	; &I-J90-5465; [52-69]
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	5647 1)
     (ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x8CE3)	; è³£
-      (=jis-x0208	  . #x6C4E)	; &I-J90-6C4E; [76-46]
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -252,6 +269,10 @@
     (=gt-k		. 02771)	; &I-GT-K02771;
     (=gt-pj-1		. #x4764)	; &I-GT-07145; [39-68]
     (mojikyo		. 050142)	; &MCS-6000C3DE;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x8CE3)	; è³£
+      (=jis-x0208	  . #x6C4E)	; &I-J90-6C4E; [76-46]
+      ))
     ))
 (define-char
   '((ideographic-radical . 33)	; â¼ 
@@ -451,12 +472,6 @@
   '((ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-same
-     ((=ucs		  . #x58FA)	; 壺
-      (=daikanwa	  . 05662)	; &I-M-05662;
-      ))
-    (<-same*sources
-     zihui daikanwa)
     (hanyu-dazidian	1 458 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -478,6 +493,12 @@
     (=daikanwa		. 05657)	; &I-M-05657;
     (=hanziku-2		. #xAE68)	; &I-HZK02-AE68;
     (=cbeta		. 06724)	; &I-CB06724;
+    (<-same
+     ((=ucs		  . #x58FA)	; 壺
+      (=daikanwa	  . 05662)	; &I-M-05662;
+      ))
+    (<-same*sources
+     zihui daikanwa)
     ))
 (define-char
   '((ideographic-radical . 33)	; â¼ 
@@ -514,6 +535,7 @@
       )
      ((=ucs		  . #x8C46)	; 豆
       ))
+    (shinjigen-1	. 1529)
     (shinjigen-2	. 1529)
     (=ucs		. #x58F9)	; 壹
     (=jis-x0208		. #x5465)	; &I-J90-5465; [52-69]
@@ -574,7 +596,10 @@
 	)
        ((=gt-k		    . 00199)	; &GT-K00199;
 	)
-       ((=ucs@unicode	    . #x80E5)	; &GT-38009;
+       ((=jis-x0208	    . #x6671)	; &GT-38009; [70-81]
+	(=gb2312	    . #x7163)	; &I-G0-7163; [81-67]
+	(=ks-x1001	    . #x6021)	; &I-K0-6021; [64-01]
+	(=daikanwa	    . 29406)	; &I-M-29406;
 	))
       (shinjigen-1	  . 1704)
       (shinjigen-2	  . 1704)
@@ -598,19 +623,16 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x2138E)	; 𡎎
-    (ideographic-radical . 33)	; â¼ 
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=daikanwa		. 05665)	; &M-05665;
-    ))
-(define-char
-  '((morohashi-daikanwa	5665 0 0)
-    (ideographic-radical . 33)	; â¼ 
+  '((ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x2138E)	; 𡎎
-    (=cns11643-6	. #x4751)	; &I-C6-4751; [39-49]
+    (->subsumptive
+     ((=daikanwa	  . 05665)	; &M-05665;
+      )
+     ((=cns11643-6	  . #x4751)	; &C6-4751; [39-49]
+      (=ucs@iso		  . #x2138E)	; &C6-4751;
+      ))
     ))
 (define-char
   '((ideographic-radical . 33)	; â¼ 
diff --git a/lisp/utf-2000/Ideograph-R034-Go.el b/lisp/utf-2000/Ideograph-R034-Go.el
index c41c73d..2a057b7 100644
--- a/lisp/utf-2000/Ideograph-R034-Go.el
+++ b/lisp/utf-2000/Ideograph-R034-Go.el
@@ -199,21 +199,21 @@
     (ideographic-radical . 34)	; ⼡
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
+    (=daikanwa		. 05699)	; &M-05699;
     (<-unknown
      ((=ucs		  . #x2F85C)	; 夆
       ))
-    (=daikanwa		. 05699)	; &M-05699;
     ))
 (define-char
   '((=>daikanwa		. 05699)	; &M-05699;
     (ideographic-radical . 34)	; ⼡
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
+    (=ucs		. #x2F85C)	; 夆
+    (=cns11643-5	. #x2362)	; &I-C5-2362; [03-66]
     (<-unknown
      ((=daikanwa	  . 05699)	; &M-05699;
       ))
-    (=ucs		. #x2F85C)	; 夆
-    (=cns11643-5	. #x2362)	; &I-C5-2362; [03-66]
     ))
 (define-char
   '((ideographic-radical . 34)	; ⼡
@@ -287,12 +287,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x5A4E)	; &GT-48488; [58-46]
-	(=ks-x1001	    . #x5C28)	; &I-K0-5C28; [60-08]
-	(=daikanwa	    . 36117)	; &I-M-36117;
-	))
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
@@ -309,6 +304,11 @@
       (=gt-pj-1		  . #x4A51)	; &I-GT-07215; [42-49]
       (=daikanwa	  . 05703)	; &I-M-05703;
       (=ucs@jis		  . #x5909)	; &GT-07215;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5A4E)	; &GT-48488; [58-46]
+	(=ks-x1001	    . #x5C28)	; &I-K0-5C28; [60-08]
+	(=daikanwa	    . 36117)	; &I-M-36117;
+	))
       )
      ((=ucs@unicode	  . #x5909)	; &UU+5909;
       ))
diff --git a/lisp/utf-2000/Ideograph-R035-Go-Slowly.el b/lisp/utf-2000/Ideograph-R035-Go-Slowly.el
index ea28794..ee92950 100644
--- a/lisp/utf-2000/Ideograph-R035-Go-Slowly.el
+++ b/lisp/utf-2000/Ideograph-R035-Go-Slowly.el
@@ -27,12 +27,12 @@
     (ideographic-radical . 35)	; â¼¢
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
-    (<-ideographic-component-forms
+    (=gt-k		. 00218)	; &GT-K00218;
+    (=gt-pj-k1		. #x3262)	; &GT-K00218; [18-66]
+    (<-identical@component/connect-below
      ((=jis-x0208	  . #x546A)	; &GT-07225; [52-74]
       (=daikanwa	  . 05708)	; &I-M-05708;
       ))
-    (=gt-k		. 00218)	; &GT-K00218;
-    (=gt-pj-k1		. #x3262)	; &GT-K00218; [18-66]
     ))
 (define-char
   '((=>ucs		. #x2155E)	; 𡕞
@@ -139,10 +139,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE8)	; ⻨
     (<-identical@component
      ((=ucs		  . #x9EA6)	; 麦
       ))
-    (=ucs		. #x2EE8)	; ⻨
     ))
 (define-char
   '((ideographic-radical@ucs . 199)	; ⿆
@@ -540,23 +540,37 @@
     (=cns11643-6	. #x515C)	; &I-C6-515C; [49-60]
     ))
 (define-char
-  '((=>ucs		. #x20B76)	; ð ­¶
+  '((ideographic-radical . 35)	; â¼¢
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs		. #x20B76)	; ð ­¶
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20B76)	; ð ­¶
+      ))
     (ideographic-radical . 35)	; â¼¢
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=daikanwa		. 05730)	; &M-05730;
+    (->subsumptive
+     ((=daikanwa	  . 05730)	; &M-05730;
+      )
+     ((=cns11643-6	  . #x515B)	; &C6-515B; [49-59]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	5730 0 0)
+  '((<-denotational
+     ((=ucs		  . #x20B76)	; ð ­¶
+      ))
     (ideographic-radical . 35)	; â¼¢
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs		. #x20B76)	; ð ­¶
-    (=cns11643-6	. #x515B)	; &I-C6-515B; [49-59]
+    (=ucs@iso		. #x20B76)	; &U-00020B76;
     ))
 (define-char
   '((<-denotational
      ((=big5		  . #xE5C0)	; &B-E5C0;
+      (=jis-x0208@1997	  . #x546B)	; &B-E5C0; [52-75]
       ))
     (ideographic-radical . 35)	; â¼¢
     (ideographic-strokes . 11)
diff --git a/lisp/utf-2000/Ideograph-R036-Evening.el b/lisp/utf-2000/Ideograph-R036-Evening.el
index 7ca6c56..e99d557 100644
--- a/lisp/utf-2000/Ideograph-R036-Evening.el
+++ b/lisp/utf-2000/Ideograph-R036-Evening.el
@@ -65,19 +65,6 @@
   '((ideographic-radical . 36)	; â¼£
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (<-same
-     ((=ucs		  . #x5917)	; 夗
-      (=daikanwa	  . 05752)	; &I-M-05752;
-      ))
-    (<-same*sources
-     zihui daikanwa)
-    (<-vulgar
-     ((shinjigen-1	  . 848)
-      (=ucs		  . #x536F)	; 卯
-      (=jis-x0208	  . #x312C)	; &I-J90-312C; [17-12]
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (hanyu-dazidian	2 861 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -98,6 +85,19 @@
     (=daikanwa		. 05753)	; &I-M-05753;
     (=hanziku-3		. #xAD64)	; &I-HZK03-AD64;
     (=cbeta		. 06470)	; &I-CB06470;
+    (<-same
+     ((=ucs		  . #x5917)	; 夗
+      (=daikanwa	  . 05752)	; &I-M-05752;
+      ))
+    (<-same*sources
+     zihui daikanwa)
+    (<-vulgar
+     ((shinjigen-1	  . 848)
+      (=ucs		  . #x536F)	; 卯
+      (=jis-x0208	  . #x312C)	; &I-J90-312C; [17-12]
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     (->mistakable
      ((=ucs		  . #x20A0D)	; 𠨍
       (=daikanwa	  . 02843)	; &I-M-02843;
@@ -180,27 +180,21 @@
   '((ideographic-radical . 36)	; â¼£
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
+    (hanyu-dazidian	2 862 1)
+    (=ucs		. #x21587)	; 𡖇
+    (=daikanwa		. 05757)	; &I-M-05757;
+    (=hanziku-3		. #xADA3)	; &I-HZK03-ADA3;
     (<-same
      ((=ucs		  . #x591A)	; 多
       (=daikanwa	  . 05756)	; &I-M-05756;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (hanyu-dazidian	2 862 1)
-    (=ucs		. #x21587)	; 𡖇
-    (=daikanwa		. 05757)	; &I-M-05757;
-    (=hanziku-3		. #xADA3)	; &I-HZK03-ADA3;
     ))
 (define-char
   '((ideographic-radical . 36)	; â¼£
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (<-ancient
-     ((=ucs		  . #x591A)	; 多
-      (=daikanwa	  . 05756)	; &I-M-05756;
-      ))
-    (<-ancient*sources
-     jiyun daikanwa)
     (hanyu-dazidian	1 53 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -214,6 +208,12 @@
     (=cns11643-6	. #x243A)	; &I-C6-243A; [04-26]
     (=daikanwa		. 05758)	; &I-M-05758;
     (=hanziku-1		. #xAEE5)	; &I-HZK01-AEE5;
+    (<-ancient
+     ((=ucs		  . #x591A)	; 多
+      (=daikanwa	  . 05756)	; &I-M-05756;
+      ))
+    (<-ancient*sources
+     jiyun daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -222,12 +222,6 @@
     (ideographic-radical . 36)	; â¼£
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (<-vulgar
-     ((=ucs		  . #x591A)	; 多
-      (=daikanwa	  . 05756)	; &I-M-05756;
-      ))
-    (<-vulgar*sources
-     zhengzi-tong daikanwa)
     (hanyu-dazidian	2 863 1)
     (=ucs		. #x591B)	; 夛
     (=jis-x0208		. #x546C)	; &I-J90-546C; [52-76]
@@ -236,6 +230,12 @@
     (=gt-pj-1		. #x546C)	; &I-GT-07281; [52-76]
     (=daikanwa		. 05759)	; &I-M-05759;
     (=hanziku-3		. #xADC3)	; &I-HZK03-ADC3;
+    (<-vulgar
+     ((=ucs		  . #x591A)	; 多
+      (=daikanwa	  . 05756)	; &I-M-05756;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa)
     ))
 (define-char
   '((=>ucs		. #x591B)	; 夛
@@ -254,21 +254,18 @@
     (shinjigen-1	. 1547)
     ))
 (define-char
-  '((=>ucs		. #x2158A)	; 𡖊
-    (ideographic-radical . 36)	; â¼£
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=daikanwa		. 05760)	; &M-05760;
-    ))
-(define-char
-  '((morohashi-daikanwa	5760 0 0)
-    (ideographic-radical . 36)	; â¼£
+  '((ideographic-radical . 36)	; â¼£
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (hanyu-dazidian	2 863 5)
     (=ucs		. #x2158A)	; 𡖊
-    (=cns11643-6	. #x266E)	; &I-C6-266E; [06-78]
-    (=hanziku-3		. #xADC7)	; &I-HZK03-ADC7;
+    (->subsumptive
+     ((=daikanwa	  . 05760)	; &M-05760;
+      )
+     ((hanyu-dazidian	  2 863 5)
+      (=cns11643-6	  . #x266E)	; &HZK03-ADC7; [06-78]
+      (=hanziku-3	  . #xADC7)	; &I-HZK03-ADC7;
+      (=ucs@iso		  . #x2158A)	; &HZK03-ADC7;
+      ))
     ))
 (define-char
   '((ideographic-radical . 36)	; â¼£
@@ -698,13 +695,6 @@
     (ideographic-radical@cns*sources
      daikanwa=05784 cns11643 gt jis)
     (total-strokes	 . 11)
-    (<-vulgar
-     ((shinjigen-1	  . 1550)
-      (=cns11643-1	  . #x6842)	; &M-05802; [72-34]
-      (=daikanwa	  . 05802)	; &I-M-05802;
-      ))
-    (<-vulgar*sources
-     songyuan-yilai-suzipu zihui daikanwa shinjigen-1)
     (hanyu-dazidian	2 863 18)
     (shinjigen-1	. 1552)
     (shinjigen-2	. 1552)
@@ -717,6 +707,13 @@
     (=gt-pj-1		. #x546D)	; &I-GT-07313; [52-77]
     (=hanziku-3		. #xADD4)	; &I-HZK03-ADD4;
     (=jef-china3	. #x82A2)	; &I-JC3-82A2;
+    (<-vulgar
+     ((shinjigen-1	  . 1550)
+      (=cns11643-1	  . #x6842)	; &M-05802; [72-34]
+      (=daikanwa	  . 05802)	; &I-M-05802;
+      ))
+    (<-vulgar*sources
+     songyuan-yilai-suzipu zihui daikanwa shinjigen-1)
     (->subsumptive
      ((ideographic-radical . 36)	; â¼£
       (ideographic-strokes . 8)
@@ -919,13 +916,6 @@
     (ideographic-radical . 36)	; â¼£
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (<-simplified
-     ((shinjigen-1	  . 1550)
-      (=cns11643-1	  . #x6842)	; &M-05802; [72-34]
-      (=daikanwa	  . 05802)	; &I-M-05802;
-      ))
-    (<-simplified*sources
-     shinjigen-1)
     (shinjigen-1	. 1549)
     (=jis-x0208		. #x4C34)	; &GT-07332; [44-20]
     (=ks-x1001		. #x5953)	; &I-K0-5953; [57-51]
@@ -936,6 +926,13 @@
     (=gt-pj-1		. #x4C34)	; &I-GT-07332; [44-20]
     (=ucs@unicode	. #x5922)	; &GT-07332;
     (mojikyo		. 050144)	; &MCS-6000C3E0;
+    (<-simplified
+     ((shinjigen-1	  . 1550)
+      (=cns11643-1	  . #x6842)	; &M-05802; [72-34]
+      (=daikanwa	  . 05802)	; &I-M-05802;
+      ))
+    (<-simplified*sources
+     shinjigen-1)
     ))
 (define-char
   '((<-denotational
@@ -955,6 +952,10 @@
     (->subsumptive
      ((ideographic-strokes . 11)
       (total-strokes	   . 14)
+      (shinjigen-1	  . 1553)
+      (=jis-x0212	  . #x3869)	; &M-05803; [24-73]
+      (=daikanwa	  . 05803)	; &I-M-05803;
+      (=ucs@jis		  . #x5923)	; &M-05803;
       (<-vulgar
        ((shinjigen-1	    . 1550)
 	(=cns11643-1	    . #x6842)	; &M-05802; [72-34]
@@ -962,10 +963,6 @@
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 1553)
-      (=jis-x0212	  . #x3869)	; &M-05803; [24-73]
-      (=daikanwa	  . 05803)	; &I-M-05803;
-      (=ucs@jis		  . #x5923)	; &M-05803;
       )
      ((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 72973b5..944e973 100644
--- a/lisp/utf-2000/Ideograph-R037-Big.el
+++ b/lisp/utf-2000/Ideograph-R037-Big.el
@@ -463,11 +463,7 @@
     (->subsumptive
      ((=daikanwa	  . 05860)	; &M-05860;
       )
-     ((<-simplified@CN
-       ((=ucs		    . #x55AC)	; 喬
-	(=gb12345	    . #x4747)	; 喬 [39-39]
-	))
-      (hanyu-dazidian	  1 38 1)
+     ((hanyu-dazidian	  1 38 1)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
@@ -480,6 +476,10 @@
       (=cns11643-3	  . #x2345)	; &I-C3-2345; [03-37]
       (=hanziku-1	  . #xABD7)	; &I-HZK01-ABD7;
       (=ucs@unicode	  . #x4E54)	; &HZK01-ABD7;
+      (<-simplified@CN
+       ((=ucs		    . #x55AC)	; 喬
+	(=gb12345	    . #x4747)	; 喬 [39-39]
+	))
       ))
     ))
 (define-char
@@ -685,37 +685,34 @@
     (=hanziku-2		. #xBCD8)	; &I-HZK02-BCD8;
     ))
 (define-char
-  '((=>ucs		. #x215F1)	; 𡗱
-    (morohashi-daikanwa	ho 113)
-    (ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=gt		. 07409)	; &GT-07409;
-    (=gt-pj-11		. #x433F)	; &GT-07409; [35-31]
-    (mojikyo		. 085213)	; &MCS-60014CDD;
-    ))
-(define-char
-  '((morohashi-daikanwa	ho 113 0)
-    (ideographic-radical . 37)	; ⼤
+  '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 529 13)
     (=ucs		. #x215F1)	; 𡗱
-    (=hanziku-2		. #xBCD9)	; &I-HZK02-BCD9;
+    (->subsumptive
+     ((morohashi-daikanwa	ho 113)
+      (=gt		  . 07409)	; &GT-07409;
+      (=gt-pj-11	  . #x433F)	; &GT-07409; [35-31]
+      (mojikyo		  . 085213)	; &MCS-60014CDD;
+      )
+     ((hanyu-dazidian	  1 529 13)
+      (=hanziku-2	  . #xBCD9)	; &HZK02-BCD9;
+      (=ucs@iso		  . #x215F1)	; &HZK02-BCD9;
+      ))
     ))
 (define-char
   '((script		CN Simplified Ideograph)
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-simplified
-     ((=gb12345		  . #x5E46)	; &UU+5969; [62-38]
-      ))
     (hanyu-dazidian	1 529 9)
     (=ucs		. #x5941)	; 奁
     (=gb2312		. #x5E46)	; &I-G0-5E46; [62-38]
     (=hanziku-2		. #xBCD5)	; &I-HZK02-BCD5;
     (mojikyo		. 051272)	; &MCS-6000C848;
+    (<-simplified@CN
+     ((=gb12345		  . #x5E46)	; &UU+5969; [62-38]
+      ))
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
@@ -762,7 +759,15 @@
     (=hanziku-2		. #xBE59)	; &I-HZK02-BE59;
     ))
 (define-char
-  '((=>ucs		. #x5943)	; 奃
+  '((ideographic-radical . 37)	; ⼤
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (=ucs		. #x5943)	; 奃
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5943)	; 奃
+      ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
@@ -773,53 +778,50 @@
     (=ucs@jis		. #x5943)	; &M-05880;
     ))
 (define-char
-  '((morohashi-daikanwa	5880 0 1)
+  '((<-denotational
+     ((=ucs		  . #x5943)	; 奃
+      ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (hanyu-dazidian	1 535 8)
-    (=ucs		. #x5943)	; 奃
-    (=hanziku-2		. #xBDF7)	; &I-HZK02-BDF7;
+    (=hanziku-2		. #xBDF7)	; &HZK02-BDF7;
+    (=ucs@unicode	. #x5943)	; &HZK02-BDF7;
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (shinjigen-2	. 1567)
     (=ucs		. #x5944)	; 奄
-    (=jis-x0208		. #x3162)	; &I-J90-3162; [17-66]
-    (=gb2312		. #x5159)	; &I-G0-5159; [49-57]
-    (=ks-x1001		. #x6572)	; &I-K0-6572; [69-82]
-    (=big5		. #xA961)	; &I-B-A961;
-    (=gt		. 07418)	; &I-GT-07418;
-    (=gt-k		. 03633)	; &I-GT-K03633;
-    (=gt-pj-1		. #x3162)	; &I-GT-07418; [17-66]
-    (=daikanwa		. 05881)	; &I-M-05881;
-    ))
-(define-char
-  '((=>ucs		. #x5944)	; 奄
-    (morohashi-daikanwa	5881 0 0)
-    (ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=cns11643-1	. #x4C63)	; &C1-4C63; [44-67]
+    (->subsumptive
+     ((shinjigen-1	  . 1567)
+      (shinjigen-2	  . 1567)
+      (=jis-x0208	  . #x3162)	; &GT-07418; [17-66]
+      (=gb2312		  . #x5159)	; &I-G0-5159; [49-57]
+      (=ks-x1001	  . #x6572)	; &I-K0-6572; [69-82]
+      (=big5		  . #xA961)	; &I-B-A961;
+      (=gt		  . 07418)	; &I-GT-07418;
+      (=gt-k		  . 03633)	; &I-GT-K03633;
+      (=gt-pj-1		  . #x3162)	; &I-GT-07418; [17-66]
+      (=daikanwa	  . 05881)	; &I-M-05881;
+      (=ucs@unicode	  . #x5944)	; &GT-07418;
+      )
+     ((=cns11643-1	  . #x4C63)	; &C1-4C63; [44-67]
+      ))
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (hanyu-dazidian	1 303 16)
     (=ucs		. #x215FA)	; 𡗺
-    (=daikanwa		. 05882)	; &I-M-05882;
-    (=hanziku-1		. #xE4A9)	; &I-HZK01-E4A9;
-    ))
-(define-char
-  '((=>ucs		. #x215FA)	; 𡗺
-    (morohashi-daikanwa	5882 0 0)
-    (ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=cns11643-6	. #x2A55)	; &C6-2A55; [10-53]
+    (->subsumptive
+     ((hanyu-dazidian	  1 303 16)
+      (=daikanwa	  . 05882)	; &M-05882;
+      (=hanziku-1	  . #xE4A9)	; &I-HZK01-E4A9;
+      (=ucs@iso		  . #x215FA)	; &M-05882;
+      )
+     ((=cns11643-6	  . #x2A55)	; &C6-2A55; [10-53]
+      ))
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
@@ -834,9 +836,11 @@
   '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
+    (sources		bos=A2003-10837-00013)
     (=ucs		. #x3694)	; 㚔
     (=cns11643-4	. #x2571)	; &I-C4-2571; [05-81]
     (=daikanwa		. 05884)	; &I-M-05884;
+    (=ruimoku-v6	. #xE01C)	; &I-RUI6-E01C;
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
@@ -1244,20 +1248,17 @@
   '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (hanyu-dazidian	1 540 7)
     (=ucs		. #x2160F)	; 𡘏
-    (=gt		. 07470)	; &I-GT-07470;
-    (=gt-pj-2		. #x6732)	; &I-GT-07470; [71-18]
-    (=daikanwa		. 05913)	; &I-M-05913;
-    (=hanziku-2		. #xBEF9)	; &I-HZK02-BEF9;
-    ))
-(define-char
-  '((=>ucs		. #x2160F)	; 𡘏
-    (morohashi-daikanwa	5913 0 0)
-    (ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=cns11643-5	. #x2862)	; &C5-2862; [08-66]
+    (->subsumptive
+     ((hanyu-dazidian	  1 540 7)
+      (=gt		  . 07470)	; &GT-07470;
+      (=gt-pj-2		  . #x6732)	; &GT-07470; [71-18]
+      (=daikanwa	  . 05913)	; &I-M-05913;
+      (=hanziku-2	  . #xBEF9)	; &I-HZK02-BEF9;
+      (=ucs@iso		  . #x2160F)	; &GT-07470;
+      )
+     ((=cns11643-5	  . #x2862)	; &C5-2862; [08-66]
+      ))
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
@@ -1271,7 +1272,15 @@
     (=daikanwa		. 05914)	; &I-M-05914;
     ))
 (define-char
-  '((=>ucs		. #x594F)	; 奏
+  '((ideographic-radical . 37)	; ⼤
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (=ucs		. #x594F)	; 奏
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x594F)	; 奏
+      ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
@@ -1281,102 +1290,105 @@
     (=daikanwa		. 05915)	; &I-M-05915;
     ))
 (define-char
-  '((=>ucs		. #x594F)	; 奏
-    (morohashi-daikanwa	5915 0 2)
+  '((<-denotational
+     ((=ucs		  . #x594F)	; 奏
+      ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (shinjigen-2	. 1582)
-    (=jis-x0208		. #x4155)	; &GT-07472; [33-53]
-    (=ks-x1001		. #x7134)	; &I-K0-7134; [81-20]
-    (=gt		. 07472)	; &I-GT-07472;
-    (=gt-k		. 05366)	; &I-GT-K05366;
-    (=gt-pj-1		. #x4155)	; &I-GT-07472; [33-53]
-    (=ucs@jis		. #x594F)	; &GT-07472;
+    (->subsumptive
+     ((shinjigen-1	  . 1582)
+      (shinjigen-2	  . 1582)
+      (=jis-x0208	  . #x4155)	; &GT-07472; [33-53]
+      (=ks-x1001	  . #x7134)	; &I-K0-7134; [81-20]
+      (=gt		  . 07472)	; &I-GT-07472;
+      (=gt-k		  . 05366)	; &I-GT-K05366;
+      (=gt-pj-1		  . #x4155)	; &I-GT-07472; [33-53]
+      (=ucs@jis		  . #x594F)	; &GT-07472;
+      )
+     ((=gb2312		  . #x5760)	; &C1-5057; [55-64]
+      (=cns11643-1	  . #x5057)	; &I-C1-5057; [48-55]
+      (=big5		  . #xABB5)	; &I-B-ABB5;
+      (=ucs@unicode	  . #x594F)	; &C1-5057;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	5915 0 3)
-    (ideographic-radical . 37)	; ⼤
+  '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=ucs		. #x594F)	; 奏
-    (=gb2312		. #x5760)	; &I-G0-5760; [55-64]
-    (=cns11643-1	. #x5057)	; &I-C1-5057; [48-55]
-    (=big5		. #xABB5)	; &I-B-ABB5;
+    (=ucs		. #x5950)	; 奐
+    (=big5		. #xABB7)	; &I-B-ABB7;
     ))
 (define-char
-  '((=>ucs		. #x5950)	; 奐
+  '((<-denotational
+     ((=ucs		  . #x5950)	; 奐
+      ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (shinjigen-1	. 1576)
     (shinjigen-2	. 1576)
     (=jis-x0208		. #x5476)	; &GT-07458; [52-86]
     (=ks-x1001		. #x7C31)	; &I-K0-7C31; [92-17]
-    (=big5		. #xABB7)	; &I-B-ABB7;
     (=gt		. 07458)	; &I-GT-07458;
     (=gt-k		. 05229)	; &I-GT-K05229;
     (=gt-pj-1		. #x5476)	; &I-GT-07458; [52-86]
     (=daikanwa		. 05916)	; &I-M-05916;
     (=ucs@jis		. #x5950)	; &GT-07458;
-    (=ucs@big5		. #x5950)	; &GT-07458;
     ))
 (define-char
-  '((morohashi-daikanwa	5916 0 2)
+  '((<-denotational
+     ((=ucs		  . #x5950)	; 奐
+      ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (shinjigen-2	. 1576)
-    (=ucs		. #x5950)	; 奐
-    (=gb12345		. #x5B3C)	; 奐 [59-28]
+    (=gb12345		. #x5B3C)	; &UU+5950; [59-28]
+    (=ucs@unicode	. #x5950)	; &UU+5950;
     ))
 (define-char
-  '((=>ucs		. #x5950)	; 奐
-    (morohashi-daikanwa	5916 0 5)
+  '((<-denotational
+     ((=ucs		  . #x5950)	; 奐
+      ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=cns11643-1	. #x5059)	; &C1-5059; [48-57]
     ))
 (define-char
-  '((=>ucs		. #x5951)	; 契
-    (ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=big5		. #xABB4)	; &GT-07464;
-    (=gt		. 07464)	; &I-GT-07464;
-    (=gt-k		. 05057)	; &I-GT-K05057;
-    (=gt-pj-2		. #x6735)	; &I-GT-07464; [71-21]
-    (=daikanwa		. 05917)	; &I-M-05917;
-    (=ucs@big5		. #x5951)	; &GT-07464;
-    ))
-(define-char
-  '((=>ucs		. #x5951)	; 契
-    (morohashi-daikanwa	5917 0 0)
-    (ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=ks-x1001		. #x4C78)	; &K0-4C78; [44-88]
-    (=jef-china3	. #x48EA)	; &I-JC3-48EA;
-    ))
-(define-char
-  '((=>ucs		. #x5951)	; 契
-    (morohashi-daikanwa	5917 0 1)
-    (ideographic-radical . 37)	; ⼤
+  '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=cns11643-1	. #x5056)	; &C1-5056; [48-54]
+    (=ucs		. #x5951)	; 契
     ))
 (define-char
-  '((morohashi-daikanwa	5917 0 2)
+  '((<-denotational
+     ((=ucs		  . #x5951)	; 契
+      ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=ucs		. #x5951)	; 契
-    (=gb2312		. #x4675)	; &I-G0-4675; [38-85]
+    (=big5		. #xABB4)	; &B-ABB4;
+    (=ucs@big5		. #x5951)	; &B-ABB4;
+    (->subsumptive
+     ((=gt		  . 07464)	; &GT-07464;
+      (=gt-k		  . 05057)	; &I-GT-K05057;
+      (=gt-pj-2		  . #x6735)	; &GT-07464; [71-21]
+      (=daikanwa	  . 05917)	; &I-M-05917;
+      )
+     ((=ks-x1001	  . #x4C78)	; &K0-4C78; [44-88]
+      (=jef-china3	  . #x48EA)	; &I-JC3-48EA;
+      )
+     ((=cns11643-1	  . #x5056)	; &C1-5056; [48-54]
+      )
+     ((=gb2312		  . #x4675)	; &G0-4675; [38-85]
+      (=ucs@unicode	  . #x5951)	; &G0-4675;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5951)	; 契
-    (morohashi-daikanwa	5917 0 3)
+  '((<-denotational
+     ((=ucs		  . #x5951)	; 契
+      ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
@@ -1458,9 +1470,6 @@
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-simplified
-     ((=ucs		  . #xFA7F)	; ï©¿
-      ))
     (=ucs		. #x5954)	; 奔
     (=jis-x0208		. #x4B5B)	; &I-J90-4B5B; [43-59]
     (=gb2312		. #x313C)	; &I-G0-313C; [17-28]
@@ -1470,67 +1479,98 @@
     (=gt		. 07449)	; &I-GT-07449;
     (=gt-k		. 03830)	; &I-GT-K03830;
     (=gt-pj-1		. #x4B5B)	; &I-GT-07449; [43-59]
+    (<-simplified
+     ((=ucs		  . #xFA7F)	; ï©¿
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5955)	; 奕
-    (ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (shinjigen-2	. 1575)
-    (=jis-x0208		. #x5475)	; &GT-07452; [52-85]
-    (=ks-x1001		. #x7A51)	; &I-K0-7A51; [90-49]
-    (=gt		. 07452)	; &I-GT-07452;
-    (=gt-k		. 05228)	; &I-GT-K05228;
-    (=gt-pj-1		. #x5475)	; &I-GT-07452; [52-85]
-    (=daikanwa		. 05922)	; &I-M-05922;
-    (=ucs@jis		. #x5955)	; &GT-07452;
-    ))
-(define-char
-  '((morohashi-daikanwa	5922 0 0)
-    (ideographic-radical . 37)	; ⼤
+  '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x5955)	; 奕
-    (=gb2312		. #x5E48)	; &I-G0-5E48; [62-40]
-    (=cns11643-1	. #x5055)	; &I-C1-5055; [48-53]
     (=big5		. #xABB3)	; &I-B-ABB3;
+    (->subsumptive
+     ((shinjigen-1	  . 1575)
+      (shinjigen-2	  . 1575)
+      (=jis-x0208	  . #x5475)	; &GT-07452; [52-85]
+      (=ks-x1001	  . #x7A51)	; &I-K0-7A51; [90-49]
+      (=gt		  . 07452)	; &I-GT-07452;
+      (=gt-k		  . 05228)	; &I-GT-K05228;
+      (=gt-pj-1		  . #x5475)	; &I-GT-07452; [52-85]
+      (=daikanwa	  . 05922)	; &I-M-05922;
+      (=ucs@jis		  . #x5955)	; &GT-07452;
+      )
+     ((=gb2312		  . #x5E48)	; &G0-5E48; [62-40]
+      (=ucs@unicode	  . #x5955)	; &G0-5E48;
+      )
+     ((=cns11643-1	  . #x5055)	; &C1-5055; [48-53]
+      ))
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=daikanwa		. 05923)	; &M-05923;
+    (=ucs		. #x21619)	; 𡘙
+    (->subsumptive
+     ((=daikanwa	  . 05923)	; &M-05923;
+      )
+     ((hanyu-dazidian	  1 539 4)
+      (=hanziku-2	  . #xBED6)	; &HZK02-BED6;
+      )
+     ((=ucs@iso		  . #x21619)	; &U-00021619;
+      ))
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=daikanwa		. 05924)	; &M-05924;
+    (hanyu-dazidian	1 540 8)
+    (=ucs		. #x2161B)	; 𡘛
+    (=daikanwa		. 05924)	; &I-M-05924;
+    (=hanziku-2		. #xBEFA)	; &I-HZK02-BEFA;
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=daikanwa		. 05925)	; &M-05925;
+    (=ucs		. #x21621)	; 𡘡
     ))
 (define-char
-  '((=>ucs		. #x2161A)	; 𡘚
-    (morohashi-daikanwa	ho 114)
+  '((<-denotational
+     ((=ucs		  . #x21621)	; 𡘡
+      ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=gt		. 07459)	; &GT-07459;
-    (=gt-pj-11		. #x435B)	; &GT-07459; [35-59]
-    (mojikyo		. 085234)	; &MCS-60014CF2;
+    (->subsumptive
+     ((=daikanwa	  . 05925)	; &M-05925;
+      )
+     ((hanyu-dazidian	  1 539 3)
+      (=hanziku-2	  . #xBED5)	; &HZK02-BED5;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	ho 114 0)
+  '((<-denotational
+     ((=ucs		  . #x21621)	; 𡘡
+      ))
     (ideographic-radical . 37)	; ⼤
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=ucs@iso		. #x21621)	; &U-00021621;
+    ))
+(define-char
+  '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (hanyu-dazidian	1 540 4)
     (=ucs		. #x2161A)	; 𡘚
-    (=hanziku-2		. #xBEF6)	; &I-HZK02-BEF6;
+    (->subsumptive
+     ((morohashi-daikanwa	ho 114)
+      (=gt		  . 07459)	; &GT-07459;
+      (=gt-pj-11	  . #x435B)	; &GT-07459; [35-59]
+      (mojikyo		  . 085234)	; &MCS-60014CF2;
+      )
+     ((hanyu-dazidian	  1 540 4)
+      (=hanziku-2	  . #xBEF6)	; &HZK02-BEF6;
+      (=ucs@iso		  . #x2161A)	; &HZK02-BEF6;
+      ))
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
@@ -1744,20 +1784,6 @@
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=ucs		. #x21621)	; 𡘡
-    ))
-(define-char
-  '((=>ucs		. #x21621)	; 𡘡
-    (ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (hanyu-dazidian	1 539 3)
-    (=hanziku-2		. #xBED5)	; &HZK02-BED5;
-    ))
-(define-char
-  '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (hanyu-dazidian	1 543 7)
@@ -2048,16 +2074,16 @@
   '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (=ucs		. #x21641)	; 𡙁
+    (=cns11643-4	. #x3127)	; &I-C4-3127; [17-07]
+    (=big5-cdp		. #x856E)	; &I-CDP-856E;
+    (=daikanwa		. 05959)	; &I-M-05959;
     (<-vulgar
      ((=ucs		  . #x723D)	; 爽
       (=daikanwa	  . 19746)	; &I-M-19746;
       ))
     (<-vulgar*sources
      songyuan-yilai-suzipu daikanwa)
-    (=ucs		. #x21641)	; 𡙁
-    (=cns11643-4	. #x3127)	; &I-C4-3127; [17-07]
-    (=big5-cdp		. #x856E)	; &I-CDP-856E;
-    (=daikanwa		. 05959)	; &I-M-05959;
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
@@ -2338,88 +2364,82 @@
     (=hanziku-2		. #xC05E)	; &I-HZK02-C05E;
     ))
 (define-char
-  '((=>ucs		. #x2165A)	; 𡙚
-    (ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=daikanwa		. 05975)	; &M-05975;
-    ))
-(define-char
-  '((morohashi-daikanwa	5975 0 1)
-    (ideographic-radical . 37)	; ⼤
+  '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (hanyu-dazidian	2 1236 3)
     (=ucs		. #x2165A)	; 𡙚
-    (=cns11643-6	. #x4757)	; &I-C6-4757; [39-55]
-    (=hanziku-4		. #xA6B3)	; &I-HZK04-A6B3;
-    ))
-(define-char
-  '((=>ucs		. #x2164E)	; 𡙎
-    (ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=daikanwa		. 05977)	; &M-05977;
+    (->subsumptive
+     ((=daikanwa	  . 05975)	; &M-05975;
+      )
+     ((hanyu-dazidian	  2 1236 3)
+      (=cns11643-6	  . #x4757)	; &HZK04-A6B3; [39-55]
+      (=hanziku-4	  . #xA6B3)	; &I-HZK04-A6B3;
+      (=ucs@iso		  . #x2165A)	; &HZK04-A6B3;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	5977 0 0)
-    (ideographic-radical . 37)	; ⼤
+  '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 544 6)
     (=ucs		. #x2164E)	; 𡙎
-    (=cns11643-6	. #x4755)	; &I-C6-4755; [39-53]
-    (=hanziku-2		. #xBFDB)	; &I-HZK02-BFDB;
+    (->subsumptive
+     ((=daikanwa	  . 05977)	; &M-05977;
+      )
+     ((hanyu-dazidian	  1 544 6)
+      (=cns11643-6	  . #x4755)	; &HZK02-BFDB; [39-53]
+      (=hanziku-2	  . #xBFDB)	; &I-HZK02-BFDB;
+      (=ucs@iso		  . #x2164E)	; &HZK02-BFDB;
+      ))
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5967)	; 奧
-      (=jis-x0208	  . #x547C)	; &I-J90-547C; [52-92]
-      ))
-    (shinjigen-2	. 1589)
     (=ucs		. #x5965)	; 奥
-    (=jis-x0208		. #x317C)	; &I-J90-317C; [17-92]
-    (=gb2312		. #x3042)	; &I-G0-3042; [16-34]
-    (=gt		. 07520)	; &I-GT-07520;
-    (=gt-k		. 09000)	; &I-GT-K09000;
-    (=gt-pj-1		. #x317C)	; &I-GT-07520; [17-92]
-    (=daikanwa		. 05981)	; &I-M-05981;
-    ))
-(define-char
-  '((=>ucs		. #x5965)	; 奥
-    (morohashi-daikanwa	5981 0 0)
-    (ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=cns11643-4	. #x3679)	; &C4-3679; [22-89]
-    ))
-(define-char
-  '((=>ucs		. #x2164C)	; 𡙌
-    (ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=daikanwa		. 49009)	; &M-49009;
+    (->subsumptive
+     ((shinjigen-1	  . 1589)
+      (shinjigen-2	  . 1589)
+      (=jis-x0208	  . #x317C)	; &GT-07520; [17-92]
+      (=gb2312		  . #x3042)	; &I-G0-3042; [16-34]
+      (=gt		  . 07520)	; &I-GT-07520;
+      (=gt-k		  . 09000)	; &I-GT-K09000;
+      (=gt-pj-1		  . #x317C)	; &I-GT-07520; [17-92]
+      (=daikanwa	  . 05981)	; &I-M-05981;
+      (=ucs@unicode	  . #x5965)	; &GT-07520;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x547C)	; &GT-07553; [52-92]
+	(=ks-x1001	    . #x6773)	; &I-K0-6773; [71-83]
+	(=daikanwa	    . 05985)	; &I-M-05985;
+	))
+      )
+     ((=cns11643-4	  . #x3679)	; &C4-3679; [22-89]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	49009 0 0)
-    (ideographic-radical . 37)	; ⼤
+  '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x2164C)	; 𡙌
-    (=cns11643-6	. #x475A)	; &I-C6-475A; [39-58]
+    (->subsumptive
+     ((=daikanwa	  . 49009)	; &M-49009;
+      )
+     ((=cns11643-6	  . #x475A)	; &C6-475A; [39-58]
+      (=ucs@iso		  . #x2164C)	; &C6-475A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (hanyu-dazidian	8 12 16)
     (=ucs		. #x21655)	; 𡙕
-    (=cns11643-6	. #x4759)	; &I-C6-4759; [39-57]
-    (=daikanwa		. 49010)	; &I-M-49010;
-    (=hanziku-12	. #xEBED)	; &I-HZK12-EBED;
+    (->subsumptive
+     ((=daikanwa	  . 49010)	; &M-49010;
+      )
+     ((hanyu-dazidian	  8 12 16)
+      (=cns11643-6	  . #x4759)	; &HZK12-EBED; [39-57]
+      (=hanziku-12	  . #xEBED)	; &I-HZK12-EBED;
+      (=ucs@iso		  . #x21655)	; &HZK12-EBED;
+      ))
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
@@ -2496,23 +2516,21 @@
   '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (shinjigen-2	. 1590)
     (=ucs		. #x5967)	; 奧
-    (=jis-x0208		. #x547C)	; &I-J90-547C; [52-92]
-    (=ks-x1001		. #x6773)	; &I-K0-6773; [71-83]
-    (=big5		. #xB6F8)	; &I-B-B6F8;
-    (=gt		. 07553)	; &I-GT-07553;
-    (=gt-k		. 10301)	; &I-GT-K10301;
-    (=gt-pj-1		. #x547C)	; &I-GT-07553; [52-92]
-    (=daikanwa		. 05985)	; &I-M-05985;
-    ))
-(define-char
-  '((=>ucs		. #x5967)	; 奧
-    (morohashi-daikanwa	5985 0 0)
-    (ideographic-radical . 37)	; ⼤
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=cns11643-1	. #x635F)	; &C1-635F; [67-63]
+    (->subsumptive
+     ((shinjigen-1	  . 1590)
+      (shinjigen-2	  . 1590)
+      (=jis-x0208	  . #x547C)	; &GT-07553; [52-92]
+      (=ks-x1001	  . #x6773)	; &I-K0-6773; [71-83]
+      (=big5		  . #xB6F8)	; &I-B-B6F8;
+      (=gt		  . 07553)	; &I-GT-07553;
+      (=gt-k		  . 10301)	; &I-GT-K10301;
+      (=gt-pj-1		  . #x547C)	; &I-GT-07553; [52-92]
+      (=daikanwa	  . 05985)	; &I-M-05985;
+      (=ucs@unicode	  . #x5967)	; &GT-07553;
+      )
+     ((=cns11643-1	  . #x635F)	; &C1-635F; [67-63]
+      ))
     ))
 (define-char
   '((=>ucs		. #x2165C)	; 𡙜
@@ -2597,49 +2615,57 @@
   '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=daikanwa		. 05990)	; &M-05990;
+    (=ucs		. #x21664)	; 𡙤
     ))
 (define-char
-  '((morohashi-daikanwa	5990 1)
+  '((<-denotational
+     ((=ucs		  . #x21664)	; 𡙤
+      ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x596C)	; 奬
-      (=jis-x0208	  . #x547D)	; &I-J90-547D; [52-93]
-      ))
-    (hanyu-dazidian	1 547 4)
-    (=ucs		. #x5968)	; 奨
-    (=jis-x0208		. #x3E29)	; &I-J90-3E29; [30-09]
-    (=gt		. 07558)	; &I-GT-07558;
-    (=gt-pj-1		. #x3E29)	; &I-GT-07558; [30-09]
-    (=hanziku-2		. #xC07A)	; &I-HZK02-C07A;
-    (mojikyo		. 050145)	; &MCS-6000C3E1;
+    (=daikanwa		. 05990)	; &M-05990;
     ))
 (define-char
-  '((=>ucs		. #x5968)	; 奨
-    (morohashi-daikanwa	5990 1 0)
+  '((<-denotational
+     ((=ucs		  . #x21664)	; 𡙤
+      ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (->mojikyo		. 050145)	; 奨
-    (=cns11643-3	. #x4061)	; &C3-4061; [32-65]
+    (hanyu-dazidian	1 547 8)
+    (=hanziku-2		. #xC07E)	; &HZK02-C07E;
+    (=ucs@iso		. #x21664)	; &HZK02-C07E;
     ))
 (define-char
-  '((=>daikanwa		. 05991)	; &GT-07573;
-    (ideographic-radical . 37)	; ⼤
+  '((ideographic-radical . 37)	; ⼤
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs		. #x5968)	; 奨
+    (->subsumptive
+     ((morohashi-daikanwa	5990 1)
+      (hanyu-dazidian	  1 547 4)
+      (=jis-x0208	  . #x3E29)	; &GT-07558; [30-09]
+      (=gt		  . 07558)	; &I-GT-07558;
+      (=gt-pj-1		  . #x3E29)	; &I-GT-07558; [30-09]
+      (=hanziku-2	  . #xC07A)	; &I-HZK02-C07A;
+      (=ucs@unicode	  . #x5968)	; &GT-07558;
+      (mojikyo		  . 050145)	; &MCS-6000C3E1;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x596C)	; 奬
+	(=jis-x0208	    . #x547D)	; &I-J90-547D; [52-93]
+	))
+      )
+     ((=cns11643-3	  . #x4061)	; &C3-4061; [32-65]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x5969)	; 奩
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 796)
-	(=ucs		    . #x5333)	; 匳
-	(=jis-x0208	    . #x523D)	; &I-J90-523D; [50-29]
-	))
-      (<-vulgar*sources
-       shinjigen-1)
-      (shinjigen-1	  . 799)
+     ((shinjigen-1	  . 799)
       (shinjigen-2	  . 799)
       (=jis-x0208	  . #x547E)	; &GT-07573; [52-94]
       (=cns11643-1	  . #x6845)	; &I-C1-6845; [72-37]
@@ -2648,6 +2674,13 @@
       (=gt-pj-1		  . #x547E)	; &I-GT-07573; [52-94]
       (=daikanwa	  . 05991)	; &I-M-05991;
       (=ucs@jis		  . #x5969)	; &GT-07573;
+      (<-vulgar
+       ((shinjigen-1	    . 796)
+	(=ucs		    . #x5333)	; 匳
+	(=jis-x0208	    . #x523D)	; &I-J90-523D; [50-29]
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       )
      ((=gb12345		  . #x5E46)	; &UU+5969; [62-38]
       (=ucs@unicode	  . #x5969)	; &UU+5969;
@@ -3057,10 +3090,10 @@
   '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (=big5-cdp		. #x85BD)	; &CDP-85BD;
     (<-unknown
      ((=ucs		  . #x596D)	; 奭
       ))
-    (=big5-cdp		. #x85BD)	; &CDP-85BD;
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
@@ -3485,18 +3518,6 @@
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
-    (hanyu-dazidian	1 539 4)
-    (=ucs		. #x21619)	; 𡘙
-    (=hanziku-2		. #xBED6)	; &I-HZK02-BED6;
-    ))
-(define-char
-  '((ideographic-radical . 37)	; ⼤
-    (hanyu-dazidian	1 540 8)
-    (=ucs		. #x2161B)	; 𡘛
-    (=hanziku-2		. #xBEFA)	; &I-HZK02-BEFA;
-    ))
-(define-char
-  '((ideographic-radical . 37)	; ⼤
     (hanyu-dazidian	1 387 13)
     (=ucs		. #x2161E)	; 𡘞
     (=hanziku-1		. #xF5B9)	; &I-HZK01-F5B9;
@@ -3587,12 +3608,6 @@
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
-    (hanyu-dazidian	1 547 8)
-    (=ucs		. #x21664)	; 𡙤
-    (=hanziku-2		. #xC07E)	; &I-HZK02-C07E;
-    ))
-(define-char
-  '((ideographic-radical . 37)	; ⼤
     (hanyu-dazidian	8 12 17)
     (=ucs		. #x21665)	; 𡙥
     (=hanziku-12	. #xEBEE)	; &I-HZK12-EBEE;
@@ -3623,10 +3638,10 @@
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
-    (<-unknown
-     ((=ucs		  . #x215DB)	; 𡗛
-      ))
     (sources		bos=A016462-00003 bos=A016430-00004
 			bos=A016594-00007)
     (=ruimoku-v6	. #xE006)	; &RUI6-E006;
+    (<-unknown
+     ((=ucs		  . #x215DB)	; 𡗛
+      ))
     ))
diff --git a/lisp/utf-2000/Ideograph-R038-Woman.el b/lisp/utf-2000/Ideograph-R038-Woman.el
index cf08c97..17fad47 100644
--- a/lisp/utf-2000/Ideograph-R038-Woman.el
+++ b/lisp/utf-2000/Ideograph-R038-Woman.el
@@ -83,6 +83,9 @@
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
+    (=daikanwa		. 06040)	; &M-06040;
+    (=ucs@unicode	. #x36A2)	; &M-06040;
+    (mojikyo		. 006040)	; &MCS-60001798;
     (<-ancient
      ((=jis-x0208	  . #x455B)	; &GT-07627; [37-59]
       (=gb2312		  . #x452B)	; &I-G0-452B; [37-11]
@@ -91,9 +94,6 @@
       ))
     (<-ancient*sources
      shuowen daikanwa)
-    (=daikanwa		. 06040)	; &M-06040;
-    (=ucs@unicode	. #x36A2)	; &M-06040;
-    (mojikyo		. 006040)	; &MCS-60001798;
     (->mistakable
      ((=daikanwa	  . 00395)	; &M-00395;
       ))
@@ -570,20 +570,35 @@
     (=cns11643-4	. #x2257)	; &C4-2257; [02-55]
     ))
 (define-char
-  '((morohashi-daikanwa	ho 117)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x36A8)	; 㚨
+    (->subsumptive
+     ((morohashi-daikanwa	ho 117)
+      (=ucs@unicode	  . #x36A8)	; &UU+36A8;
+      )
+     ((=cns11643-3	  . #x2349)	; &C3-2349; [03-41]
+      (mojikyo		  . 083506)	; &MCS-60014632;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x36A8)	; 㚨
-    (morohashi-daikanwa	ho 117 0)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (=cns11643-3	. #x2349)	; &C3-2349; [03-41]
-    (mojikyo		. 083506)	; &MCS-60014632;
+    (=ucs		. #x5986)	; 妆
+    (->subsumptive
+     ((=gb2312		  . #x5731)	; &G0-5731; [55-17]
+      (=ucs@unicode	  . #x5986)	; &G0-5731;
+      (mojikyo		  . 054753)	; &MCS-6000D5E1;
+      (<-simplified@CN
+       ((=jis-x0208	    . #x5523)	; &GT-07686; [53-03]
+	(=gb12345	    . #x5731)	; &GT-07686; [55-17]
+	(=daikanwa	    . 06096)	; &I-M-06096;
+	))
+      )
+     ((=cns11643-3	  . #x234D)	; &C3-234D; [03-45]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
@@ -601,374 +616,524 @@
     (=cns11643-6	. #x2442)	; &I-C6-2442; [04-34]
     ))
 (define-char
+  '((ideographic-radical@ucs . 38)	; â¼¥
+    (ideographic-radical@jis . 46)	; â¼­
+    (ideographic-radical@jis*sources
+     jis-x0213@2000)
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
+    (=ucs		. #x216B4)	; 𡚴
+    (->subsumptive
+     ((sound@ja/kun/place "aken")
+      (=jis-x0213-1-2000  . #x4F63)	; &JX1-4F63; [47-67]
+      (=ucs@jis		  . #x216B4)	; &JX1-4F63;
+      )
+     ((=ucs@iso		  . #x216B4)	; &U-000216B4;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x5973)	; 女
+    (=ucs		. #x5989)	; 妉
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x3D77)	; &GT-07623; [29-87]
+	(=gb2312	    . #x452E)	; &I-G0-452E; [37-14]
+	(=ks-x1001	    . #x5233)	; &I-K0-5233; [50-19]
+	(=daikanwa	    . 06036)	; &I-M-06036;
+	)
+       ((=ucs		    . #x5198)	; 冘
+	))
+      (=daikanwa	  . 06071)	; &M-06071;
+      (=cbeta		  . 00884)	; &I-CB00884;
+      (=ucs@unicode	  . #x5989)	; &M-06071;
       )
-     ((=ucs		  . #x5198)	; 冘
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=cns11643-1	    . #x444C)	; &C1-444C; [36-44]
+	)
+       ((=ucs		    . #x5198)	; 冘
+	))
+      (=cns11643-3	  . #x2555)	; &C3-2555; [05-53]
       ))
-    (=ucs		. #x5989)	; 妉
-    (=cns11643-3	. #x2555)	; &I-C3-2555; [05-53]
-    (=daikanwa		. 06071)	; &I-M-06071;
-    (=cbeta		. 00884)	; &I-CB00884;
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (shinjigen-2	. 1611)
     (=ucs		. #x598A)	; 妊
-    (=jis-x0208		. #x4725)	; &I-J90-4725; [39-05]
-    (=gb2312		. #x4851)	; &I-G0-4851; [40-49]
-    (=ks-x1001		. #x6C74)	; &I-K0-6C74; [76-84]
-    (=cns11643-1	. #x4973)	; &I-C1-4973; [41-83]
-    (=big5		. #xA7B3)	; &I-B-A7B3;
-    (=gt		. 07696)	; &I-GT-07696;
-    (=gt-pj-1		. #x4725)	; &I-GT-07696; [39-05]
-    (=daikanwa		. 06072)	; &I-M-06072;
+    (->subsumptive
+     ((shinjigen-2	  . 1611)
+      (=jis-x0208	  . #x4725)	; &GT-07696; [39-05]
+      (=gb2312		  . #x4851)	; &I-G0-4851; [40-49]
+      (=ks-x1001	  . #x6C74)	; &I-K0-6C74; [76-84]
+      (=big5		  . #xA7B3)	; &I-B-A7B3;
+      (=gt		  . 07696)	; &I-GT-07696;
+      (=gt-pj-1		  . #x4725)	; &I-GT-07696; [39-05]
+      (=daikanwa	  . 06072)	; &I-M-06072;
+      (=ucs@unicode	  . #x598A)	; &GT-07696;
+      )
+     ((=cns11643-1	  . #x4973)	; &C1-4973; [41-83]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x598B)	; 妋
-    (=jis-x0212		. #x3928)	; &I-JSP-3928; [25-08]
-    (=jis-x0213-1-2000	. #x2F6B)	; &I-JX1-2F6B; [15-75]
-    (=daikanwa		. 06073)	; &I-M-06073;
-    (=jef-china3	. #x48FB)	; &I-JC3-48FB;
-    ))
-(define-char
-  '((=>ucs		. #x598B)	; 妋
-    (morohashi-daikanwa	6073 0 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=cns11643-4	. #x2367)	; &C4-2367; [03-71]
+    (->subsumptive
+     ((=jis-x0212	  . #x3928)	; &M-06073; [25-08]
+      (=jis-x0213-1-2000  . #x2F6B)	; &I-JX1-2F6B; [15-75]
+      (=daikanwa	  . 06073)	; &I-M-06073;
+      (=jef-china3	  . #x48FB)	; &I-JC3-48FB;
+      (=ucs@unicode	  . #x598B)	; &M-06073;
+      )
+     ((=cns11643-4	  . #x2367)	; &C4-2367; [03-71]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x598C)	; 妌
-    (=jis-x0212		. #x3929)	; &I-JSP-3929; [25-09]
-    (=cns11643-3	. #x254C)	; &I-C3-254C; [05-44]
-    (=daikanwa		. 06074)	; &I-M-06074;
-    (=jef-china3	. #x48FC)	; &I-JC3-48FC;
+    (->subsumptive
+     ((=jis-x0212	  . #x3929)	; &M-06074; [25-09]
+      (=daikanwa	  . 06074)	; &I-M-06074;
+      (=jef-china3	  . #x48FC)	; &I-JC3-48FC;
+      (=ucs@unicode	  . #x598C)	; &M-06074;
+      )
+     ((=cns11643-3	  . #x254C)	; &C3-254C; [05-44]
+      ))
     ))
 (define-char
-  '((ideographic-radical . 38)	; â¼¥
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x552B)	; &J97-552B; [53-11]
+      ))
+    (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
-    (kangxi-strokes	 . 6)
     (total-strokes	 . 7)
-    (shinjigen-2	. 1650)
     (=ucs		. #x598D)	; 妍
-    (=jis-x0208		. #x552B)	; &I-J90-552B; [53-11]
-    (=gb2312		. #x657B)	; &I-G0-657B; [69-91]
-    (=cns11643-1	. #x4970)	; &I-C1-4970; [41-80]
-    (=big5		. #xA7B0)	; &I-B-A7B0;
-    (=gt		. 07670)	; &I-GT-07670;
-    (=gt-pj-1		. #x552B)	; &I-GT-07670; [53-11]
-    (=daikanwa		. 06075)	; &I-M-06075;
-    (=jef-china3	. #x49B5)	; &I-JC3-49B5;
+    (->subsumptive
+     ((shinjigen-1	  . 1650)
+      (shinjigen-2	  . 1650)
+      (=jis-x0208	  . #x552B)	; &GT-07670; [53-11]
+      (=gb2312		  . #x657B)	; &I-G0-657B; [69-91]
+      (=big5		  . #xA7B0)	; &I-B-A7B0;
+      (=gt		  . 07670)	; &I-GT-07670;
+      (=gt-pj-1		  . #x552B)	; &I-GT-07670; [53-11]
+      (=daikanwa	  . 06075)	; &I-M-06075;
+      (=ucs@unicode	  . #x598D)	; &GT-07670;
+      (<-vulgar
+       ((shinjigen-1	    . 1649)
+	(=ucs@unicode	    . #x59F8)	; &UU+59F8;
+	))
+      (<-vulgar*sources
+       shinjigen-1)
+      )
+     ((=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)	; 妎
-    (=jis-x0212		. #x392A)	; &I-JSP-392A; [25-10]
-    (=cns11643-2	. #x2356)	; &I-C2-2356; [03-54]
-    (=big5		. #xCAB6)	; &I-B-CAB6;
-    (=daikanwa		. 06076)	; &I-M-06076;
-    (=jef-china3	. #x48FD)	; &I-JC3-48FD;
+    (->subsumptive
+     ((=jis-x0212	  . #x392A)	; &M-06076; [25-10]
+      (=big5		  . #xCAB6)	; &I-B-CAB6;
+      (=daikanwa	  . 06076)	; &I-M-06076;
+      (=jef-china3	  . #x48FD)	; &I-JC3-48FD;
+      (=ucs@unicode	  . #x598E)	; &M-06076;
+      )
+     ((=cns11643-2	  . #x2356)	; &C2-2356; [03-54]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x36A9)	; 㚩
-    (=cns11643-3	. #x2552)	; &I-C3-2552; [05-50]
-    (=daikanwa		. 06077)	; &I-M-06077;
+    (->subsumptive
+     ((=daikanwa	  . 06077)	; &M-06077;
+      (=ucs@unicode	  . #x36A9)	; &M-06077;
+      )
+     ((=cns11643-3	  . #x2552)	; &C3-2552; [05-50]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x598F)	; 妏
-    (=cns11643-2	. #x2359)	; &I-C2-2359; [03-57]
     (=big5		. #xCAB9)	; &I-B-CAB9;
-    (=daikanwa		. 06078)	; &I-M-06078;
+    (->subsumptive
+     ((=daikanwa	  . 06078)	; &M-06078;
+      )
+     ((=ucs@unicode	  . #x598F)	; &UU+598F;
+      )
+     ((=cns11643-2	  . #x2359)	; &C2-2359; [03-57]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x36AA)	; 㚪
-    (=cns11643-3	. #x2557)	; &I-C3-2557; [05-55]
-    (=daikanwa		. 06079)	; &I-M-06079;
+    (->subsumptive
+     ((=daikanwa	  . 06079)	; &M-06079;
+      (=ucs@unicode	  . #x36AA)	; &M-06079;
+      )
+     ((=cns11643-3	  . #x2557)	; &C3-2557; [05-55]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x5990)	; 妐
-    (=cns11643-2	. #x2358)	; &I-C2-2358; [03-56]
     (=big5		. #xCAB8)	; &I-B-CAB8;
-    (=daikanwa		. 06080)	; &I-M-06080;
+    (->subsumptive
+     ((=daikanwa	  . 06080)	; &M-06080;
+      )
+     ((=ucs@unicode	  . #x5990)	; &UU+5990;
+      )
+     ((=cns11643-2	  . #x2358)	; &C2-2358; [03-56]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x5991)	; 妑
-    (=cns11643-4	. #x2369)	; &I-C4-2369; [03-73]
-    (=daikanwa		. 06081)	; &I-M-06081;
+    (->subsumptive
+     ((=daikanwa	  . 06081)	; &M-06081;
+      (=ucs@unicode	  . #x5991)	; &M-06081;
+      )
+     ((=cns11643-4	  . #x2369)	; &C4-2369; [03-73]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5992)	; 妒
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=jis-x0212		. #x392B)	; &M-06082; [25-11]
-    (=jis-x0213-1-2000	. #x2F6C)	; &I-JX1-2F6C; [15-76]
-    (=daikanwa		. 06082)	; &I-M-06082;
-    (=jef-china3	. #x48FE)	; &I-JC3-48FE;
-    (=ucs@jis		. #x5992)	; &M-06082;
+    (=ucs		. #x5992)	; 妒
+    (=big5		. #xA7AA)	; &I-B-A7AA;
     ))
 (define-char
-  '((=>ucs		. #x5992)	; 妒
-    (morohashi-daikanwa	6082 0 1)
+  '((<-denotational
+     ((=ucs		  . #x5992)	; 妒
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=cns11643-1	. #x496A)	; &C1-496A; [41-74]
+    (->subsumptive
+     ((shinjigen-1	  . 1636)
+      (=jis-x0212	  . #x392B)	; &M-06082; [25-11]
+      (=jis-x0213-1-2000  . #x2F6C)	; &I-JX1-2F6C; [15-76]
+      (=daikanwa	  . 06082)	; &I-M-06082;
+      (=jef-china3	  . #x48FE)	; &I-JC3-48FE;
+      (=ucs@jis		  . #x5992)	; &M-06082;
+      (<-formed
+       ((shinjigen-1	    . 1635)
+	(=jis-x0208	    . #x454A)	; &GT-07772; [37-42]
+	(=ks-x1001	    . #x7760)	; &I-K0-7760; [87-64]
+	(=daikanwa	    . 06121)	; &I-M-06121;
+	))
+      (<-formed*sources
+       shinjigen-1)
+      )
+     ((=cns11643-1	  . #x496A)	; &C1-496A; [41-74]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	6082 0 3)
+  '((<-denotational
+     ((=ucs		  . #x5992)	; 妒
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=ucs		. #x5992)	; 妒
-    (=gb2312		. #x364A)	; &I-G0-364A; [22-42]
-    (=big5		. #xA7AA)	; &I-B-A7AA;
+    (=gb2312		. #x364A)	; &G0-364A; [22-42]
+    (=ucs@unicode	. #x5992)	; &G0-364A;
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (shinjigen-2	. 1606)
     (=ucs		. #x5993)	; 妓
-    (=jis-x0208		. #x3538)	; &I-J90-3538; [21-24]
-    (=gb2312		. #x3C4B)	; &I-G0-3C4B; [28-43]
-    (=ks-x1001		. #x5075)	; &I-K0-5075; [48-85]
-    (=cns11643-1	. #x4972)	; &I-C1-4972; [41-82]
-    (=big5		. #xA7B2)	; &I-B-A7B2;
-    (=gt		. 07667)	; &I-GT-07667;
-    (=gt-pj-1		. #x3538)	; &I-GT-07667; [21-24]
-    (=daikanwa		. 06083)	; &I-M-06083;
+    (->subsumptive
+     ((shinjigen-2	  . 1606)
+      (=jis-x0208	  . #x3538)	; &GT-07667; [21-24]
+      (=gb2312		  . #x3C4B)	; &I-G0-3C4B; [28-43]
+      (=ks-x1001	  . #x5075)	; &I-K0-5075; [48-85]
+      (=big5		  . #xA7B2)	; &I-B-A7B2;
+      (=gt		  . 07667)	; &I-GT-07667;
+      (=gt-pj-1		  . #x3538)	; &I-GT-07667; [21-24]
+      (=daikanwa	  . 06083)	; &I-M-06083;
+      (=ucs@unicode	  . #x5993)	; &GT-07667;
+      )
+     ((=cns11643-1	  . #x4972)	; &C1-4972; [41-82]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x5994)	; 妔
-    (=cns11643-3	. #x254B)	; &I-C3-254B; [05-43]
-    (=daikanwa		. 06084)	; &I-M-06084;
+    (->subsumptive
+     ((=daikanwa	  . 06084)	; &M-06084;
+      )
+     ((=ucs@unicode	  . #x5994)	; &UU+5994;
+      )
+     ((=cns11643-3	  . #x254B)	; &C3-254B; [05-43]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x5995)	; 妕
-    (=jis-x0212		. #x392C)	; &I-JSP-392C; [25-12]
-    (=cns11643-4	. #x236A)	; &I-C4-236A; [03-74]
-    (=daikanwa		. 06085)	; &I-M-06085;
-    (=jef-china3	. #x49A1)	; &I-JC3-49A1;
+    (->subsumptive
+     ((=jis-x0212	  . #x392C)	; &M-06085; [25-12]
+      (=daikanwa	  . 06085)	; &I-M-06085;
+      (=jef-china3	  . #x49A1)	; &I-JC3-49A1;
+      (=ucs@unicode	  . #x5995)	; &M-06085;
+      )
+     ((=cns11643-4	  . #x236A)	; &C4-236A; [03-74]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (shinjigen-2	. 1619)
     (=ucs		. #x5996)	; 妖
-    (=jis-x0208		. #x4D45)	; &I-J90-4D45; [45-37]
-    (=gb2312		. #x517D)	; &I-G0-517D; [49-93]
-    (=ks-x1001		. #x686D)	; &I-K0-686D; [72-77]
-    (=cns11643-1	. #x496F)	; &I-C1-496F; [41-79]
-    (=big5		. #xA7AF)	; &I-B-A7AF;
-    (=gt		. 07712)	; &I-GT-07712;
-    (=gt-pj-1		. #x4D45)	; &I-GT-07712; [45-37]
-    (=daikanwa		. 06086)	; &I-M-06086;
+    (->subsumptive
+     ((shinjigen-1	  . 1619)
+      (shinjigen-2	  . 1619)
+      (=jis-x0208	  . #x4D45)	; &GT-07712; [45-37]
+      (=gb2312		  . #x517D)	; &I-G0-517D; [49-93]
+      (=ks-x1001	  . #x686D)	; &I-K0-686D; [72-77]
+      (=big5		  . #xA7AF)	; &I-B-A7AF;
+      (=gt		  . 07712)	; &I-GT-07712;
+      (=gt-pj-1		  . #x4D45)	; &I-GT-07712; [45-37]
+      (=daikanwa	  . 06086)	; &I-M-06086;
+      (=ucs@unicode	  . #x5996)	; &GT-07712;
+      )
+     ((=cns11643-1	  . #x496F)	; &C1-496F; [41-79]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x5997)	; 妗
-    (=gb2312		. #x6621)	; &I-G0-6621; [70-01]
-    (=ks-x1001		. #x5052)	; &I-K0-5052; [48-50]
-    (=jis-x0212		. #x392D)	; &I-JSP-392D; [25-13]
-    (=cns11643-2	. #x2355)	; &I-C2-2355; [03-53]
     (=big5		. #xCAB5)	; &I-B-CAB5;
-    (=daikanwa		. 06087)	; &I-M-06087;
-    (=jef-china3	. #x49A2)	; &I-JC3-49A2;
+    (->subsumptive
+     ((=ks-x1001	  . #x5052)	; &M-06087; [48-50]
+      (=jis-x0212	  . #x392D)	; &I-JSP-392D; [25-13]
+      (=daikanwa	  . 06087)	; &I-M-06087;
+      (=jef-china3	  . #x49A2)	; &I-JC3-49A2;
+      (=ucs@jis		  . #x5997)	; &M-06087;
+      )
+     ((=cns11643-2	  . #x2355)	; &C2-2355; [03-53]
+      )
+     ((=gb2312		  . #x6621)	; &G0-6621; [70-01]
+      (=ucs@unicode	  . #x5997)	; &G0-6621;
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x5998)	; 妘
-    (=cns11643-2	. #x2353)	; &I-C2-2353; [03-51]
     (=big5		. #xCAB3)	; &I-B-CAB3;
-    (=daikanwa		. 06088)	; &I-M-06088;
-    ))
-(define-char
-  '((=>ucs		. #x216CD)	; 𡛍
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=daikanwa		. 06089)	; &M-06089;
+    (->subsumptive
+     ((=daikanwa	  . 06088)	; &M-06088;
+      (=ucs@unicode	  . #x5998)	; &M-06088;
+      )
+     ((=cns11643-2	  . #x2353)	; &C2-2353; [03-51]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	6089 0 0)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x216CD)	; 𡛍
-    (=cns11643-6	. #x2672)	; &I-C6-2672; [06-82]
+    (->subsumptive
+     ((=daikanwa	  . 06089)	; &M-06089;
+      )
+     ((=cns11643-6	  . #x2672)	; &C6-2672; [06-82]
+      (=ucs@iso		  . #x216CD)	; &C6-2672;
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (shinjigen-2	. 1617)
     (=ucs		. #x5999)	; 妙
-    (=jis-x0208		. #x4C2F)	; &I-J90-4C2F; [44-15]
-    (=gb2312		. #x436E)	; &I-G0-436E; [35-78]
-    (=ks-x1001		. #x5958)	; &I-K0-5958; [57-56]
-    (=cns11643-1	. #x496E)	; &I-C1-496E; [41-78]
-    (=big5		. #xA7AE)	; &I-B-A7AE;
-    (=gt		. 07708)	; &I-GT-07708;
-    (=gt-k		. 02655)	; &I-GT-K02655;
-    (=gt-pj-1		. #x4C2F)	; &I-GT-07708; [44-15]
-    (=daikanwa		. 06090)	; &I-M-06090;
+    (->subsumptive
+     ((shinjigen-2	  . 1617)
+      (=jis-x0208	  . #x4C2F)	; &GT-07708; [44-15]
+      (=ks-x1001	  . #x5958)	; &I-K0-5958; [57-56]
+      (=big5		  . #xA7AE)	; &I-B-A7AE;
+      (=gt		  . 07708)	; &I-GT-07708;
+      (=gt-k		  . 02655)	; &I-GT-K02655;
+      (=gt-pj-1		  . #x4C2F)	; &I-GT-07708; [44-15]
+      (=daikanwa	  . 06090)	; &I-M-06090;
+      (=ucs@jis		  . #x5999)	; &GT-07708;
+      )
+     ((=gb2312		  . #x436E)	; &G0-436E; [35-78]
+      (=ucs@unicode	  . #x5999)	; &G0-436E;
+      )
+     ((=cns11643-1	  . #x496E)	; &C1-496E; [41-78]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x36AB)	; 㚫
-    (=cns11643-3	. #x2550)	; &I-C3-2550; [05-48]
-    (=daikanwa		. 06091)	; &I-M-06091;
-    ))
-(define-char
-  '((ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=ucs		. #x599A)	; 妚
-    (=cns11643-3	. #x2556)	; &I-C3-2556; [05-54]
-    (=daikanwa		. 06092)	; &I-M-06092;
-    (=jef-china3	. #x8EAC)	; &I-JC3-8EAC;
     ))
 (define-char
-  '((=>ucs		. #x216BC)	; 𡚼
+  '((<-denotational
+     ((=ucs		  . #x36AB)	; 㚫
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=daikanwa		. 06093)	; &M-06093;
+    (->subsumptive
+     ((=daikanwa	  . 06091)	; &M-06091;
+      )
+     ((=cns11643-3	  . #x2550)	; &C3-2550; [05-48]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	6093 0 0)
+  '((<-denotational
+     ((=ucs		  . #x36AB)	; 㚫
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=ucs		. #x216BC)	; 𡚼
-    (=cns11643-6	. #x2674)	; &I-C6-2674; [06-84]
+    (=ucs@unicode	. #x36AB)	; &UU+36AB;
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
-    (kangxi-radical	 . 46)	; â¼­
-    (total-strokes	 . 7)
-    (=ucs		. #x599B)	; 妛
-    (=jis-x0208		. #x562C)	; &I-J90-562C; [54-12]
-    (=gt		. 09983)	; &I-GT-09983;
-    (=gt-pj-1		. #x562C)	; &I-GT-09983; [54-12]
-    (=daikanwa		. 06094)	; &I-M-06094;
-    ))
-(define-char
-  '((=>ucs		. #x599B)	; 妛
-    (morohashi-daikanwa	6094 0 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=cns11643-3	. #x2553)	; &C3-2553; [05-51]
+    (=ucs		. #x599A)	; 妚
+    (->subsumptive
+     ((=daikanwa	  . 06092)	; &M-06092;
+      (=jef-china3	  . #x8EAC)	; &I-JC3-8EAC;
+      (=ucs@unicode	  . #x599A)	; &M-06092;
+      )
+     ((=cns11643-3	  . #x2556)	; &C3-2556; [05-54]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=ucs		. #x599C)	; 妜
-    (=cns11643-3	. #x254E)	; &I-C3-254E; [05-46]
-    (=daikanwa		. 06095)	; &I-M-06095;
+    (=ucs		. #x216BC)	; 𡚼
+    (->subsumptive
+     ((=daikanwa	  . 06093)	; &M-06093;
+      (=ucs@iso		  . #x216BC)	; &M-06093;
+      )
+     ((=cns11643-6	  . #x2674)	; &C6-2674; [06-84]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (shinjigen-2	. 1607)
-    (=ucs		. #x599D)	; 妝
-    (=jis-x0208		. #x5523)	; &I-J90-5523; [53-03]
-    (=gb12345		. #x5731)	; 妝 [55-17]
-    (=big5		. #xA7A9)	; &I-B-A7A9;
-    (=gt		. 07686)	; &I-GT-07686;
-    (=gt-pj-1		. #x5523)	; &I-GT-07686; [53-03]
-    (=daikanwa		. 06096)	; &I-M-06096;
+    (=ucs		. #x599B)	; 妛
     ))
 (define-char
-  '((=>ucs		. #x599D)	; 妝
-    (morohashi-daikanwa	6096 0 1)
+  '((<-denotational
+     ((=ucs		  . #x599B)	; 妛
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=cns11643-1	. #x4969)	; &C1-4969; [41-73]
+    (->subsumptive
+     ((=gt		  . 07678)	; &GT-07678;
+      (=gt-pj-2		  . #x6874)	; &GT-07678; [72-84]
+      (=daikanwa	  . 06094)	; &I-M-06094;
+      (=ucs@unicode	  . #x599B)	; &GT-07678;
+      )
+     ((=cns11643-3	  . #x2553)	; &C3-2553; [05-51]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	6096 0 7)
+  '((<-denotational
+     ((=ucs		  . #x599B)	; 妛
+      ))
     (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (=ucs		. #x5986)	; 妆
-    (=gb2312		. #x5731)	; &I-G0-5731; [55-17]
-    (mojikyo		. 054753)	; &MCS-6000D5E1;
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=jis-x0208		. #x562C)	; &GT-09983; [54-12]
+    (=gt		. 09983)	; &I-GT-09983;
+    (=gt-pj-1		. #x562C)	; &I-GT-09983; [54-12]
+    (=ucs@jis		. #x599B)	; &GT-09983;
+    (<-error@jis-x0208
+     ((=jis-x0213-1-2000  . #x4F63)	; &JX1-4F63; [47-67]
+      ))
+    (<-unknown
+     ((=jis-x0212	  . #x397B)	; &M-06579; [25-91]
+      (=daikanwa	  . 06579)	; &I-M-06579;
+      ))
+    (<-unknown*sources
+     jis-x0212)
     ))
 (define-char
-  '((=>ucs		. #x5986)	; 妆
-    (morohashi-daikanwa	6096 0 8)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (=cns11643-3	. #x234D)	; &C3-234D; [03-45]
+  '((ideographic-radical . 38)	; â¼¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=ucs		. #x599C)	; 妜
+    (->subsumptive
+     ((=daikanwa	  . 06095)	; &M-06095;
+      (=ucs@unicode	  . #x599C)	; &M-06095;
+      )
+     ((=cns11643-3	  . #x254E)	; &C3-254E; [05-46]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x216BD)	; 𡚽
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=daikanwa		. 06097)	; &M-06097;
+    (=ucs		. #x599D)	; 妝
+    (->subsumptive
+     ((shinjigen-2	  . 1607)
+      (=jis-x0208	  . #x5523)	; &GT-07686; [53-03]
+      (=gb12345		  . #x5731)	; &GT-07686; [55-17]
+      (=big5		  . #xA7A9)	; &I-B-A7A9;
+      (=gt		  . 07686)	; &I-GT-07686;
+      (=gt-pj-1		  . #x5523)	; &I-GT-07686; [53-03]
+      (=daikanwa	  . 06096)	; &I-M-06096;
+      (=ucs@unicode	  . #x599D)	; &GT-07686;
+      )
+     ((=cns11643-1	  . #x4969)	; &C1-4969; [41-73]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	6097 0 0)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x216BD)	; 𡚽
-    (=cns11643-4	. #x2368)	; &I-C4-2368; [03-72]
+    (->subsumptive
+     ((=daikanwa	  . 06097)	; &M-06097;
+      )
+     ((=cns11643-4	  . #x2368)	; &C4-2368; [03-72]
+      (=ucs@iso		  . #x216BD)	; &C4-2368;
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
@@ -1334,6 +1499,18 @@
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
+    (=ucs		. #x59AA)	; 妪
+    (=gb2312		. #x657D)	; &I-G0-657D; [69-93]
+    (<-simplified@CN
+     ((=jis-x0208	  . #x5542)	; &GT-08346; [53-34]
+      (=gb12345		  . #x657D)	; &GT-08346; [69-93]
+      (=daikanwa	  . 06640)	; &I-M-06640;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 38)	; â¼¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
     (non-morohashi	6119 9 3)
     (=ucs		. #x59AB)	; 妫
     (=gb2312		. #x6623)	; &I-G0-6623; [70-03]
@@ -1343,49 +1520,118 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x36B0)	; 㚰
-    (=cns11643-3	. #x2831)	; &I-C3-2831; [08-17]
-    (=daikanwa		. 06120)	; &I-M-06120;
+    (->subsumptive
+     ((=daikanwa	  . 06120)	; &M-06120;
+      (=ucs@unicode	  . #x36B0)	; &M-06120;
+      )
+     ((=cns11643-3	  . #x2831)	; &C3-2831; [08-17]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x5973)	; 女
+    (=ucs		. #x59AC)	; 妬
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x3D77)	; &GT-07623; [29-87]
+	(=gb2312	    . #x452E)	; &I-G0-452E; [37-14]
+	(=ks-x1001	    . #x5233)	; &I-K0-5233; [50-19]
+	(=daikanwa	    . 06036)	; &I-M-06036;
+	)
+       ((=ucs		    . #x77F3)	; 石
+	))
+      (shinjigen-1	  . 1635)
+      (shinjigen-2	  . 1635)
+      (=jis-x0208	  . #x454A)	; &GT-07772; [37-42]
+      (=ks-x1001	  . #x7760)	; &I-K0-7760; [87-64]
+      (=gt		  . 07772)	; &I-GT-07772;
+      (=gt-pj-1		  . #x454A)	; &I-GT-07772; [37-42]
+      (=daikanwa	  . 06121)	; &I-M-06121;
+      (=cbeta		  . 00107)	; &I-CB00107;
+      (=ucs@unicode	  . #x59AC)	; &GT-07772;
       )
-     ((=ucs		  . #x77F3)	; 石
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=cns11643-1	    . #x444C)	; &C1-444C; [36-44]
+	)
+       ((=ucs		    . #x77F3)	; 石
+	))
+      (=cns11643-3	  . #x2841)	; &C3-2841; [08-33]
       ))
-    (shinjigen-2	. 1635)
-    (=ucs		. #x59AC)	; 妬
-    (=jis-x0208		. #x454A)	; &I-J90-454A; [37-42]
-    (=ks-x1001		. #x7760)	; &I-K0-7760; [87-64]
-    (=cns11643-3	. #x2841)	; &I-C3-2841; [08-33]
-    (=gt		. 07772)	; &I-GT-07772;
-    (=gt-pj-1		. #x454A)	; &I-GT-07772; [37-42]
-    (=daikanwa		. 06121)	; &I-M-06121;
-    (=cbeta		. 00107)	; &I-CB00107;
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
+    (=ucs		. #x59AD)	; 妭
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x59AD)	; 妭
+      ))
+    (ideographic-radical . 38)	; â¼¥
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x3D77)	; &GT-07623; [29-87]
+	(=gb2312	    . #x452E)	; &I-G0-452E; [37-14]
+	(=ks-x1001	    . #x5233)	; &I-K0-5233; [50-19]
+	(=daikanwa	    . 06036)	; &I-M-06036;
+	)
+       ((=jis-x0212	    . #x4A6E)	; &M-20236; [42-78]
+	(=cns11643-2	    . #x2164)	; &I-C2-2164; [01-68]
+	(=jis-x0213-2-2000  . #x703B)	; &I-JX2-703B; [80-27]
+	(=daikanwa	    . 20236)	; &I-M-20236;
+	))
+      (=jis-x0212	  . #x3931)	; &M-06122; [25-17]
+      (=daikanwa	  . 06122)	; &I-M-06122;
+      (=cbeta		  . 00885)	; &I-CB00885;
+      (=jef-china3	  . #x49A4)	; &I-JC3-49A4;
+      (=ucs@jis		  . #x59AD)	; &M-06122;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=cns11643-1	    . #x444C)	; &C1-444C; [36-44]
+	)
+       ((=jis-x0212	    . #x4A6E)	; &M-20236; [42-78]
+	(=cns11643-2	    . #x2164)	; &I-C2-2164; [01-68]
+	(=jis-x0213-2-2000  . #x703B)	; &I-JX2-703B; [80-27]
+	(=daikanwa	    . 20236)	; &I-M-20236;
+	))
+      (=cns11643-3	  . #x2833)	; &C3-2833; [08-19]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x59AD)	; 妭
+      ))
+    (ideographic-radical . 38)	; â¼¥
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x5973)	; 女
+     ((=jis-x0208	  . #x3D77)	; &GT-07623; [29-87]
+      (=gb2312		  . #x452E)	; &I-G0-452E; [37-14]
+      (=ks-x1001	  . #x5233)	; &I-K0-5233; [50-19]
+      (=daikanwa	  . 06036)	; &I-M-06036;
       )
-     ((=ucs		  . #x72AE)	; 犮
+     ((=ucs@unicode	  . #x72AE)	; &UU+72AE;
       ))
-    (=ucs		. #x59AD)	; 妭
-    (=jis-x0212		. #x3931)	; &I-JSP-3931; [25-17]
-    (=cns11643-3	. #x2833)	; &I-C3-2833; [08-19]
-    (=daikanwa		. 06122)	; &I-M-06122;
-    (=cbeta		. 00885)	; &I-CB00885;
-    (=jef-china3	. #x49A4)	; &I-JC3-49A4;
+    (=ucs@unicode	. #x59AD)	; &UU+59AD;
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
@@ -1691,24 +1937,22 @@
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (shinjigen-2	. 1624)
     (=ucs		. #x59BB)	; 妻
-    (=jis-x0208		. #x3A4A)	; &I-J90-3A4A; [26-42]
-    (=gb2312		. #x465E)	; &I-G0-465E; [38-62]
-    (=ks-x1001		. #x7423)	; &I-K0-7423; [84-03]
-    (=big5		. #xA964)	; &I-B-A964;
-    (=gt		. 07743)	; &I-GT-07743;
-    (=gt-k		. 03714)	; &I-GT-K03714;
-    (=gt-pj-1		. #x3A4A)	; &I-GT-07743; [26-42]
-    (=daikanwa		. 06140)	; &I-M-06140;
-    ))
-(define-char
-  '((=>ucs		. #x59BB)	; 妻
-    (morohashi-daikanwa	6140 0 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=cns11643-1	. #x4C66)	; &C1-4C66; [44-70]
+    (->subsumptive
+     ((shinjigen-1	  . 1624)
+      (shinjigen-2	  . 1624)
+      (=jis-x0208	  . #x3A4A)	; &GT-07743; [26-42]
+      (=gb2312		  . #x465E)	; &I-G0-465E; [38-62]
+      (=ks-x1001	  . #x7423)	; &I-K0-7423; [84-03]
+      (=big5		  . #xA964)	; &I-B-A964;
+      (=gt		  . 07743)	; &I-GT-07743;
+      (=gt-k		  . 03714)	; &I-GT-K03714;
+      (=gt-pj-1		  . #x3A4A)	; &I-GT-07743; [26-42]
+      (=daikanwa	  . 06140)	; &I-M-06140;
+      (=ucs@unicode	  . #x59BB)	; &GT-07743;
+      )
+     ((=cns11643-1	  . #x4C66)	; &C1-4C66; [44-70]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
@@ -1790,65 +2034,118 @@
 (define-char
   '((=>ucs		. #x216DD)	; 𡛝
     (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=daikanwa		. 06145)	; &M-06145;
-    ))
-(define-char
-  '((morohashi-daikanwa	6145 0 0)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=ucs		. #x216DD)	; 𡛝
-    (=cns11643-4	. #x257A)	; &I-C4-257A; [05-90]
-    ))
-(define-char
-  '((ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x5973)	; 女
-      )
-     ((=ucs		  . #x5360)	; 占
-      ))
-    (=ucs		. #x36B2)	; 㚲
-    (=cns11643-4	. #x257B)	; &I-C4-257B; [05-91]
-    (=daikanwa		. 06146)	; &I-M-06146;
-    (=cbeta		. 01754)	; &I-CB01754;
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (=daikanwa		. 06145)	; &M-06145;
     ))
 (define-char
-  '((=>ucs		. #x59BE)	; 妾
+  '((morohashi-daikanwa	6145 0 0)
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (shinjigen-2	. 1631)
-    (=jis-x0208		. #x3E2A)	; &GT-07757; [30-10]
-    (=ks-x1001		. #x745D)	; &I-K0-745D; [84-61]
-    (=gt		. 07757)	; &I-GT-07757;
-    (=gt-k		. 03742)	; &I-GT-K03742;
-    (=gt-pj-1		. #x3E2A)	; &I-GT-07757; [30-10]
-    (=daikanwa		. 06147)	; &I-M-06147;
-    (=ucs@jis		. #x59BE)	; &GT-07757;
+    (=ucs		. #x216DD)	; 𡛝
+    (=cns11643-4	. #x257A)	; &I-C4-257A; [05-90]
     ))
 (define-char
-  '((morohashi-daikanwa	6147 0 0)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=ucs		. #x59BE)	; 妾
-    (=gb2312		. #x662A)	; &I-G0-662A; [70-10]
-    (=big5		. #xA963)	; &I-B-A963;
+    (=ucs		. #x36B2)	; 㚲
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x3D77)	; &GT-07623; [29-87]
+	(=gb2312	    . #x452E)	; &I-G0-452E; [37-14]
+	(=ks-x1001	    . #x5233)	; &I-K0-5233; [50-19]
+	(=daikanwa	    . 06036)	; &I-M-06036;
+	)
+       ((=ucs		    . #x5360)	; 占
+	))
+      (=daikanwa	  . 06146)	; &M-06146;
+      (=cbeta		  . 01754)	; &I-CB01754;
+      (=ucs@unicode	  . #x36B2)	; &M-06146;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=cns11643-1	    . #x444C)	; &C1-444C; [36-44]
+	)
+       ((=ucs		    . #x5360)	; 占
+	))
+      (=cns11643-4	  . #x257B)	; &C4-257B; [05-91]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x59BE)	; 妾
-    (morohashi-daikanwa	6147 0 1)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=cns11643-1	. #x4C65)	; &C1-4C65; [44-69]
+    (=ucs		. #x59BE)	; 妾
+    (=big5		. #xA963)	; &I-B-A963;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=jis-x0208	    . #x4E29)	; &GT-33181; [46-09]
+	(=ks-x1001	    . #x5821)	; &I-K0-5821; [56-01]
+	(=daikanwa	    . 25721)	; &I-M-25721;
+	)
+       ((=jis-x0208	    . #x3D77)	; &GT-07623; [29-87]
+	(=gb2312	    . #x452E)	; &I-G0-452E; [37-14]
+	(=ks-x1001	    . #x5233)	; &I-K0-5233; [50-19]
+	(=daikanwa	    . 06036)	; &I-M-06036;
+	))
+      (shinjigen-2	  . 1631)
+      (=jis-x0208	  . #x3E2A)	; &GT-07757; [30-10]
+      (=ks-x1001	  . #x745D)	; &I-K0-745D; [84-61]
+      (=gt		  . 07757)	; &I-GT-07757;
+      (=gt-k		  . 03742)	; &I-GT-K03742;
+      (=gt-pj-1		  . #x3E2A)	; &I-GT-07757; [30-10]
+      (=daikanwa	  . 06147)	; &I-M-06147;
+      (=ucs@jis		  . #x59BE)	; &GT-07757;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=gb2312	    . #x4122)	; &C1-4721; [33-02]
+	(=cns11643-1	    . #x4721)	; &I-C1-4721; [39-01]
+	)
+       ((=jis-x0208	    . #x3D77)	; &GT-07623; [29-87]
+	(=gb2312	    . #x452E)	; &I-G0-452E; [37-14]
+	(=ks-x1001	    . #x5233)	; &I-K0-5233; [50-19]
+	(=daikanwa	    . 06036)	; &I-M-06036;
+	))
+      (=gb2312		  . #x662A)	; &G0-662A; [70-10]
+      (=ucs@unicode	  . #x59BE)	; &G0-662A;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=gb2312	    . #x4122)	; &C1-4721; [33-02]
+	(=cns11643-1	    . #x4721)	; &I-C1-4721; [39-01]
+	)
+       ((=cns11643-1	    . #x444C)	; &C1-444C; [36-44]
+	))
+      (=cns11643-1	  . #x4C65)	; &C1-4C65; [44-69]
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=gt-k		    . 01020)	; &GT-K01020;
+	)
+       ((=jis-x0208	    . #x3D77)	; &GT-07623; [29-87]
+	(=gb2312	    . #x452E)	; &I-G0-452E; [37-14]
+	(=ks-x1001	    . #x5233)	; &I-K0-5233; [50-19]
+	(=daikanwa	    . 06036)	; &I-M-06036;
+	))
+      (shinjigen-1	  . 1631)
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
@@ -2126,14 +2423,7 @@
     (=ucs		. #x59C9)	; 姉
     (=jis-x0208@1997	. #x3B50)	; 姉 [27-48]
     (->subsumptive
-     ((<-vulgar
-       ((=gb2312	    . #x6622)	; &M-06164; [70-02]
-	(=jis-x0212	    . #x393D)	; &I-JSP-393D; [25-29]
-	(=daikanwa	    . 06164)	; &I-M-06164;
-	))
-      (<-vulgar*sources
-       daikanwa)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
@@ -2152,6 +2442,13 @@
       (=daikanwa	  . 06165)	; &I-M-06165;
       (=cbeta		  . 00106)	; &I-CB00106;
       (=ucs@unicode	  . #x59C9)	; &M-06165;
+      (<-vulgar
+       ((=gb2312	    . #x6622)	; &M-06164; [70-02]
+	(=jis-x0212	    . #x393D)	; &I-JSP-393D; [25-29]
+	(=daikanwa	    . 06164)	; &I-M-06164;
+	))
+      (<-vulgar*sources
+       daikanwa)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -2190,7 +2487,8 @@
 	)
        ((=cns11643-1	    . #x444C)	; &C1-444C; [36-44]
 	)
-       ((=ucs@unicode	    . #x5E02)	; &C1-464B;
+       ((=gb2312	    . #x4A50)	; &C1-464B; [42-48]
+	(=cns11643-1	    . #x464B)	; &I-C1-464B; [38-43]
 	))
       (=cns11643-3	  . #x283F)	; &C3-283F; [08-31]
       ))
@@ -2426,192 +2724,238 @@
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (shinjigen-2	. 1632)
     (=ucs		. #x59D3)	; 姓
-    (=jis-x0208		. #x402B)	; &I-J90-402B; [32-11]
-    (=gb2312		. #x5055)	; &I-G0-5055; [48-53]
-    (=ks-x1001		. #x6073)	; &I-K0-6073; [64-83]
-    (=cns11643-1	. #x4C6F)	; &I-C1-4C6F; [44-79]
-    (=big5		. #xA96D)	; &I-B-A96D;
-    (=gt		. 07760)	; &I-GT-07760;
-    (=gt-pj-1		. #x402B)	; &I-GT-07760; [32-11]
-    (=daikanwa		. 06178)	; &I-M-06178;
+    (->subsumptive
+     ((shinjigen-1	  . 1632)
+      (shinjigen-2	  . 1632)
+      (=jis-x0208	  . #x402B)	; &GT-07760; [32-11]
+      (=gb2312		  . #x5055)	; &I-G0-5055; [48-53]
+      (=ks-x1001	  . #x6073)	; &I-K0-6073; [64-83]
+      (=big5		  . #xA96D)	; &I-B-A96D;
+      (=gt		  . 07760)	; &I-GT-07760;
+      (=gt-pj-1		  . #x402B)	; &I-GT-07760; [32-11]
+      (=daikanwa	  . 06178)	; &I-M-06178;
+      (=ucs@unicode	  . #x59D3)	; &GT-07760;
+      )
+     ((=cns11643-1	  . #x4C6F)	; &C1-4C6F; [44-79]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x216E1)	; 𡛡
-    (=daikanwa		. 06179)	; &I-M-06179;
-    ))
-(define-char
-  '((=>ucs		. #x216E1)	; 𡛡
-    (morohashi-daikanwa	6179 0 0)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=cns11643-5	. #x255C)	; &C5-255C; [05-60]
+    (->subsumptive
+     ((=daikanwa	  . 06179)	; &M-06179;
+      (=ucs@unicode	  . #x216E1)	; &M-06179;
+      )
+     ((=cns11643-5	  . #x255C)	; &C5-255C; [05-60]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x36B9)	; 㚹
-    (=cns11643-4	. #x2621)	; &I-C4-2621; [06-01]
-    (=daikanwa		. 06180)	; &I-M-06180;
+    (->subsumptive
+     ((=daikanwa	  . 06180)	; &M-06180;
+      (=ucs@unicode	  . #x36B9)	; &M-06180;
+      )
+     ((=cns11643-4	  . #x2621)	; &C4-2621; [06-01]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (shinjigen-1	. 1621)
-    (shinjigen-2	. 1621)
     (=ucs		. #x59D4)	; 委
-    (=jis-x0208		. #x3051)	; &I-J90-3051; [16-49]
-    (=gb2312		. #x4E2F)	; &I-G0-4E2F; [46-15]
-    (=ks-x1001		. #x6A4D)	; &I-K0-6A4D; [74-45]
-    (=big5		. #xA965)	; &I-B-A965;
-    (=gt		. 07715)	; &I-GT-07715;
-    (=gt-k		. 03626)	; &I-GT-K03626;
-    (=gt-pj-1		. #x3051)	; &I-GT-07715; [16-49]
-    (=daikanwa		. 06181)	; &I-M-06181;
-    ))
-(define-char
-  '((=>ucs		. #x59D4)	; 委
-    (morohashi-daikanwa	6181 0 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (shinjigen-1	. 1621)
-    (shinjigen-2	. 1621)
-    (=cns11643-1	. #x4C67)	; &C1-4C67; [44-71]
+    (->subsumptive
+     ((shinjigen-1	  . 1621)
+      (shinjigen-2	  . 1621)
+      (=jis-x0208	  . #x3051)	; &GT-07715; [16-49]
+      (=gb2312		  . #x4E2F)	; &I-G0-4E2F; [46-15]
+      (=ks-x1001	  . #x6A4D)	; &I-K0-6A4D; [74-45]
+      (=big5		  . #xA965)	; &I-B-A965;
+      (=gt		  . 07715)	; &I-GT-07715;
+      (=gt-k		  . 03626)	; &I-GT-K03626;
+      (=gt-pj-1		  . #x3051)	; &I-GT-07715; [16-49]
+      (=daikanwa	  . 06181)	; &I-M-06181;
+      (=ucs@unicode	  . #x59D4)	; &GT-07715;
+      )
+     ((=cns11643-1	  . #x4C67)	; &C1-4C67; [44-71]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x36BA)	; 㚺
-    (=cns11643-3	. #x2844)	; &I-C3-2844; [08-36]
-    (=daikanwa		. 06182)	; &I-M-06182;
-    ))
-(define-char
-  '((=>ucs		. #x59D5)	; 姕
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=daikanwa		. 06183)	; &M-06183;
+    (->subsumptive
+     ((=daikanwa	  . 06182)	; &M-06182;
+      (=ucs@unicode	  . #x36BA)	; &M-06182;
+      )
+     ((=cns11643-3	  . #x2844)	; &C3-2844; [08-36]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	6183 0 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 6)
-    (kangxi-strokes	 . 5)
-    (total-strokes	 . 9)
+  '((ideographic-radical . 38)	; â¼¥
     (=ucs		. #x59D5)	; 姕
-    (=cns11643-3	. #x2C26)	; &I-C3-2C26; [12-06]
+    (->subsumptive
+     ((ideographic-strokes . 5)
+      (total-strokes	   . 8)
+      (=daikanwa	  . 06183)	; &M-06183;
+      (=ucs@unicode	  . #x59D5)	; &M-06183;
+      )
+     ((ideographic-strokes . 6)
+      (total-strokes	   . 9)
+      (=cns11643-3	  . #x2C26)	; &C3-2C26; [12-06]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x216E2)	; 𡛢
-    (=daikanwa		. 06184)	; &I-M-06184;
-    ))
-(define-char
-  '((=>ucs		. #x216E2)	; 𡛢
-    (morohashi-daikanwa	6184 0 0)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=cns11643-4	. #x257E)	; &C4-257E; [05-94]
+    (->subsumptive
+     ((=daikanwa	  . 06184)	; &M-06184;
+      (=ucs@iso		  . #x216E2)	; &M-06184;
+      )
+     ((=cns11643-4	  . #x257E)	; &C4-257E; [05-94]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x59D6)	; 姖
-    (=cns11643-2	. #x262F)	; &I-C2-262F; [06-15]
     (=big5		. #xCC4E)	; &I-B-CC4E;
-    (=daikanwa		. 06185)	; &I-M-06185;
+    (->subsumptive
+     ((=daikanwa	  . 06185)	; &M-06185;
+      )
+     ((=ucs@unicode	  . #x59D6)	; &UU+59D6;
+      )
+     ((=cns11643-2	  . #x262F)	; &C2-262F; [06-15]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x36BB)	; 㚻
-    (=cns11643-3	. #x283E)	; &I-C3-283E; [08-30]
-    (=daikanwa		. 06186)	; &I-M-06186;
+    (->subsumptive
+     ((=daikanwa	  . 06186)	; &M-06186;
+      (=ucs@unicode	  . #x36BB)	; &M-06186;
+      )
+     ((=cns11643-3	  . #x283E)	; &C3-283E; [08-30]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x5973)	; 女
+    (=ucs		. #x36BC)	; 㚼
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x3D77)	; &GT-07623; [29-87]
+	(=gb2312	    . #x452E)	; &I-G0-452E; [37-14]
+	(=ks-x1001	    . #x5233)	; &I-K0-5233; [50-19]
+	(=daikanwa	    . 06036)	; &I-M-06036;
+	)
+       ((=ucs		    . #x7530)	; 田
+	))
+      (=daikanwa	  . 06187)	; &M-06187;
+      (=cbeta		  . 01950)	; &I-CB01950;
+      (=ucs@unicode	  . #x36BC)	; &M-06187;
       )
-     ((=ucs		  . #x7530)	; 田
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=cns11643-1	    . #x444C)	; &C1-444C; [36-44]
+	)
+       ((=ucs		    . #x7530)	; 田
+	))
+      (=cns11643-3	  . #x2836)	; &C3-2836; [08-22]
       ))
-    (=ucs		. #x36BC)	; 㚼
-    (=cns11643-3	. #x2836)	; &I-C3-2836; [08-22]
-    (=daikanwa		. 06187)	; &I-M-06187;
-    (=cbeta		. 01950)	; &I-CB01950;
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x36C1)	; 㛁
-    (=cns11643-3	. #x2830)	; &I-C3-2830; [08-16]
-    (=daikanwa		. 06188)	; &I-M-06188;
     ))
 (define-char
-  '((ideographic-radical . 38)	; â¼¥
+  '((<-denotational
+     ((=ucs		  . #x36C1)	; 㛁
+      ))
+    (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=ucs		. #x21701)	; 𡜁
-    (=daikanwa		. 06189)	; &I-M-06189;
+    (=daikanwa		. 06188)	; &M-06188;
     ))
 (define-char
-  '((=>ucs		. #x21701)	; 𡜁
-    (morohashi-daikanwa	6189 0 0)
+  '((<-denotational
+     ((=ucs		  . #x36C1)	; 㛁
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=cns11643-5	. #x2561)	; &C5-2561; [05-65]
+    (->subsumptive
+     ((=ucs@unicode	  . #x36C1)	; &UU+36C1;
+      )
+     ((=cns11643-3	  . #x2830)	; &C3-2830; [08-16]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=ucs		. #x36BD)	; 㚽
-    (=cns11643-3	. #x283C)	; &I-C3-283C; [08-28]
-    (=daikanwa		. 06190)	; &I-M-06190;
+    (=ucs		. #x21701)	; 𡜁
+    (->subsumptive
+     ((=daikanwa	  . 06189)	; &M-06189;
+      (=ucs@iso		  . #x21701)	; &M-06189;
+      )
+     ((=cns11643-5	  . #x2561)	; &C5-2561; [05-65]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=ucs		. #x216FE)	; 𡛾
-    (=daikanwa		. 06191)	; &I-M-06191;
+    (=ucs		. #x36BD)	; 㚽
+    (->subsumptive
+     ((=daikanwa	  . 06190)	; &M-06190;
+      (=ucs@unicode	  . #x36BD)	; &M-06190;
+      )
+     ((=cns11643-3	  . #x283C)	; &C3-283C; [08-28]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x216FE)	; 𡛾
-    (morohashi-daikanwa	6191 0 0)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=cns11643-5	. #x255F)	; &C5-255F; [05-63]
+    (=ucs		. #x216FE)	; 𡛾
+    (->subsumptive
+     ((=daikanwa	  . 06191)	; &M-06191;
+      (=ucs@iso		  . #x216FE)	; &M-06191;
+      )
+     ((=cns11643-5	  . #x255F)	; &C5-255F; [05-63]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x36BE)	; 㚾
-    (=cns11643-5	. #x255D)	; &I-C5-255D; [05-61]
-    (=daikanwa		. 06193)	; &I-M-06193;
+    (->subsumptive
+     ((=daikanwa	  . 06193)	; &M-06193;
+      (=ucs@unicode	  . #x36BE)	; &M-06193;
+      )
+     ((=cns11643-5	  . #x255D)	; &C5-255D; [05-61]
+      ))
     ))
 (define-char
   '((=>ucs		. #x21700)	; 𡜀
@@ -3568,15 +3912,20 @@
     (=cns11643-5	. #x2866)	; &C5-2866; [08-70]
     ))
 (define-char
-  '((ideographic-radical . 38)	; â¼¥
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x552B)	; &J97-552B; [53-11]
+      ))
+    (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x59F8)	; 姸
     (->subsumptive
      ((=ks-x1001	  . #x6641)	; &M-06247; [70-33]
       (=daikanwa	  . 06247)	; &I-M-06247;
+      (=jef-china3	  . #x49B5)	; &I-JC3-49B5;
       )
-     ((=ucs@unicode	  . #x59F8)	; &UU+59F8;
+     ((shinjigen-1	  . 1649)
+      (=ucs@unicode	  . #x59F8)	; &UU+59F8;
       )
      ((=cns11643-3	  . #x2C2B)	; &C3-2C2B; [12-11]
       ))
@@ -3613,7 +3962,7 @@
 	(=ks-x1001	    . #x5233)	; &I-K0-5233; [50-19]
 	(=daikanwa	    . 06036)	; &I-M-06036;
 	)
-       ((=ucs@unicode	    . #x5B85)	; &UU+5B85;
+       ((=gb2312	    . #x552C)	; &G0-552C; [53-12]
 	))
       (=gb2312		  . #x6631)	; &G0-6631; [70-17]
       (=ucs@unicode	  . #x59F9)	; &G0-6631;
@@ -3624,7 +3973,7 @@
 	)
        ((=cns11643-1	    . #x444C)	; &C1-444C; [36-44]
 	)
-       ((=ucs@unicode	    . #x5B85)	; &UU+5B85;
+       ((=gb2312	    . #x552C)	; &G0-552C; [53-12]
 	))
       (=cns11643-3	  . #x2C29)	; &C3-2C29; [12-09]
       (=ucs@cns		  . #x59F9)	; &C3-2C29;
@@ -3635,9 +3984,9 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x59FA)	; 姺
+    (=big5		. #xCE68)	; &I-B-CE68;
     (->subsumptive
-     ((=big5		  . #xCE68)	; &M-06249;
-      (=daikanwa	  . 06249)	; &I-M-06249;
+     ((=daikanwa	  . 06249)	; &M-06249;
       (=ucs@unicode	  . #x59FA)	; &M-06249;
       )
      ((=cns11643-2	  . #x2969)	; &C2-2969; [09-73]
@@ -5713,117 +6062,148 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A3B)	; 娻
-    (=daikanwa		. 06375)	; &I-M-06375;
-    (=jef-china3	. #x9FE8)	; &I-JC3-9FE8;
-    ))
-(define-char
-  '((=>ucs		. #x5A3B)	; 娻
-    (morohashi-daikanwa	6375 0 0)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=cns11643-3	. #x3524)	; &C3-3524; [21-04]
+    (->subsumptive
+     ((=daikanwa	  . 06375)	; &M-06375;
+      (=jef-china3	  . #x9FE8)	; &I-JC3-9FE8;
+      (=ucs@unicode	  . #x5A3B)	; &M-06375;
+      )
+     ((=cns11643-3	  . #x3524)	; &C3-3524; [21-04]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (shinjigen-2	. 1689)
     (=ucs		. #x5A3C)	; 娼
-    (=jis-x0208		. #x3E2B)	; &I-J90-3E2B; [30-11]
-    (=gb2312		. #x663D)	; &I-G0-663D; [70-29]
-    (=ks-x1001		. #x735E)	; &I-K0-735E; [83-62]
-    (=cns11643-1	. #x5964)	; &I-C1-5964; [57-68]
-    (=big5		. #xB140)	; &I-B-B140;
-    (=gt		. 08048)	; &I-GT-08048;
-    (=gt-pj-1		. #x3E2B)	; &I-GT-08048; [30-11]
-    (=daikanwa		. 06376)	; &I-M-06376;
+    (->subsumptive
+     ((shinjigen-1	  . 1689)
+      (shinjigen-2	  . 1689)
+      (=jis-x0208	  . #x3E2B)	; &GT-08048; [30-11]
+      (=gb2312		  . #x663D)	; &I-G0-663D; [70-29]
+      (=ks-x1001	  . #x735E)	; &I-K0-735E; [83-62]
+      (=big5		  . #xB140)	; &I-B-B140;
+      (=gt		  . 08048)	; &I-GT-08048;
+      (=gt-pj-1		  . #x3E2B)	; &I-GT-08048; [30-11]
+      (=daikanwa	  . 06376)	; &I-M-06376;
+      (=ucs@unicode	  . #x5A3C)	; &GT-08048;
+      )
+     ((=cns11643-1	  . #x5964)	; &C1-5964; [57-68]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x36E7)	; 㛧
-    (=cns11643-3	. #x352D)	; &I-C3-352D; [21-13]
-    (=daikanwa		. 06377)	; &I-M-06377;
+    (->subsumptive
+     ((=daikanwa	  . 06377)	; &M-06377;
+      (=ucs@unicode	  . #x36E7)	; &M-06377;
+      )
+     ((=cns11643-3	  . #x352D)	; &C3-352D; [21-13]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
-    (kangxi-strokes	 . 7)
     (total-strokes	 . 11)
     (=ucs		. #x5A3D)	; 娽
-    (=cns11643-3	. #x3531)	; &I-C3-3531; [21-17]
-    (=daikanwa		. 06378)	; &I-M-06378;
     ))
 (define-char
-  '((=>ucs		. #x21763)	; 𡝣
+  '((<-denotational
+     ((=ucs		  . #x5A3D)	; 娽
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=daikanwa		. 06379)	; &M-06379;
+    (->subsumptive
+     ((=daikanwa	  . 06378)	; &M-06378;
+      )
+     ((=cns11643-3	  . #x3531)	; &C3-3531; [21-17]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	6379 0 0)
+  '((<-denotational
+     ((=ucs		  . #x5A3D)	; 娽
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (=ucs@unicode	. #x5A3D)	; &UU+5A3D;
+    ))
+(define-char
+  '((ideographic-radical . 38)	; â¼¥
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
     (=ucs		. #x21763)	; 𡝣
-    (=cns11643-6	. #x3E48)	; &I-C6-3E48; [30-40]
+    (->subsumptive
+     ((=daikanwa	  . 06379)	; &M-06379;
+      )
+     ((=cns11643-6	  . #x3E48)	; &C6-3E48; [30-40]
+      (=ucs@iso		  . #x21763)	; &C6-3E48;
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A3E)	; 娾
-    (=cns11643-2	. #x3467)	; &I-C2-3467; [20-71]
     (=big5		. #xD4E4)	; &I-B-D4E4;
-    (=daikanwa		. 06380)	; &I-M-06380;
+    (->subsumptive
+     ((=daikanwa	  . 06380)	; &M-06380;
+      (=ucs@unicode	  . #x5A3E)	; &M-06380;
+      )
+     ((=cns11643-2	  . #x3467)	; &C2-3467; [20-71]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A3F)	; 娿
-    (=cns11643-3	. #x3533)	; &I-C3-3533; [21-19]
-    (=daikanwa		. 06381)	; &I-M-06381;
+    (->subsumptive
+     ((=daikanwa	  . 06381)	; &M-06381;
+      (=ucs@unicode	  . #x5A3F)	; &M-06381;
+      )
+     ((=cns11643-3	  . #x3533)	; &C3-3533; [21-19]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (shinjigen-2	. 1678)
     (=ucs		. #x5A40)	; 婀
-    (=jis-x0208		. #x5534)	; &I-J90-5534; [53-20]
-    (=gb2312		. #x6639)	; &I-G0-6639; [70-25]
-    (=cns11643-1	. #x5963)	; &I-C1-5963; [57-67]
-    (=big5		. #xB0FE)	; &I-B-B0FE;
-    (=gt		. 08000)	; &I-GT-08000;
-    (=gt-pj-1		. #x5534)	; &I-GT-08000; [53-20]
-    (=daikanwa		. 06382)	; &I-M-06382;
+    (->subsumptive
+     ((shinjigen-2	  . 1678)
+      (=jis-x0208	  . #x5534)	; &GT-08000; [53-20]
+      (=gb2312		  . #x6639)	; &I-G0-6639; [70-25]
+      (=big5		  . #xB0FE)	; &I-B-B0FE;
+      (=gt		  . 08000)	; &I-GT-08000;
+      (=gt-pj-1		  . #x5534)	; &I-GT-08000; [53-20]
+      (=daikanwa	  . 06382)	; &I-M-06382;
+      (=ucs@unicode	  . #x5A40)	; &GT-08000;
+      )
+     ((=cns11643-1	  . #x5963)	; &C1-5963; [57-67]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (shinjigen-2	. 1698)
     (=ucs		. #x5A41)	; 婁
-    (=jis-x0208		. #x4F2C)	; &I-J90-4F2C; [47-12]
-    (=ks-x1001		. #x5725)	; &I-K0-5725; [55-05]
-    (=gb12345		. #x4226)	; 婁 [34-06]
-    (=big5		. #xB0FA)	; &I-B-B0FA;
-    (=gt		. 08103)	; &I-GT-08103;
-    (=gt-k		. 07902)	; &I-GT-K07902;
-    (=gt-pj-1		. #x4F2C)	; &I-GT-08103; [47-12]
-    (=daikanwa		. 06383)	; &I-M-06383;
-    ))
-(define-char
-  '((=>ucs		. #x5A41)	; 婁
-    (morohashi-daikanwa	6383 0 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=cns11643-1	. #x595F)	; &C1-595F; [57-63]
+    (->subsumptive
+     ((shinjigen-2	  . 1698)
+      (=jis-x0208	  . #x4F2C)	; &GT-08103; [47-12]
+      (=ks-x1001	  . #x5725)	; &I-K0-5725; [55-05]
+      (=gb12345		  . #x4226)	; &GT-08103; [34-06]
+      (=big5		  . #xB0FA)	; &I-B-B0FA;
+      (=gt		  . 08103)	; &I-GT-08103;
+      (=gt-k		  . 07902)	; &I-GT-K07902;
+      (=gt-pj-1		  . #x4F2C)	; &I-GT-08103; [47-12]
+      (=daikanwa	  . 06383)	; &I-M-06383;
+      (=ucs@unicode	  . #x5A41)	; &GT-08103;
+      )
+     ((=cns11643-1	  . #x595F)	; &C1-595F; [57-63]
+      ))
     ))
 (define-char
   '((=>ucs		. #x21764)	; 𡝤
@@ -6236,19 +6616,42 @@
     (=cns11643-6	. #x3E4D)	; &I-C6-3E4D; [30-45]
     ))
 (define-char
-  '((=>ucs		. #x21769)	; 𡝩
+  '((ideographic-radical . 38)	; â¼¥
+    (=ucs		. #x21769)	; 𡝩
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21769)	; 𡝩
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=daikanwa		. 06409)	; &M-06409;
+    (->subsumptive
+     ((shinjigen-1	  . 1620)
+      (=daikanwa	  . 06409)	; &M-06409;
+      (=cbeta		  . 07847)	; &I-CB07847;
+      (<-original
+       ((shinjigen-1	    . 1619)
+	(=jis-x0208	    . #x4D45)	; &GT-07712; [45-37]
+	(=gb2312	    . #x517D)	; &I-G0-517D; [49-93]
+	(=ks-x1001	    . #x686D)	; &I-K0-686D; [72-77]
+	(=daikanwa	    . 06086)	; &I-M-06086;
+	))
+      (<-original*sources
+       shinjigen-1)
+      )
+     ((=cns11643-4	  . #x312B)	; &C4-312B; [17-11]
+      (=ucs@iso		  . #x21769)	; &C4-312B;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	6409 0 0)
+  '((<-denotational
+     ((=ucs		  . #x21769)	; 𡝩
+      ))
     (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=ucs		. #x21769)	; 𡝩
-    (=cns11643-4	. #x312B)	; &I-C4-312B; [17-11]
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=hanziku-3		. #xD7BB)	; &HZK03-D7BB;
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
@@ -7066,67 +7469,80 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A73)	; 婳
-    (=iso-ir165		. #x7B39)	; &I-EGB-7B39; [91-25]
+    (->subsumptive
+     ((=iso-ir165	  . #x7B39)	; &EGB-7B39; [91-25]
+      (=ucs@unicode	  . #x5A73)	; &EGB-7B39;
+      )
+     ((=cns11643-3	  . #x3537)	; &C3-3537; [21-23]
+      (mojikyo		  . 052259)	; &MCS-6000CC23;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5A73)	; 婳
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=cns11643-3	. #x3537)	; &C3-3537; [21-23]
-    (mojikyo		. 052259)	; &MCS-6000CC23;
-    ))
-(define-char
-  '((=>ucs		. #x5A77)	; å©·
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=jis-x0212		. #x3967)	; &M-06457; [25-71]
-    (=jis-x0213-1-2000	. #x2F75)	; &I-JX1-2F75; [15-85]
-    (=daikanwa		. 06457)	; &I-M-06457;
-    (=jef-china3	. #x49C9)	; &I-JC3-49C9;
-    (=ucs@jis		. #x5A77)	; &M-06457;
+    (=ucs		. #x5A74)	; å©´
+    (=gb2312		. #x5324)	; &I-G0-5324; [51-04]
+    (<-simplified@CN
+     ((=ucs		  . #x5B30)	; 嬰
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	6457 0 0)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5A77)	; å©·
-    (=gb2312		. #x6643)	; &I-G0-6643; [70-35]
     (=big5		. #xB440)	; &I-B-B440;
+    (->subsumptive
+     ((=jis-x0212	  . #x3967)	; &M-06457; [25-71]
+      (=jis-x0213-1-2000  . #x2F75)	; &I-JX1-2F75; [15-85]
+      (=daikanwa	  . 06457)	; &I-M-06457;
+      (=jef-china3	  . #x49C9)	; &I-JC3-49C9;
+      (=ucs@jis		  . #x5A77)	; &M-06457;
+      )
+     ((=gb2312		  . #x6643)	; &G0-6643; [70-35]
+      (=ucs@unicode	  . #x5A77)	; &G0-6643;
+      )
+     ((=cns11643-1	  . #x5E65)	; &C1-5E65; [62-69]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5A77)	; å©·
-    (morohashi-daikanwa	6457 0 1)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=cns11643-1	. #x5E65)	; &C1-5E65; [62-69]
+    (=ucs		. #x5A78)	; 婸
+    (=big5		. #xD8BB)	; &I-B-D8BB;
+    (->subsumptive
+     ((=daikanwa	  . 06458)	; &M-06458;
+      (=ucs@unicode	  . #x5A78)	; &M-06458;
+      )
+     ((=cns11643-2	  . #x3A7D)	; &C2-3A7D; [26-93]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs		. #x5A78)	; 婸
-    (=cns11643-2	. #x3A7D)	; &I-C2-3A7D; [26-93]
-    (=big5		. #xD8BB)	; &I-B-D8BB;
-    (=daikanwa		. 06458)	; &I-M-06458;
+    (=ucs		. #x2179C)	; 𡞜
     ))
 (define-char
-  '((=>ucs		. #x2179C)	; 𡞜
+  '((<-denotational
+     ((=ucs		  . #x2179C)	; 𡞜
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=daikanwa		. 06459)	; &M-06459;
     ))
 (define-char
-  '((morohashi-daikanwa	6459 0 2)
+  '((<-denotational
+     ((=ucs		  . #x2179C)	; 𡞜
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs		. #x2179C)	; 𡞜
-    (=cns11643-4	. #x367B)	; &I-C4-367B; [22-91]
+    (=cns11643-4	. #x367B)	; &C4-367B; [22-91]
+    (=ucs@iso		. #x2179C)	; &C4-367B;
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
@@ -9184,6 +9600,7 @@
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (=ucs		. #x5AB6)	; 媶
+    (=big5		. #xDD44)	; &I-B-DD44;
     ))
 (define-char
   '((<-denotational
@@ -9206,63 +9623,63 @@
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (->subsumptive
-     ((=big5		  . #xDD44)	; &B-DD44;
-      (=ucs@big5	  . #x5AB6)	; &B-DD44;
-      )
-     ((=ucs@unicode	  . #x5AB6)	; &UU+5AB6;
-      ))
-    ))
-(define-char
-  '((=>ucs		. #x217E8)	; 𡟨
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=daikanwa		. 06577)	; &M-06577;
+    (=ucs@unicode	. #x5AB6)	; &UU+5AB6;
     ))
 (define-char
-  '((morohashi-daikanwa	6577 0 0)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x217E8)	; 𡟨
-    ))
-(define-char
-  '((=>ucs		. #x217E8)	; 𡟨
-    (morohashi-daikanwa	6577 0 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=cns11643-5	. #x3E5F)	; &C5-3E5F; [30-63]
+    (->subsumptive
+     ((=daikanwa	  . 06577)	; &M-06577;
+      )
+     ((=ucs@iso		  . #x217E8)	; &U-000217E8;
+      )
+     ((=cns11643-5	  . #x3E5F)	; &C5-3E5F; [30-63]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x5AB7)	; 媷
-    (=cns11643-2	. #x4246)	; &I-C2-4246; [34-38]
     (=big5		. #xDD40)	; &I-B-DD40;
-    (=daikanwa		. 06578)	; &I-M-06578;
+    (->subsumptive
+     ((=daikanwa	  . 06578)	; &M-06578;
+      (=ucs@unicode	  . #x5AB7)	; &M-06578;
+      )
+     ((=cns11643-2	  . #x4246)	; &C2-4246; [34-38]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x5AB8)	; 媸
-    (=gb2312		. #x664A)	; &I-G0-664A; [70-42]
-    (=jis-x0212		. #x397B)	; &I-JSP-397B; [25-91]
-    (=cns11643-2	. #x423E)	; &I-C2-423E; [34-30]
     (=big5		. #xDCF7)	; &I-B-DCF7;
-    (=daikanwa		. 06579)	; &I-M-06579;
+    (->subsumptive
+     ((=jis-x0212	  . #x397B)	; &M-06579; [25-91]
+      (=daikanwa	  . 06579)	; &I-M-06579;
+      (=ucs@jis		  . #x5AB8)	; &M-06579;
+      )
+     ((=gb2312		  . #x664A)	; &G0-664A; [70-42]
+      (=ucs@unicode	  . #x5AB8)	; &G0-664A;
+      )
+     ((=cns11643-2	  . #x423E)	; &C2-423E; [34-30]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x5AB9)	; 媹
-    (=cns11643-2	. #x424C)	; &I-C2-424C; [34-44]
     (=big5		. #xDD46)	; &I-B-DD46;
-    (=daikanwa		. 06580)	; &I-M-06580;
+    (->subsumptive
+     ((=daikanwa	  . 06580)	; &M-06580;
+      (=ucs@unicode	  . #x5AB9)	; &M-06580;
+      )
+     ((=cns11643-2	  . #x424C)	; &C2-424C; [34-44]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
@@ -10228,123 +10645,132 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x5AD5)	; 嫕
-    (=cns11643-2	. #x4955)	; &I-C2-4955; [41-53]
     (=big5		. #xE16E)	; &I-B-E16E;
-    (=daikanwa		. 06636)	; &I-M-06636;
+    (->subsumptive
+     ((=daikanwa	  . 06636)	; &M-06636;
+      (=ucs@unicode	  . #x5AD5)	; &M-06636;
+      )
+     ((=cns11643-2	  . #x4955)	; &C2-4955; [41-53]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (shinjigen-2	. 1737)
     (=ucs		. #x5AD6)	; 嫖
-    (=jis-x0208		. #x5545)	; &I-J90-5545; [53-37]
-    (=gb2312		. #x664E)	; &I-G0-664E; [70-46]
-    (=cns11643-1	. #x684A)	; &I-C1-684A; [72-42]
-    (=big5		. #xB9E2)	; &I-B-B9E2;
-    (=gt		. 08399)	; &I-GT-08399;
-    (=gt-k		. 11201)	; &I-GT-K11201;
-    (=gt-pj-1		. #x5545)	; &I-GT-08399; [53-37]
-    (=daikanwa		. 06637)	; &I-M-06637;
-    ))
-(define-char
-  '((=>ucs		. #x21817)	; 𡠗
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=daikanwa		. 06638)	; &M-06638;
-    ))
-(define-char
-  '((morohashi-daikanwa	6638 0 4)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=ucs		. #x21817)	; 𡠗
-    (=cns11643-4	. #x4270)	; &I-C4-4270; [34-80]
+    (->subsumptive
+     ((=daikanwa	  . 06637)	; &M-06637;
+      )
+     ((shinjigen-2	  . 1737)
+      (=jis-x0208	  . #x5545)	; &GT-08399; [53-37]
+      (=gb2312		  . #x664E)	; &I-G0-664E; [70-46]
+      (=big5		  . #xB9E2)	; &I-B-B9E2;
+      (=gt		  . 08399)	; &I-GT-08399;
+      (=gt-k		  . 11201)	; &I-GT-K11201;
+      (=gt-pj-1		  . #x5545)	; &I-GT-08399; [53-37]
+      (=ucs@unicode	  . #x5AD6)	; &GT-08399;
+      )
+     ((=cns11643-1	  . #x684A)	; &C1-684A; [72-42]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x21826)	; ð¡ ¦
-    (=cns11643-5	. #x4537)	; &I-C5-4537; [37-23]
-    (=daikanwa		. 06639)	; &I-M-06639;
+    (->subsumptive
+     ((=daikanwa	  . 06638)	; &M-06638;
+      )
+     ((=cns11643-5	  . #x4537)	; &C5-4537; [37-23]
+      (=ucs@iso		  . #x21826)	; &C5-4537;
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (shinjigen-2	. 1730)
-    (=ucs		. #x5AD7)	; 嫗
-    (=jis-x0208		. #x5542)	; &I-J90-5542; [53-34]
-    (=gb12345		. #x657D)	; 嫗 [69-93]
-    (=big5		. #xB9E1)	; &I-B-B9E1;
-    (=gt		. 08346)	; &I-GT-08346;
-    (=gt-pj-1		. #x5542)	; &I-GT-08346; [53-34]
-    (=daikanwa		. 06640)	; &I-M-06640;
+    (=ucs		. #x21817)	; 𡠗
+    (->subsumptive
+     ((=daikanwa	  . 06639)	; &M-06639;
+      )
+     ((=cns11643-4	  . #x4270)	; &C4-4270; [34-80]
+      (=ucs@iso		  . #x21817)	; &C4-4270;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5AD7)	; 嫗
-    (morohashi-daikanwa	6640 0 2)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=cns11643-1	. #x6849)	; &C1-6849; [72-41]
-    ))
-(define-char
-  '((morohashi-daikanwa	6640 0 5)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=ucs		. #x59AA)	; 妪
-    (=gb2312		. #x657D)	; &I-G0-657D; [69-93]
+    (=ucs		. #x5AD7)	; 嫗
+    (->subsumptive
+     ((shinjigen-2	  . 1730)
+      (=jis-x0208	  . #x5542)	; &GT-08346; [53-34]
+      (=gb12345		  . #x657D)	; &GT-08346; [69-93]
+      (=big5		  . #xB9E1)	; &I-B-B9E1;
+      (=gt		  . 08346)	; &I-GT-08346;
+      (=gt-pj-1		  . #x5542)	; &I-GT-08346; [53-34]
+      (=daikanwa	  . 06640)	; &I-M-06640;
+      (=ucs@unicode	  . #x5AD7)	; &GT-08346;
+      )
+     ((=cns11643-1	  . #x6849)	; &C1-6849; [72-41]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x5AD8)	; 嫘
-    (=gb2312		. #x6650)	; &I-G0-6650; [70-48]
-    (=cns11643-1	. #x684B)	; &I-C1-684B; [72-43]
     (=big5		. #xB9E3)	; &I-B-B9E3;
-    (=daikanwa		. 06641)	; &I-M-06641;
+    (->subsumptive
+     ((=daikanwa	  . 06641)	; &M-06641;
+      )
+     ((=gb2312		  . #x6650)	; &G0-6650; [70-48]
+      (=ucs@unicode	  . #x5AD8)	; &G0-6650;
+      )
+     ((=cns11643-1	  . #x684B)	; &C1-684B; [72-43]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x5AD9)	; 嫙
-    (=cns11643-2	. #x4961)	; &I-C2-4961; [41-65]
     (=big5		. #xE17A)	; &I-B-E17A;
-    (=daikanwa		. 06642)	; &I-M-06642;
-    ))
-(define-char
-  '((=>ucs		. #x2184D)	; 𡡍
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=daikanwa		. 06643)	; &M-06643;
+    (->subsumptive
+     ((=daikanwa	  . 06642)	; &M-06642;
+      )
+     ((=ucs@unicode	  . #x5AD9)	; &UU+5AD9;
+      )
+     ((=cns11643-2	  . #x4961)	; &C2-4961; [41-65]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	6643 0 0)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x2184D)	; 𡡍
+    (->subsumptive
+     ((=daikanwa	  . 06643)	; &M-06643;
+      )
+     ((=ucs@iso		  . #x2184D)	; &U-0002184D;
+      )
+     ((=cns11643-6	  . #x5B77)	; &C6-5B77; [59-87]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x2184D)	; 𡡍
-    (morohashi-daikanwa	6643 0 1)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=cns11643-6	. #x5B77)	; &C6-5B77; [59-87]
+    (=ucs		. #x5ADA)	; 嫚
+    (=big5		. #xE170)	; &I-B-E170;
     ))
 (define-char
-  '((ideographic-radical . 38)	; â¼¥
+  '((<-denotational
+     ((=ucs		  . #x5ADA)	; 嫚
+      ))
+    (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=ucs		. #x5ADA)	; 嫚
     (->subsumptive
      ((=jis-x0212	  . #x3A25)	; &M-06644; [26-05]
       (=jis-x0213-2-2000  . #x256A)	; &I-JX2-256A; [05-74]
@@ -10353,13 +10779,19 @@
       )
      ((=cns11643-2	  . #x4957)	; &C2-4957; [41-55]
       (=ucs@cns		  . #x5ADA)	; &C2-4957;
-      )
-     ((=iso-ir165	  . #x7B3C)	; &EGB-7B3C; [91-28]
-      (=big5		  . #xE170)	; &I-B-E170;
-      (=ucs@unicode	  . #x5ADA)	; &EGB-7B3C;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x5ADA)	; 嫚
+      ))
+    (ideographic-radical . 38)	; â¼¥
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=iso-ir165		. #x7B3C)	; &EGB-7B3C; [91-28]
+    (=ucs@unicode	. #x5ADA)	; &EGB-7B3C;
+    ))
+(define-char
   '((=>ucs		. #x21842)	; 𡡂
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 11)
@@ -11554,13 +11986,7 @@
     (->subsumptive
      ((=daikanwa	  . 06711)	; &M-06711;
       )
-     ((<-same
-       ((shinjigen-1	    . 1742)
-	(=jis-x0208	    . #x5546)	; &GT-08426; [53-38]
-	))
-      (<-same*sources
-       shinjigen-1)
-      (shinjigen-1	  . 1743)
+     ((shinjigen-1	  . 1743)
       (shinjigen-2	  . 1743)
       (=jis-x0208	  . #x5547)	; &GT-08427; [53-39]
       (=gb12345		  . #x6635)	; &GT-08427; [70-21]
@@ -11568,6 +11994,12 @@
       (=gt		  . 08427)	; &I-GT-08427;
       (=gt-pj-1		  . #x5547)	; &I-GT-08427; [53-39]
       (=ucs@unicode	  . #x5AFB)	; &GT-08427;
+      (<-same
+       ((shinjigen-1	    . 1742)
+	(=jis-x0208	    . #x5546)	; &GT-08426; [53-38]
+	))
+      (<-same*sources
+       shinjigen-1)
       )
      ((=cns11643-1	  . #x6C49)	; &C1-6C49; [76-41]
       ))
@@ -12466,15 +12898,15 @@
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (shinjigen-1	. 1744)
+    (=ucs		. #x21883)	; 𡢃
+    (=cbeta		. 08135)	; &I-CB08135;
     (<-vulgar
      ((shinjigen-1	  . 1742)
       (=jis-x0208	  . #x5546)	; &GT-08426; [53-38]
       ))
     (<-vulgar*sources
      shinjigen-1)
-    (shinjigen-1	. 1744)
-    (=ucs		. #x21883)	; 𡢃
-    (=cbeta		. 08135)	; &I-CB08135;
     ))
 (define-char
   '((=>ucs		. #x21891)	; 𡢑
@@ -13212,43 +13644,28 @@
     (=gb2312		. #x6648)	; &I-G0-6648; [70-40]
     ))
 (define-char
-  '((=>ucs		. #x5B22)	; 嬢
-    (morohashi-daikanwa	6807 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5550)	; &GT-08671; [53-48]
-      (=ks-x1001	  . #x653E)	; &I-K0-653E; [69-30]
-      (=daikanwa	  . 06891)	; &I-M-06891;
-      ))
-    (=jis-x0208		. #x3E6E)	; &GT-08529; [30-78]
-    (=gt		. 08529)	; &I-GT-08529;
-    (=gt-pj-1		. #x3E6E)	; &I-GT-08529; [30-78]
-    (=ucs@jis		. #x5B22)	; &GT-08529;
-    ))
-(define-char
-  '((morohashi-daikanwa	6807 1 0)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (=ucs		. #x5B22)	; 嬢
-    ))
-(define-char
-  '((=>ucs		. #x5B22)	; 嬢
-    (morohashi-daikanwa	6807 1 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (mojikyo		. 050148)	; &MCS-6000C3E4;
-    ))
-(define-char
-  '((=>ucs		. #x5B22)	; 嬢
-    (morohashi-daikanwa	6807 1 2)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=cns11643-3	. #x5056)	; &C3-5056; [48-54]
+    (->subsumptive
+     ((morohashi-daikanwa	6807 1)
+      (=jis-x0208	  . #x3E6E)	; &GT-08529; [30-78]
+      (=gt		  . 08529)	; &I-GT-08529;
+      (=gt-pj-1		  . #x3E6E)	; &I-GT-08529; [30-78]
+      (=ucs@jis		  . #x5B22)	; &GT-08529;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5550)	; &GT-08671; [53-48]
+	(=ks-x1001	    . #x653E)	; &I-K0-653E; [69-30]
+	(=daikanwa	    . 06891)	; &I-M-06891;
+	))
+      )
+     ((=ucs@unicode	  . #x5B22)	; &UU+5B22;
+      )
+     ((mojikyo		  . 050148)	; &MCS-6000C3E4;
+      )
+     ((=cns11643-3	  . #x5056)	; &C3-5056; [48-54]
+      ))
     ))
 (define-char
   '((=>ucs		. #x218B7)	; ð¡¢·
@@ -13650,9 +14067,9 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x5B2E)	; 嬮
+    (=big5		. #xECD6)	; &I-B-ECD6;
     (->subsumptive
-     ((=big5		  . #xECD6)	; &M-06825;
-      (=daikanwa	  . 06825)	; &I-M-06825;
+     ((=daikanwa	  . 06825)	; &M-06825;
       (=ucs@unicode	  . #x5B2E)	; &M-06825;
       )
      ((=cns11643-2	  . #x5C62)	; &C2-5C62; [60-66]
@@ -13660,131 +14077,147 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x218D4)	; 𡣔
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=daikanwa		. 06826)	; &M-06826;
-    ))
-(define-char
-  '((morohashi-daikanwa	6826 0 2)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x218D4)	; 𡣔
-    (=cns11643-5	. #x5B35)	; &I-C5-5B35; [59-21]
+    (->subsumptive
+     ((=daikanwa	  . 06826)	; &M-06826;
+      )
+     ((=cns11643-5	  . #x5B35)	; &C5-5B35; [59-21]
+      )
+     ((=ucs@iso		  . #x218D4)	; &U-000218D4;
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x5B2F)	; 嬯
-    (=cns11643-2	. #x5C61)	; &I-C2-5C61; [60-65]
     (=big5		. #xECD5)	; &I-B-ECD5;
-    (=daikanwa		. 06827)	; &I-M-06827;
+    (->subsumptive
+     ((=daikanwa	  . 06827)	; &M-06827;
+      (=ucs@unicode	  . #x5B2F)	; &M-06827;
+      )
+     ((=cns11643-2	  . #x5C61)	; &C2-5C61; [60-65]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (shinjigen-2	. 1759)
     (=ucs		. #x5B30)	; 嬰
-    (=jis-x0208		. #x3145)	; &I-J90-3145; [17-37]
-    (=gb12345		. #x5324)	; 嬰 [51-04]
-    (=big5		. #xC0A6)	; &I-B-C0A6;
-    (=gt		. 08565)	; &I-GT-08565;
-    (=gt-pj-1		. #x3145)	; &I-GT-08565; [17-37]
-    (=daikanwa		. 06828)	; &I-M-06828;
-    ))
-(define-char
-  '((=>ucs		. #x5B30)	; 嬰
-    (morohashi-daikanwa	6828 0 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=cns11643-1	. #x734F)	; &C1-734F; [83-47]
-    ))
-(define-char
-  '((morohashi-daikanwa	6828 0 5)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=ucs		. #x5A74)	; å©´
-    (=gb2312		. #x5324)	; &I-G0-5324; [51-04]
-    ))
-(define-char
-  '((=>ucs		. #x218CB)	; 𡣋
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=daikanwa		. 06829)	; &M-06829;
-    ))
-(define-char
-  '((=>ucs		. #x218CB)	; 𡣋
-    (morohashi-daikanwa	6829 0 0)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=cns11643-4	. #x5623)	; &C4-5623; [54-03]
+    (->subsumptive
+     ((shinjigen-1	  . 1759)
+      (shinjigen-2	  . 1759)
+      (=jis-x0208	  . #x3145)	; &GT-08565; [17-37]
+      (=gb12345		  . #x5324)	; &GT-08565; [51-04]
+      (=big5		  . #xC0A6)	; &I-B-C0A6;
+      (=gt		  . 08565)	; &I-GT-08565;
+      (=gt-pj-1		  . #x3145)	; &I-GT-08565; [17-37]
+      (=daikanwa	  . 06828)	; &I-M-06828;
+      (=ucs@unicode	  . #x5B30)	; &GT-08565;
+      )
+     ((=cns11643-1	  . #x734F)	; &C1-734F; [83-47]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	6829 0 1)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x218CB)	; 𡣋
+    (->subsumptive
+     ((=daikanwa	  . 06829)	; &M-06829;
+      )
+     ((=cns11643-4	  . #x5623)	; &C4-5623; [54-03]
+      )
+     ((=ucs@iso		  . #x218CB)	; &U-000218CB;
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x5B31)	; 嬱
-    (=cns11643-3	. #x5452)	; &I-C3-5452; [52-50]
-    (=daikanwa		. 06830)	; &I-M-06830;
+    (->subsumptive
+     ((=daikanwa	  . 06830)	; &M-06830;
+      (=ucs@unicode	  . #x5B31)	; &M-06830;
+      )
+     ((=cns11643-3	  . #x5452)	; &C3-5452; [52-50]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (shinjigen-2	. 1761)
     (=ucs		. #x5B32)	; 嬲
-    (=jis-x0208		. #x554B)	; &I-J90-554B; [53-43]
-    (=gb2312		. #x6655)	; &I-G0-6655; [70-53]
-    (=cns11643-2	. #x5C5C)	; &I-C2-5C5C; [60-60]
-    (=big5		. #xECD0)	; &I-B-ECD0;
-    (=gt		. 08586)	; &I-GT-08586;
-    (=gt-pj-1		. #x554B)	; &I-GT-08586; [53-43]
-    (=daikanwa		. 06831)	; &I-M-06831;
+    (->subsumptive
+     ((shinjigen-1	  . 1761)
+      (shinjigen-2	  . 1761)
+      (=jis-x0208	  . #x554B)	; &GT-08586; [53-43]
+      (=gb2312		  . #x6655)	; &I-G0-6655; [70-53]
+      (=big5		  . #xECD0)	; &I-B-ECD0;
+      (=gt		  . 08586)	; &I-GT-08586;
+      (=gt-pj-1		  . #x554B)	; &I-GT-08586; [53-43]
+      (=daikanwa	  . 06831)	; &I-M-06831;
+      (=ucs@unicode	  . #x5B32)	; &GT-08586;
+      )
+     ((=cns11643-2	  . #x5C5C)	; &C2-5C5C; [60-60]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
+    (=ucs		. #x5B33)	; 嬳
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5B33)	; 嬳
+      ))
+    (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x5B33)	; 嬳
-    (=cns11643-3	. #x544F)	; &I-C3-544F; [52-47]
-    (=daikanwa		. 06832)	; &I-M-06832;
+    (->subsumptive
+     ((=daikanwa	  . 06832)	; &M-06832;
+      )
+     ((=cns11643-3	  . #x544F)	; &C3-544F; [52-47]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x218CC)	; 𡣌
+  '((<-denotational
+     ((=ucs		  . #x5B33)	; 嬳
+      ))
     (ideographic-radical . 38)	; â¼¥
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x5B33)	; &UU+5B33;
+    ))
+(define-char
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=daikanwa		. 06833)	; &M-06833;
+    (=ucs		. #x218CC)	; 𡣌
     ))
 (define-char
-  '((=>ucs		. #x218CC)	; 𡣌
-    (morohashi-daikanwa	6833 0 1)
+  '((<-denotational
+     ((=ucs		  . #x218CC)	; 𡣌
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=cns11643-7	. #x3753)	; &C7-3753; [23-51]
+    (->subsumptive
+     ((=daikanwa	  . 06833)	; &M-06833;
+      )
+     ((=cns11643-7	  . #x3753)	; &C7-3753; [23-51]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	6833 0 2)
+  '((<-denotational
+     ((=ucs		  . #x218CC)	; 𡣌
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x218CC)	; 𡣌
+    (=ucs@iso		. #x218CC)	; &U-000218CC;
     ))
 (define-char
   '((=>ucs		. #x218CD)	; 𡣍
diff --git a/lisp/utf-2000/Ideograph-R039-Child.el b/lisp/utf-2000/Ideograph-R039-Child.el
index 0f2603b..27f62fc 100644
--- a/lisp/utf-2000/Ideograph-R039-Child.el
+++ b/lisp/utf-2000/Ideograph-R039-Child.el
@@ -234,29 +234,44 @@
     (=jef-china3	. #x81DE)	; &I-JC3-81DE;
     ))
 (define-char
-  '((=>ucs		. #x21946)	; 𡥆
-    (ideographic-radical . 39)	; ⼦
+  '((ideographic-radical . 39)	; ⼦
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=daikanwa		. 06947)	; &M-06947;
+    (=ucs		. #x21946)	; 𡥆
     ))
 (define-char
-  '((morohashi-daikanwa	6947 0 0)
+  '((<-denotational
+     ((=ucs		  . #x21946)	; 𡥆
+      ))
     (ideographic-radical . 39)	; ⼦
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=ucs		. #x21946)	; 𡥆
+    (->subsumptive
+     ((=daikanwa	  . 06947)	; &M-06947;
+      )
+     ((=ucs@iso		  . #x21946)	; &U-00021946;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x21946)	; 𡥆
-    (morohashi-daikanwa	6947 0 4)
+  '((<-denotational
+     ((=ucs		  . #x21946)	; 𡥆
+      ))
     (ideographic-radical . 39)	; ⼦
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=cns11643-6	. #x2676)	; &C6-2676; [06-86]
     ))
 (define-char
-  '((=>ucs		. #x5B5A)	; 孚
+  '((ideographic-radical . 39)	; ⼦
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=ucs		. #x5B5A)	; 孚
+    (=big5		. #xA7B7)	; &I-B-A7B7;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5B5A)	; 孚
+      ))
     (ideographic-radical . 39)	; ⼦
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
@@ -270,14 +285,15 @@
     (=ucs@jis		. #x5B5A)	; &GT-08748;
     ))
 (define-char
-  '((morohashi-daikanwa	6948 0 2)
+  '((<-denotational
+     ((=ucs		  . #x5B5A)	; 孚
+      ))
     (ideographic-radical . 39)	; ⼦
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=ucs		. #x5B5A)	; 孚
-    (=gb2312		. #x665A)	; &I-G0-665A; [70-58]
+    (=gb2312		. #x665A)	; &C1-4977; [70-58]
     (=cns11643-1	. #x4977)	; &I-C1-4977; [41-87]
-    (=big5		. #xA7B7)	; &I-B-A7B7;
+    (=ucs@unicode	. #x5B5A)	; &C1-4977;
     ))
 (define-char
   '((ideographic-radical . 39)	; ⼦
@@ -429,27 +445,27 @@
     (total-strokes	 . 7)
     (=ucs		. #x6588)	; 斈
     (->subsumptive
-     ((<-vulgar
+     ((=jis-x0208	  . #x555D)	; &M-13453; [53-61]
+      (=daikanwa	  . 13453)	; &I-M-13453;
+      (=ucs@jis		  . #x6588)	; &M-13453;
+      (<-vulgar
        ((=ucs		    . #x5B78)	; å­¸
 	(=daikanwa	    . 07033)	; &I-M-07033;
 	))
       (<-vulgar*sources
        daikanwa)
-      (=jis-x0208	  . #x555D)	; &M-13453; [53-61]
-      (=daikanwa	  . 13453)	; &I-M-13453;
-      (=ucs@jis		  . #x6588)	; &M-13453;
       )
-     ((<-vulgar
+     ((shinjigen-1	  . 1786)
+      (shinjigen-2	  . 1786)
+      (=gt		  . 17011)	; &GT-17011;
+      (=gt-pj-1		  . #x555D)	; &GT-17011; [53-61]
+      (<-vulgar
        ((shinjigen-1	    . 1783)
 	(=ucs		    . #x5B78)	; å­¸
 	(=jis-x0208	    . #x555C)	; &I-J90-555C; [53-60]
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 1786)
-      (shinjigen-2	  . 1786)
-      (=gt		  . 17011)	; &GT-17011;
-      (=gt-pj-1		  . #x555D)	; &GT-17011; [53-61]
       )
      ((=cns11643-3	  . #x2558)	; &C3-2558; [05-56]
       (=ucs@unicode	  . #x6588)	; &C3-2558;
@@ -652,10 +668,7 @@
   '((ideographic-radical . 39)	; ⼦
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5B78)	; å­¸
-      (=jis-x0208	  . #x555C)	; &I-J90-555C; [53-60]
-      ))
+    (shinjigen-1	. 1782)
     (shinjigen-2	. 1782)
     (=ucs		. #x5B66)	; å­¦
     (=jis-x0208		. #x3358)	; &I-J90-3358; [19-56]
@@ -665,6 +678,17 @@
     (=gt-k		. 03657)	; &I-GT-K03657;
     (=gt-pj-1		. #x3358)	; &I-GT-08752; [19-56]
     (=daikanwa		. 06974)	; &I-M-06974;
+    (<-simplified@CN
+     ((=ucs		  . #x5B78)	; å­¸
+      (=gb12345		  . #x5127)	; å­¸ [49-07]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x5B78)	; å­¸
+      (=jis-x0208	  . #x555C)	; &I-J90-555C; [53-60]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x5B78)	; å­¸
+      ))
     ))
 (define-char
   '((ideographic-radical . 39)	; ⼦
@@ -756,27 +780,28 @@
   '((ideographic-radical . 39)	; ⼦
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (=ucs		. #x21966)	; 𡥦
+    (=cns11643-6	. #x3022)	; &I-C6-3022; [16-02]
+    (=daikanwa		. 06982)	; &I-M-06982;
     (<-Large-Seal
      ((=ks-x1001	  . #x7264)	; &M-38943; [82-68]
       (=daikanwa	  . 38943)	; &I-M-38943;
       ))
-    (=ucs		. #x21966)	; 𡥦
-    (=cns11643-6	. #x3022)	; &I-C6-3022; [16-02]
-    (=daikanwa		. 06982)	; &I-M-06982;
     ))
 (define-char
   '((ideographic-radical . 39)	; ⼦
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x5B6A)	; å­ª
-    (=gb2312		. #x424F)	; &I-G0-424F; [34-47]
-    ))
-(define-char
-  '((=>ucs		. #x5B6A)	; å­ª
-    (ideographic-radical . 39)	; ⼦
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=cns11643-3	. #x2C2F)	; &C3-2C2F; [12-15]
+    (->subsumptive
+     ((=cns11643-3	  . #x2C2F)	; &C3-2C2F; [12-15]
+      )
+     ((=gb2312		  . #x424F)	; &G0-424F; [34-47]
+      (=ucs@unicode	  . #x5B6A)	; &G0-424F;
+      (<-simplified@CN
+       ((=gb12345	    . #x424F)	; å­¿ [34-47]
+	))
+      ))
     ))
 (define-char
   '((=>ucs		. #x5B6A)	; å­ª
@@ -815,12 +840,7 @@
     (total-strokes	 . 10)
     (=ucs		. #x5B6B)	; å­«
     (->subsumptive
-     ((<-formed
-       ((=jis-x0208@1978    . #x423D)	; &M-39038; [34-29]
-	(=ks-x1001	    . #x6161)	; &I-K0-6161; [65-65]
-	(=daikanwa	    . 39038)	; &I-M-39038;
-	))
-      (shinjigen-1	  . 1792)
+     ((shinjigen-1	  . 1792)
       (shinjigen-2	  . 1792)
       (=jis-x0208	  . #x4239)	; &GT-08784; [34-25]
       (=ks-x1001	  . #x615D)	; &I-K0-615D; [65-61]
@@ -831,6 +851,11 @@
       (=daikanwa	  . 06987)	; &I-M-06987;
       (=ucs@jis		  . #x5B6B)	; &GT-08784;
       (=ucs@big5	  . #x5B6B)	; &GT-08784;
+      (<-formed
+       ((=jis-x0208@1978    . #x423D)	; &M-39038; [34-29]
+	(=ks-x1001	    . #x6161)	; &I-K0-6161; [65-65]
+	(=daikanwa	    . 39038)	; &I-M-39038;
+	))
       )
      ((=gb12345		  . #x4B6F)	; &UU+5B6B; [43-79]
       (=ucs@unicode	  . #x5B6B)	; &UU+5B6B;
diff --git a/lisp/utf-2000/Ideograph-R040-Roof.el b/lisp/utf-2000/Ideograph-R040-Roof.el
index b0e70d1..5823be0 100644
--- a/lisp/utf-2000/Ideograph-R040-Roof.el
+++ b/lisp/utf-2000/Ideograph-R040-Roof.el
@@ -21,19 +21,16 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x219B9)	; 𡦹
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 1)
-    (total-strokes	 . 4)
-    (=daikanwa		. 49023)	; &M-49023;
-    ))
-(define-char
-  '((morohashi-daikanwa	49023 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 1)
     (total-strokes	 . 4)
     (=ucs		. #x219B9)	; 𡦹
-    (=cns11643-6	. #x2169)	; &I-C6-2169; [01-73]
+    (->subsumptive
+     ((=daikanwa	  . 49023)	; &M-49023;
+      )
+     ((=cns11643-6	  . #x2169)	; &C6-2169; [01-73]
+      (=ucs@iso		  . #x219B9)	; &C6-2169;
+      ))
     ))
 (define-char
   '((ideographic-radical . 40)	; ⼧
@@ -42,120 +39,106 @@
     (=ucs		. #x3749)	; 㝉
     ))
 (define-char
-  '((=>ucs		. #x5B81)	; 宁
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
-    (=jis-x0212		. #x3A47)	; &M-07055; [26-39]
-    (=jis-x0213-2-2000	. #x257C)	; &I-JX2-257C; [05-92]
-    (=big5		. #xC972)	; &I-B-C972;
-    (=daikanwa		. 07055)	; &I-M-07055;
-    (=jef-china3	. #x4AA1)	; &I-JC3-4AA1;
-    (=ucs@jis		. #x5B81)	; &M-07055;
-    (=ucs@big5		. #x5B81)	; &M-07055;
-    ))
-(define-char
-  '((morohashi-daikanwa	7055 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
     (=ucs		. #x5B81)	; 宁
-    (=gb2312		. #x447E)	; &I-G0-447E; [36-94]
-    (=cns11643-2	. #x2153)	; &I-C2-2153; [01-51]
-    (=jef-china3	. #x81E8)	; &I-JC3-81E8;
-    ))
-(define-char
-  '((=>ucs		. #x5B82)	; 宂
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
-    (=daikanwa		. 07056)	; &M-07056;
-    ))
-(define-char
-  '((=>ucs		. #x5B82)	; 宂
-    (morohashi-daikanwa	7056 0 0)
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
-    (=cns11643-3	. #x223D)	; &C3-223D; [02-29]
-    ))
-(define-char
-  '((=>ucs		. #x5B82)	; 宂
-    (morohashi-daikanwa	7056 0 8)
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
-    (=cbeta		. 00974)	; &CB00974;
-    (mojikyo		. 053063)	; &MCS-6000CF47;
+    (=big5		. #xC972)	; &I-B-C972;
+    (->subsumptive
+     ((=jis-x0212	  . #x3A47)	; &M-07055; [26-39]
+      (=jis-x0213-2-2000  . #x257C)	; &I-JX2-257C; [05-92]
+      (=daikanwa	  . 07055)	; &I-M-07055;
+      (=jef-china3	  . #x4AA1)	; &I-JC3-4AA1;
+      (=ucs@jis		  . #x5B81)	; &M-07055;
+      )
+     ((=gb2312		  . #x447E)	; &C2-2153; [36-94]
+      (=cns11643-2	  . #x2153)	; &I-C2-2153; [01-51]
+      (=jef-china3	  . #x81E8)	; &I-JC3-81E8;
+      (=ucs@unicode	  . #x5B81)	; &C2-2153;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7056 0 9)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (->mojikyo		. 053063)	; &CB00974;
     (=ucs		. #x5B82)	; 宂
     ))
 (define-char
-  '((=>ucs		. #x5B83)	; 它
+  '((<-denotational
+     ((=ucs		  . #x5B82)	; 宂
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (shinjigen-2	. 1803)
-    (=jis-x0208		. #x5560)	; &GT-08875; [53-64]
-    (=big5		. #xA5A6)	; &I-B-A5A6;
-    (=gt		. 08875)	; &I-GT-08875;
-    (=gt-k		. 01043)	; &I-GT-K01043;
-    (=gt-pj-1		. #x5560)	; &I-GT-08875; [53-64]
-    (=daikanwa		. 07057)	; &I-M-07057;
-    (=ucs@jis		. #x5B83)	; &GT-08875;
-    (=ucs@big5		. #x5B83)	; &GT-08875;
+    (->subsumptive
+     ((=daikanwa	  . 07056)	; &M-07056;
+      )
+     ((=cns11643-3	  . #x223D)	; &C3-223D; [02-29]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7057 0 0)
+  '((<-denotational
+     ((=ucs		  . #x5B82)	; 宂
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (=ucs		. #x5B83)	; 它
-    (=gb2312		. #x4B7C)	; &I-G0-4B7C; [43-92]
-    (=cns11643-1	. #x4646)	; &I-C1-4646; [38-38]
+    (->subsumptive
+     ((=cbeta		  . 00974)	; &CB00974;
+      (mojikyo		  . 053063)	; &MCS-6000CF47;
+      )
+     ((=ucs@unicode	  . #x5B82)	; &UU+5B82;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5B84)	; 宄
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (=jis-x0212		. #x3A48)	; &M-07058; [26-40]
-    (=jis-x0213-2-2000	. #x257D)	; &I-JX2-257D; [05-93]
-    (=big5		. #xC973)	; &I-B-C973;
-    (=daikanwa		. 07058)	; &I-M-07058;
-    (=jef-china3	. #x4AA2)	; &I-JC3-4AA2;
-    (=ucs@jis		. #x5B84)	; &M-07058;
-    (=ucs@big5		. #x5B84)	; &M-07058;
+    (=ucs		. #x5B83)	; 它
+    (=big5		. #xA5A6)	; &I-B-A5A6;
+    (->subsumptive
+     ((shinjigen-2	  . 1803)
+      (=jis-x0208	  . #x5560)	; &GT-08875; [53-64]
+      (=gt		  . 08875)	; &I-GT-08875;
+      (=gt-k		  . 01043)	; &I-GT-K01043;
+      (=gt-pj-1		  . #x5560)	; &I-GT-08875; [53-64]
+      (=daikanwa	  . 07057)	; &I-M-07057;
+      (=ucs@jis		  . #x5B83)	; &GT-08875;
+      )
+     ((=gb2312		  . #x4B7C)	; &C1-4646; [43-92]
+      (=cns11643-1	  . #x4646)	; &I-C1-4646; [38-38]
+      (=ucs@unicode	  . #x5B83)	; &C1-4646;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7058 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
     (=ucs		. #x5B84)	; 宄
-    (=gb2312		. #x6533)	; &I-G0-6533; [69-19]
-    (=cns11643-2	. #x2154)	; &I-C2-2154; [01-52]
-    ))
-(define-char
-  '((=>ucs		. #x374A)	; 㝊
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
-    (=daikanwa		. 07059)	; &M-07059;
+    (=big5		. #xC973)	; &I-B-C973;
+    (->subsumptive
+     ((=jis-x0212	  . #x3A48)	; &M-07058; [26-40]
+      (=jis-x0213-2-2000  . #x257D)	; &I-JX2-257D; [05-93]
+      (=daikanwa	  . 07058)	; &I-M-07058;
+      (=jef-china3	  . #x4AA2)	; &I-JC3-4AA2;
+      (=ucs@jis		  . #x5B84)	; &M-07058;
+      )
+     ((=gb2312		  . #x6533)	; &C2-2154; [69-19]
+      (=cns11643-2	  . #x2154)	; &I-C2-2154; [01-52]
+      (=ucs@unicode	  . #x5B84)	; &C2-2154;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7059 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
     (=ucs		. #x374A)	; 㝊
-    (=cns11643-3	. #x223C)	; &I-C3-223C; [02-28]
+    (->subsumptive
+     ((=daikanwa	  . 07059)	; &M-07059;
+      )
+     ((=cns11643-3	  . #x223C)	; &C3-223C; [02-28]
+      (=ucs@unicode	  . #x374A)	; &C3-223C;
+      ))
     ))
 (define-char
   '((=>ucs		. #x219BC)	; 𡦼
@@ -187,66 +170,51 @@
     (=ucs		. #x219BA)	; 𡦺
     ))
 (define-char
-  '((=>ucs		. #x374B)	; 㝋
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
-    (=daikanwa		. 07062)	; &M-07062;
-    (=jef-china3	. #x4AA3)	; &I-JC3-4AA3;
-    ))
-(define-char
-  '((morohashi-daikanwa	7062 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
     (=ucs		. #x374B)	; 㝋
+    (->subsumptive
+     ((=daikanwa	  . 07062)	; &M-07062;
+      (=jef-china3	  . #x4AA3)	; &I-JC3-4AA3;
+      )
+     ((=ucs@unicode	  . #x374B)	; &UU+374B;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5B85)	; 宅
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (shinjigen-2	. 1809)
-    (=jis-x0208		. #x4270)	; &GT-08889; [34-80]
-    (=ks-x1001		. #x536B)	; &I-K0-536B; [51-75]
-    (=big5		. #xA676)	; &I-B-A676;
-    (=gt		. 08889)	; &I-GT-08889;
-    (=gt-k		. 01665)	; &I-GT-K01665;
-    (=gt-pj-1		. #x4270)	; &I-GT-08889; [34-80]
-    (=daikanwa		. 07064)	; &I-M-07064;
-    (=ucs@jis		. #x5B85)	; &GT-08889;
-    (=ucs@big5		. #x5B85)	; &GT-08889;
-    ))
-(define-char
-  '((morohashi-daikanwa	7064 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x5B85)	; 宅
-    (=gb2312		. #x552C)	; &I-G0-552C; [53-12]
-    ))
-(define-char
-  '((=>ucs		. #x5B85)	; 宅
-    (morohashi-daikanwa	7064 0 1)
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (=cns11643-1	. #x4777)	; &C1-4777; [39-87]
-    ))
-(define-char
-  '((=>ucs		. #x374C)	; 㝌
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (=daikanwa		. 07065)	; &M-07065;
+    (=big5		. #xA676)	; &I-B-A676;
+    (->subsumptive
+     ((shinjigen-1	  . 1809)
+      (shinjigen-2	  . 1809)
+      (=jis-x0208	  . #x4270)	; &GT-08889; [34-80]
+      (=ks-x1001	  . #x536B)	; &I-K0-536B; [51-75]
+      (=gt		  . 08889)	; &I-GT-08889;
+      (=gt-k		  . 01665)	; &I-GT-K01665;
+      (=gt-pj-1		  . #x4270)	; &I-GT-08889; [34-80]
+      (=daikanwa	  . 07064)	; &I-M-07064;
+      (=ucs@jis		  . #x5B85)	; &GT-08889;
+      )
+     ((=gb2312		  . #x552C)	; &G0-552C; [53-12]
+      (=ucs@unicode	  . #x5B85)	; &G0-552C;
+      )
+     ((=cns11643-1	  . #x4777)	; &C1-4777; [39-87]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7065 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x374C)	; 㝌
-    (=cns11643-3	. #x234F)	; &I-C3-234F; [03-47]
+    (->subsumptive
+     ((=daikanwa	  . 07065)	; &M-07065;
+      )
+     ((=cns11643-3	  . #x234F)	; &C3-234F; [03-47]
+      (=ucs@unicode	  . #x374C)	; &C3-234F;
+      ))
     ))
 (define-char
   '((=>ucs		. #x5B86)	; 宆
@@ -460,76 +428,60 @@
     (=cns11643-4	. #x236F)	; &I-C4-236F; [03-79]
     ))
 (define-char
-  '((=>ucs		. #x5B8B)	; 宋
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (shinjigen-2	. 1813)
-    (=jis-x0208		. #x4157)	; &GT-08906; [33-55]
-    (=ks-x1001		. #x6164)	; &I-K0-6164; [65-68]
-    (=big5		. #xA7BA)	; &I-B-A7BA;
-    (=gt		. 08906)	; &I-GT-08906;
-    (=gt-k		. 02594)	; &I-GT-K02594;
-    (=gt-pj-1		. #x4157)	; &I-GT-08906; [33-55]
-    (=daikanwa		. 07078)	; &I-M-07078;
-    (=ucs@jis		. #x5B8B)	; &GT-08906;
-    (=ucs@big5		. #x5B8B)	; &GT-08906;
-    ))
-(define-char
-  '((morohashi-daikanwa	7078 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x5B8B)	; 宋
-    (=gb2312		. #x4B4E)	; &I-G0-4B4E; [43-46]
-    (=cns11643-1	. #x497A)	; &I-C1-497A; [41-90]
-    ))
-(define-char
-  '((=>ucs		. #x5B8C)	; 完
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (shinjigen-2	. 1811)
-    (=jis-x0208		. #x3430)	; &GT-08898; [20-16]
-    (=ks-x1001		. #x6847)	; &I-K0-6847; [72-39]
-    (=big5		. #xA7B9)	; &I-B-A7B9;
-    (=gt		. 08898)	; &I-GT-08898;
-    (=gt-k		. 02512)	; &I-GT-K02512;
-    (=gt-pj-1		. #x3430)	; &I-GT-08898; [20-16]
-    (=daikanwa		. 07079)	; &I-M-07079;
-    (=ucs@jis		. #x5B8C)	; &GT-08898;
-    (=ucs@big5		. #x5B8C)	; &GT-08898;
+    (=big5		. #xA7BA)	; &I-B-A7BA;
+    (->subsumptive
+     ((shinjigen-2	  . 1813)
+      (=jis-x0208	  . #x4157)	; &GT-08906; [33-55]
+      (=ks-x1001	  . #x6164)	; &I-K0-6164; [65-68]
+      (=gt		  . 08906)	; &I-GT-08906;
+      (=gt-k		  . 02594)	; &I-GT-K02594;
+      (=gt-pj-1		  . #x4157)	; &I-GT-08906; [33-55]
+      (=daikanwa	  . 07078)	; &I-M-07078;
+      (=ucs@jis		  . #x5B8B)	; &GT-08906;
+      )
+     ((=gb2312		  . #x4B4E)	; &C1-497A; [43-46]
+      (=cns11643-1	  . #x497A)	; &I-C1-497A; [41-90]
+      (=ucs@unicode	  . #x5B8B)	; &C1-497A;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7079 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x5B8C)	; 完
-    (=gb2312		. #x4D6A)	; &I-G0-4D6A; [45-74]
-    (=cns11643-1	. #x4979)	; &I-C1-4979; [41-89]
-    ))
-(define-char
-  '((=>ucs		. #x219CB)	; 𡧋
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=daikanwa		. 07080)	; &M-07080;
+    (=big5		. #xA7B9)	; &I-B-A7B9;
+    (->subsumptive
+     ((shinjigen-1	  . 1811)
+      (shinjigen-2	  . 1811)
+      (=jis-x0208	  . #x3430)	; &GT-08898; [20-16]
+      (=ks-x1001	  . #x6847)	; &I-K0-6847; [72-39]
+      (=gt		  . 08898)	; &I-GT-08898;
+      (=gt-k		  . 02512)	; &I-GT-K02512;
+      (=gt-pj-1		  . #x3430)	; &I-GT-08898; [20-16]
+      (=daikanwa	  . 07079)	; &I-M-07079;
+      (=ucs@jis		  . #x5B8C)	; &GT-08898;
+      )
+     ((=gb2312		  . #x4D6A)	; &C1-4979; [45-74]
+      (=cns11643-1	  . #x4979)	; &I-C1-4979; [41-89]
+      (=ucs@unicode	  . #x5B8C)	; &C1-4979;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7080 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x219CB)	; 𡧋
-    ))
-(define-char
-  '((=>ucs		. #x219CB)	; 𡧋
-    (morohashi-daikanwa	7080 0 1)
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=cns11643-6	. #x267E)	; &C6-267E; [06-94]
+    (->subsumptive
+     ((=daikanwa	  . 07080)	; &M-07080;
+      )
+     ((=ucs@iso		  . #x219CB)	; &U-000219CB;
+      )
+     ((=cns11643-6	  . #x267E)	; &C6-267E; [06-94]
+      ))
     ))
 (define-char
   '((=>ucs		. #x374F)	; 㝏
@@ -676,20 +628,26 @@
     ))
 (define-char
   '((ideographic-radical . 40)	; ⼧
+    (=ucs		. #x5B90)	; 宐
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5B90)	; 宐
+      ))
+    (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=ucs		. #x5B90)	; 宐
     (->subsumptive
-     ((<-original
+     ((=jis-x0212	  . #x3A4C)	; &M-07089; [26-44]
+      (=daikanwa	  . 07089)	; &I-M-07089;
+      (=ucs@jis		  . #x5B90)	; &M-07089;
+      (<-original
        ((=jis-x0208	    . #x3539)	; &GT-08923; [21-25]
 	(=ks-x1001	    . #x6B71)	; &I-K0-6B71; [75-81]
 	(=daikanwa	    . 07111)	; &I-M-07111;
 	))
       (<-original*sources
        daikanwa)
-      (=jis-x0212	  . #x3A4C)	; &M-07089; [26-44]
-      (=daikanwa	  . 07089)	; &I-M-07089;
-      (=ucs@jis		  . #x5B90)	; &M-07089;
       )
      ((=ucs@unicode	  . #x5B90)	; &UU+5B90;
       ))
@@ -963,134 +921,118 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x5B98)	; 官
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (shinjigen-2	. 1815)
-    (=jis-x0208		. #x3431)	; &GT-08922; [20-17]
-    (=ks-x1001		. #x4E2F)	; &I-K0-4E2F; [46-15]
-    (=big5		. #xA978)	; &I-B-A978;
-    (=gt		. 08922)	; &I-GT-08922;
-    (=gt-k		. 03661)	; &I-GT-K03661;
-    (=gt-pj-1		. #x3431)	; &I-GT-08922; [20-17]
-    (=daikanwa		. 07107)	; &I-M-07107;
-    (=ucs@jis		. #x5B98)	; &GT-08922;
-    (=ucs@big5		. #x5B98)	; &GT-08922;
-    ))
-(define-char
-  '((morohashi-daikanwa	7107 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x5B98)	; 官
-    (=gb2312		. #x3959)	; &I-G0-3959; [25-57]
-    (=cns11643-1	. #x4C7A)	; &I-C1-4C7A; [44-90]
-    ))
-(define-char
-  '((=>ucs		. #x5B99)	; 宙
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (shinjigen-2	. 1821)
-    (=jis-x0208		. #x4368)	; &GT-08937; [35-72]
-    (=ks-x1001		. #x7135)	; &I-K0-7135; [81-21]
-    (=big5		. #xA97A)	; &I-B-A97A;
-    (=gt		. 08937)	; &I-GT-08937;
-    (=gt-k		. 03769)	; &I-GT-K03769;
-    (=gt-pj-1		. #x4368)	; &I-GT-08937; [35-72]
-    (=daikanwa		. 07108)	; &I-M-07108;
-    (=ucs@jis		. #x5B99)	; &GT-08937;
-    (=ucs@big5		. #x5B99)	; &GT-08937;
+    (=big5		. #xA978)	; &I-B-A978;
+    (->subsumptive
+     ((shinjigen-1	  . 1815)
+      (shinjigen-2	  . 1815)
+      (=jis-x0208	  . #x3431)	; &GT-08922; [20-17]
+      (=ks-x1001	  . #x4E2F)	; &I-K0-4E2F; [46-15]
+      (=gt		  . 08922)	; &I-GT-08922;
+      (=gt-k		  . 03661)	; &I-GT-K03661;
+      (=gt-pj-1		  . #x3431)	; &I-GT-08922; [20-17]
+      (=daikanwa	  . 07107)	; &I-M-07107;
+      (=ucs@jis		  . #x5B98)	; &GT-08922;
+      )
+     ((=gb2312		  . #x3959)	; &C1-4C7A; [25-57]
+      (=cns11643-1	  . #x4C7A)	; &I-C1-4C7A; [44-90]
+      (=ucs@unicode	  . #x5B98)	; &C1-4C7A;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7108 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x5B99)	; 宙
-    (=gb2312		. #x5666)	; &I-G0-5666; [54-70]
-    (=cns11643-1	. #x4C7C)	; &I-C1-4C7C; [44-92]
-    ))
-(define-char
-  '((=>ucs		. #x5B9A)	; 定
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (shinjigen-2	. 1822)
-    (=jis-x0208		. #x446A)	; &GT-08939; [36-74]
-    (=ks-x1001		. #x6F52)	; &I-K0-6F52; [79-50]
-    (=big5		. #xA977)	; &I-B-A977;
-    (=gt		. 08939)	; &I-GT-08939;
-    (=gt-k		. 03777)	; &I-GT-K03777;
-    (=gt-pj-1		. #x446A)	; &I-GT-08939; [36-74]
-    (=daikanwa		. 07109)	; &I-M-07109;
-    (=ucs@jis		. #x5B9A)	; &GT-08939;
-    (=ucs@big5		. #x5B9A)	; &GT-08939;
+    (=big5		. #xA97A)	; &I-B-A97A;
+    (->subsumptive
+     ((shinjigen-1	  . 1821)
+      (shinjigen-2	  . 1821)
+      (=jis-x0208	  . #x4368)	; &GT-08937; [35-72]
+      (=ks-x1001	  . #x7135)	; &I-K0-7135; [81-21]
+      (=gt		  . 08937)	; &I-GT-08937;
+      (=gt-k		  . 03769)	; &I-GT-K03769;
+      (=gt-pj-1		  . #x4368)	; &I-GT-08937; [35-72]
+      (=daikanwa	  . 07108)	; &I-M-07108;
+      (=ucs@jis		  . #x5B99)	; &GT-08937;
+      )
+     ((=gb2312		  . #x5666)	; &C1-4C7C; [54-70]
+      (=cns11643-1	  . #x4C7C)	; &I-C1-4C7C; [44-92]
+      (=ucs@unicode	  . #x5B99)	; &C1-4C7C;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7109 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x5B9A)	; 定
-    (=gb2312		. #x3628)	; &I-G0-3628; [22-08]
-    (=cns11643-1	. #x4C79)	; &I-C1-4C79; [44-89]
-    ))
-(define-char
-  '((=>ucs		. #x5B9B)	; 宛
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (shinjigen-1	. 1814)
-    (shinjigen-2	. 1814)
-    (=jis-x0208		. #x3038)	; &GT-08917; [16-24]
-    (=ks-x1001		. #x6848)	; &I-K0-6848; [72-40]
-    (=big5		. #xA97B)	; &I-B-A97B;
-    (=gt		. 08917)	; &I-GT-08917;
-    (=gt-k		. 03623)	; &I-GT-K03623;
-    (=gt-pj-1		. #x3038)	; &I-GT-08917; [16-24]
-    (=daikanwa		. 07110)	; &I-M-07110;
-    (=ucs@jis		. #x5B9B)	; &GT-08917;
-    (=ucs@big5		. #x5B9B)	; &GT-08917;
+    (=big5		. #xA977)	; &I-B-A977;
+    (->subsumptive
+     ((shinjigen-1	  . 1822)
+      (shinjigen-2	  . 1822)
+      (=jis-x0208	  . #x446A)	; &GT-08939; [36-74]
+      (=ks-x1001	  . #x6F52)	; &I-K0-6F52; [79-50]
+      (=gt		  . 08939)	; &I-GT-08939;
+      (=gt-k		  . 03777)	; &I-GT-K03777;
+      (=gt-pj-1		  . #x446A)	; &I-GT-08939; [36-74]
+      (=daikanwa	  . 07109)	; &I-M-07109;
+      (=ucs@jis		  . #x5B9A)	; &GT-08939;
+      )
+     ((=gb2312		  . #x3628)	; &C1-4C79; [22-08]
+      (=cns11643-1	  . #x4C79)	; &I-C1-4C79; [44-89]
+      (=ucs@unicode	  . #x5B9A)	; &C1-4C79;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7110 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x5B9B)	; 宛
-    (=gb2312		. #x4D70)	; &I-G0-4D70; [45-80]
-    (=cns11643-1	. #x4C7D)	; &I-C1-4C7D; [44-93]
-    ))
-(define-char
-  '((=>ucs		. #x5B9C)	; 宜
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (shinjigen-2	. 1816)
-    (=jis-x0208		. #x3539)	; &GT-08923; [21-25]
-    (=ks-x1001		. #x6B71)	; &I-K0-6B71; [75-81]
-    (=big5		. #xA979)	; &I-B-A979;
-    (=gt		. 08923)	; &I-GT-08923;
-    (=gt-k		. 03666)	; &I-GT-K03666;
-    (=gt-pj-1		. #x3539)	; &I-GT-08923; [21-25]
-    (=daikanwa		. 07111)	; &I-M-07111;
-    (=ucs@jis		. #x5B9C)	; &GT-08923;
-    (=ucs@big5		. #x5B9C)	; &GT-08923;
+    (=big5		. #xA97B)	; &I-B-A97B;
+    (->subsumptive
+     ((shinjigen-1	  . 1814)
+      (shinjigen-2	  . 1814)
+      (=jis-x0208	  . #x3038)	; &GT-08917; [16-24]
+      (=ks-x1001	  . #x6848)	; &I-K0-6848; [72-40]
+      (=gt		  . 08917)	; &I-GT-08917;
+      (=gt-k		  . 03623)	; &I-GT-K03623;
+      (=gt-pj-1		  . #x3038)	; &I-GT-08917; [16-24]
+      (=daikanwa	  . 07110)	; &I-M-07110;
+      (=ucs@jis		  . #x5B9B)	; &GT-08917;
+      )
+     ((=gb2312		  . #x4D70)	; &C1-4C7D; [45-80]
+      (=cns11643-1	  . #x4C7D)	; &I-C1-4C7D; [44-93]
+      (=ucs@unicode	  . #x5B9B)	; &C1-4C7D;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7111 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x5B9C)	; 宜
-    (=gb2312		. #x524B)	; &I-G0-524B; [50-43]
-    (=cns11643-1	. #x4C7B)	; &I-C1-4C7B; [44-91]
+    (=big5		. #xA979)	; &I-B-A979;
+    (->subsumptive
+     ((shinjigen-2	  . 1816)
+      (=jis-x0208	  . #x3539)	; &GT-08923; [21-25]
+      (=ks-x1001	  . #x6B71)	; &I-K0-6B71; [75-81]
+      (=gt		  . 08923)	; &I-GT-08923;
+      (=gt-k		  . 03666)	; &I-GT-K03666;
+      (=gt-pj-1		  . #x3539)	; &I-GT-08923; [21-25]
+      (=daikanwa	  . 07111)	; &I-M-07111;
+      (=ucs@jis		  . #x5B9C)	; &GT-08923;
+      )
+     ((=gb2312		  . #x524B)	; &C1-4C7B; [50-43]
+      (=cns11643-1	  . #x4C7B)	; &I-C1-4C7B; [44-91]
+      (=ucs@unicode	  . #x5B9C)	; &C1-4C7B;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5B90)	; 宐
-    (=>daikanwa		. 07112)	; &M-07112;
+  '((<-denotational
+     ((=ucs		  . #x5B90)	; 宐
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
@@ -1113,8 +1055,12 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x3752)	; 㝒
-    (=cns11643-3	. #x284F)	; &I-C3-284F; [08-47]
-    (=daikanwa		. 07113)	; &I-M-07113;
+    (->subsumptive
+     ((=daikanwa	  . 07113)	; &M-07113;
+      )
+     ((=cns11643-3	  . #x284F)	; &C3-284F; [08-47]
+      (=ucs@unicode	  . #x3752)	; &C3-284F;
+      ))
     ))
 (define-char
   '((=>ucs		. #x219DA)	; 𡧚
@@ -1147,73 +1093,76 @@
     (=cns11643-6	. #x2A65)	; &I-C6-2A65; [10-69]
     ))
 (define-char
-  '((=>ucs		. #x5B9D)	; 宝
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x556F)	; &GT-09285; [53-79]
-      (=ks-x1001	  . #x5C44)	; &I-K0-5C44; [60-36]
-      (=daikanwa	  . 07376)	; &I-M-07376;
-      ))
-    (shinjigen-2	. 1825)
-    (=jis-x0208		. #x4A75)	; &GT-08946; [42-85]
-    (=gt		. 08946)	; &I-GT-08946;
-    (=gt-k		. 03819)	; &I-GT-K03819;
-    (=gt-pj-1		. #x4A75)	; &I-GT-08946; [42-85]
-    (=daikanwa		. 07122)	; &I-M-07122;
-    (=ucs@jis		. #x5B9D)	; &GT-08946;
-    ))
-(define-char
-  '((morohashi-daikanwa	7122 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x5B9D)	; 宝
-    (=gb2312		. #x3126)	; &I-G0-3126; [17-06]
-    (=cns11643-3	. #x284E)	; &I-C3-284E; [08-46]
-    ))
-(define-char
-  '((=>ucs		. #x5B9E)	; 实
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=daikanwa		. 07123)	; &M-07123;
+    (<-simplified@ucs
+     ((=ucs		  . #x5BF6)	; 寶
+      ))
+    (->subsumptive
+     ((shinjigen-1	  . 1825)
+      (shinjigen-2	  . 1825)
+      (=jis-x0208	  . #x4A75)	; &GT-08946; [42-85]
+      (=gt		  . 08946)	; &I-GT-08946;
+      (=gt-k		  . 03819)	; &I-GT-K03819;
+      (=gt-pj-1		  . #x4A75)	; &I-GT-08946; [42-85]
+      (=daikanwa	  . 07122)	; &I-M-07122;
+      (=ucs@jis		  . #x5B9D)	; &GT-08946;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x556F)	; &GT-09285; [53-79]
+	(=ks-x1001	    . #x5C44)	; &I-K0-5C44; [60-36]
+	(=daikanwa	    . 07376)	; &I-M-07376;
+	))
+      )
+     ((=gb2312		  . #x3126)	; &C3-284E; [17-06]
+      (=cns11643-3	  . #x284E)	; &I-C3-284E; [08-46]
+      (=ucs@unicode	  . #x5B9D)	; &C3-284E;
+      (<-simplified@CN
+       ((=gb12345	    . #x3126)	; 寶 [17-06]
+	))
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7123 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x5B9E)	; 实
-    (=gb2312		. #x4A35)	; &I-G0-4A35; [42-21]
-    (=cns11643-3	. #x284B)	; &I-C3-284B; [08-43]
-    (=jef-china3	. #x81C6)	; &I-JC3-81C6;
-    ))
-(define-char
-  '((=>ucs		. #x5B9F)	; 実
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5569)	; &GT-09177; [53-73]
-      (=ks-x1001	  . #x6379)	; &I-K0-6379; [67-89]
-      (=daikanwa	  . 07294)	; &I-M-07294;
+    (->subsumptive
+     ((=daikanwa	  . 07123)	; &M-07123;
+      )
+     ((=gb2312		  . #x4A35)	; &G0-4A35; [42-21]
+      (=jef-china3	  . #x81C6)	; &I-JC3-81C6;
+      (=ucs@unicode	  . #x5B9E)	; &G0-4A35;
+      (<-simplified@CN
+       ((=gb12345	    . #x4A35)	; &C1-6852; [42-21]
+	))
+      )
+     ((=cns11643-3	  . #x284B)	; &C3-284B; [08-43]
       ))
-    (shinjigen-2	. 1818)
-    (=jis-x0208		. #x3C42)	; &GT-08931; [28-34]
-    (=gt		. 08931)	; &I-GT-08931;
-    (=gt-pj-1		. #x3C42)	; &I-GT-08931; [28-34]
-    (=daikanwa		. 07124)	; &I-M-07124;
-    (=ucs@jis		. #x5B9F)	; &GT-08931;
     ))
 (define-char
-  '((morohashi-daikanwa	7124 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x5B9F)	; 実
-    (=cns11643-3	. #x284D)	; &I-C3-284D; [08-45]
+    (->subsumptive
+     ((shinjigen-1	  . 1818)
+      (shinjigen-2	  . 1818)
+      (=jis-x0208	  . #x3C42)	; &GT-08931; [28-34]
+      (=gt		  . 08931)	; &I-GT-08931;
+      (=gt-pj-1		  . #x3C42)	; &I-GT-08931; [28-34]
+      (=daikanwa	  . 07124)	; &I-M-07124;
+      (=ucs@jis		  . #x5B9F)	; &GT-08931;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5569)	; &GT-09177; [53-73]
+	(=ks-x1001	    . #x6379)	; &I-K0-6379; [67-89]
+	(=daikanwa	    . 07294)	; &I-M-07294;
+	))
+      )
+     ((=cns11643-3	  . #x284D)	; &C3-284D; [08-45]
+      (=ucs@unicode	  . #x5B9F)	; &C3-284D;
+      ))
     ))
 (define-char
   '((=>ucs		. #x219DC)	; 𡧜
@@ -1264,47 +1213,46 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x3753)	; 㝓
-    (=cns11643-5	. #x286E)	; &I-C5-286E; [08-78]
-    (=daikanwa		. 07126)	; &I-M-07126;
-    ))
-(define-char
-  '((=>ucs		. #x219EA)	; 𡧪
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=daikanwa		. 07127)	; &M-07127;
+    (->subsumptive
+     ((=daikanwa	  . 07126)	; &M-07126;
+      )
+     ((=cns11643-5	  . #x286E)	; &C5-286E; [08-78]
+      (=ucs@unicode	  . #x3753)	; &C5-286E;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7127 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x219EA)	; 𡧪
-    (=cns11643-6	. #x3028)	; &I-C6-3028; [16-08]
-    ))
-(define-char
-  '((=>ucs		. #x5BA2)	; 客
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (shinjigen-2	. 1828)
-    (=jis-x0208		. #x3552)	; &GT-08957; [21-50]
-    (=ks-x1001		. #x4B54)	; &I-K0-4B54; [43-52]
-    (=gt		. 08957)	; &I-GT-08957;
-    (=gt-k		. 05048)	; &I-GT-K05048;
-    (=gt-pj-1		. #x3552)	; &I-GT-08957; [21-50]
-    (=daikanwa		. 07128)	; &I-M-07128;
-    (=ucs@jis		. #x5BA2)	; &GT-08957;
+    (->subsumptive
+     ((=daikanwa	  . 07127)	; &M-07127;
+      )
+     ((=cns11643-6	  . #x3028)	; &C6-3028; [16-08]
+      (=ucs@iso		  . #x219EA)	; &C6-3028;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7128 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x5BA2)	; 客
-    (=gb2312		. #x3F4D)	; &I-G0-3F4D; [31-45]
-    (=cns11643-1	. #x506A)	; &I-C1-506A; [48-74]
     (=big5		. #xABC8)	; &I-B-ABC8;
+    (->subsumptive
+     ((shinjigen-1	  . 1828)
+      (shinjigen-2	  . 1828)
+      (=jis-x0208	  . #x3552)	; &GT-08957; [21-50]
+      (=ks-x1001	  . #x4B54)	; &I-K0-4B54; [43-52]
+      (=gt		  . 08957)	; &I-GT-08957;
+      (=gt-k		  . 05048)	; &I-GT-K05048;
+      (=gt-pj-1		  . #x3552)	; &I-GT-08957; [21-50]
+      (=daikanwa	  . 07128)	; &I-M-07128;
+      (=ucs@jis		  . #x5BA2)	; &GT-08957;
+      )
+     ((=gb2312		  . #x3F4D)	; &C1-506A; [31-45]
+      (=cns11643-1	  . #x506A)	; &I-C1-506A; [48-74]
+      (=ucs@unicode	  . #x5BA2)	; &C1-506A;
+      ))
     ))
 (define-char
   '((=>ucs		. #x219EB)	; 𡧫
@@ -1876,101 +1824,96 @@
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (->subsumptive
-     ((=daikanwa	  . 07163)	; &M-07163;
-      )
-     ((=cns11643-4	  . #x2C43)	; &C4-2C43; [12-35]
-      ))
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x21A04)	; 𡨄
-      ))
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (->subsumptive
-     ((=big5-cdp	  . #x8C5F)	; &CDP-8C5F;
-      )
-     ((=ucs@iso		  . #x21A04)	; &U-00021A04;
-      ))
-    ))
-(define-char
-  '((=>ucs		. #x5BB2)	; 宲
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=jis-x0212		. #x3A57)	; &M-07164; [26-55]
-    (=daikanwa		. 07164)	; &I-M-07164;
-    (=ucs@jis		. #x5BB2)	; &M-07164;
-    ))
-(define-char
-  '((=>ucs		. #x5BB2)	; 宲
-    (morohashi-daikanwa	7164 0 1)
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=cns11643-6	. #x3666)	; &C6-3666; [22-70]
+    (->subsumptive
+     ((=daikanwa	  . 07163)	; &M-07163;
+      )
+     ((=cns11643-4	  . #x2C43)	; &C4-2C43; [12-35]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5BB2)	; 宲
-    (morohashi-daikanwa	7164 0 2)
+  '((<-denotational
+     ((=ucs		  . #x21A04)	; 𡨄
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=jef-china3	. #x4AB0)	; &JC3-4AB0;
+    (->subsumptive
+     ((=big5-cdp	  . #x8C5F)	; &CDP-8C5F;
+      )
+     ((=ucs@iso		  . #x21A04)	; &U-00021A04;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7164 0 3)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5BB2)	; 宲
     ))
 (define-char
-  '((=>ucs		. #x5BB3)	; 害
+  '((<-denotational
+     ((=ucs		  . #x5BB2)	; 宲
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=daikanwa		. 07165)	; &M-07165;
+    (->subsumptive
+     ((=jis-x0212	  . #x3A57)	; &M-07164; [26-55]
+      (=daikanwa	  . 07164)	; &I-M-07164;
+      (=ucs@jis		  . #x5BB2)	; &M-07164;
+      )
+     ((=cns11643-6	  . #x3666)	; &C6-3666; [22-70]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5BB3)	; 害
-    (morohashi-daikanwa	7165 0 1)
+  '((<-denotational
+     ((=ucs		  . #x5BB2)	; 宲
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=ks-x1001		. #x7A2A)	; &K0-7A2A; [90-10]
-    (=jef-china3	. #x4AB1)	; &I-JC3-4AB1;
+    (->subsumptive
+     ((=jef-china3	  . #x4AB0)	; &JC3-4AB0;
+      )
+     ((=ucs@unicode	  . #x5BB2)	; &UU+5BB2;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5BB3)	; 害
-    (morohashi-daikanwa	7165 0 2)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=big5		. #xAE60)	; &B-AE60;
-    (=ucs@big5		. #x5BB3)	; &B-AE60;
+    (=ucs		. #x5BB3)	; 害
+    (=big5		. #xAE60)	; &I-B-AE60;
     ))
 (define-char
-  '((=>ucs		. #x5BB3)	; 害
-    (morohashi-daikanwa	7165 0 3)
+  '((<-denotational
+     ((=ucs		  . #x5BB3)	; 害
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=cns11643-1	. #x5524)	; &C1-5524; [53-04]
+    (->subsumptive
+     ((=daikanwa	  . 07165)	; &M-07165;
+      )
+     ((=ks-x1001	  . #x7A2A)	; &K0-7A2A; [90-10]
+      (=jef-china3	  . #x4AB1)	; &I-JC3-4AB1;
+      )
+     ((=gb2312		  . #x3A26)	; &G0-3A26; [26-06]
+      (=ucs@unicode	  . #x5BB3)	; &G0-3A26;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7165 0 4)
+  '((<-denotational
+     ((=ucs		  . #x5BB3)	; 害
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=ucs		. #x5BB3)	; 害
-    (=gb2312		. #x3A26)	; &I-G0-3A26; [26-06]
+    (=cns11643-1	. #x5524)	; &C1-5524; [53-04]
     ))
 (define-char
-  '((=>ucs		. #x5BB3)	; 害
-    (morohashi-daikanwa	7165 0 5)
+  '((<-denotational
+     ((=ucs		  . #x5BB3)	; 害
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
@@ -1981,124 +1924,114 @@
     (=ucs@jis		. #x5BB3)	; &GT-08987;
     ))
 (define-char
-  '((=>ucs		. #x5BB4)	; å®´
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (shinjigen-2	. 1833)
-    (=jis-x0208		. #x3163)	; &GT-08981; [17-67]
-    (=ks-x1001		. #x6643)	; &I-K0-6643; [70-35]
-    (=big5		. #xAE62)	; &I-B-AE62;
-    (=gt		. 08981)	; &I-GT-08981;
-    (=gt-k		. 06377)	; &I-GT-K06377;
-    (=gt-pj-1		. #x3163)	; &I-GT-08981; [17-67]
-    (=daikanwa		. 07166)	; &I-M-07166;
-    (=ucs@jis		. #x5BB4)	; &GT-08981;
-    (=ucs@big5		. #x5BB4)	; &GT-08981;
-    ))
-(define-char
-  '((morohashi-daikanwa	7166 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5BB4)	; å®´
-    (=gb2312		. #x5167)	; &I-G0-5167; [49-71]
-    ))
-(define-char
-  '((=>ucs		. #x5BB4)	; å®´
-    (morohashi-daikanwa	7166 0 1)
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=cns11643-1	. #x5526)	; &C1-5526; [53-06]
+    (=big5		. #xAE62)	; &I-B-AE62;
+    (->subsumptive
+     ((shinjigen-1	  . 1833)
+      (shinjigen-2	  . 1833)
+      (=jis-x0208	  . #x3163)	; &GT-08981; [17-67]
+      (=ks-x1001	  . #x6643)	; &I-K0-6643; [70-35]
+      (=gt		  . 08981)	; &I-GT-08981;
+      (=gt-k		  . 06377)	; &I-GT-K06377;
+      (=gt-pj-1		  . #x3163)	; &I-GT-08981; [17-67]
+      (=daikanwa	  . 07166)	; &I-M-07166;
+      (=ucs@jis		  . #x5BB4)	; &GT-08981;
+      )
+     ((=gb2312		  . #x5167)	; &G0-5167; [49-71]
+      (=ucs@unicode	  . #x5BB4)	; &G0-5167;
+      )
+     ((=cns11643-1	  . #x5526)	; &C1-5526; [53-06]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x21A05)	; 𡨅
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=daikanwa		. 07167)	; &M-07167;
+    (=ucs		. #x21A05)	; 𡨅
+    (->subsumptive
+     ((=daikanwa	  . 07167)	; &M-07167;
+      )
+     ((=cns11643-4	  . #x2C47)	; &C4-2C47; [12-39]
+      (=ucs@iso		  . #x21A05)	; &C4-2C47;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7167 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=ucs		. #x21A05)	; 𡨅
-    (=cns11643-4	. #x2C47)	; &I-C4-2C47; [12-39]
+    (=ucs		. #x5BB5)	; 宵
+    (=big5		. #xAE64)	; &I-B-AE64;
     ))
 (define-char
-  '((=>ucs		. #x5BB5)	; 宵
+  '((<-denotational
+     ((=ucs		  . #x5BB5)	; 宵
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ks-x1001		. #x6132)	; &M-07168; [65-18]
-    (=big5		. #xAE64)	; &I-B-AE64;
     (=daikanwa		. 07168)	; &I-M-07168;
     (=jef-china3	. #x4AB2)	; &I-JC3-4AB2;
-    (=ucs@big5		. #x5BB5)	; &M-07168;
-    ))
-(define-char
-  '((morohashi-daikanwa	7168 0 2)
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=ucs		. #x5BB5)	; 宵
-    (=jis-x0208		. #x3E2C)	; &I-J90-3E2C; [30-12]
-    (=gb2312		. #x4F7C)	; &I-G0-4F7C; [47-92]
-    (=gt		. 09012)	; &I-GT-09012;
-    (=gt-pj-1		. #x3E2C)	; &I-GT-09012; [30-12]
-    ))
-(define-char
-  '((=>ucs		. #x5BB5)	; 宵
-    (morohashi-daikanwa	7168 0 3)
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=cns11643-1	. #x5528)	; &C1-5528; [53-08]
     ))
 (define-char
-  '((=>ucs		. #x5BB6)	; 家
+  '((<-denotational
+     ((=ucs		  . #x5BB5)	; 宵
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (shinjigen-2	. 1834)
-    (=jis-x0208		. #x3248)	; &GT-08985; [18-40]
-    (=ks-x1001		. #x4A2B)	; &I-K0-4A2B; [42-11]
-    (=gt		. 08985)	; &I-GT-08985;
-    (=gt-k		. 06383)	; &I-GT-K06383;
-    (=gt-pj-1		. #x3248)	; &I-GT-08985; [18-40]
-    (=daikanwa		. 07169)	; &I-M-07169;
-    (=ucs@jis		. #x5BB6)	; &GT-08985;
+    (->subsumptive
+     ((=jis-x0208	  . #x3E2C)	; &GT-09012; [30-12]
+      (=gt		  . 09012)	; &I-GT-09012;
+      (=gt-pj-1		  . #x3E2C)	; &I-GT-09012; [30-12]
+      (=ucs@jis		  . #x5BB5)	; &GT-09012;
+      )
+     ((=gb2312		  . #x4F7C)	; &G0-4F7C; [47-92]
+      (=ucs@unicode	  . #x5BB5)	; &G0-4F7C;
+      )
+     ((=cns11643-1	  . #x5528)	; &C1-5528; [53-08]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7169 0 1)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5BB6)	; 家
-    (=gb2312		. #x3C52)	; &I-G0-3C52; [28-50]
-    (=cns11643-1	. #x5525)	; &I-C1-5525; [53-05]
     (=big5		. #xAE61)	; &I-B-AE61;
+    (->subsumptive
+     ((shinjigen-2	  . 1834)
+      (=jis-x0208	  . #x3248)	; &GT-08985; [18-40]
+      (=ks-x1001	  . #x4A2B)	; &I-K0-4A2B; [42-11]
+      (=gt		  . 08985)	; &I-GT-08985;
+      (=gt-k		  . 06383)	; &I-GT-K06383;
+      (=gt-pj-1		  . #x3248)	; &I-GT-08985; [18-40]
+      (=daikanwa	  . 07169)	; &I-M-07169;
+      (=ucs@jis		  . #x5BB6)	; &GT-08985;
+      )
+     ((=gb2312		  . #x3C52)	; &G0-3C52; [28-50]
+      (=ucs@unicode	  . #x5BB6)	; &G0-3C52;
+      )
+     ((=cns11643-1	  . #x5525)	; &C1-5525; [53-05]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5BB7)	; å®·
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=jis-x0212		. #x3A58)	; &M-07170; [26-56]
-    (=daikanwa		. 07170)	; &I-M-07170;
-    (=cbeta		. 07046)	; &I-CB07046;
-    (=jef-china3	. #x4AB3)	; &I-JC3-4AB3;
-    (=ucs@jis		. #x5BB7)	; &M-07170;
-    ))
-(define-char
-  '((morohashi-daikanwa	7170 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5BB7)	; å®·
-    (=cns11643-3	. #x3057)	; &I-C3-3057; [16-55]
+    (->subsumptive
+     ((=jis-x0212	  . #x3A58)	; &M-07170; [26-56]
+      (=daikanwa	  . 07170)	; &I-M-07170;
+      (=cbeta		  . 07046)	; &I-CB07046;
+      (=jef-china3	  . #x4AB3)	; &I-JC3-4AB3;
+      (=ucs@jis		  . #x5BB7)	; &M-07170;
+      )
+     ((=cns11643-3	  . #x3057)	; &C3-3057; [16-55]
+      (=ucs@unicode	  . #x5BB7)	; &C3-3057;
+      ))
     ))
 (define-char
   '((ideographic-radical . 40)	; ⼧
@@ -2443,25 +2376,29 @@
     (=jef-china3	. #x81F7)	; &I-JC3-81F7;
     ))
 (define-char
-  '((=>ucs		. #x5BC0)	; 寀
+  '((<-denotational
+     ((=big5-cdp	  . #x8D7C)	; &CDP-8D7C;
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x5BB7)	; å®·
-      ))
     (=gt-k		. 07616)	; &GT-K07616;
     (=gt-pj-k1		. #x3072)	; &GT-K07616; [16-82]
+    (<-formed@component/connect-below
+     ((=big5-cdp	  . #x8D7C)	; &CDP-8D7C;
+      )
+     ((=ucs		  . #x5BB7)	; å®·
+      ))
     ))
 (define-char
   '((=>ucs		. #x5BC0)	; 寀
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-ideographic-component-forms
+    (=big5-cdp		. #x8D7C)	; &CDP-8D7C;
+    (<-formed@component
      ((=ucs		  . #x5BB7)	; å®·
       ))
-    (=big5-cdp		. #x8D7C)	; &CDP-8D7C;
     ))
 (define-char
   '((ideographic-radical . 40)	; ⼧
@@ -2644,13 +2581,7 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (->subsumptive
-     ((<-vulgar
-       ((=ucs		    . #x2F818)	; 冤
-	(=daikanwa	    . 01587)	; &I-M-01587;
-	))
-      (<-vulgar*sources
-       zhengzi-tong daikanwa)
-      (=jis-x0208@1983	  . #x5563)	; &GT-09035; [53-67]
+     ((=jis-x0208@1983	  . #x5563)	; &GT-09035; [53-67]
       (=jis-x0208@1990	  . #x5563)	; &I-J90-5563; [53-67]
       (=gt		  . 09035)	; &I-GT-09035;
       (=gt-k		  . 07924)	; &I-GT-K07924;
@@ -2659,6 +2590,12 @@
       (=jef-china3	  . #x4AC8)	; &I-JC3-4AC8;
       (=ucs@jis		  . #x5BC3)	; &GT-09035;
       (mojikyo		  . 007202)	; &MCS-60001C22;
+      (<-vulgar
+       ((=ucs		    . #x2F818)	; 冤
+	(=daikanwa	    . 01587)	; &I-M-01587;
+	))
+      (<-vulgar*sources
+       zhengzitong daikanwa)
       )
      ((=cns11643-3	  . #x3541)	; &C3-3541; [21-33]
       (=ucs@unicode	  . #x5BC3)	; &C3-3541;
@@ -3545,10 +3482,32 @@
     (total-strokes	 . 12)
     (=ucs		. #x21A5C)	; 𡩜
     (->subsumptive
-     ((sources		  bos=A015412-00003)
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(=ucs		    . #x2FF3)	; ⿳
+	)
+       ((=jis-x0208	    . #x555F)	; &GT-08869; [53-63]
+	(=daikanwa	    . 07054)	; &I-M-07054;
+	)
+       ((=ucs		    . #x9FB6)	; 龶
+	)
+       ((=big5-cdp	    . #x8B48)	; &GT-36329;
+	))
+      (sources		  bos=A015412-00003)
       (=ruimoku-v6	  . #xE009)	; &RUI6-E009;
       )
-     ((=hanziku-12	  . #xECD1)	; &HZK12-ECD1;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(=ucs		    . #x2FF3)	; ⿳
+	)
+       ((=gb2312	    . #x6532)	; &C3-213B; [69-18]
+	(=cns11643-3	    . #x213B)	; &I-C3-213B; [01-27]
+	)
+       ((=ucs		    . #x9FB6)	; 龶
+	)
+       ((=big5-cdp	    . #x8B48)	; &GT-36329;
+	))
+      (=hanziku-12	  . #xECD1)	; &HZK12-ECD1;
       (=ucs@iso		  . #x21A5C)	; &HZK12-ECD1;
       ))
     ))
@@ -3907,9 +3866,7 @@
     (total-strokes	 . 13)
     (=ucs		. #x5BDB)	; 寛
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0213-1-2000  . #x4F5A)	; &JX1-4F5A; [47-58]
-	))
+     ((shinjigen-1	  . 1854)
       (shinjigen-2	  . 1854)
       (=jis-x0208	  . #x3432)	; &GT-09123; [20-18]
       (=gt		  . 09123)	; &I-GT-09123;
@@ -3917,6 +3874,9 @@
       (=gt-pj-1		  . #x3432)	; &I-GT-09123; [20-18]
       (=daikanwa	  . 07276)	; &I-M-07276;
       (=ucs@jis		  . #x5BDB)	; &GT-09123;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0213-1-2000  . #x4F5A)	; &JX1-4F5A; [47-58]
+	))
       )
      ((=cns11643-3	  . #x4076)	; &C3-4076; [32-86]
       (=ucs@unicode	  . #x5BDB)	; &C3-4076;
@@ -3951,23 +3911,29 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x5BDD)	; 寝
+    (<-simplified@ucs
+     ((=ucs		  . #x5BE2)	; 寢
+      ))
     (->subsumptive
      ((morohashi-daikanwa	7278 1)
+      (=jis-x0208	  . #x3F32)	; &GT-09138; [31-18]
+      (=gt		  . 09138)	; &I-GT-09138;
+      (=gt-pj-1		  . #x3F32)	; &I-GT-09138; [31-18]
+      (=ucs@jis		  . #x5BDD)	; &GT-09138;
       (<-simplified@JP/Jouyou
        ((=jis-x0208	    . #x556A)	; &GT-09179; [53-74]
 	(=ks-x1001	    . #x7656)	; &I-K0-7656; [86-54]
 	(=daikanwa	    . 07289)	; &I-M-07289;
 	))
-      (=jis-x0208	  . #x3F32)	; &GT-09138; [31-18]
-      (=gt		  . 09138)	; &I-GT-09138;
-      (=gt-pj-1		  . #x3F32)	; &I-GT-09138; [31-18]
-      (=ucs@jis		  . #x5BDD)	; &GT-09138;
       )
      ((mojikyo		  . 050149)	; &MCS-6000C3E5;
       )
      ((=gb2312		  . #x475E)	; &C4-3C6E; [39-62]
       (=cns11643-4	  . #x3C6E)	; &I-C4-3C6E; [28-78]
       (=ucs@unicode	  . #x5BDD)	; &C4-3C6E;
+      (<-simplified@CN
+       ((=gb12345	    . #x475E)	; &UU+5BE2; [39-62]
+	))
       ))
     ))
 (define-char
@@ -4246,40 +4212,42 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x5BE4)	; 寤
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (shinjigen-2	. 1862)
-    (=jis-x0208		. #x5568)	; &GT-09171; [53-72]
-    (=ks-x1001		. #x6775)	; &I-K0-6775; [71-85]
-    (=big5		. #xB9ED)	; &I-B-B9ED;
-    (=gt		. 09171)	; &I-GT-09171;
-    (=gt-pj-1		. #x5568)	; &I-GT-09171; [53-72]
-    (=daikanwa		. 07291)	; &I-M-07291;
-    (=ucs@jis		. #x5BE4)	; &GT-09171;
-    ))
-(define-char
-  '((morohashi-daikanwa	7291 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x5BE4)	; 寤
-    (=gb2312		. #x653B)	; &I-G0-653B; [69-27]
+    (=big5		. #xB9ED)	; &I-B-B9ED;
+    (->subsumptive
+     ((shinjigen-1	  . 1862)
+      (shinjigen-2	  . 1862)
+      (=jis-x0208	  . #x5568)	; &GT-09171; [53-72]
+      (=ks-x1001	  . #x6775)	; &I-K0-6775; [71-85]
+      (=gt		  . 09171)	; &I-GT-09171;
+      (=gt-pj-1		  . #x5568)	; &I-GT-09171; [53-72]
+      (=daikanwa	  . 07291)	; &I-M-07291;
+      (=ucs@jis		  . #x5BE4)	; &GT-09171;
+      )
+     ((=gb2312		  . #x653B)	; &G0-653B; [69-27]
+      (=ucs@unicode	  . #x5BE4)	; &G0-653B;
+      )
+     ((=cns11643-1	  . #x6855)	; &C1-6855; [72-53]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5BE4)	; 寤
-    (morohashi-daikanwa	7291 0 1)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=cns11643-1	. #x6855)	; &C1-6855; [72-53]
+    (=ucs		. #x5BE5)	; 寥
+    (=big5		. #xB9E9)	; &I-B-B9E9;
     ))
 (define-char
-  '((=>ucs		. #x5BE5)	; 寥
+  '((<-denotational
+     ((=ucs		  . #x5BE5)	; 寥
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (shinjigen-1	. 1870)
     (shinjigen-2	. 1870)
     (=jis-x0208		. #x556C)	; &GT-09200; [53-76]
     (=ks-x1001		. #x686F)	; &I-K0-686F; [72-79]
@@ -4289,67 +4257,68 @@
     (=ucs@jis		. #x5BE5)	; &GT-09200;
     ))
 (define-char
-  '((morohashi-daikanwa	7292 0 2)
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=ucs		. #x5BE5)	; 寥
-    (=gb2312		. #x4148)	; &I-G0-4148; [33-40]
-    (=big5		. #xB9E9)	; &I-B-B9E9;
-    ))
-(define-char
-  '((=>ucs		. #x5BE5)	; 寥
-    (morohashi-daikanwa	7292 0 3)
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=cns11643-1	. #x6851)	; &C1-6851; [72-49]
-    ))
-(define-char
-  '((=>ucs		. #x21A7E)	; ð¡©¾
+  '((<-denotational
+     ((=ucs		  . #x5BE5)	; 寥
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=daikanwa		. 07293)	; &M-07293;
+    (->subsumptive
+     ((=gb2312		  . #x4148)	; &G0-4148; [33-40]
+      (=ucs@unicode	  . #x5BE5)	; &G0-4148;
+      )
+     ((=cns11643-1	  . #x6851)	; &C1-6851; [72-49]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7293 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x21A7E)	; ð¡©¾
     ))
 (define-char
-  '((=>ucs		. #x21A7E)	; ð¡©¾
-    (morohashi-daikanwa	7293 0 1)
+  '((<-denotational
+     ((=ucs		  . #x21A7E)	; ð¡©¾
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=cns11643-5	. #x453A)	; &C5-453A; [37-26]
+    (->subsumptive
+     ((=daikanwa	  . 07293)	; &M-07293;
+      )
+     ((=ucs@iso		  . #x21A7E)	; &U-00021A7E;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5BE6)	; 實
+  '((<-denotational
+     ((=ucs		  . #x21A7E)	; ð¡©¾
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (shinjigen-2	. 1819)
-    (=jis-x0208		. #x5569)	; &GT-09177; [53-73]
-    (=ks-x1001		. #x6379)	; &I-K0-6379; [67-89]
-    (=big5		. #xB9EA)	; &I-B-B9EA;
-    (=gt		. 09177)	; &I-GT-09177;
-    (=gt-k		. 11202)	; &I-GT-K11202;
-    (=gt-pj-1		. #x5569)	; &I-GT-09177; [53-73]
-    (=daikanwa		. 07294)	; &I-M-07294;
-    (=ucs@jis		. #x5BE6)	; &GT-09177;
+    (=cns11643-5	. #x453A)	; &C5-453A; [37-26]
     ))
 (define-char
-  '((morohashi-daikanwa	7294 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x5BE6)	; 實
-    (=cns11643-1	. #x6852)	; &I-C1-6852; [72-50]
-    (=gb12345		. #x4A35)	; 實 [42-21]
+    (=big5		. #xB9EA)	; &I-B-B9EA;
+    (->subsumptive
+     ((shinjigen-1	  . 1819)
+      (shinjigen-2	  . 1819)
+      (=jis-x0208	  . #x5569)	; &GT-09177; [53-73]
+      (=ks-x1001	  . #x6379)	; &I-K0-6379; [67-89]
+      (=gt		  . 09177)	; &I-GT-09177;
+      (=gt-k		  . 11202)	; &I-GT-K11202;
+      (=gt-pj-1		  . #x5569)	; &I-GT-09177; [53-73]
+      (=daikanwa	  . 07294)	; &I-M-07294;
+      (=ucs@jis		  . #x5BE6)	; &GT-09177;
+      )
+     ((=cns11643-1	  . #x6852)	; &C1-6852; [72-50]
+      (=gb12345		  . #x4A35)	; &C1-6852; [42-21]
+      (=ucs@unicode	  . #x5BE6)	; &C1-6852;
+      ))
     ))
 (define-char
   '((=>ucs		. #x21A7F)	; ð¡©¿
@@ -4854,75 +4823,83 @@
   '((ideographic-radical . 40)	; ⼧
     (=ucs		. #x5BEC)	; 寬
     (=big5		. #xBC65)	; &I-B-BC65;
-    (->subsumptive
-     ((ideographic-strokes . 12)
-      (total-strokes	   . 15)
-      (->subsumptive
-       ((=ks-x1001	    . #x4E30)	; &M-07322; [46-16]
-	(=daikanwa	    . 07322)	; &I-M-07322;
-	(=jef-china3	    . #x4AC6)	; &I-JC3-4AC6;
-	)
-       ((=cns11643-1	    . #x6C4F)	; &C1-6C4F; [76-47]
-	))
-      )
-     ((ideographic-strokes . 11)
-      (total-strokes	   . 14)
-      (->subsumptive
-       ((=jis-x0213-1-2000  . #x4F5A)	; &JX1-4F5A; [47-58]
-	(=ucs@jis	    . #x5BEC)	; &JX1-4F5A;
-	)
-       ((=gb12345	    . #x3F6D)	; &UU+5BEC; [31-77]
-	(=ucs@unicode	    . #x5BEC)	; &UU+5BEC;
-	))
-      ))
     ))
 (define-char
-  '((=>ucs		. #x21AA2)	; 𡪢
+  '((<-denotational
+     ((=ucs		  . #x5BEC)	; 寬
+      ))
     (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=daikanwa		. 07323)	; &M-07323;
+    (->subsumptive
+     ((shinjigen-1	  . 1855)
+      (=ks-x1001	  . #x4E30)	; &M-07322; [46-16]
+      (=daikanwa	  . 07322)	; &I-M-07322;
+      (=jef-china3	  . #x4AC6)	; &I-JC3-4AC6;
+      )
+     ((=cns11643-1	  . #x6C4F)	; &C1-6C4F; [76-47]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7323 0 0)
+  '((<-denotational
+     ((=ucs		  . #x5BEC)	; 寬
+      ))
     (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x21AA2)	; 𡪢
-    (=cns11643-7	. #x2237)	; &I-C7-2237; [02-23]
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (->subsumptive
+     ((=jis-x0213-1-2000  . #x4F5A)	; &JX1-4F5A; [47-58]
+      (=ucs@jis		  . #x5BEC)	; &JX1-4F5A;
+      )
+     ((=gb12345		  . #x3F6D)	; &UU+5BEC; [31-77]
+      (=ucs@unicode	  . #x5BEC)	; &UU+5BEC;
+      ))
     ))
 (define-char
   '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x5BED)	; 寭
-    (=cns11643-4	. #x4944)	; &I-C4-4944; [41-36]
-    (=daikanwa		. 07324)	; &I-M-07324;
+    (=ucs		. #x21AA2)	; 𡪢
+    (->subsumptive
+     ((=daikanwa	  . 07323)	; &M-07323;
+      )
+     ((=cns11643-7	  . #x2237)	; &C7-2237; [02-23]
+      (=ucs@iso		  . #x21AA2)	; &C7-2237;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5BEE)	; 寮
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (shinjigen-2	. 1875)
-    (=jis-x0208		. #x4E40)	; &GT-09238; [46-32]
-    (=ks-x1001		. #x5677)	; &I-K0-5677; [54-87]
-    (=big5		. #xBC64)	; &I-B-BC64;
-    (=gt		. 09238)	; &I-GT-09238;
-    (=gt-k		. 11958)	; &I-GT-K11958;
-    (=gt-pj-1		. #x4E40)	; &I-GT-09238; [46-32]
-    (=daikanwa		. 07325)	; &I-M-07325;
-    (=ucs@jis		. #x5BEE)	; &GT-09238;
-    (=ucs@big5		. #x5BEE)	; &GT-09238;
+    (=ucs		. #x5BED)	; 寭
+    (->subsumptive
+     ((=daikanwa	  . 07324)	; &M-07324;
+      )
+     ((=cns11643-4	  . #x4944)	; &C4-4944; [41-36]
+      (=ucs@unicode	  . #x5BED)	; &C4-4944;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7325 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x5BEE)	; 寮
-    (=gb2312		. #x653C)	; &I-G0-653C; [69-28]
-    (=cns11643-1	. #x6C4E)	; &I-C1-6C4E; [76-46]
+    (=big5		. #xBC64)	; &I-B-BC64;
+    (->subsumptive
+     ((shinjigen-1	  . 1875)
+      (shinjigen-2	  . 1875)
+      (=jis-x0208	  . #x4E40)	; &GT-09238; [46-32]
+      (=ks-x1001	  . #x5677)	; &I-K0-5677; [54-87]
+      (=gt		  . 09238)	; &I-GT-09238;
+      (=gt-k		  . 11958)	; &I-GT-K11958;
+      (=gt-pj-1		  . #x4E40)	; &I-GT-09238; [46-32]
+      (=daikanwa	  . 07325)	; &I-M-07325;
+      (=ucs@jis		  . #x5BEE)	; &GT-09238;
+      )
+     ((=gb2312		  . #x653C)	; &C1-6C4E; [69-28]
+      (=cns11643-1	  . #x6C4E)	; &I-C1-6C4E; [76-46]
+      (=ucs@unicode	  . #x5BEE)	; &C1-6C4E;
+      ))
     ))
 (define-char
   '((=>ucs		. #x21AA3)	; 𡪣
@@ -5570,23 +5547,24 @@
   '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (shinjigen-2	. 1877)
     (=ucs		. #x5BF5)	; 寵
-    (=jis-x0208		. #x437E)	; &I-J90-437E; [35-94]
-    (=ks-x1001		. #x7541)	; &I-K0-7541; [85-33]
-    (=gb12345		. #x3368)	; 寵 [19-72]
     (=big5		. #xC364)	; &I-B-C364;
-    (=gt		. 09271)	; &I-GT-09271;
-    (=gt-pj-1		. #x437E)	; &I-GT-09271; [35-94]
-    (=daikanwa		. 07368)	; &I-M-07368;
-    ))
-(define-char
-  '((=>ucs		. #x5BF5)	; 寵
-    (morohashi-daikanwa	7368 0 1)
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 16)
-    (total-strokes	 . 19)
-    (=cns11643-1	. #x7831)	; &C1-7831; [88-17]
+    (->subsumptive
+     ((shinjigen-2	  . 1877)
+      (=jis-x0208	  . #x437E)	; &GT-09271; [35-94]
+      (=ks-x1001	  . #x7541)	; &I-K0-7541; [85-33]
+      (=gt		  . 09271)	; &I-GT-09271;
+      (=gt-pj-1		  . #x437E)	; &I-GT-09271; [35-94]
+      (=daikanwa	  . 07368)	; &I-M-07368;
+      (=ucs@jis		  . #x5BF5)	; &GT-09271;
+      )
+     ((=gb12345		  . #x3368)	; &UU+5BF5; [19-72]
+      (=ucs@unicode	  . #x5BF5)	; &UU+5BF5;
+      )
+     ((=cns11643-1	  . #x7831)	; &C1-7831; [88-17]
+      )
+     ((shinjigen-1	  . 1877)
+      ))
     ))
 (define-char
   '((=>ucs		. #x21AEE)	; ð¡«®
diff --git a/lisp/utf-2000/Ideograph-R041-Inch.el b/lisp/utf-2000/Ideograph-R041-Inch.el
index c2f8105..28135f9 100644
--- a/lisp/utf-2000/Ideograph-R041-Inch.el
+++ b/lisp/utf-2000/Ideograph-R041-Inch.el
@@ -32,10 +32,18 @@
   '((ideographic-radical . 41)	; ⼨
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
+    (shinjigen-1	. 1882)
     (=ucs		. #x5BF9)	; 对
     (=gb2312		. #x3654)	; &I-G0-3654; [22-52]
     (=cns11643-3	. #x223E)	; &I-C3-223E; [02-30]
     (=daikanwa		. 07413)	; &I-M-07413;
+    (<-vulgar
+     ((shinjigen-1	  . 1881)
+      (=ucs		  . #x5C0D)	; 對
+      (=jis-x0208	  . #x5574)	; &I-J90-5574; [53-84]
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 41)	; ⼨
@@ -90,16 +98,31 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x5BFD)	; 寽
-    (->subsumptive
-     ((=jis-x0212	  . #x3A68)	; &M-07416; [26-72]
-      (=jis-x0213-2-2000  . #x282B)	; &I-JX2-282B; [08-11]
-      (=daikanwa	  . 07416)	; &I-M-07416;
-      (=jef-china3	  . #x91CC)	; &I-JC3-91CC;
-      (=ucs@jis		  . #x5BFD)	; &M-07416;
-      )
-     ((=cns11643-3	  . #x255E)	; &C3-255E; [05-62]
-      (=ucs@unicode	  . #x5BFD)	; &C3-255E;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5BFD)	; 寽
       ))
+    (ideographic-radical . 41)	; ⼨
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=jis-x0212		. #x3A68)	; &M-07416; [26-72]
+    (=jis-x0213-2-2000	. #x282B)	; &I-JX2-282B; [08-11]
+    (=daikanwa		. 07416)	; &I-M-07416;
+    (=cbeta		. 04953)	; &I-CB04953;
+    (=jef-china3	. #x91CC)	; &I-JC3-91CC;
+    (=ucs@jis		. #x5BFD)	; &M-07416;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5BFD)	; 寽
+      ))
+    (ideographic-radical . 41)	; ⼨
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=cns11643-3	. #x255E)	; &C3-255E; [05-62]
+    (=ucs@unicode	. #x5BFD)	; &C3-255E;
+    (mojikyo		. 071778)	; &MCS-60011862;
     ))
 (define-char
   '((ideographic-radical . 41)	; ⼨
@@ -115,10 +138,7 @@
     (total-strokes	 . 7)
     (=ucs		. #x5BFE)	; 対
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=ucs		    . #x5C0D)	; 對
-	(=jis-x0208	    . #x5574)	; &I-J90-5574; [53-84]
-	))
+     ((shinjigen-1	  . 1880)
       (shinjigen-2	  . 1880)
       (=jis-x0208	  . #x4250)	; &GT-09330; [34-48]
       (=gt		  . 09330)	; &I-GT-09330;
@@ -126,36 +146,45 @@
       (=gt-pj-1		  . #x4250)	; &I-GT-09330; [34-48]
       (=daikanwa	  . 07419)	; &I-M-07419;
       (=ucs@jis		  . #x5BFE)	; &GT-09330;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x5C0D)	; 對
+	(=jis-x0208	    . #x5574)	; &I-J90-5574; [53-84]
+	))
       )
      ((=cns11643-3	  . #x255C)	; &C3-255C; [05-60]
       (=ucs@unicode	  . #x5BFE)	; &C3-255C;
       ))
     ))
 (define-char
-  '((morohashi-daikanwa	7419 1)
-    (ideographic-radical . 41)	; ⼨
+  '((ideographic-radical . 41)	; ⼨
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
+    (=ucs		. #x5BFF)	; 寿
+    (<-simplified@ucs
      ((=ucs		  . #x58FD)	; 壽
-      (=jis-x0208	  . #x5468)	; &I-J90-5468; [52-72]
       ))
-    (=ucs		. #x5BFF)	; 寿
-    (=jis-x0208		. #x3C77)	; &I-J90-3C77; [28-87]
-    (=gb2312		. #x4A59)	; &I-G0-4A59; [42-57]
-    (=cns11643-3	. #x255D)	; &I-C3-255D; [05-61]
-    (=cns11643-6	. #x2721)	; &I-C6-2721; [07-01]
-    (=gt		. 09329)	; &I-GT-09329;
-    (=gt-k		. 02570)	; &I-GT-K02570;
-    (=gt-pj-1		. #x3C77)	; &I-GT-09329; [28-87]
-    (mojikyo		. 050151)	; &MCS-6000C3E7;
-    ))
-(define-char
-  '((ideographic-radical . 41)	; ⼨
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=cbeta		. 04953)	; &CB04953;
-    (mojikyo		. 071778)	; &MCS-60011862;
+    (->subsumptive
+     ((morohashi-daikanwa	7419 1)
+      (=jis-x0208	  . #x3C77)	; &GT-09329; [28-87]
+      (=cns11643-3	  . #x255D)	; &I-C3-255D; [05-61]
+      (=gt		  . 09329)	; &I-GT-09329;
+      (=gt-k		  . 02570)	; &I-GT-K02570;
+      (=gt-pj-1		  . #x3C77)	; &I-GT-09329; [28-87]
+      (=ucs@jis		  . #x5BFF)	; &GT-09329;
+      (mojikyo		  . 050151)	; &MCS-6000C3E7;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x58FD)	; 壽
+	(=jis-x0208	    . #x5468)	; &I-J90-5468; [52-72]
+	))
+      )
+     ((=gb2312		  . #x4A59)	; &C6-2721; [42-57]
+      (=cns11643-6	  . #x2721)	; &I-C6-2721; [07-01]
+      (=ucs@unicode	  . #x5BFF)	; &C6-2721;
+      (<-simplified@CN
+       ((=ucs		    . #x58FD)	; 壽
+	(=gb12345	    . #x4A59)	; 壽 [42-57]
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 41)	; ⼨
@@ -282,7 +311,8 @@
     (total-strokes	 . 10)
     (=ucs		. #x5C04)	; 射
     (->subsumptive
-     ((shinjigen-2	  . 1888)
+     ((shinjigen-1	  . 1888)
+      (shinjigen-2	  . 1888)
       (=jis-x0208	  . #x3C4D)	; &GT-09353; [28-45]
       (=ks-x1001	  . #x5E52)	; &I-K0-5E52; [62-50]
       (=cns11643-1	  . #x552B)	; &I-C1-552B; [53-11]
@@ -301,13 +331,6 @@
   '((ideographic-radical . 41)	; ⼨
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-vulgar
-     ((shinjigen-1	  . 638)
-      (=ucs		  . #x524B)	; 剋
-      (=jis-x0208	  . #x516E)	; &I-J90-516E; [49-78]
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (shinjigen-1	. 639)
     (shinjigen-2	. 639)
     (=ucs		. #x5C05)	; 尅
@@ -318,6 +341,13 @@
     (=gt-pj-1		. #x5571)	; &I-GT-09352; [53-81]
     (=daikanwa		. 07435)	; &I-M-07435;
     (=cbeta		. 00018)	; &I-CB00018;
+    (<-vulgar
+     ((shinjigen-1	  . 638)
+      (=ucs		  . #x524B)	; 剋
+      (=jis-x0208	  . #x516E)	; &I-J90-516E; [49-78]
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 41)	; ⼨
@@ -330,6 +360,9 @@
 (define-char
   '((ideographic-radical . 41)	; ⼨
     (=ucs		. #x5C06)	; 将
+    (<-simplified@ucs
+     ((=ucs		  . #x5C07)	; 將
+      ))
     ))
 (define-char
   '((<-denotational
@@ -361,6 +394,12 @@
     (=gb2312		. #x3D2B)	; &G0-3D2B; [29-11]
     (=ucs@unicode	. #x5C06)	; &G0-3D2B;
     (mojikyo		. 051049)	; &MCS-6000C769;
+    (<-simplified@CN
+     ((=jis-x0208	  . #x5572)	; &GT-09364; [53-82]
+      (=ks-x1001	  . #x6D62)	; &I-K0-6D62; [77-66]
+      (=gb12345		  . #x3D2B)	; &GT-09364; [29-11]
+      (=daikanwa	  . 07438)	; &I-M-07438;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -370,11 +409,7 @@
     (ideographic-radical . 41)	; ⼨
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5572)	; &GT-09364; [53-82]
-      (=ks-x1001	  . #x6D62)	; &I-K0-6D62; [77-66]
-      (=daikanwa	  . 07438)	; &I-M-07438;
-      ))
+    (shinjigen-1	. 1889)
     (=jis-x0208		. #x3E2D)	; &GT-09355; [30-13]
     (=cns11643-3	. #x3059)	; &I-C3-3059; [16-57]
     (=gt		. 09355)	; &I-GT-09355;
@@ -382,6 +417,11 @@
     (=gt-pj-1		. #x3E2D)	; &I-GT-09355; [30-13]
     (=ucs@jis		. #x5C06)	; &GT-09355;
     (mojikyo		. 050152)	; &MCS-6000C3E8;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5572)	; &GT-09364; [53-82]
+      (=ks-x1001	  . #x6D62)	; &I-K0-6D62; [77-66]
+      (=daikanwa	  . 07438)	; &I-M-07438;
+      ))
     ))
 (define-char
   '((ideographic-radical . 41)	; ⼨
@@ -390,7 +430,8 @@
     (=ucs		. #x5C07)	; 將
     (=big5		. #xB14E)	; &I-B-B14E;
     (->subsumptive
-     ((shinjigen-2	  . 1890)
+     ((shinjigen-1	  . 1890)
+      (shinjigen-2	  . 1890)
       (=jis-x0208	  . #x5572)	; &GT-09364; [53-82]
       (=ks-x1001	  . #x6D62)	; &I-K0-6D62; [77-66]
       (=gb12345		  . #x3D2B)	; &GT-09364; [29-11]
@@ -430,17 +471,17 @@
     (ideographic-radical . 41)	; ⼨
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (=ucs		. #x5C02)	; 専
+    (=jis-x0208		. #x406C)	; &I-J90-406C; [32-76]
+    (=gt		. 09348)	; &I-GT-09348;
+    (=gt-k		. 05353)	; &I-GT-K05353;
+    (=gt-pj-1		. #x406C)	; &I-GT-09348; [32-76]
     (<-simplified@JP/Jouyou
      ((=jis-x0208	  . #x5573)	; &GT-09367; [53-83]
       (=ks-x1001	  . #x6E76)	; &I-K0-6E76; [78-86]
       (=cns11643-1	  . #x5971)	; &I-C1-5971; [57-81]
       (=daikanwa	  . 07439)	; &I-M-07439;
       ))
-    (=ucs		. #x5C02)	; 専
-    (=jis-x0208		. #x406C)	; &I-J90-406C; [32-76]
-    (=gt		. 09348)	; &I-GT-09348;
-    (=gt-k		. 05353)	; &I-GT-K05353;
-    (=gt-pj-1		. #x406C)	; &I-GT-09348; [32-76]
     ))
 (define-char
   '((ideographic-radical . 41)	; ⼨
@@ -683,6 +724,7 @@
   '((ideographic-radical . 41)	; ⼨
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (shinjigen-1	. 1881)
     (shinjigen-2	. 1881)
     (=ucs		. #x5C0D)	; 對
     (=jis-x0208		. #x5574)	; &I-J90-5574; [53-84]
@@ -784,12 +826,6 @@
     (ideographic-radical . 41)	; ⼨
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (<-simplified
-     ((=ks-x1001	  . #x5374)	; &M-07465; [51-84]
-      (=daikanwa	  . 07465)	; &I-M-07465;
-      ))
-    (<-simplified*sources
-     daikanwa)
     (=jis-x0208		. #x4633)	; &GT-09406; [38-19]
     (=gb12345		. #x353C)	; &GT-09406; [21-28]
     (=gt		. 09406)	; &I-GT-09406;
@@ -797,6 +833,12 @@
     (=gt-pj-1		. #x4633)	; &I-GT-09406; [38-19]
     (=ucs@unicode	. #x5C0E)	; &GT-09406;
     (mojikyo		. 050153)	; &MCS-6000C3E9;
+    (<-simplified
+     ((=ks-x1001	  . #x5374)	; &M-07465; [51-84]
+      (=daikanwa	  . 07465)	; &I-M-07465;
+      ))
+    (<-simplified*sources
+     daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -867,26 +909,40 @@
 (define-char
   '((ideographic-radical . 41)	; ⼨
     (=ucs		. #x21B4E)	; 𡭎
-    (->subsumptive
-     ((ideographic-strokes . 14)
-      (total-strokes	   . 17)
-      (<-ancient
-       ((=ks-x1001	    . #x5374)	; &M-07465; [51-84]
-	(=daikanwa	    . 07465)	; &I-M-07465;
-	))
-      (<-ancient*sources
-       daikanwa)
-      (=daikanwa	  . 07468)	; &M-07468;
-      (mojikyo		  . 007468)	; &MCS-60001D2C;
-      )
-     ((ideographic-strokes . 14)
-      (total-strokes	   . 17)
-      (=cns11643-7	  . #x375C)	; &C7-375C; [23-60]
-      )
-     ((ideographic-strokes . 13)
-      (total-strokes	   . 16)
-      (=ucs@iso		  . #x21B4E)	; &U-00021B4E;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21B4E)	; 𡭎
+      ))
+    (ideographic-radical . 41)	; ⼨
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=daikanwa		. 07468)	; &M-07468;
+    (mojikyo		. 007468)	; &MCS-60001D2C;
+    (<-ancient
+     ((=ks-x1001	  . #x5374)	; &M-07465; [51-84]
+      (=daikanwa	  . 07465)	; &I-M-07465;
       ))
+    (<-ancient*sources
+     daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21B4E)	; 𡭎
+      ))
+    (ideographic-radical . 41)	; ⼨
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs@iso		. #x21B4E)	; &U-00021B4E;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21B4E)	; 𡭎
+      ))
+    (ideographic-radical . 41)	; ⼨
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=cns11643-7	. #x375C)	; &C7-375C; [23-60]
     ))
 (define-char
   '((ideographic-radical . 41)	; ⼨
@@ -904,26 +960,39 @@
   '((ideographic-radical . 41)	; ⼨
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
+    (=ucs		. #x21B51)	; 𡭑
+    (=cns11643-7	. #x4659)	; &I-C7-4659; [38-57]
+    (=daikanwa		. 07470)	; &I-M-07470;
     (<-ancient
      ((=ks-x1001	  . #x5374)	; &M-07465; [51-84]
       (=daikanwa	  . 07465)	; &I-M-07465;
       ))
-    (=ucs		. #x21B51)	; 𡭑
-    (=cns11643-7	. #x4659)	; &I-C7-4659; [38-57]
-    (=daikanwa		. 07470)	; &I-M-07470;
     ))
 (define-char
   '((ideographic-radical . 41)	; ⼨
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (=ucs		. #x21B52)	; 𡭒
-    (->subsumptive
-     ((=daikanwa	  . 07471)	; &M-07471;
-      (mojikyo		  . 007471)	; &MCS-60001D2F;
-      )
-     ((=cns11643-7	  . #x4D54)	; &C7-4D54; [45-52]
-      (=ucs@iso		  . #x21B52)	; &C7-4D54;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21B52)	; 𡭒
+      ))
+    (ideographic-radical . 41)	; ⼨
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
+    (=daikanwa		. 07471)	; &M-07471;
+    (mojikyo		. 007471)	; &MCS-60001D2F;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21B52)	; 𡭒
       ))
+    (ideographic-radical . 41)	; ⼨
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
+    (=cns11643-7	. #x4D54)	; &C7-4D54; [45-52]
+    (=ucs@iso		. #x21B52)	; &C7-4D54;
     ))
 (define-char
   '((ideographic-radical . 41)	; ⼨
diff --git a/lisp/utf-2000/Ideograph-R042-Small.el b/lisp/utf-2000/Ideograph-R042-Small.el
index e8fa4e8..2169f12 100644
--- a/lisp/utf-2000/Ideograph-R042-Small.el
+++ b/lisp/utf-2000/Ideograph-R042-Small.el
@@ -133,16 +133,20 @@
     (total-strokes	 . 5)
     (=ucs		. #x5C14)	; 尔
     (->subsumptive
-     ((<-same
+     ((=gb2312		  . #x367B)	; &M-07479; [22-91]
+      (=daikanwa	  . 07479)	; &I-M-07479;
+      (=cbeta		  . 00380)	; &I-CB00380;
+      (=ucs@unicode	  . #x5C14)	; &M-07479;
+      (<-same
        ((=gt		    . 09427)	; &GT-09427;
 	(=daikanwa	    . 07477)	; &I-M-07477;
 	))
       (<-same*sources
        jiyun daikanwa)
-      (=gb2312		  . #x367B)	; &M-07479; [22-91]
-      (=daikanwa	  . 07479)	; &I-M-07479;
-      (=cbeta		  . 00380)	; &I-CB00380;
-      (=ucs@unicode	  . #x5C14)	; &M-07479;
+      (<-simplified@CN
+       ((=ucs		    . #x723E)	; 爾
+	(=gb12345	    . #x367B)	; 爾 [22-91]
+	))
       )
      ((=cns11643-3	  . #x223F)	; &GT-09429; [02-31]
       (=big5-cdp	  . #x88C2)	; &I-CDP-88C2;
@@ -221,81 +225,87 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x5C18)	; 尘
-    (=gb2312		. #x333E)	; &I-G0-333E; [19-30]
-    (=cns11643-3	. #x2352)	; &I-C3-2352; [03-50]
-    (=daikanwa		. 07484)	; &I-M-07484;
-    (=jef-china3	. #x81D4)	; &I-JC3-81D4;
+    (->subsumptive
+     ((=daikanwa	  . 07484)	; &M-07484;
+      )
+     ((=gb2312		  . #x333E)	; &C3-2352; [19-30]
+      (=cns11643-3	  . #x2352)	; &I-C3-2352; [03-50]
+      (=jef-china3	  . #x81D4)	; &I-JC3-81D4;
+      (=ucs@unicode	  . #x5C18)	; &C3-2352;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 42)	; ⼩
+  '((=>ucs*		. #x5F53)	; 当
+    (ideographic-radical . 42)	; ⼩
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (=cns11643-6	. #x244B)	; &M-07486; [04-43]
-    (=daikanwa		. 07486)	; &I-M-07486;
-    ))
-(define-char
-  '((=>ucs		. #x21B5D)	; 𡭝
-    (ideographic-radical . 42)	; ⼩
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=daikanwa		. 07487)	; &M-07487;
+    (=ucs		. #x2F874)	; 当
+    (->subsumptive
+     ((=daikanwa	  . 07486)	; &M-07486;
+      (<-simplified
+       ((=ucs		    . #x7576)	; 當
+	(=daikanwa	    . 21890)	; &I-M-21890;
+	))
+      (<-simplified*sources
+       daikanwa)
+      )
+     ((=cns11643-6	  . #x244B)	; &C6-244B; [04-43]
+      (=ucs@iso		  . #x2F874)	; &C6-244B;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7487 0 0)
-    (ideographic-radical . 42)	; ⼩
+  '((ideographic-radical . 42)	; ⼩
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x21B5D)	; 𡭝
-    (=cns11643-6	. #x2724)	; &I-C6-2724; [07-04]
-    ))
-(define-char
-  '((=>ucs		. #x21B5E)	; 𡭞
-    (ideographic-radical . 42)	; ⼩
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=daikanwa		. 07488)	; &M-07488;
+    (->subsumptive
+     ((=daikanwa	  . 07487)	; &M-07487;
+      )
+     ((=cns11643-6	  . #x2724)	; &C6-2724; [07-04]
+      (=ucs@iso		  . #x21B5D)	; &C6-2724;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7488 0 0)
-    (ideographic-radical . 42)	; ⼩
+  '((ideographic-radical . 42)	; ⼩
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x21B5E)	; 𡭞
-    (=cns11643-4	. #x2372)	; &I-C4-2372; [03-82]
-    ))
-(define-char
-  '((=>ucs		. #x21B5F)	; 𡭟
-    (ideographic-radical . 42)	; ⼩
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=daikanwa		. 07489)	; &M-07489;
+    (->subsumptive
+     ((=daikanwa	  . 07488)	; &M-07488;
+      )
+     ((=ucs@iso		  . #x21B5E)	; &U-00021B5E;
+      )
+     ((=cns11643-4	  . #x2372)	; &C4-2372; [03-82]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7489 0 0)
-    (ideographic-radical . 42)	; ⼩
+  '((ideographic-radical . 42)	; ⼩
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x21B5F)	; 𡭟
-    (=cns11643-6	. #x2723)	; &I-C6-2723; [07-03]
+    (->subsumptive
+     ((=daikanwa	  . 07489)	; &M-07489;
+      )
+     ((=cns11643-6	  . #x2723)	; &C6-2723; [07-03]
+      (=ucs@iso		  . #x21B5F)	; &C6-2723;
+      ))
     ))
 (define-char
   '((ideographic-radical . 42)	; ⼩
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x21B60)	; ð¡­ 
-    (=daikanwa		. 07490)	; &I-M-07490;
-    ))
-(define-char
-  '((=>ucs		. #x21B60)	; ð¡­ 
-    (morohashi-daikanwa	7490 0 1)
-    (ideographic-radical . 42)	; ⼩
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=cns11643-6	. #x2722)	; &C6-2722; [07-02]
+    (->subsumptive
+     ((=daikanwa	  . 07490)	; &M-07490;
+      (=ucs@iso		  . #x21B60)	; &M-07490;
+      )
+     ((=cns11643-6	  . #x2722)	; &C6-2722; [07-02]
+      ))
     ))
 (define-char
   '((<-denotational
      ((=big5		  . #xA97C)	; &B-A97C;
+      (=jis-x0208@1997	  . #x3E30)	; &B-A97C; [30-16]
       ))
     (ideographic-radical . 42)	; ⼩
     (ideographic-strokes . 5)
@@ -322,6 +332,7 @@
 (define-char
   '((<-denotational
      ((=big5		  . #xA97C)	; &B-A97C;
+      (=jis-x0208@1997	  . #x3E30)	; &B-A97C; [30-16]
       ))
     (morohashi-daikanwa	7493 1)
     (ideographic-radical . 42)	; ⼩
@@ -343,9 +354,6 @@
     (ideographic-radical . 42)	; ⼩
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x5C1A)	; 尚
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -364,6 +372,9 @@
       ))
     (=gt-k		. 05014)	; &GT-K05014;
     (=gt-pj-k1		. #x3242)	; &GT-K05014; [18-34]
+    (<-formed@component/connect-below
+     ((=ucs		  . #x5C1A)	; 尚
+      ))
     ))
 (define-char
   '((=>ucs		. #x21B65)	; ð¡­¥
@@ -614,8 +625,7 @@
     (=cns11643-6	. #x3E60)	; &I-C6-3E60; [30-64]
     ))
 (define-char
-  '((=>daikanwa		. 07516)	; &M-07516;
-    (ideographic-radical@ucs . 9)	; ⼈
+  '((ideographic-radical@ucs . 9)	; ⼈
     (ideographic-strokes@ucs . 9)
     (ideographic-radical@daikanwa . 42)	; ⼩
     (ideographic-strokes@daikanwa . 8)
diff --git a/lisp/utf-2000/Ideograph-R043-Lame.el b/lisp/utf-2000/Ideograph-R043-Lame.el
index 0166ce0..cc5e92d 100644
--- a/lisp/utf-2000/Ideograph-R043-Lame.el
+++ b/lisp/utf-2000/Ideograph-R043-Lame.el
@@ -25,10 +25,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E90)	; ⺐
     (<-identical@component
      ((=ucs		  . #x5C22)	; å°¢
       ))
-    (=ucs		. #x2E90)	; ⺐
     ))
 (define-char
   '((<-denotational
@@ -56,16 +56,16 @@
     (total-strokes	 . 4)
     (=ucs		. #x5C23)	; å°£
     (->subsumptive
-     ((<-same
+     ((=jis-x0212	  . #x3A6D)	; &M-07540; [26-77]
+      (=jis-x0213-1-2000  . #x4F5D)	; &I-JX1-4F5D; [47-61]
+      (=daikanwa	  . 07540)	; &I-M-07540;
+      (=ucs@unicode	  . #x5C23)	; &M-07540;
+      (<-same
        ((=cns11643-1	    . #x4452)	; &M-07538; [36-50]
 	(=daikanwa	    . 07538)	; &I-M-07538;
 	))
       (<-same*sources
        zihui daikanwa)
-      (=jis-x0212	  . #x3A6D)	; &M-07540; [26-77]
-      (=jis-x0213-1-2000  . #x4F5D)	; &I-JX1-4F5D; [47-61]
-      (=daikanwa	  . 07540)	; &I-M-07540;
-      (=ucs@unicode	  . #x5C23)	; &M-07540;
       (->formed
        ((=daikanwa	    . 07583)	; &I-M-07583;
 	))
@@ -83,10 +83,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E8F)	; ⺏
     (<-identical@component
      ((=ucs		  . #x5C23)	; å°£
       ))
-    (=ucs		. #x2E8F)	; ⺏
     ))
 (define-char
   '((<-denotational
@@ -97,6 +97,7 @@
     (ideographic-radical . 43)	; ⼪
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=big5-cdp		. #x8DEF)	; &CDP-8DEF;
     (<-formed@component
      ((=cns11643-1	  . #x4452)	; &M-07538; [36-50]
       (=daikanwa	  . 07538)	; &I-M-07538;
@@ -106,7 +107,6 @@
       (=jis-x0213-1-2000  . #x4F5D)	; &I-JX1-4F5D; [47-61]
       (=daikanwa	  . 07540)	; &I-M-07540;
       ))
-    (=big5-cdp		. #x8DEF)	; &CDP-8DEF;
     ))
 (define-char
   '((ideographic-radical . 43)	; ⼪
@@ -114,13 +114,13 @@
     (total-strokes	 . 4)
     (=ucs		. #x21BC2)	; 𡯂
     (->subsumptive
-     ((<-same
+     ((=daikanwa	  . 07541)	; &M-07541;
+      (<-same
        ((=cns11643-1	    . #x4452)	; &M-07538; [36-50]
 	(=daikanwa	    . 07538)	; &I-M-07538;
 	))
       (<-same*sources
        zihui daikanwa)
-      (=daikanwa	  . 07541)	; &M-07541;
       )
      ((=cns11643-4	  . #x214A)	; &C4-214A; [01-42]
       )
@@ -135,10 +135,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E91)	; ⺑
     (<-identical@component
      ((=daikanwa	  . 07541)	; &M-07541;
       ))
-    (=ucs		. #x2E91)	; ⺑
     ))
 (define-char
   '((=>ucs		. #xFA0C)	; 兀
@@ -146,14 +146,14 @@
     (ideographic-radical . 43)	; ⼪
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
+    (sound@ja/on	"wAu")
+    (=daikanwa		. 07542)	; &M-07542;
     (<-same
      ((=cns11643-1	  . #x4452)	; &M-07538; [36-50]
       (=daikanwa	  . 07538)	; &I-M-07538;
       ))
     (<-same*sources
-     goon-shuuin daikanwa)
-    (sound@ja/on	"wAu")
-    (=daikanwa		. 07542)	; &M-07542;
+     wuyinjiyun daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -166,11 +166,11 @@
     (ideographic-radical@unicode . 10)	; ⼉
     (ideographic-strokes@unicode . 1)
     (total-strokes	 . 3)
+    (=ucs		. #xFA0C)	; 兀
+    (=big5		. #xC94A)	; &I-B-C94A;
     (<-unknown
      ((=daikanwa	  . 07542)	; &M-07542;
       ))
-    (=ucs		. #xFA0C)	; 兀
-    (=big5		. #xC94A)	; &I-B-C94A;
     ))
 (define-char
   '((<-denotational
@@ -180,13 +180,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E8E)	; ⺎
     (<-formed@component
      ((=ucs		  . #x5C22)	; å°¢
       ))
     (<-identical@component
      ((=daikanwa	  . 07542)	; &M-07542;
       ))
-    (=ucs		. #x2E8E)	; ⺎
     ))
 (define-char
   '((ideographic-radical . 43)	; ⼪
@@ -794,15 +794,19 @@
   '((ideographic-radical . 43)	; ⼪
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-same
-     ((=cns11643-6	  . #x366A)	; &M-07583; [22-74]
-      (=daikanwa	  . 07583)	; &I-M-07583;
-      ))
-    (<-same*sources
-     daikanwa)
     (=ucs		. #x21BED)	; 𡯭
-    (=cns11643-6	. #x366B)	; &I-C6-366B; [22-75]
-    (=daikanwa		. 49037)	; &I-M-49037;
+    (->subsumptive
+     ((=cns11643-6	  . #x366B)	; &M-49037; [22-75]
+      (=daikanwa	  . 49037)	; &I-M-49037;
+      (<-same
+       ((=cns11643-6	    . #x366A)	; &M-07583; [22-74]
+	(=daikanwa	    . 07583)	; &I-M-07583;
+	))
+      (<-same*sources
+       daikanwa)
+      )
+     ((=ucs@iso		  . #x21BED)	; &U-00021BED;
+      ))
     ))
 (define-char
   '((ideographic-radical . 43)	; ⼪
@@ -986,19 +990,20 @@
     (=ucs		. #x5C31)	; å°±
     (=big5		. #xB44E)	; &I-B-B44E;
     (->subsumptive
+     ((=daikanwa	  . 07599)	; &M-07599;
+      )
      ((shinjigen-2	  . 1916)
       (=jis-x0208	  . #x3D22)	; &GT-09571; [29-02]
       (=ks-x1001	  . #x7626)	; &I-K0-7626; [86-06]
       (=gt		  . 09571)	; &I-GT-09571;
       (=gt-k		  . 09064)	; &I-GT-K09064;
       (=gt-pj-1		  . #x3D22)	; &I-GT-09571; [29-02]
-      (=daikanwa	  . 07599)	; &I-M-07599;
       (=ucs@jis		  . #x5C31)	; &GT-09571;
       )
-     ((=cns11643-1	  . #x5E73)	; &C1-5E73; [62-83]
-      )
      ((=gb2312		  . #x3E4D)	; &G0-3E4D; [30-45]
       (=ucs@unicode	  . #x5C31)	; &G0-3E4D;
+      )
+     ((=cns11643-1	  . #x5E73)	; &C1-5E73; [62-83]
       ))
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R044-Corpse.el b/lisp/utf-2000/Ideograph-R044-Corpse.el
index fa711ef..54564fa 100644
--- a/lisp/utf-2000/Ideograph-R044-Corpse.el
+++ b/lisp/utf-2000/Ideograph-R044-Corpse.el
@@ -163,10 +163,7 @@
   '((ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x76E1)	; 盡
-      (=jis-x0208	  . #x6238)	; &I-J90-6238; [66-24]
-      ))
+    (shinjigen-1	. 5256)
     (shinjigen-2	. 5256)
     (=ucs		. #x5C3D)	; å°½
     (=jis-x0208		. #x3F54)	; &I-J90-3F54; [31-52]
@@ -176,6 +173,20 @@
     (=gt-k		. 01648)	; &I-GT-K01648;
     (=gt-pj-1		. #x3F54)	; &I-GT-09632; [31-52]
     (=daikanwa		. 07642)	; &I-M-07642;
+    (<-simplified@CN
+     ((=ucs		  . #x76E1)	; 盡
+      (=gb12345		  . #x3E21)	; 盡 [30-01]
+      )
+     ((=ucs		  . #x5118)	; 儘
+      (=gb12345		  . #x7845)	; 儘 [88-37]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x76E1)	; 盡
+      (=jis-x0208	  . #x6238)	; &I-J90-6238; [66-24]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x76E1)	; 盡
+      ))
     ))
 (define-char
   '((ideographic-radical . 44)	; ⼫
@@ -452,7 +463,8 @@
 	)
        ((=ucs		    . #x5C38)	; å°¸
 	)
-       ((=ucs@unicode	    . #x7ACB)	; &C1-4721;
+       ((=gb2312	    . #x4122)	; &C1-4721; [33-02]
+	(=cns11643-1	    . #x4721)	; &I-C1-4721; [39-01]
 	))
       (=cns11643-3	  . #x2852)	; &C3-2852; [08-50]
       (=ucs@unicode	  . #x3790)	; &C3-2852;
@@ -474,24 +486,39 @@
   '((ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (shinjigen-2	. 1928)
     (=ucs		. #x5C46)	; 屆
-    (=jis-x0208		. #x557C)	; &I-J90-557C; [53-92]
-    (=ks-x1001		. #x4C7A)	; &I-K0-4C7A; [44-90]
-    (=cns11643-1	. #x4D23)	; &I-C1-4D23; [45-03]
     (=big5		. #xA9A1)	; &I-B-A9A1;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5C46)	; 屆
+      ))
+    (ideographic-radical . 44)	; ⼫
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (shinjigen-1	. 1928)
+    (shinjigen-2	. 1928)
+    (=jis-x0208		. #x557C)	; &GT-09652; [53-92]
+    (=ks-x1001		. #x4C7A)	; &I-K0-4C7A; [44-90]
     (=gt		. 09652)	; &I-GT-09652;
     (=gt-pj-1		. #x557C)	; &I-GT-09652; [53-92]
     (=daikanwa		. 07666)	; &I-M-07666;
+    (=ucs@jis		. #x5C46)	; &GT-09652;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5C46)	; 屆
+      ))
+    (ideographic-radical . 44)	; ⼫
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (=cns11643-1	. #x4D23)	; &C1-4D23; [45-03]
+    (=ucs@unicode	. #x5C46)	; &C1-4D23;
     ))
 (define-char
   '((ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5C46)	; 屆
-      (=jis-x0208	  . #x557C)	; &I-J90-557C; [53-92]
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
       (=ucs		  . #x2FF8)	; ⿸
@@ -500,6 +527,7 @@
       )
      ((=ucs		  . #x7531)	; 由
       ))
+    (shinjigen-1	. 1927)
     (shinjigen-2	. 1927)
     (=ucs		. #x5C4A)	; 届
     (=jis-x0208		. #x464F)	; &I-J90-464F; [38-47]
@@ -510,6 +538,11 @@
     (=gt-pj-1		. #x464F)	; &I-GT-09653; [38-47]
     (=daikanwa		. 07667)	; &I-M-07667;
     (=cbeta		. 04396)	; &I-CB04396;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x557C)	; &GT-09652; [53-92]
+      (=ks-x1001	  . #x4C7A)	; &I-K0-4C7A; [44-90]
+      (=daikanwa	  . 07666)	; &I-M-07666;
+      ))
     ))
 (define-char
   '((ideographic-radical . 44)	; ⼫
@@ -524,6 +557,7 @@
   '((ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
+    (shinjigen-1	. 1930)
     (shinjigen-2	. 1930)
     (=ucs		. #x5C48)	; 屈
     (=jis-x0208		. #x367E)	; &I-J90-367E; [22-94]
@@ -747,18 +781,6 @@
     (ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x5622)	; &M-07734; [54-02]
-      (=ks-x1001	  . #x5C33)	; &I-K0-5C33; [60-19]
-      (=daikanwa	  . 07734)	; &I-M-07734;
-      ))
-    (<-vulgar
-     ((=jis-x0208@1978	  . #x5622)	; &M-07734; [54-02]
-      (=ks-x1001	  . #x5C33)	; &I-K0-5C33; [60-19]
-      (=daikanwa	  . 07734)	; &I-M-07734;
-      ))
-    (<-vulgar*sources
-     zhengzi-tong daikanwa)
     (shinjigen-2	. 1939)
     (=ucs		. #x5C4F)	; 屏
     (=gb2312		. #x4641)	; &I-G0-4641; [38-33]
@@ -771,6 +793,18 @@
     (=gt-pj-1		. #x5622)	; &I-GT-09700; [54-02]
     (=daikanwa		. 07692)	; &I-M-07692;
     (=jef-china3	. #x4AE7)	; &I-JC3-4AE7;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x5622)	; &M-07734; [54-02]
+      (=ks-x1001	  . #x5C33)	; &I-K0-5C33; [60-19]
+      (=daikanwa	  . 07734)	; &I-M-07734;
+      ))
+    (<-vulgar
+     ((=jis-x0208@1978	  . #x5622)	; &M-07734; [54-02]
+      (=ks-x1001	  . #x5C33)	; &I-K0-5C33; [60-19]
+      (=daikanwa	  . 07734)	; &I-M-07734;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa)
     ))
 (define-char
   '((ideographic-radical . 44)	; ⼫
@@ -815,6 +849,7 @@
     (total-strokes	 . 9)
     (=ucs		. #x21C52)	; 𡱒
     (=cns11643-6	. #x303E)	; &I-C6-303E; [16-30]
+    (=big5-cdp		. #x8DBE)	; &I-CDP-8DBE;
     (=daikanwa		. 07696)	; &I-M-07696;
     ))
 (define-char
@@ -874,22 +909,29 @@
     ))
 (define-char
   '((total-strokes	 . 9)
+    (shinjigen-2	. 3309)
+    (=ucs		. #x663C)	; 昼
+    (=jis-x0208		. #x436B)	; &I-J90-436B; [35-75]
+    (=gb2312		. #x5667)	; &I-G0-5667; [54-71]
+    (=gt		. 17517)	; &I-GT-17517;
+    (=gt-pj-1		. #x436B)	; &I-GT-17517; [35-75]
+    (<-simplified@CN
+     ((=ucs		  . #x665D)	; 晝
+      (=gb12345		  . #x5667)	; 晝 [54-71]
+      ))
     (<-simplified@JP/Jouyou
      ((=ucs		  . #x665D)	; 晝
       (=jis-x0208	  . #x5A6C)	; &I-J90-5A6C; [58-76]
       ))
+    (<-simplified@ucs
+     ((=ucs		  . #x665D)	; 晝
+      ))
     (<-vulgar
      ((=ucs		  . #x665D)	; 晝
       (=daikanwa	  . 13948)	; &I-M-13948;
       ))
     (<-vulgar*sources
      songyuan-yilai-suzipu daikanwa)
-    (shinjigen-2	. 3309)
-    (=ucs		. #x663C)	; 昼
-    (=jis-x0208		. #x436B)	; &I-J90-436B; [35-75]
-    (=gb2312		. #x5667)	; &I-G0-5667; [54-71]
-    (=gt		. 17517)	; &I-GT-17517;
-    (=gt-pj-1		. #x436B)	; &I-GT-17517; [35-75]
     (->subsumptive
      ((ideographic-radical . 44)	; ⼫
       (ideographic-strokes . 6)
@@ -901,6 +943,7 @@
       )
      ((ideographic-radical . 44)	; ⼫
       (ideographic-strokes . 6)
+      (shinjigen-1	  . 3309)
       (=cns11643-3	  . #x2C37)	; &C3-2C37; [12-23]
       ))
     ))
@@ -961,6 +1004,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5C51)	; 屑
+    (=big5		. #xAE68)	; &I-B-AE68;
     (=jis-x0208@1997	. #x367D)	; 屑 [22-93]
     ))
 (define-char
@@ -972,9 +1016,7 @@
     (total-strokes	 . 10)
     (=jis-x0208@1978	. #x367D)	; &M-07709; [22-93]
     (=ks-x1001		. #x605A)	; &I-K0-605A; [64-58]
-    (=big5		. #xAE68)	; &I-B-AE68;
     (=daikanwa		. 07709)	; &I-M-07709;
-    (=ucs@big5		. #x5C51)	; &M-07709;
     ))
 (define-char
   '((<-denotational
@@ -984,12 +1026,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (->subsumptive
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x367D)	; &M-07709; [22-93]
-	(=ks-x1001	    . #x605A)	; &I-K0-605A; [64-58]
-	(=daikanwa	    . 07709)	; &I-M-07709;
-	))
-      (=gb2312		  . #x503C)	; &GT-09717; [48-28]
+     ((=gb2312		  . #x503C)	; &GT-09717; [48-28]
       (=jis-x0208@1983	  . #x367D)	; &I-J83-367D; [22-93]
       (=jis-x0208@1990	  . #x367D)	; &I-J90-367D; [22-93]
       (=gt		  . 09717)	; &I-GT-09717;
@@ -997,6 +1034,11 @@
       (=gt-pj-1		  . #x367D)	; &I-GT-09717; [22-93]
       (=jef-china3	  . #x4AE4)	; &I-JC3-4AE4;
       (=ucs@unicode	  . #x5C51)	; &GT-09717;
+      (<-simplified@JP
+       ((=jis-x0208@1978    . #x367D)	; &M-07709; [22-93]
+	(=ks-x1001	    . #x605A)	; &I-K0-605A; [64-58]
+	(=daikanwa	    . 07709)	; &I-M-07709;
+	))
       )
      ((=cns11643-1	  . #x552C)	; &C1-552C; [53-12]
       ))
@@ -1495,11 +1537,6 @@
   '((ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5624)	; &GT-09844; [54-04]
-      (=ks-x1001	  . #x6155)	; &I-K0-6155; [65-53]
-      (=daikanwa	  . 07821)	; &I-M-07821;
-      ))
     (=ucs		. #x5C5E)	; 属
     (=jis-x0208		. #x4230)	; &I-J90-4230; [34-16]
     (=gb2312		. #x4A74)	; &I-G0-4A74; [42-84]
@@ -1508,6 +1545,18 @@
     (=gt-k		. 09090)	; &I-GT-K09090;
     (=gt-pj-1		. #x4230)	; &I-GT-09770; [34-16]
     (=daikanwa		. 07754)	; &I-M-07754;
+    (<-simplified@CN
+     ((=cns11643-1	  . #x7A68)	; &C1-7A68; [90-72]
+      (=gb12345		  . #x4A74)	; &C1-7A68; [42-84]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5624)	; &GT-09844; [54-04]
+      (=ks-x1001	  . #x6155)	; &I-K0-6155; [65-53]
+      (=daikanwa	  . 07821)	; &I-M-07821;
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x5C6C)	; 屬
+      ))
     ))
 (define-char
   '((ideographic-radical . 44)	; ⼫
@@ -1607,11 +1656,6 @@
     (ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x454B)	; &M-07761; [37-43]
-      (=ks-x1001	  . #x5375)	; &I-K0-5375; [51-85]
-      (=daikanwa	  . 07761)	; &I-M-07761;
-      ))
     (=gb2312		. #x4D40)	; &GT-09744; [45-32]
     (=jis-x0208@1983	. #x454B)	; &I-J83-454B; [37-43]
     (=jis-x0208@1990	. #x454B)	; &I-J90-454B; [37-43]
@@ -1622,6 +1666,11 @@
     (=jef-china3	. #x4AE6)	; &I-JC3-4AE6;
     (=ucs@unicode	. #x5C60)	; &GT-09744;
     (mojikyo		. 054252)	; &MCS-6000D3EC;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x454B)	; &M-07761; [37-43]
+      (=ks-x1001	  . #x5375)	; &I-K0-5375; [51-85]
+      (=daikanwa	  . 07761)	; &I-M-07761;
+      ))
     ))
 (define-char
   '((ideographic-radical . 44)	; ⼫
@@ -1707,34 +1756,47 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5C61)	; 屡
+    (<-simplified@ucs
+     ((=ucs		  . #x5C62)	; å±¢
+      ))
     (->subsumptive
-     ((<-simplified@JP
+     ((shinjigen-1	  . 1949)
+      (shinjigen-2	  . 1949)
+      (=gb2312		  . #x4245)	; &GT-09780; [34-37]
+      (=jis-x0208@1983	  . #x3C48)	; &I-J83-3C48; [28-40]
+      (=jis-x0208@1990	  . #x3C48)	; &I-J90-3C48; [28-40]
+      (=gt		  . 09780)	; &I-GT-09780;
+      (=gt-pj-1		  . #x3C48)	; &I-GT-09780; [28-40]
+      (=daikanwa	  . 07770)	; &I-M-07770;
+      (=jef-china3	  . #x4AE5)	; &I-JC3-4AE5;
+      (=ucs@unicode	  . #x5C61)	; &GT-09780;
+      (<-simplified@CN
        ((=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-2000  . #x4F60)	; &I-JX1-4F60; [47-64]
+	(=gb12345	    . #x4245)	; &M-07787; [34-37]
 	(=daikanwa	    . 07787)	; &I-M-07787;
 	))
-      (<-vulgar
+      (<-simplified@JP
        ((=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-2000  . #x4F60)	; &I-JX1-4F60; [47-64]
 	(=daikanwa	    . 07787)	; &I-M-07787;
 	))
+      (<-vulgar
+       ((shinjigen-1	    . 1948)
+	(=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-2000  . #x4F60)	; &I-JX1-4F60; [47-64]
+	(=daikanwa	    . 07787)	; &I-M-07787;
+	))
       (<-vulgar*sources
-       songyuan-yilai-suzipu daikanwa)
-      (shinjigen-2	  . 1949)
-      (=gb2312		  . #x4245)	; &GT-09780; [34-37]
-      (=jis-x0208@1983	  . #x3C48)	; &I-J83-3C48; [28-40]
-      (=jis-x0208@1990	  . #x3C48)	; &I-J90-3C48; [28-40]
-      (=gt		  . 09780)	; &I-GT-09780;
-      (=gt-pj-1		  . #x3C48)	; &I-GT-09780; [28-40]
-      (=daikanwa	  . 07770)	; &I-M-07770;
-      (=jef-china3	  . #x4AE5)	; &I-JC3-4AE5;
-      (=ucs@unicode	  . #x5C61)	; &GT-09780;
+       songyuan-yilai-suzipu daikanwa shinjigen-1)
       )
-     ((cns-total-strokes  . 11)
+     ((total-strokes@cns       . 11)
       (=cns11643-3	  . #x3544)	; &C3-3544; [21-36]
       ))
     ))
@@ -1746,11 +1808,11 @@
   '((ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (=ucs		. #x21CAA)	; 𡲪
+    (=cns11643-4	. #x372E)	; &I-C4-372E; [23-14]
     (<-same
      ((=daikanwa	  . 07001)	; &M-07001;
       ))
-    (=ucs		. #x21CAA)	; 𡲪
-    (=cns11643-4	. #x372E)	; &I-C4-372E; [23-14]
     ))
 (define-char
   '((ideographic-radical . 44)	; ⼫
@@ -1916,7 +1978,8 @@
     (total-strokes	 . 14)
     (=ucs		. #x5C62)	; å±¢
     (->subsumptive
-     ((=jis-x0208@1978	  . #x3C48)	; &M-07787; [28-40]
+     ((shinjigen-1	  . 1948)
+      (=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-2000  . #x4F60)	; &I-JX1-4F60; [47-64]
@@ -2086,14 +2149,14 @@
     (ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA3B)	; 層
-      (=jis-x0213-1-2000  . #x4F61)	; &I-JX1-4F61; [47-65]
-      ))
     (=jis-x0208		. #x4158)	; &GT-09808; [33-56]
     (=gt		. 09808)	; &I-GT-09808;
     (=gt-pj-1		. #x4158)	; &I-GT-09808; [33-56]
     (=ucs@jis		. #x5C64)	; &GT-09808;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA3B)	; 層
+      (=jis-x0213-1-2000  . #x4F61)	; &I-JX1-4F61; [47-65]
+      ))
     ))
 (define-char
   '((ideographic-radical . 44)	; ⼫
diff --git a/lisp/utf-2000/Ideograph-R045-Sprout.el b/lisp/utf-2000/Ideograph-R045-Sprout.el
index 2f8c6c7..0335508 100644
--- a/lisp/utf-2000/Ideograph-R045-Sprout.el
+++ b/lisp/utf-2000/Ideograph-R045-Sprout.el
@@ -302,17 +302,17 @@
     ))
 (define-char
   '((total-strokes	 . 10)
+    (hanyu-dazidian	2 1022 17)
+    (=ucs		. #x21D18)	; 𡴘
+    (=cns11643-6	. #x3528)	; &I-C6-3528; [21-08]
+    (=hanziku-3		. #xD0D4)	; &I-HZK03-D0D4;
     (<-original
      ((=jis-x0208	  . #x392C)	; &GT-11561; [25-12]
       (=ks-x1001	  . #x7A39)	; &I-K0-7A39; [90-25]
       (=daikanwa	  . 09176)	; &I-M-09176;
       ))
     (<-original*sources
-     zhengzi-tong zhonghua-dazidian daikanwa)
-    (hanyu-dazidian	2 1022 17)
-    (=ucs		. #x21D18)	; 𡴘
-    (=cns11643-6	. #x3528)	; &I-C6-3528; [21-08]
-    (=hanziku-3		. #xD0D4)	; &I-HZK03-D0D4;
+     zhengzitong zhonghua-dazidian daikanwa)
     (->subsumptive
      ((ideographic-radical . 4)	; ⼃
       (ideographic-strokes . 9)
diff --git a/lisp/utf-2000/Ideograph-R046-Mountain.el b/lisp/utf-2000/Ideograph-R046-Mountain.el
index 5990fa6..8d80896 100644
--- a/lisp/utf-2000/Ideograph-R046-Mountain.el
+++ b/lisp/utf-2000/Ideograph-R046-Mountain.el
@@ -448,6 +448,22 @@
     (mojikyo		. 059514)	; &MCS-6000E87A;
     ))
 (define-char
+  '((ideographic-radical@ucs . 38)	; â¼¥
+    (ideographic-radical@jis . 46)	; â¼­
+    (ideographic-radical@jis*sources
+     jis-x0213@2000)
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
+    (=ucs		. #x216B4)	; 𡚴
+    (->subsumptive
+     ((sound@ja/kun/place "aken")
+      (=jis-x0213-1-2000  . #x4F63)	; &JX1-4F63; [47-67]
+      (=ucs@jis		  . #x216B4)	; &JX1-4F63;
+      )
+     ((=ucs@iso		  . #x216B4)	; &U-000216B4;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
@@ -1527,11 +1543,7 @@
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5656)	; &GT-10778; [54-54]
-      (=ks-x1001	  . #x6440)	; &I-K0-6440; [68-32]
-      (=daikanwa	  . 08566)	; &I-M-08566;
-      ))
+    (shinjigen-1	. 1962)
     (shinjigen-2	. 1962)
     (=ucs		. #x5CB3)	; å²³
     (=jis-x0208		. #x3359)	; &I-J90-3359; [19-57]
@@ -1543,6 +1555,11 @@
     (=gt-k		. 03658)	; &I-GT-K03658;
     (=gt-pj-1		. #x3359)	; &I-GT-10017; [19-57]
     (=daikanwa		. 08001)	; &I-M-08001;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5656)	; &GT-10778; [54-54]
+      (=ks-x1001	  . #x6440)	; &I-K0-6440; [68-32]
+      (=daikanwa	  . 08566)	; &I-M-08566;
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
@@ -2272,39 +2289,58 @@
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x5C71)	; å±±
+    (=ucs		. #x5CE0)	; å³ 
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x5C71)	; å±±
+	)
+       ((=ucs		    . #x209D7)	; 𠧗
+	))
+      (shinjigen-1	  . 1980)
+      (shinjigen-2	  . 1980)
+      (=jis-x0208	  . #x463D)	; &GT-10140; [38-29]
+      (=ks-x1001	  . #x5F47)	; &I-K0-5F47; [63-39]
+      (=gt		  . 10140)	; &I-GT-10140;
+      (=gt-pj-1		  . #x463D)	; &I-GT-10140; [38-29]
+      (=daikanwa	  . 08068)	; &I-M-08068;
+      (=cbeta		  . 05888)	; &I-CB05888;
+      (=ucs@jis		  . #x5CE0)	; &GT-10140;
       )
-     ((=ucs		  . #x209D7)	; 𠧗
+     ((=ucs@unicode	  . #x5CE0)	; &UU+5CE0;
       ))
-    (shinjigen-2	. 1980)
-    (=ucs		. #x5CE0)	; å³ 
-    (=jis-x0208		. #x463D)	; &I-J90-463D; [38-29]
-    (=ks-x1001		. #x5F47)	; &I-K0-5F47; [63-39]
-    (=gt		. 10140)	; &I-GT-10140;
-    (=gt-pj-1		. #x463D)	; &I-GT-10140; [38-29]
-    (=daikanwa		. 08068)	; &I-M-08068;
-    (=cbeta		. 05888)	; &I-CB05888;
     ))
 (define-char
-  '((morohashi-daikanwa	8068 1)
-    (ideographic-radical . 46)	; â¼­
+  '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
+    (=ucs		. #x5CE1)	; 峡
+    (<-simplified@ucs
      ((=ucs		  . #x5CFD)	; å³½
-      (=jis-x0208	  . #x5637)	; &I-J90-5637; [54-23]
       ))
-    (=ucs		. #x5CE1)	; 峡
-    (=jis-x0208		. #x362E)	; &I-J90-362E; [22-14]
-    (=gb2312		. #x4F3F)	; &I-G0-4F3F; [47-31]
-    (=cns11643-3	. #x2C3E)	; &I-C3-2C3E; [12-30]
-    (=gt		. 10105)	; &I-GT-10105;
-    (=gt-pj-1		. #x362E)	; &I-GT-10105; [22-14]
-    (mojikyo		. 050157)	; &MCS-6000C3ED;
+    (->subsumptive
+     ((morohashi-daikanwa	8068 1)
+      (=jis-x0208	  . #x362E)	; &GT-10105; [22-14]
+      (=cns11643-3	  . #x2C3E)	; &I-C3-2C3E; [12-30]
+      (=gt		  . 10105)	; &I-GT-10105;
+      (=gt-pj-1		  . #x362E)	; &I-GT-10105; [22-14]
+      (=ucs@jis		  . #x5CE1)	; &GT-10105;
+      (mojikyo		  . 050157)	; &MCS-6000C3ED;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5637)	; &GT-10173; [54-23]
+	(=ks-x1001	    . #x7A72)	; &I-K0-7A72; [90-82]
+	(=cns11643-1	    . #x5530)	; &I-C1-5530; [53-16]
+	(=daikanwa	    . 08122)	; &I-M-08122;
+	))
+      )
+     ((=gb2312		  . #x4F3F)	; &G0-4F3F; [47-31]
+      (=ucs@unicode	  . #x5CE1)	; &G0-4F3F;
+      (<-simplified@CN
+       ((=gb12345	    . #x4F3F)	; &UU+5CFD; [47-31]
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
@@ -2990,16 +3026,22 @@
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (shinjigen-2	. 1976)
     (=ucs		. #x5CFD)	; å³½
-    (=jis-x0208		. #x5637)	; &I-J90-5637; [54-23]
-    (=ks-x1001		. #x7A72)	; &I-K0-7A72; [90-82]
-    (=cns11643-1	. #x5530)	; &I-C1-5530; [53-16]
-    (=gb12345		. #x4F3F)	; å³½ [47-31]
-    (=big5		. #xAE6C)	; &I-B-AE6C;
-    (=gt		. 10173)	; &I-GT-10173;
-    (=gt-pj-1		. #x5637)	; &I-GT-10173; [54-23]
-    (=daikanwa		. 08122)	; &I-M-08122;
+    (->subsumptive
+     ((shinjigen-1	  . 1976)
+      (shinjigen-2	  . 1976)
+      (=jis-x0208	  . #x5637)	; &GT-10173; [54-23]
+      (=ks-x1001	  . #x7A72)	; &I-K0-7A72; [90-82]
+      (=cns11643-1	  . #x5530)	; &I-C1-5530; [53-16]
+      (=big5		  . #xAE6C)	; &I-B-AE6C;
+      (=gt		  . 10173)	; &I-GT-10173;
+      (=gt-pj-1		  . #x5637)	; &I-GT-10173; [54-23]
+      (=daikanwa	  . 08122)	; &I-M-08122;
+      (=ucs@jis		  . #x5CFD)	; &GT-10173;
+      )
+     ((=gb12345		  . #x4F3F)	; &UU+5CFD; [47-31]
+      (=ucs@unicode	  . #x5CFD)	; &UU+5CFD;
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
@@ -3631,93 +3673,128 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x21E1C)	; 𡸜
-    (->subsumptive
-     ((=daikanwa	  . 08174)	; &M-08174;
-      )
-     ((=ucs@iso		  . #x21E1C)	; &U-00021E1C;
-      )
-     ((=cns11643-4	  . #x3138)	; &C4-3138; [17-24]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21E1C)	; 𡸜
       ))
+    (ideographic-radical . 46)	; â¼­
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=daikanwa		. 08174)	; &M-08174;
     ))
 (define-char
-  '((=>ucs		. #x5D12)	; 崒
+  '((<-denotational
+     ((=ucs		  . #x21E1C)	; 𡸜
+      ))
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=jis-x0212		. #x3B45)	; &M-08175; [27-37]
-    (=big5		. #xD541)	; &I-B-D541;
-    (=daikanwa		. 08175)	; &I-M-08175;
-    (=jef-china3	. #x4AF7)	; &I-JC3-4AF7;
-    (=ucs@jis		. #x5D12)	; &M-08175;
-    (=ucs@big5		. #x5D12)	; &M-08175;
+    (=ucs@iso		. #x21E1C)	; &U-00021E1C;
     ))
 (define-char
-  '((morohashi-daikanwa	8175 0 0)
+  '((<-denotational
+     ((=ucs		  . #x21E1C)	; 𡸜
+      ))
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x5D12)	; 崒
-    (=cns11643-2	. #x3525)	; &I-C2-3525; [21-05]
+    (=cns11643-4	. #x3138)	; &C4-3138; [17-24]
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x5D2A)	; å´ª
-    (=cns11643-3	. #x354E)	; &I-C3-354E; [21-46]
-    (=daikanwa		. 08176)	; &I-M-08176;
+    (=ucs		. #x5D12)	; 崒
+    (=big5		. #xD541)	; &I-B-D541;
+    (->subsumptive
+     ((=jis-x0212	  . #x3B45)	; &M-08175; [27-37]
+      (=daikanwa	  . 08175)	; &I-M-08175;
+      (=jef-china3	  . #x4AF7)	; &I-JC3-4AF7;
+      (=ucs@jis		  . #x5D12)	; &M-08175;
+      )
+     ((=cns11643-2	  . #x3525)	; &C2-3525; [21-05]
+      (=ucs@unicode	  . #x5D12)	; &C2-3525;
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x5D13)	; 崓
-    (=cns11643-3	. #x3552)	; &I-C3-3552; [21-50]
-    (=daikanwa		. 08177)	; &I-M-08177;
-    (=jef-china3	. #x91CE)	; &I-JC3-91CE;
-    (mojikyo		. 008177)	; &MCS-60001FF1;
+    (=ucs		. #x5D2A)	; å´ª
+    (->subsumptive
+     ((=daikanwa	  . 08176)	; &M-08176;
+      )
+     ((=cns11643-3	  . #x354E)	; &C3-354E; [21-46]
+      )
+     ((=ucs@unicode	  . #x5D2A)	; &UU+5D2A;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5D14)	; 崔
-    (ideographic-radical . 46)	; â¼­
+  '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (shinjigen-2	. 2003)
-    (=jis-x0208		. #x5643)	; &GT-10305; [54-35]
-    (=ks-x1001		. #x754B)	; &I-K0-754B; [85-43]
-    (=gt		. 10305)	; &I-GT-10305;
-    (=gt-k		. 07927)	; &I-GT-K07927;
-    (=gt-pj-1		. #x5643)	; &I-GT-10305; [54-35]
-    (=daikanwa		. 08178)	; &I-M-08178;
-    (=ucs@jis		. #x5D14)	; &GT-10305;
+    (=ucs		. #x5D13)	; 崓
+    (->subsumptive
+     ((=cns11643-3	  . #x3552)	; &M-08177; [21-50]
+      (=daikanwa	  . 08177)	; &I-M-08177;
+      (=jef-china3	  . #x91CE)	; &I-JC3-91CE;
+      (mojikyo		  . 008177)	; &MCS-60001FF1;
+      )
+     ((=ucs@unicode	  . #x5D13)	; &UU+5D13;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	8178 0 1)
-    (ideographic-radical . 46)	; â¼­
+  '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5D14)	; 崔
-    (=gb2312		. #x345E)	; &I-G0-345E; [20-62]
-    (=cns11643-1	. #x597E)	; &I-C1-597E; [57-94]
     (=big5		. #xB15A)	; &I-B-B15A;
+    (->subsumptive
+     ((shinjigen-1	  . 2003)
+      (shinjigen-2	  . 2003)
+      (=jis-x0208	  . #x5643)	; &GT-10305; [54-35]
+      (=ks-x1001	  . #x754B)	; &I-K0-754B; [85-43]
+      (=gt		  . 10305)	; &I-GT-10305;
+      (=gt-k		  . 07927)	; &I-GT-K07927;
+      (=gt-pj-1		  . #x5643)	; &I-GT-10305; [54-35]
+      (=daikanwa	  . 08178)	; &I-M-08178;
+      (=ucs@jis		  . #x5D14)	; &GT-10305;
+      )
+     ((=gb2312		  . #x345E)	; &C1-597E; [20-62]
+      (=cns11643-1	  . #x597E)	; &I-C1-597E; [57-94]
+      (=ucs@unicode	  . #x5D14)	; &C1-597E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (shinjigen-2	. 1994)
     (=ucs		. #x5D15)	; 崕
-    (=jis-x0208		. #x563D)	; &I-J90-563D; [54-29]
-    (=cns11643-3	. #x354F)	; &I-C3-354F; [21-47]
-    (=gt		. 10265)	; &I-GT-10265;
-    (=gt-pj-1		. #x563D)	; &I-GT-10265; [54-29]
-    (=daikanwa		. 08179)	; &I-M-08179;
-    (=cbeta		. 00114)	; &I-CB00114;
+    (->subsumptive
+     ((shinjigen-1	  . 1994)
+      (shinjigen-2	  . 1994)
+      (=jis-x0208	  . #x563D)	; &GT-10265; [54-29]
+      (=cns11643-3	  . #x354F)	; &I-C3-354F; [21-47]
+      (=gt		  . 10265)	; &I-GT-10265;
+      (=gt-pj-1		  . #x563D)	; &I-GT-10265; [54-29]
+      (=daikanwa	  . 08179)	; &I-M-08179;
+      (=cbeta		  . 00114)	; &I-CB00114;
+      (=ucs@jis		  . #x5D15)	; &GT-10265;
+      (<-formed
+       ((=jis-x0208	    . #x3333)	; &I-J90-3333; [19-19]
+	))
+      (<-formed*sources
+       shinjigen-1)
+      )
+     ((=ucs@unicode	  . #x5D15)	; &UU+5D15;
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (shinjigen-1	. 1993)
     (shinjigen-2	. 1993)
     (=ucs		. #x5D16)	; 崖
     (=jis-x0208		. #x3333)	; &I-J90-3333; [19-19]
@@ -4169,7 +4246,15 @@
     (=daikanwa		. 08211)	; &I-M-08211;
     ))
 (define-char
-  '((=>ucs		. #x5D29)	; å´©
+  '((ideographic-radical . 46)	; â¼­
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=ucs		. #x5D29)	; å´©
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5D29)	; å´©
+      ))
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
@@ -4177,12 +4262,14 @@
     (=jef-china3	. #x4AFC)	; &I-JC3-4AFC;
     ))
 (define-char
-  '((morohashi-daikanwa	8212 1)
+  '((<-denotational
+     ((=ucs		  . #x5D29)	; å´©
+      ))
+    (morohashi-daikanwa	8212 1)
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x5D29)	; å´©
-    (=jis-x0208		. #x4A78)	; &I-J90-4A78; [42-88]
+    (=jis-x0208		. #x4A78)	; &GT-10360; [42-88]
     (=gb2312		. #x3140)	; &I-G0-3140; [17-32]
     (=ks-x1001		. #x5D5A)	; &I-K0-5D5A; [61-58]
     (=cns11643-1	. #x597D)	; &I-C1-597D; [57-93]
@@ -4190,6 +4277,7 @@
     (=gt		. 10360)	; &I-GT-10360;
     (=gt-k		. 07873)	; &I-GT-K07873;
     (=gt-pj-1		. #x4A78)	; &I-GT-10360; [42-88]
+    (=ucs@unicode	. #x5D29)	; &GT-10360;
     (mojikyo		. 050158)	; &MCS-6000C3EE;
     ))
 (define-char
@@ -5210,6 +5298,12 @@
     (=gt-k		. 09183)	; &I-GT-K09183;
     (=gt-pj-1		. #x5649)	; &I-GT-10390; [54-41]
     (=daikanwa		. 08294)	; &I-M-08294;
+    (->mistakable
+     ((=ucs		  . #x55A6)	; 喦
+      (=daikanwa	  . 03975)	; &I-M-03975;
+      ))
+    (->mistakable*sources
+     daikanwa)
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
@@ -5413,46 +5507,43 @@
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (=ucs		. #xFA11)	; 﨑
+    (=jis-x0213-1-2000	. #x4F72)	; &I-JX1-4F72; [47-82]
+    (=gt		. 10395)	; &I-GT-10395;
+    (=gt-pj-9		. #x3374)	; &I-GT-10395; [19-84]
+    (mojikyo		. 054902)	; &MCS-6000D676;
     (<-vulgar
      ((=ucs		  . #x5D0E)	; 崎
       (=daikanwa	  . 08169)	; &I-M-08169;
       ))
     (<-vulgar*sources
      ruijumyougishou daikanwa)
-    (=ucs		. #xFA11)	; 﨑
-    (=jis-x0213-1-2000	. #x4F72)	; &I-JX1-4F72; [47-82]
-    (=gt		. 10395)	; &I-GT-10395;
-    (=gt-pj-9		. #x3374)	; &I-GT-10395; [19-84]
-    (mojikyo		. 054902)	; &MCS-6000D676;
-    ))
-(define-char
-  '((=>ucs		. #x5D5C)	; 嵜
-    (morohashi-daikanwa	ho 150)
-    (ideographic-radical . 46)	; â¼­
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=jis-x0208		. #x563F)	; &GT-10394; [54-31]
-    (=gt		. 10394)	; &I-GT-10394;
-    (=gt-pj-1		. #x563F)	; &I-GT-10394; [54-31]
-    (=ucs@jis		. #x5D5C)	; &GT-10394;
-    (mojikyo		. 054552)	; &MCS-6000D518;
     ))
 (define-char
-  '((morohashi-daikanwa	ho 150 0)
-    (ideographic-radical . 46)	; â¼­
+  '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5D5C)	; 嵜
+    (->subsumptive
+     ((morohashi-daikanwa	ho 150)
+      (=jis-x0208	  . #x563F)	; &GT-10394; [54-31]
+      (=gt		  . 10394)	; &I-GT-10394;
+      (=gt-pj-1		  . #x563F)	; &I-GT-10394; [54-31]
+      (=ucs@jis		  . #x5D5C)	; &GT-10394;
+      (mojikyo		  . 054552)	; &MCS-6000D518;
+      )
+     ((=ucs@unicode	  . #x5D5C)	; &UU+5D5C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5D59)	; 嵙
+    (=big5		. #xD8E8)	; &I-B-D8E8;
     (->subsumptive
      ((morohashi-daikanwa	ho 151)
       (=jis-x0212	  . #x3B56)	; &JSP-3B56; [27-54]
-      (=big5		  . #xD8E8)	; &I-B-D8E8;
       (=ucs@unicode	  . #x5D59)	; &JSP-3B56;
       (mojikyo		  . 050010)	; &MCS-6000C35A;
       )
@@ -5477,7 +5568,6 @@
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 9)
-    (kangxi-strokes	 . 12)
     (total-strokes	 . 12)
     (=ucs		. #x5D5A)	; 嵚
     (=iso-ir165		. #x7A7C)	; &I-EGB-7A7C; [90-92]
@@ -5487,8 +5577,12 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5D5B)	; 嵛
-    (=gb2312		. #x614E)	; &I-G0-614E; [65-46]
-    (=cns11643-3	. #x3B2D)	; &I-C3-3B2D; [27-13]
+    (->subsumptive
+     ((=gb2312		  . #x614E)	; &G0-614E; [65-46]
+      (=ucs@unicode	  . #x5D5B)	; &G0-614E;
+      )
+     ((=cns11643-3	  . #x3B2D)	; &C3-3B2D; [27-13]
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
@@ -8109,28 +8203,43 @@
     (=daikanwa		. 08503)	; &I-M-08503;
     ))
 (define-char
-  '((=>ucs		. #x21F3D)	; 𡼽
+  '((ideographic-radical . 46)	; â¼­
+    (=ucs		. #x21F3D)	; 𡼽
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21F3D)	; 𡼽
+      ))
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (=daikanwa		. 08504)	; &M-08504;
     ))
 (define-char
-  '((morohashi-daikanwa	8504 0 2)
+  '((<-denotational
+     ((=ucs		  . #x21F3D)	; 𡼽
+      ))
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x21F3D)	; 𡼽
-    (=cns11643-4	. #x4951)	; &I-C4-4951; [41-49]
+    (->subsumptive
+     ((=ucs@iso		  . #x21F3D)	; &U-00021F3D;
+      )
+     ((=cns11643-4	  . #x4951)	; &C4-4951; [41-49]
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (=ucs		. #x5DA9)	; 嶩
-    (=cns11643-2	. #x566A)	; &I-C2-566A; [54-74]
-    (=big5		. #xE960)	; &I-B-E960;
-    (=daikanwa		. 08505)	; &I-M-08505;
+    (->subsumptive
+     ((=cns11643-2	  . #x566A)	; &M-08505; [54-74]
+      (=big5		  . #xE960)	; &I-B-E960;
+      (=daikanwa	  . 08505)	; &I-M-08505;
+      )
+     ((=ucs@unicode	  . #x5DA9)	; &UU+5DA9;
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
@@ -8144,7 +8253,9 @@
 	)
        ((=ucs		    . #x5C71)	; å±±
 	)
-       ((=ucs@unicode	    . #x696D)	; &GT-19258;
+       ((=jis-x0208	    . #x3648)	; &GT-19258; [22-40]
+	(=ks-x1001	    . #x6576)	; &I-K0-6576; [69-86]
+	(=daikanwa	    . 15170)	; &I-M-15170;
 	))
       (=ks-x1001	  . #x6575)	; &M-08506; [69-85]
       (=big5		  . #xE965)	; &I-B-E965;
@@ -8168,35 +8279,36 @@
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x5C71)	; å±±
-      )
-     ((=ucs		  . #x696D)	; 業
-      ))
     (=ucs		. #x5DAB)	; 嶫
-    (=jis-x0212		. #x3B71)	; &I-JSP-3B71; [27-81]
-    (=daikanwa		. 08507)	; &I-M-08507;
-    (=jef-china3	. #x4BDD)	; &I-JC3-4BDD;
-    ))
-(define-char
-  '((=>ucs		. #x5DAB)	; 嶫
-    (morohashi-daikanwa	8507 0 0)
-    (ideographic-radical . 46)	; â¼­
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x5C71)	; å±±
+	)
+       ((=jis-x0208	    . #x3648)	; &GT-19258; [22-40]
+	(=ks-x1001	    . #x6576)	; &I-K0-6576; [69-86]
+	(=daikanwa	    . 15170)	; &I-M-15170;
+	))
+      (=jis-x0212	  . #x3B71)	; &M-08507; [27-81]
+      (=daikanwa	  . 08507)	; &I-M-08507;
+      (=jef-china3	  . #x4BDD)	; &I-JC3-4BDD;
+      (=ucs@jis		  . #x5DAB)	; &M-08507;
       )
-     ((=ucs		  . #x5C71)	; å±±
+     ((=ucs@unicode	  . #x5DAB)	; &UU+5DAB;
       )
-     ((=cns11643-1	  . #x6446)	; &C1-6446; [68-38]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x5C71)	; å±±
+	)
+       ((=cns11643-1	    . #x6446)	; &C1-6446; [68-38]
+	))
+      (=cns11643-3	  . #x505B)	; &CB03544; [48-59]
+      (=cbeta		  . 03544)	; &I-CB03544;
       ))
-    (=cns11643-3	. #x505B)	; &CB03544; [48-59]
-    (=cbeta		. 03544)	; &I-CB03544;
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
@@ -8986,64 +9098,94 @@
     (=ucs		. #x381B)	; 㠛
     ))
 (define-char
-  '((=>ucs		. #x5DBD)	; 嶽
-    (ideographic-radical . 46)	; â¼­
+  '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (shinjigen-2	. 1963)
-    (=jis-x0208		. #x5656)	; &GT-10778; [54-54]
-    (=ks-x1001		. #x6440)	; &I-K0-6440; [68-32]
+    (=ucs		. #x5DBD)	; 嶽
     (=big5		. #xC0AE)	; &I-B-C0AE;
-    (=gt		. 10778)	; &I-GT-10778;
-    (=gt-pj-1		. #x5656)	; &I-GT-10778; [54-54]
-    (=daikanwa		. 08566)	; &I-M-08566;
-    (=ucs@jis		. #x5DBD)	; &GT-10778;
+    (->subsumptive
+     ((shinjigen-1	  . 1963)
+      (shinjigen-2	  . 1963)
+      (=jis-x0208	  . #x5656)	; &GT-10778; [54-54]
+      (=ks-x1001	  . #x6440)	; &I-K0-6440; [68-32]
+      (=gt		  . 10778)	; &I-GT-10778;
+      (=gt-pj-1		  . #x5656)	; &I-GT-10778; [54-54]
+      (=daikanwa	  . 08566)	; &I-M-08566;
+      (=ucs@jis		  . #x5DBD)	; &GT-10778;
+      )
+     ((=cns11643-1	  . #x7357)	; &C1-7357; [83-55]
+      (=ucs@unicode	  . #x5DBD)	; &C1-7357;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 46)	; â¼­
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x21F7A)	; 𡽺
+    (->subsumptive
+     ((=daikanwa	  . 08567)	; &M-08567;
+      )
+     ((=cns11643-7	  . #x3767)	; &C7-3767; [23-71]
+      (=ucs@iso		  . #x21F7A)	; &C7-3767;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	8566 0 0)
+  '((ideographic-radical . 46)	; â¼­
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x5DBE)	; 嶾
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5DBE)	; 嶾
+      ))
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x5DBD)	; 嶽
-    (=cns11643-1	. #x7357)	; &I-C1-7357; [83-55]
+    (=daikanwa		. 08568)	; &M-08568;
     ))
 (define-char
-  '((=>ucs		. #x21F7A)	; 𡽺
+  '((<-denotational
+     ((=ucs		  . #x5DBE)	; 嶾
+      ))
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=daikanwa		. 08567)	; &M-08567;
+    (=ucs@unicode	. #x5DBE)	; &UU+5DBE;
     ))
 (define-char
-  '((morohashi-daikanwa	8567 0 0)
+  '((<-denotational
+     ((=ucs		  . #x5DBE)	; 嶾
+      ))
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x21F7A)	; 𡽺
-    (=cns11643-7	. #x3767)	; &I-C7-3767; [23-71]
+    (=cns11643-3	. #x5455)	; &C3-5455; [52-53]
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x5DBE)	; 嶾
-    (=cns11643-3	. #x5455)	; &I-C3-5455; [52-53]
-    (=daikanwa		. 08568)	; &I-M-08568;
+    (=ucs		. #x21F78)	; 𡽸
     ))
 (define-char
-  '((=>ucs		. #x21F78)	; 𡽸
+  '((<-denotational
+     ((=ucs		  . #x21F78)	; 𡽸
+      ))
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=daikanwa		. 08569)	; &M-08569;
     ))
 (define-char
-  '((morohashi-daikanwa	8569 0 2)
+  '((<-denotational
+     ((=ucs		  . #x21F78)	; 𡽸
+      ))
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x21F78)	; 𡽸
-    (=cns11643-7	. #x3763)	; &I-C7-3763; [23-67]
+    (=cns11643-7	. #x3763)	; &C7-3763; [23-67]
+    (=ucs@iso		. #x21F78)	; &C7-3763;
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
@@ -9173,7 +9315,7 @@
       )
      ((=ucs		  . #x5C71)	; å±±
       )
-     ((=ucs		  . #x96A0)	; 隠
+     ((=jis-x0208	  . #x3123)	; &GT-56168; [17-03]
       ))
     (sources		bos=A015330-00006)
     (=ruimoku-v6	. #xE008)	; &RUI6-E008;
@@ -9956,8 +10098,12 @@
     (ideographic-strokes . 18)
     (total-strokes	 . 21)
     (=ucs		. #x3825)	; ã ¥
-    (=cns11643-4	. #x663A)	; &I-C4-663A; [70-26]
-    (=daikanwa		. 08625)	; &I-M-08625;
+    (->subsumptive
+     ((=cns11643-4	  . #x663A)	; &M-08625; [70-26]
+      (=daikanwa	  . 08625)	; &I-M-08625;
+      )
+     ((=ucs@unicode	  . #x3825)	; &UU+3825;
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
diff --git a/lisp/utf-2000/Ideograph-R047-River.el b/lisp/utf-2000/Ideograph-R047-River.el
index 77c53f0..b7bef82 100644
--- a/lisp/utf-2000/Ideograph-R047-River.el
+++ b/lisp/utf-2000/Ideograph-R047-River.el
@@ -19,15 +19,15 @@
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
+    (=gt		. 10943)	; &GT-10943;
+    (=gt-pj-3		. #x3D72)	; &GT-10943; [29-82]
+    (=daikanwa		. 08670)	; &I-M-08670;
     (<-ancient
      ((=ucs		  . #x5764)	; 坤
       (=daikanwa	  . 04969)	; &I-M-04969;
       ))
     (<-ancient*sources
      yupian daikanwa)
-    (=gt		. 10943)	; &GT-10943;
-    (=gt-pj-3		. #x3D72)	; &GT-10943; [29-82]
-    (=daikanwa		. 08670)	; &I-M-08670;
     (->mistakable
      ((=ucs		  . #x5DDB)	; 巛
       (=daikanwa	  . 08669)	; &I-M-08669;
@@ -83,6 +83,10 @@
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
+    (=big5-cdp		. #x8BED)	; &GT-10942;
+    (=gt		. 10942)	; &I-GT-10942;
+    (=gt-pj-3		. #x3D75)	; &I-GT-10942; [29-85]
+    (=daikanwa		. 08674)	; &I-M-08674;
     (<-simplified@JP/old
      ((=jis-x0208	  . #x3731)	; &GT-47374; [23-17]
       (=ks-x1001	  . #x7D3A)	; &I-K0-7D3A; [93-26]
@@ -90,10 +94,6 @@
       ))
     (<-simplified@JP/old*sources
      daikanwa)
-    (=big5-cdp		. #x8BED)	; &GT-10942;
-    (=gt		. 10942)	; &I-GT-10942;
-    (=gt-pj-3		. #x3D75)	; &I-GT-10942; [29-85]
-    (=daikanwa		. 08674)	; &I-M-08674;
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
@@ -130,9 +130,18 @@
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (shinjigen-2	. 2058)
     (=ucs		. #x5DDE)	; 州
-    (=jis-x0208		. #x3D23)	; &I-J90-3D23; [29-03]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5DDE)	; 州
+      ))
+    (ideographic-radical . 47)	; â¼®
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
+    (shinjigen-1	. 2058)
+    (shinjigen-2	. 2058)
+    (=jis-x0208		. #x3D23)	; &GT-10952; [29-03]
     (=gb2312		. #x565D)	; &I-G0-565D; [54-61]
     (=ks-x1001		. #x7136)	; &I-K0-7136; [81-22]
     (=big5		. #xA67B)	; &I-B-A67B;
@@ -140,29 +149,28 @@
     (=gt-k		. 01635)	; &I-GT-K01635;
     (=gt-pj-1		. #x3D23)	; &I-GT-10952; [29-03]
     (=daikanwa		. 08678)	; &I-M-08678;
+    (=ucs@unicode	. #x5DDE)	; &GT-10952;
     ))
 (define-char
-  '((=>ucs		. #x5DDE)	; 州
-    (morohashi-daikanwa	8678 0 2)
+  '((<-denotational
+     ((=ucs		  . #x5DDE)	; 州
+      ))
     (ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=cns11643-1	. #x477C)	; &C1-477C; [39-92]
     ))
 (define-char
-  '((=>ucs		. #x21FEB)	; ð¡¿«
-    (ideographic-radical . 47)	; â¼®
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (=daikanwa		. 08679)	; &M-08679;
-    ))
-(define-char
-  '((morohashi-daikanwa	8679 0 1)
-    (ideographic-radical . 47)	; â¼®
+  '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x21FEB)	; ð¡¿«
-    (=cns11643-6	. #x245B)	; &I-C6-245B; [04-59]
+    (->subsumptive
+     ((=daikanwa	  . 08679)	; &M-08679;
+      )
+     ((=cns11643-6	  . #x245B)	; &C6-245B; [04-59]
+      (=ucs@iso		  . #x21FEB)	; &C6-245B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
@@ -440,10 +448,6 @@
     (ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5DE2)	; å·¢
-      (=jis-x0213-1-2000  . #x7428)	; &I-JX1-7428; [84-08]
-      ))
     (hanyu-dazidian	2 1221 1)
     (=ucs		. #x5DE3)	; å·£
     (=jis-x0208		. #x4163)	; &I-J90-4163; [33-67]
@@ -453,6 +457,10 @@
     (=gt-pj-1		. #x4163)	; &I-GT-12986; [33-67]
     (=hanziku-3		. #xF95D)	; &I-HZK03-F95D;
     (mojikyo		. 050161)	; &MCS-6000C3F1;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x5DE2)	; å·¢
+      (=jis-x0213-1-2000  . #x7428)	; &I-JX1-7428; [84-08]
+      ))
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
diff --git a/lisp/utf-2000/Ideograph-R048-Work.el b/lisp/utf-2000/Ideograph-R048-Work.el
index 063ea79..84dabd6 100644
--- a/lisp/utf-2000/Ideograph-R048-Work.el
+++ b/lisp/utf-2000/Ideograph-R048-Work.el
@@ -248,10 +248,17 @@
     (mojikyo		. 059574)	; &MCS-6000E8B6;
     ))
 (define-char
-  '((=>ucs		. #x5DEE)	; å·®
+  '((ideographic-radical . 48)	; ⼯
+    (=ucs		. #x5DEE)	; å·®
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5DEE)	; å·®
+      ))
     (ideographic-radical . 48)	; ⼯
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (shinjigen-1	. 2067)
     (shinjigen-2	. 2067)
     (=jis-x0208		. #x3A39)	; &GT-11011; [26-25]
     (=ks-x1001		. #x732C)	; &I-K0-732C; [83-12]
@@ -265,12 +272,14 @@
     (=ucs@big5		. #x5DEE)	; &GT-11011;
     ))
 (define-char
-  '((morohashi-daikanwa	8732 0 1)
+  '((<-denotational
+     ((=ucs		  . #x5DEE)	; å·®
+      ))
     (ideographic-radical . 48)	; ⼯
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=ucs		. #x5DEE)	; å·®
-    (=gb2312		. #x326E)	; &I-G0-326E; [18-78]
+    (=gb2312		. #x326E)	; &G0-326E; [18-78]
+    (=ucs@unicode	. #x5DEE)	; &G0-326E;
     (mojikyo		. 053115)	; &MCS-6000CF7B;
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R049-Oneself.el b/lisp/utf-2000/Ideograph-R049-Oneself.el
index 3898004..f9109d2 100644
--- a/lisp/utf-2000/Ideograph-R049-Oneself.el
+++ b/lisp/utf-2000/Ideograph-R049-Oneself.el
@@ -23,10 +23,10 @@
     (ideographic-radical . 49)	; â¼°
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
+    (=big5-cdp		. #x896D)	; &CDP-896D;
     (<-formed@component
      ((=ucs		  . #x5DF1)	; å·±
       ))
-    (=big5-cdp		. #x896D)	; &CDP-896D;
     ))
 (define-char
   '((ideographic-radical . 49)	; â¼°
@@ -70,10 +70,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E92)	; ⺒
     (<-identical@component
      ((=ucs		  . #x5DF3)	; å·³
       ))
-    (=ucs		. #x2E92)	; ⺒
     ))
 (define-char
   '((ideographic-radical . 49)	; â¼°
@@ -128,10 +128,12 @@
     (=daikanwa		. 08748)	; &I-M-08748;
     ))
 (define-char
-  '((ideographic-	(:radical	49 ; â¼°
-			 :strokes	3)
-			(:radical	4 ; ⼃
-			 :strokes	5))
+  '((ideographic-radical@ucs . 4)	; ⼃
+    (ideographic-strokes@ucs . 5)
+    (ideographic-radical@cns . 49)	; â¼°
+    (ideographic-strokes@cns . 3)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 6)
     (hanyu-dazidian	1 69 21)
     (=ucs		. #x200AC)	; 𠂬
@@ -257,22 +259,28 @@
     (=daikanwa		. 08759)	; &I-M-08759;
     ))
 (define-char
-  '((morohashi-daikanwa	8759 1)
-    (ideographic-radical . 49)	; â¼°
+  '((ideographic-radical . 49)	; â¼°
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x524B)	; &GT-03636; [50-43]
-      (=ks-x1001	  . #x4F69)	; &I-K0-4F69; [47-73]
-      (=daikanwa	  . 02860)	; &I-M-02860;
-      ))
     (=ucs		. #x5DFB)	; å·»
-    (=jis-x0208		. #x342C)	; &I-J90-342C; [20-12]
-    (=cns11643-3	. #x2C44)	; &I-C3-2C44; [12-36]
-    (=gt		. 11038)	; &I-GT-11038;
-    (=gt-k		. 05217)	; &I-GT-K05217;
-    (=gt-pj-1		. #x342C)	; &I-GT-11038; [20-12]
-    (mojikyo		. 050162)	; &MCS-6000C3F2;
+    (->subsumptive
+     ((morohashi-daikanwa	8759 1)
+      (=jis-x0208	  . #x342C)	; &GT-11038; [20-12]
+      (=gt		  . 11038)	; &I-GT-11038;
+      (=gt-k		  . 05217)	; &I-GT-K05217;
+      (=gt-pj-1		  . #x342C)	; &I-GT-11038; [20-12]
+      (=ucs@jis		  . #x5DFB)	; &GT-11038;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x524B)	; &GT-03636; [50-43]
+	(=ks-x1001	    . #x4F69)	; &I-K0-4F69; [47-73]
+	(=daikanwa	    . 02860)	; &I-M-02860;
+	))
+      )
+     ((mojikyo		  . 050162)	; &MCS-6000C3F2;
+      )
+     ((=cns11643-3	  . #x2C44)	; &C3-2C44; [12-36]
+      (=ucs@unicode	  . #x5DFB)	; &C3-2C44;
+      ))
     ))
 (define-char
   '((ideographic-radical . 49)	; â¼°
@@ -396,13 +404,6 @@
     (ideographic-radical . 49)	; â¼°
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4327)	; &GT-11052; [35-07]
-      (=gb2312		  . #x5963)	; &I-G0-5963; [57-67]
-      (=ks-x1001	  . #x615E)	; &I-K0-615E; [65-62]
-      (=cns11643-6	  . #x4837)	; &I-C6-4837; [40-23]
-      (=daikanwa	  . 08765)	; &I-M-08765;
-      ))
     (=jis-x0208@1983	. #x4327)	; &GT-11054; [35-07]
     (=jis-x0208@1990	. #x4327)	; &I-J90-4327; [35-07]
     (=gt		. 11054)	; &I-GT-11054;
@@ -410,6 +411,13 @@
     (=gt-pj-1		. #x4327)	; &I-GT-11054; [35-07]
     (=jef-china3	. #x4BF5)	; &I-JC3-4BF5;
     (=ucs@jis		. #x5DFD)	; &GT-11054;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x4327)	; &GT-11052; [35-07]
+      (=gb2312		  . #x5963)	; &I-G0-5963; [57-67]
+      (=ks-x1001	  . #x615E)	; &I-K0-615E; [65-62]
+      (=cns11643-6	  . #x4837)	; &I-C6-4837; [40-23]
+      (=daikanwa	  . 08765)	; &I-M-08765;
+      ))
     ))
 (define-char
   '((=>ucs		. #x22045)	; 𢁅
diff --git a/lisp/utf-2000/Ideograph-R050-Turban.el b/lisp/utf-2000/Ideograph-R050-Turban.el
index a0d40bb..76d84bd 100644
--- a/lisp/utf-2000/Ideograph-R050-Turban.el
+++ b/lisp/utf-2000/Ideograph-R050-Turban.el
@@ -2186,11 +2186,8 @@
   '((ideographic-radical . 50)	; â¼±
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5E36)	; 帶
-      (=jis-x0208	  . #x5668)	; &I-J90-5668; [54-72]
-      ))
     (hanyu-dazidian	1 739 12)
+    (shinjigen-1	. 2108)
     (shinjigen-2	. 2108)
     (=ucs		. #x5E2F)	; 帯
     (=jis-x0208		. #x4253)	; &I-J90-4253; [34-51]
@@ -2200,6 +2197,10 @@
     (=gt-pj-1		. #x4253)	; &I-GT-11232; [34-51]
     (=daikanwa		. 08929)	; &I-M-08929;
     (=hanziku-2		. #xEA58)	; &I-HZK02-EA58;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x5E36)	; 帶
+      (=jis-x0208	  . #x5668)	; &I-J90-5668; [54-72]
+      ))
     ))
 (define-char
   '((ideographic-radical . 50)	; â¼±
@@ -2226,14 +2227,14 @@
       (=daikanwa	  . 08930)	; &I-M-08930;
       (=ucs@unicode	  . #x5E30)	; &GT-11209;
       )
-     ((<-simplified@JP/Jouyou
+     ((=jis-x0208@1990	  . #x3522)	; &J90-3522; [21-02]
+      (=ucs@jis		  . #x5E30)	; &J90-3522;
+      (<-simplified@JP/Jouyou
        ((=jis-x0208	    . #x5D45)	; &GT-20995; [61-37]
 	(=ks-x1001	    . #x4F7D)	; &I-K0-4F7D; [47-93]
 	(=cns11643-1	    . #x7657)	; &I-C1-7657; [86-55]
 	(=daikanwa	    . 16349)	; &I-M-16349;
 	))
-      (=jis-x0208@1990	  . #x3522)	; &J90-3522; [21-02]
-      (=ucs@jis		  . #x5E30)	; &J90-3522;
       ))
     ))
 (define-char
@@ -2550,6 +2551,7 @@
       )
      ((=ucs		  . #x5DFE)	; å·¾
       ))
+    (shinjigen-1	. 2109)
     (shinjigen-2	. 2109)
     (=ucs		. #x5E36)	; 帶
     (=jis-x0208		. #x5668)	; &I-J90-5668; [54-72]
@@ -3452,7 +3454,9 @@
       )
      ((=ucs		  . #x5196)	; 冖
       )
-     ((=ucs@unicode	  . #x65F2)	; &M-13753;
+     ((=jis-x0212	  . #x416F)	; &M-13753; [33-79]
+      (=jis-x0213-2-2000  . #x2D72)	; &I-JX2-2D72; [13-82]
+      (=daikanwa	  . 13753)	; &I-M-13753;
       )
      ((=ucs		  . #x5DFE)	; å·¾
       ))
@@ -4156,6 +4160,7 @@
 (define-char
   '((ideographic-radical . 50)	; â¼±
     (=ucs		. #x5E59)	; 幙
+    (=big5		. #xE1B3)	; &I-B-E1B3;
     ))
 (define-char
   '((<-denotational
@@ -4205,8 +4210,7 @@
       (=gb2312		  . #x442A)	; &I-G0-442A; [36-10]
       (=ks-x1001	  . #x5830)	; &I-K0-5830; [56-16]
       ))
-    (=big5		. #xE1B3)	; &B-E1B3;
-    (=ucs@unicode	. #x5E59)	; &B-E1B3;
+    (=ucs@unicode	. #x5E59)	; &UU+5E59;
     ))
 (define-char
   '((ideographic-radical . 50)	; â¼±
@@ -4233,7 +4237,9 @@
 	)
        ((=ucs		    . #x5DFE)	; å·¾
 	)
-       ((=ucs@unicode	    . #x7968)	; &GT-31700;
+       ((=jis-x0208	    . #x493C)	; &GT-31700; [41-28]
+	(=gb2312	    . #x4631)	; &I-G0-4631; [38-17]
+	(=ks-x1001	    . #x7879)	; &I-K0-7879; [88-89]
 	))
       (=jis-x0212	  . #x3C36)	; &CB00124; [28-22]
       (=jis-x0213-2-2000  . #x287A)	; &I-JX2-287A; [08-90]
@@ -5272,13 +5278,33 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x3865)	; ã¡¥
-    (->subsumptive
-     ((=daikanwa	  . 09120)	; &M-09120;
-      )
-     ((=cns11643-4	  . #x562D)	; &C4-562D; [54-13]
-      )
-     ((=ucs@unicode	  . #x3865)	; &UU+3865;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3865)	; ã¡¥
       ))
+    (ideographic-radical . 50)	; â¼±
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=daikanwa		. 09120)	; &M-09120;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3865)	; ã¡¥
+      ))
+    (ideographic-radical . 50)	; â¼±
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs@unicode	. #x3865)	; &UU+3865;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3865)	; ã¡¥
+      ))
+    (ideographic-radical . 50)	; â¼±
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=cns11643-4	. #x562D)	; &C4-562D; [54-13]
     ))
 (define-char
   '((ideographic-radical . 50)	; â¼±
@@ -5295,6 +5321,7 @@
 (define-char
   '((ideographic-radical . 50)	; â¼±
     (=ucs		. #x5E6A)	; 幪
+    (=big5		. #xECDC)	; &I-B-ECDC;
     ))
 (define-char
   '((<-denotational
@@ -5353,10 +5380,9 @@
 	)
        ((=ucs		    . #x5DFE)	; å·¾
 	)
-       ((=ucs@unicode	    . #x8499)	; &G0-4349;
+       ((=gb2312	    . #x4349)	; &G0-4349; [35-41]
 	))
       (=iso-ir165	  . #x7A6D)	; &EGB-7A6D; [90-77]
-      (=big5		  . #xECDC)	; &I-B-ECDC;
       (=ucs@unicode	  . #x5E6A)	; &EGB-7A6D;
       ))
     ))
diff --git a/lisp/utf-2000/Ideograph-R052-Short-Thread.el b/lisp/utf-2000/Ideograph-R052-Short-Thread.el
index 4283045..e903aee 100644
--- a/lisp/utf-2000/Ideograph-R052-Short-Thread.el
+++ b/lisp/utf-2000/Ideograph-R052-Short-Thread.el
@@ -23,20 +23,20 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E93)	; ⺓
     (<-identical@component
      ((=ucs		  . #x5E7A)	; 幺
       ))
-    (=ucs		. #x2E93)	; ⺓
     ))
 (define-char
   '((ideographic-radical . 52)	; â¼³
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (<-simplified
-     ((=ucs		  . #x5E7A)	; 幺
-      ))
     (=big5-cdp		. #x895C)	; &CDP-895C;
     (mojikyo		. 072135)	; &MCS-600119C7;
+    (<-simplified@component
+     ((=ucs		  . #x5E7A)	; 幺
+      ))
     ))
 (define-char
   '((ideographic-radical . 52)	; â¼³
@@ -147,7 +147,13 @@
   '((ideographic-radical . 52)	; â¼³
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=daikanwa		. 09199)	; &M-09199;
+    (=ucs		. #x221BA)	; 𢆺
+    (->subsumptive
+     ((=daikanwa	  . 09199)	; &M-09199;
+      )
+     ((=hanziku-3	  . #xDF6F)	; &HZK03-DF6F;
+      (=ucs@iso		  . #x221BA)	; &HZK03-DF6F;
+      ))
     ))
 (define-char
   '((ideographic-radical@ucs . 52)	; â¼³
@@ -159,6 +165,10 @@
     (ideographic-radical@cns*sources
      daikanwa=01775 cns11643)
     (total-strokes	 . 8)
+    (hanyu-dazidian	2 1094 6)
+    (=ucs		. #x221BB)	; 𢆻
+    (=cns11643-6	. #x295E)	; &I-C6-295E; [09-62]
+    (=hanziku-3		. #xDF74)	; &I-HZK03-DF74;
     (<-ancient
      ((=jis-x0208	  . #x3476)	; &M-09208; [20-86]
       (=ks-x1001	  . #x507A)	; &I-K0-507A; [48-90]
@@ -166,10 +176,6 @@
       ))
     (<-ancient*sources
      yupian jiyun daikanwa)
-    (hanyu-dazidian	2 1094 6)
-    (=ucs		. #x221BB)	; 𢆻
-    (=cns11643-6	. #x295E)	; &I-C6-295E; [09-62]
-    (=hanziku-3		. #xDF74)	; &I-HZK03-DF74;
     (->subsumptive
      ((=daikanwa	  . 01775)	; &M-01775;
       )
diff --git a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
index c259d94..ebe419a 100644
--- a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
+++ b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
@@ -26,51 +26,45 @@
     (mojikyo		. 058159)	; &MCS-6000E32F;
     ))
 (define-char
-  '((=>ucs		. #x5E80)	; 庀
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
-    (=jis-x0212		. #x3C42)	; &M-09222; [28-34]
-    (=big5		. #xC979)	; &I-B-C979;
-    (=daikanwa		. 09222)	; &I-M-09222;
-    (=ucs@jis		. #x5E80)	; &M-09222;
-    (=ucs@big5		. #x5E80)	; &M-09222;
-    ))
-(define-char
-  '((morohashi-daikanwa	9222 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
     (=ucs		. #x5E80)	; 庀
-    (=gb2312		. #x624F)	; &I-G0-624F; [66-47]
-    (=cns11643-2	. #x215A)	; &I-C2-215A; [01-58]
-    (=jef-china3	. #x4CBA)	; &I-JC3-4CBA;
-    ))
-(define-char
-  '((=>ucs		. #x5E81)	; 庁
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x572C)	; &GT-12047; [55-12]
-      (=ks-x1001	  . #x7466)	; &I-K0-7466; [84-70]
-      (=daikanwa	  . 09562)	; &I-M-09562;
+    (=big5		. #xC979)	; &I-B-C979;
+    (->subsumptive
+     ((=jis-x0212	  . #x3C42)	; &M-09222; [28-34]
+      (=daikanwa	  . 09222)	; &I-M-09222;
+      (=jef-china3	  . #x4CBA)	; &I-JC3-4CBA;
+      (=ucs@jis		  . #x5E80)	; &M-09222;
+      )
+     ((=gb2312		  . #x624F)	; &C2-215A; [66-47]
+      (=cns11643-2	  . #x215A)	; &I-C2-215A; [01-58]
+      (=ucs@unicode	  . #x5E80)	; &C2-215A;
       ))
-    (shinjigen-2	. 2169)
-    (=jis-x0208		. #x4423)	; &GT-11623; [36-03]
-    (=gt		. 11623)	; &I-GT-11623;
-    (=gt-k		. 00979)	; &I-GT-K00979;
-    (=gt-pj-1		. #x4423)	; &I-GT-11623; [36-03]
-    (=daikanwa		. 09223)	; &I-M-09223;
-    (=ucs@jis		. #x5E81)	; &GT-11623;
     ))
 (define-char
-  '((morohashi-daikanwa	9223 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
     (=ucs		. #x5E81)	; 庁
-    (=cns11643-3	. #x2247)	; &I-C3-2247; [02-39]
+    (->subsumptive
+     ((shinjigen-1	  . 2169)
+      (shinjigen-2	  . 2169)
+      (=jis-x0208	  . #x4423)	; &GT-11623; [36-03]
+      (=gt		  . 11623)	; &I-GT-11623;
+      (=gt-k		  . 00979)	; &I-GT-K00979;
+      (=gt-pj-1		  . #x4423)	; &I-GT-11623; [36-03]
+      (=daikanwa	  . 09223)	; &I-M-09223;
+      (=ucs@jis		  . #x5E81)	; &GT-11623;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x572C)	; &GT-12047; [55-12]
+	(=ks-x1001	    . #x7466)	; &I-K0-7466; [84-70]
+	(=daikanwa	    . 09562)	; &I-M-09562;
+	))
+      )
+     ((=cns11643-3	  . #x2247)	; &C3-2247; [02-39]
+      (=ucs@unicode	  . #x5E81)	; &C3-2247;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
@@ -92,17 +86,17 @@
     (=ucs		. #x5E83)	; 広
     (->subsumptive
      ((morohashi-daikanwa	9224 1)
-      (<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x5722)	; &GT-11938; [55-02]
-	(=ks-x1001	    . #x4E46)	; &I-K0-4E46; [46-38]
-	(=daikanwa	    . 09493)	; &I-M-09493;
-	))
       (=jis-x0208	  . #x392D)	; &GT-11621; [25-13]
       (=gt		  . 11621)	; &I-GT-11621;
       (=gt-k		  . 00928)	; &I-GT-K00928;
       (=gt-pj-1		  . #x392D)	; &I-GT-11621; [25-13]
       (=ucs@jis		  . #x5E83)	; &GT-11621;
       (mojikyo		  . 050163)	; &MCS-6000C3F3;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5722)	; &GT-11938; [55-02]
+	(=ks-x1001	    . #x4E46)	; &I-K0-4E46; [46-38]
+	(=daikanwa	    . 09493)	; &I-M-09493;
+	))
       )
      ((=cns11643-3	  . #x2248)	; &C3-2248; [02-40]
       (=ucs@unicode	  . #x5E83)	; &C3-2248;
@@ -114,7 +108,16 @@
     (total-strokes	 . 6)
     (=ucs		. #x386F)	; 㡯
     (->subsumptive
-     ((=daikanwa	  . 09225)	; &M-09225;
+     ((shinjigen-1	  . 1810)
+      (=daikanwa	  . 09225)	; &M-09225;
+      (<-ancient
+       ((shinjigen-1	    . 1809)
+	(=jis-x0208	    . #x4270)	; &GT-08889; [34-80]
+	(=ks-x1001	    . #x536B)	; &I-K0-536B; [51-75]
+	(=daikanwa	    . 07064)	; &I-M-07064;
+	))
+      (<-ancient*sources
+       shinjigen-1)
       )
      ((=ucs@unicode	  . #x386F)	; &UU+386F;
       )
@@ -757,10 +760,6 @@
     (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4A79)	; &M-09266; [42-89]
-      (=daikanwa	  . 09266)	; &I-M-09266;
-      ))
     (=jis-x0208@1983	. #x4A79)	; &GT-11697; [42-89]
     (=jis-x0208@1990	. #x4A79)	; &I-J90-4A79; [42-89]
     (=gt		. 11697)	; &I-GT-11697;
@@ -768,31 +767,32 @@
     (=gt-pj-1		. #x4A79)	; &I-GT-11697; [42-89]
     (=jef-china3	. #x4CD3)	; &I-JC3-4CD3;
     (=ucs@jis		. #x5E96)	; &GT-11697;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x4A79)	; &M-09266; [42-89]
+      (=daikanwa	  . 09266)	; &I-M-09266;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5E97)	; 店
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (shinjigen-2	. 2179)
-    (=jis-x0208		. #x4539)	; &GT-11686; [37-25]
-    (=ks-x1001		. #x6F41)	; &I-K0-6F41; [79-33]
-    (=big5		. #xA9B1)	; &I-B-A9B1;
-    (=gt		. 11686)	; &I-GT-11686;
-    (=gt-k		. 03783)	; &I-GT-K03783;
-    (=gt-pj-1		. #x4539)	; &I-GT-11686; [37-25]
-    (=daikanwa		. 09267)	; &I-M-09267;
-    (=ucs@jis		. #x5E97)	; &GT-11686;
-    (=ucs@big5		. #x5E97)	; &GT-11686;
-    ))
-(define-char
-  '((morohashi-daikanwa	9267 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x5E97)	; 店
-    (=gb2312		. #x356A)	; &I-G0-356A; [21-74]
-    (=cns11643-1	. #x4D33)	; &I-C1-4D33; [45-19]
+    (=big5		. #xA9B1)	; &I-B-A9B1;
+    (->subsumptive
+     ((shinjigen-1	  . 2179)
+      (shinjigen-2	  . 2179)
+      (=jis-x0208	  . #x4539)	; &GT-11686; [37-25]
+      (=ks-x1001	  . #x6F41)	; &I-K0-6F41; [79-33]
+      (=gt		  . 11686)	; &I-GT-11686;
+      (=gt-k		  . 03783)	; &I-GT-K03783;
+      (=gt-pj-1		  . #x4539)	; &I-GT-11686; [37-25]
+      (=daikanwa	  . 09267)	; &I-M-09267;
+      (=ucs@jis		  . #x5E97)	; &GT-11686;
+      )
+     ((=gb2312		  . #x356A)	; &C1-4D33; [21-74]
+      (=cns11643-1	  . #x4D33)	; &I-C1-4D33; [45-19]
+      (=ucs@unicode	  . #x5E97)	; &C1-4D33;
+      ))
     ))
 (define-char
   '((=>ucs		. #x3877)	; ã¡·
@@ -1041,29 +1041,26 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x5E9C)	; 府
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (shinjigen-2	. 2180)
-    (=jis-x0208		. #x495C)	; &GT-11695; [41-60]
-    (=ks-x1001		. #x5D24)	; &I-K0-5D24; [61-04]
-    (=big5		. #xA9B2)	; &I-B-A9B2;
-    (=gt		. 11695)	; &I-GT-11695;
-    (=gt-k		. 03808)	; &I-GT-K03808;
-    (=gt-pj-1		. #x495C)	; &I-GT-11695; [41-60]
-    (=daikanwa		. 09283)	; &I-M-09283;
-    (=ucs@jis		. #x5E9C)	; &GT-11695;
-    (=ucs@big5		. #x5E9C)	; &GT-11695;
-    ))
-(define-char
-  '((morohashi-daikanwa	9283 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x5E9C)	; 府
-    (=gb2312		. #x382E)	; &I-G0-382E; [24-14]
-    (=cns11643-1	. #x4D34)	; &I-C1-4D34; [45-20]
+    (=big5		. #xA9B2)	; &I-B-A9B2;
+    (->subsumptive
+     ((shinjigen-1	  . 2180)
+      (shinjigen-2	  . 2180)
+      (=jis-x0208	  . #x495C)	; &GT-11695; [41-60]
+      (=ks-x1001	  . #x5D24)	; &I-K0-5D24; [61-04]
+      (=gt		  . 11695)	; &I-GT-11695;
+      (=gt-k		  . 03808)	; &I-GT-K03808;
+      (=gt-pj-1		  . #x495C)	; &I-GT-11695; [41-60]
+      (=daikanwa	  . 09283)	; &I-M-09283;
+      (=ucs@jis		  . #x5E9C)	; &GT-11695;
+      )
+     ((=gb2312		  . #x382E)	; &C1-4D34; [24-14]
+      (=cns11643-1	  . #x4D34)	; &I-C1-4D34; [45-20]
+      (=ucs@unicode	  . #x5E9C)	; &C1-4D34;
+      ))
     ))
 (define-char
   '((=>ucs		. #x387B)	; ã¡»
@@ -1273,141 +1270,131 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x387D)	; 㡽
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=daikanwa		. 09300)	; &M-09300;
-    (=jef-china3	. #x4CBD)	; &I-JC3-4CBD;
-    ))
-(define-char
-  '((morohashi-daikanwa	9300 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x387D)	; 㡽
-    (=cns11643-3	. #x2C49)	; &I-C3-2C49; [12-41]
+    (->subsumptive
+     ((=daikanwa	  . 09300)	; &M-09300;
+      (=jef-china3	  . #x4CBD)	; &I-JC3-4CBD;
+      )
+     ((=cns11643-3	  . #x2C49)	; &C3-2C49; [12-41]
+      (=ucs@unicode	  . #x387D)	; &C3-2C49;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x387E)	; 㡾
-    (=cns11643-3	. #x2C4A)	; &I-C3-2C4A; [12-42]
-    (=daikanwa		. 09301)	; &I-M-09301;
+    (->subsumptive
+     ((=daikanwa	  . 09301)	; &M-09301;
+      )
+     ((=cns11643-3	  . #x2C4A)	; &C3-2C4A; [12-42]
+      (=ucs@unicode	  . #x387E)	; &C3-2C4A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x22209)	; 𢈉
-    (=cns11643-4	. #x2927)	; &I-C4-2927; [09-07]
-    (=daikanwa		. 09302)	; &I-M-09302;
+    (->subsumptive
+     ((=daikanwa	  . 09302)	; &M-09302;
+      )
+     ((=cns11643-4	  . #x2927)	; &C4-2927; [09-07]
+      (=ucs@iso		  . #x22209)	; &C4-2927;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x2220A)	; 𢈊
-    (=cns11643-6	. #x306C)	; &I-C6-306C; [16-76]
-    (=daikanwa		. 09303)	; &I-M-09303;
+    (->subsumptive
+     ((=daikanwa	  . 09303)	; &M-09303;
+      )
+     ((=cns11643-6	  . #x306C)	; &C6-306C; [16-76]
+      (=ucs@iso		  . #x2220A)	; &C6-306C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x2220B)	; 𢈋
-    (=daikanwa		. 09304)	; &I-M-09304;
-    ))
-(define-char
-  '((=>ucs		. #x2220B)	; 𢈋
-    (morohashi-daikanwa	9304 0 1)
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=cns11643-5	. #x2929)	; &C5-2929; [09-09]
-    ))
-(define-char
-  '((=>ucs		. #x5EA1)	; 庡
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=daikanwa		. 09305)	; &M-09305;
+    (->subsumptive
+     ((=daikanwa	  . 09304)	; &M-09304;
+      )
+     ((=ucs@iso		  . #x2220B)	; &U-0002220B;
+      )
+     ((=cns11643-5	  . #x2929)	; &C5-2929; [09-09]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9305 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x5EA1)	; 庡
-    (=cns11643-3	. #x2C48)	; &I-C3-2C48; [12-40]
-    ))
-(define-char
-  '((=>ucs		. #x387F)	; ã¡¿
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=daikanwa		. 09306)	; &M-09306;
+    (->subsumptive
+     ((=daikanwa	  . 09305)	; &M-09305;
+      )
+     ((=cns11643-3	  . #x2C48)	; &C3-2C48; [12-40]
+      (=ucs@unicode	  . #x5EA1)	; &C3-2C48;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9306 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x387F)	; ã¡¿
-    (=cns11643-4	. #x292A)	; &I-C4-292A; [09-10]
-    ))
-(define-char
-  '((=>ucs		. #x5EA2)	; 庢
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=jis-x0212		. #x3C45)	; &M-09307; [28-37]
-    (=big5		. #xCEB7)	; &I-B-CEB7;
-    (=daikanwa		. 09307)	; &I-M-09307;
-    (=ucs@jis		. #x5EA2)	; &M-09307;
-    (=ucs@big5		. #x5EA2)	; &M-09307;
+    (->subsumptive
+     ((=daikanwa	  . 09306)	; &M-09306;
+      )
+     ((=cns11643-4	  . #x292A)	; &C4-292A; [09-10]
+      (=ucs@unicode	  . #x387F)	; &C4-292A;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9307 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x5EA2)	; 庢
-    (=cns11643-2	. #x2A38)	; &I-C2-2A38; [10-24]
-    (=jef-china3	. #x4CBE)	; &I-JC3-4CBE;
-    ))
-(define-char
-  '((=>ucs		. #x5EA3)	; 庣
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=big5		. #xCEB9)	; &M-09308;
-    (=daikanwa		. 09308)	; &I-M-09308;
-    (=ucs@big5		. #x5EA3)	; &M-09308;
+    (=big5		. #xCEB7)	; &I-B-CEB7;
+    (->subsumptive
+     ((=jis-x0212	  . #x3C45)	; &M-09307; [28-37]
+      (=daikanwa	  . 09307)	; &I-M-09307;
+      (=jef-china3	  . #x4CBE)	; &I-JC3-4CBE;
+      (=ucs@jis		  . #x5EA2)	; &M-09307;
+      )
+     ((=cns11643-2	  . #x2A38)	; &C2-2A38; [10-24]
+      (=ucs@unicode	  . #x5EA2)	; &C2-2A38;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9308 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x5EA3)	; 庣
-    (=cns11643-2	. #x2A3A)	; &I-C2-2A3A; [10-26]
-    ))
-(define-char
-  '((=>ucs		. #x3880)	; 㢀
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=daikanwa		. 09309)	; &M-09309;
+    (=big5		. #xCEB9)	; &I-B-CEB9;
+    (->subsumptive
+     ((=daikanwa	  . 09308)	; &M-09308;
+      )
+     ((=cns11643-2	  . #x2A3A)	; &C2-2A3A; [10-26]
+      (=ucs@unicode	  . #x5EA3)	; &C2-2A3A;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9309 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x3880)	; 㢀
-    (=cns11643-5	. #x2926)	; &I-C5-2926; [09-06]
+    (->subsumptive
+     ((=daikanwa	  . 09309)	; &M-09309;
+      )
+     ((=cns11643-5	  . #x2926)	; &C5-2926; [09-06]
+      (=ucs@unicode	  . #x3880)	; &C5-2926;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
@@ -1444,312 +1431,363 @@
     (=ucs@cns		. #x5EA4)	; &C2-2A37;
     ))
 (define-char
-  '((=>ucs		. #x5EA5)	; 庥
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=jis-x0212		. #x3C47)	; &M-09311; [28-39]
-    (=jis-x0213-2-2000	. #x2C23)	; &I-JX2-2C23; [12-03]
-    (=big5		. #xCEBA)	; &I-B-CEBA;
-    (=daikanwa		. 09311)	; &I-M-09311;
-    (=ucs@jis		. #x5EA5)	; &M-09311;
-    (=ucs@big5		. #x5EA5)	; &M-09311;
-    ))
-(define-char
-  '((morohashi-daikanwa	9311 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x5EA5)	; 庥
-    (=gb2312		. #x6253)	; &I-G0-6253; [66-51]
-    (=cns11643-2	. #x2A3B)	; &I-C2-2A3B; [10-27]
-    (=jef-china3	. #x4CC0)	; &I-JC3-4CC0;
+    (=big5		. #xCEBA)	; &I-B-CEBA;
+    (->subsumptive
+     ((=jis-x0212	  . #x3C47)	; &M-09311; [28-39]
+      (=jis-x0213-2-2000  . #x2C23)	; &I-JX2-2C23; [12-03]
+      (=daikanwa	  . 09311)	; &I-M-09311;
+      (=jef-china3	  . #x4CC0)	; &I-JC3-4CC0;
+      (=ucs@jis		  . #x5EA5)	; &M-09311;
+      )
+     ((=gb2312		  . #x6253)	; &C2-2A3B; [66-51]
+      (=cns11643-2	  . #x2A3B)	; &I-C2-2A3B; [10-27]
+      (=ucs@unicode	  . #x5EA5)	; &C2-2A3B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x3881)	; 㢁
-    (=cns11643-4	. #x2929)	; &I-C4-2929; [09-09]
-    (=daikanwa		. 09312)	; &I-M-09312;
-    ))
-(define-char
-  '((=>ucs		. #x5EA6)	; 度
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=daikanwa		. 09313)	; &M-09313;
-    ))
-(define-char
-  '((=>ucs		. #x5EA6)	; 度
-    (morohashi-daikanwa	9313 0 0)
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=jis-x0208		. #x4559)	; &GT-11725; [37-57]
-    (=ks-x1001		. #x5378)	; &I-K0-5378; [51-88]
-    (=gt		. 11725)	; &I-GT-11725;
-    (=gt-k		. 05152)	; &I-GT-K05152;
-    (=gt-pj-1		. #x4559)	; &I-GT-11725; [37-57]
-    (=ucs@jis		. #x5EA6)	; &GT-11725;
+    (->subsumptive
+     ((=daikanwa	  . 09312)	; &M-09312;
+      )
+     ((=cns11643-4	  . #x2929)	; &C4-2929; [09-09]
+      (=ucs@unicode	  . #x3881)	; &C4-2929;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9313 0 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x5EA6)	; 度
-    (=gb2312		. #x3648)	; &I-G0-3648; [22-40]
-    (=cns11643-1	. #x5079)	; &I-C1-5079; [48-89]
     (=big5		. #xABD7)	; &I-B-ABD7;
+    (->subsumptive
+     ((=jis-x0208	  . #x4559)	; &GT-11725; [37-57]
+      (=ks-x1001	  . #x5378)	; &I-K0-5378; [51-88]
+      (=gt		  . 11725)	; &I-GT-11725;
+      (=gt-k		  . 05152)	; &I-GT-K05152;
+      (=gt-pj-1		  . #x4559)	; &I-GT-11725; [37-57]
+      (=daikanwa	  . 09313)	; &I-M-09313;
+      (=ucs@jis		  . #x5EA6)	; &GT-11725;
+      )
+     ((=gb2312		  . #x3648)	; &C1-5079; [22-40]
+      (=cns11643-1	  . #x5079)	; &I-C1-5079; [48-89]
+      (=ucs@unicode	  . #x5EA6)	; &C1-5079;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x3882)	; 㢂
-    (=cns11643-4	. #x2928)	; &I-C4-2928; [09-08]
-    (=daikanwa		. 09314)	; &I-M-09314;
+    (->subsumptive
+     ((=daikanwa	  . 09314)	; &M-09314;
+      )
+     ((=cns11643-4	  . #x2928)	; &C4-2928; [09-08]
+      (=ucs@unicode	  . #x3882)	; &C4-2928;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x2220C)	; 𢈌
-    (=cns11643-6	. #x306D)	; &I-C6-306D; [16-77]
-    (=daikanwa		. 09315)	; &I-M-09315;
-    ))
-(define-char
-  '((=>ucs		. #x22217)	; 𢈗
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=daikanwa		. 09316)	; &M-09316;
+    (->subsumptive
+     ((=daikanwa	  . 09315)	; &M-09315;
+      )
+     ((=cns11643-6	  . #x306D)	; &C6-306D; [16-77]
+      (=ucs@iso		  . #x2220C)	; &C6-306D;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9316 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x22217)	; 𢈗
-    (=cns11643-6	. #x306B)	; &I-C6-306B; [16-75]
+    (->subsumptive
+     ((=daikanwa	  . 09316)	; &M-09316;
+      )
+     ((=cns11643-6	  . #x306B)	; &C6-306B; [16-75]
+      )
+     ((=ucs@iso		  . #x22217)	; &U-00022217;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=daikanwa		. 09317)	; &M-09317;
+    (=ucs		. #x22213)	; 𢈓
+    (->subsumptive
+     ((=daikanwa	  . 09317)	; &M-09317;
+      (=cbeta		  . 10989)	; &I-CB10989;
+      )
+     ((=ucs@iso		  . #x22213)	; &U-00022213;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=daikanwa		. 09318)	; &M-09318;
-    ))
-(define-char
-  '((=>ucs		. #x5EA7)	; 座
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (shinjigen-2	. 2184)
-    (=jis-x0208		. #x3A42)	; &GT-11737; [26-34]
-    (=ks-x1001		. #x7128)	; &I-K0-7128; [81-08]
-    (=gt		. 11737)	; &I-GT-11737;
-    (=gt-k		. 06434)	; &I-GT-K06434;
-    (=gt-pj-1		. #x3A42)	; &I-GT-11737; [26-34]
-    (=daikanwa		. 09319)	; &I-M-09319;
-    (=ucs@jis		. #x5EA7)	; &GT-11737;
+    (=ucs		. #x22212)	; 𢈒
+    (->subsumptive
+     ((=daikanwa	  . 09318)	; &M-09318;
+      )
+     ((=ucs@iso		  . #x22212)	; &U-00022212;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9319 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5EA7)	; 座
-    (=gb2312		. #x5779)	; &I-G0-5779; [55-89]
-    (=cns11643-1	. #x553D)	; &I-C1-553D; [53-29]
     (=big5		. #xAE79)	; &I-B-AE79;
+    (->subsumptive
+     ((shinjigen-1	  . 2184)
+      (shinjigen-2	  . 2184)
+      (=jis-x0208	  . #x3A42)	; &GT-11737; [26-34]
+      (=ks-x1001	  . #x7128)	; &I-K0-7128; [81-08]
+      (=gt		  . 11737)	; &I-GT-11737;
+      (=gt-k		  . 06434)	; &I-GT-K06434;
+      (=gt-pj-1		  . #x3A42)	; &I-GT-11737; [26-34]
+      (=daikanwa	  . 09319)	; &I-M-09319;
+      (=ucs@jis		  . #x5EA7)	; &GT-11737;
+      )
+     ((=gb2312		  . #x5779)	; &C1-553D; [55-89]
+      (=cns11643-1	  . #x553D)	; &I-C1-553D; [53-29]
+      (=ucs@unicode	  . #x5EA7)	; &C1-553D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x22219)	; 𢈙
-    (=cns11643-5	. #x2D3D)	; &I-C5-2D3D; [13-29]
-    (=daikanwa		. 09320)	; &I-M-09320;
-    ))
-(define-char
-  '((=>ucs		. #x5EA8)	; 庨
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=jis-x0212		. #x3C48)	; &M-09321; [28-40]
-    (=daikanwa		. 09321)	; &I-M-09321;
-    (=jef-china3	. #x4CC1)	; &I-JC3-4CC1;
-    (=ucs@jis		. #x5EA8)	; &M-09321;
+    (->subsumptive
+     ((=daikanwa	  . 09320)	; &M-09320;
+      )
+     ((=cns11643-5	  . #x2D3D)	; &C5-2D3D; [13-29]
+      (=ucs@iso		  . #x22219)	; &C5-2D3D;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9321 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5EA8)	; 庨
-    (=cns11643-2	. #x2E77)	; &I-C2-2E77; [14-87]
     (=big5		. #xD175)	; &I-B-D175;
+    (->subsumptive
+     ((=jis-x0212	  . #x3C48)	; &M-09321; [28-40]
+      (=daikanwa	  . 09321)	; &I-M-09321;
+      (=jef-china3	  . #x4CC1)	; &I-JC3-4CC1;
+      (=ucs@jis		  . #x5EA8)	; &M-09321;
+      )
+     ((=cns11643-2	  . #x2E77)	; &C2-2E77; [14-87]
+      (=ucs@unicode	  . #x5EA8)	; &C2-2E77;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x2221A)	; 𢈚
-    (=cns11643-5	. #x2D40)	; &I-C5-2D40; [13-32]
-    (=daikanwa		. 09322)	; &I-M-09322;
-    ))
-(define-char
-  '((=>ucs		. #x2221B)	; 𢈛
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=daikanwa		. 09323)	; &M-09323;
+    (->subsumptive
+     ((=daikanwa	  . 09322)	; &M-09322;
+      )
+     ((=cns11643-5	  . #x2D40)	; &C5-2D40; [13-32]
+      (=ucs@iso		  . #x2221A)	; &C5-2D40;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9323 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x2221B)	; 𢈛
-    (=cns11643-5	. #x2D3E)	; &I-C5-2D3E; [13-30]
+    (->subsumptive
+     ((=daikanwa	  . 09323)	; &M-09323;
+      )
+     ((=cns11643-5	  . #x2D3E)	; &C5-2D3E; [13-30]
+      (=ucs@iso		  . #x2221B)	; &C5-2D3E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x3883)	; 㢃
-    (=cns11643-4	. #x2C6B)	; &I-C4-2C6B; [12-75]
-    (=daikanwa		. 09324)	; &I-M-09324;
+    (->subsumptive
+     ((=daikanwa	  . 09324)	; &M-09324;
+      )
+     ((=cns11643-4	  . #x2C6B)	; &C4-2C6B; [12-75]
+      (=ucs@unicode	  . #x3883)	; &C4-2C6B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5EA9)	; 庩
-    (=cns11643-3	. #x306C)	; &I-C3-306C; [16-76]
-    (=daikanwa		. 09325)	; &I-M-09325;
+    (->subsumptive
+     ((=daikanwa	  . 09325)	; &M-09325;
+      )
+     ((=cns11643-3	  . #x306C)	; &C3-306C; [16-76]
+      (=ucs@unicode	  . #x5EA9)	; &C3-306C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x2221C)	; 𢈜
-    (=cns11643-5	. #x2D41)	; &I-C5-2D41; [13-33]
-    (=daikanwa		. 09326)	; &I-M-09326;
+    (->subsumptive
+     ((=daikanwa	  . 09326)	; &M-09326;
+      )
+     ((=ucs@iso		  . #x2221C)	; &U-0002221C;
+      )
+     ((=cns11643-5	  . #x2D41)	; &C5-2D41; [13-33]
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x2221D)	; 𢈝
-    (=cns11643-5	. #x2D3B)	; &I-C5-2D3B; [13-27]
-    (=daikanwa		. 09327)	; &I-M-09327;
+    (->subsumptive
+     ((=daikanwa	  . 09327)	; &M-09327;
+      )
+     ((=ucs@iso		  . #x2221D)	; &U-0002221D;
+      )
+     ((=cns11643-5	  . #x2D3B)	; &C5-2D3B; [13-27]
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x3884)	; 㢄
-    (=cns11643-4	. #x2C6D)	; &I-C4-2C6D; [12-77]
-    (=daikanwa		. 09328)	; &I-M-09328;
-    ))
-(define-char
-  '((=>ucs		. #x5EAA)	; 庪
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=jis-x0212		. #x3C49)	; &M-09329; [28-41]
-    (=jis-x0213-2-2000	. #x2C24)	; &I-JX2-2C24; [12-04]
-    (=daikanwa		. 09329)	; &I-M-09329;
-    (=ucs@jis		. #x5EAA)	; &M-09329;
+    (->subsumptive
+     ((=daikanwa	  . 09328)	; &M-09328;
+      )
+     ((=cns11643-4	  . #x2C6D)	; &C4-2C6D; [12-77]
+      (=ucs@unicode	  . #x3884)	; &C4-2C6D;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9329 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5EAA)	; 庪
-    (=cns11643-2	. #x2E79)	; &I-C2-2E79; [14-89]
     (=big5		. #xD177)	; &I-B-D177;
+    (->subsumptive
+     ((=jis-x0212	  . #x3C49)	; &M-09329; [28-41]
+      (=jis-x0213-2-2000  . #x2C24)	; &I-JX2-2C24; [12-04]
+      (=daikanwa	  . 09329)	; &I-M-09329;
+      (=ucs@jis		  . #x5EAA)	; &M-09329;
+      )
+     ((=cns11643-2	  . #x2E79)	; &C2-2E79; [14-89]
+      (=ucs@unicode	  . #x5EAA)	; &C2-2E79;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5EAB)	; 庫
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (shinjigen-2	. 2183)
-    (=jis-x0208		. #x384B)	; &GT-11733; [24-43]
-    (=ks-x1001		. #x4D37)	; &I-K0-4D37; [45-23]
-    (=gt		. 11733)	; &I-GT-11733;
-    (=gt-k		. 06423)	; &I-GT-K06423;
-    (=gt-pj-1		. #x384B)	; &I-GT-11733; [24-43]
-    (=daikanwa		. 09330)	; &I-M-09330;
-    (=ucs@jis		. #x5EAB)	; &GT-11733;
-    ))
-(define-char
-  '((morohashi-daikanwa	9330 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5EAB)	; 庫
-    (=cns11643-1	. #x553B)	; &I-C1-553B; [53-27]
-    (=gb12345		. #x3F62)	; 庫 [31-66]
     (=big5		. #xAE77)	; &I-B-AE77;
+    (->subsumptive
+     ((shinjigen-2	  . 2183)
+      (=jis-x0208	  . #x384B)	; &GT-11733; [24-43]
+      (=ks-x1001	  . #x4D37)	; &I-K0-4D37; [45-23]
+      (=gt		  . 11733)	; &I-GT-11733;
+      (=gt-k		  . 06423)	; &I-GT-K06423;
+      (=gt-pj-1		  . #x384B)	; &I-GT-11733; [24-43]
+      (=daikanwa	  . 09330)	; &I-M-09330;
+      (=ucs@jis		  . #x5EAB)	; &GT-11733;
+      )
+     ((=cns11643-1	  . #x553B)	; &C1-553B; [53-27]
+      (=gb12345		  . #x3F62)	; &C1-553B; [31-66]
+      (=ucs@unicode	  . #x5EAB)	; &C1-553B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x2221E)	; 𢈞
-    (=cns11643-6	. #x373A)	; &I-C6-373A; [23-26]
-    (=daikanwa		. 09331)	; &I-M-09331;
+    (->subsumptive
+     ((=daikanwa	  . 09331)	; &M-09331;
+      )
+     ((=cns11643-6	  . #x373A)	; &C6-373A; [23-26]
+      (=ucs@iso		  . #x2221E)	; &C6-373A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x2221F)	; 𢈟
-    (=daikanwa		. 09332)	; &I-M-09332;
+    (->subsumptive
+     ((=daikanwa	  . 09332)	; &M-09332;
+      )
+     ((=ucs@iso		  . #x2221F)	; &U-0002221F;
+      )
+     ((=cns11643-6	  . #x373B)	; &C6-373B; [23-27]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x2221F)	; 𢈟
-    (morohashi-daikanwa	9332 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=cns11643-6	. #x373B)	; &C6-373B; [23-27]
+    (=ucs		. #x5EAC)	; 庬
+    (=big5		. #xD178)	; &I-B-D178;
     ))
 (define-char
-  '((ideographic-radical . 53)	; â¼´
+  '((<-denotational
+     ((=ucs		  . #x5EAC)	; 庬
+      ))
+    (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=ucs		. #x5EAC)	; 庬
     (->subsumptive
-     ((<-vulgar
+     ((=daikanwa	  . 09333)	; &M-09333;
+      (<-vulgar
        ((shinjigen-1	    . 879)
 	(=ucs		    . #x5396)	; 厖
 	(=jis-x0208	    . #x524D)	; &I-J90-524D; [50-45]
 	(=daikanwa	    . 02942)	; &I-M-02942;
 	))
       (<-vulgar*sources
-       zhengzi-tong daikanwa shinjigen-1)
-      (shinjigen-1	  . 880)
-      (=jis-x0212	  . #x3C4A)	; &M-09333; [28-42]
+       zhengzitong daikanwa shinjigen-1)
+      )
+     ((shinjigen-1	  . 879)
+      (=jis-x0212	  . #x3C4A)	; &JX2-2C25; [28-42]
       (=jis-x0213-2-2000  . #x2C25)	; &I-JX2-2C25; [12-05]
-      (=daikanwa	  . 09333)	; &I-M-09333;
-      (=jef-china3	  . #x4CC2)	; &I-JC3-4CC2;
-      (=ucs@jis		  . #x5EAC)	; &M-09333;
+      (=ucs@jis		  . #x5EAC)	; &JX2-2C25;
+      )
+     ((=jef-china3	  . #x4CC2)	; &JC3-4CC2;
+      )
+     ((=ucs@unicode	  . #x5EAC)	; &UU+5EAC;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5EAC)	; 庬
+      ))
+    (ideographic-radical . 53)	; â¼´
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (->subsumptive
+     ((shinjigen-1	  . 880)
+      (<-formed
+       ((=jis-x0212	    . #x3C4A)	; &JX2-2C25; [28-42]
+	(=jis-x0213-2-2000  . #x2C25)	; &I-JX2-2C25; [12-05]
+	))
       )
      ((=cns11643-2	  . #x2E7A)	; &C2-2E7A; [14-90]
-      (=big5		  . #xD178)	; &I-B-D178;
-      (=ucs@unicode	  . #x5EAC)	; &C2-2E7A;
       ))
     ))
 (define-char
@@ -2328,224 +2366,270 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x22259)	; 𢉙
-    (=cns11643-6	. #x3F42)	; &I-C6-3F42; [31-34]
-    (=daikanwa		. 09374)	; &I-M-09374;
+    (->subsumptive
+     ((=daikanwa	  . 09374)	; &M-09374;
+      )
+     ((=ucs@iso		  . #x22259)	; &U-00022259;
+      )
+     ((=cns11643-6	  . #x3F42)	; &C6-3F42; [31-34]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x22241)	; 𢉁
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=daikanwa		. 09375)	; &M-09375;
+    (=ucs		. #x22241)	; 𢉁
     ))
 (define-char
-  '((morohashi-daikanwa	9375 0 1)
+  '((<-denotational
+     ((=ucs		  . #x22241)	; 𢉁
+      ))
     (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x22241)	; 𢉁
-    (=cns11643-5	. #x3241)	; &I-C5-3241; [18-33]
+    (=daikanwa		. 09375)	; &M-09375;
     ))
 (define-char
-  '((=>ucs		. #x5EB7)	; 康
+  '((<-denotational
+     ((=ucs		  . #x22241)	; 𢉁
+      ))
     (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (shinjigen-2	. 2189)
-    (=jis-x0208		. #x392F)	; &GT-11782; [25-15]
-    (=ks-x1001		. #x4B2C)	; &I-K0-4B2C; [43-12]
-    (=gt		. 11782)	; &I-GT-11782;
-    (=gt-k		. 07760)	; &I-GT-K07760;
-    (=gt-pj-1		. #x392F)	; &I-GT-11782; [25-15]
-    (=daikanwa		. 09376)	; &I-M-09376;
-    (=ucs@jis		. #x5EB7)	; &GT-11782;
+    (=cns11643-5	. #x3241)	; &C5-3241; [18-33]
+    (=ucs@iso		. #x22241)	; &C5-3241;
     ))
 (define-char
-  '((morohashi-daikanwa	9376 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5EB7)	; 康
-    (=gb2312		. #x3F35)	; &I-G0-3F35; [31-21]
     (=big5		. #xB164)	; &I-B-B164;
-    ))
-(define-char
-  '((=>ucs		. #x5EB7)	; 康
-    (morohashi-daikanwa	9376 0 1)
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=cns11643-1	. #x5A2A)	; &C1-5A2A; [58-10]
+    (->subsumptive
+     ((shinjigen-2	  . 2189)
+      (=jis-x0208	  . #x392F)	; &GT-11782; [25-15]
+      (=ks-x1001	  . #x4B2C)	; &I-K0-4B2C; [43-12]
+      (=gt		  . 11782)	; &I-GT-11782;
+      (=gt-k		  . 07760)	; &I-GT-K07760;
+      (=gt-pj-1		  . #x392F)	; &I-GT-11782; [25-15]
+      (=daikanwa	  . 09376)	; &I-M-09376;
+      (=ucs@jis		  . #x5EB7)	; &GT-11782;
+      )
+     ((=gb2312		  . #x3F35)	; &G0-3F35; [31-21]
+      (=ucs@unicode	  . #x5EB7)	; &G0-3F35;
+      )
+     ((=cns11643-1	  . #x5A2A)	; &C1-5A2A; [58-10]
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x22242)	; 𢉂
-    (=cns11643-5	. #x3238)	; &I-C5-3238; [18-24]
-    (=daikanwa		. 09377)	; &I-M-09377;
-    ))
-(define-char
-  '((=>ucs		. #x5EB8)	; 庸
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (shinjigen-2	. 2190)
-    (=jis-x0208		. #x4D47)	; &GT-11819; [45-39]
-    (=ks-x1001		. #x693C)	; &I-K0-693C; [73-28]
-    (=gt		. 11819)	; &I-GT-11819;
-    (=gt-k		. 07888)	; &I-GT-K07888;
-    (=gt-pj-1		. #x4D47)	; &I-GT-11819; [45-39]
-    (=daikanwa		. 09378)	; &I-M-09378;
-    (=ucs@jis		. #x5EB8)	; &GT-11819;
+    (->subsumptive
+     ((=daikanwa	  . 09377)	; &M-09377;
+      )
+     ((=cns11643-5	  . #x3238)	; &C5-3238; [18-24]
+      (=ucs@iso		  . #x22242)	; &C5-3238;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9378 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5EB8)	; 庸
-    (=gb2312		. #x5339)	; &I-G0-5339; [51-25]
-    (=cns11643-1	. #x5A2B)	; &I-C1-5A2B; [58-11]
     (=big5		. #xB165)	; &I-B-B165;
+    (->subsumptive
+     ((shinjigen-2	  . 2190)
+      (=jis-x0208	  . #x4D47)	; &GT-11819; [45-39]
+      (=ks-x1001	  . #x693C)	; &I-K0-693C; [73-28]
+      (=gt		  . 11819)	; &I-GT-11819;
+      (=gt-k		  . 07888)	; &I-GT-K07888;
+      (=gt-pj-1		  . #x4D47)	; &I-GT-11819; [45-39]
+      (=daikanwa	  . 09378)	; &I-M-09378;
+      (=ucs@jis		  . #x5EB8)	; &GT-11819;
+      )
+     ((=gb2312		  . #x5339)	; &C1-5A2B; [51-25]
+      (=cns11643-1	  . #x5A2B)	; &I-C1-5A2B; [58-11]
+      (=ucs@unicode	  . #x5EB8)	; &C1-5A2B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x22243)	; 𢉃
-    (=cns11643-4	. #x3150)	; &I-C4-3150; [17-48]
-    (=daikanwa		. 09379)	; &I-M-09379;
+    (->subsumptive
+     ((=daikanwa	  . 09379)	; &M-09379;
+      )
+     ((=cns11643-4	  . #x3150)	; &C4-3150; [17-48]
+      (=ucs@iso		  . #x22243)	; &C4-3150;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x22244)	; 𢉄
-    (=cns11643-6	. #x3F44)	; &I-C6-3F44; [31-36]
-    (=daikanwa		. 09380)	; &I-M-09380;
-    ))
-(define-char
-  '((=>ucs		. #x5EB9)	; 庹
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=jis-x0213-2-2000	. #x2C26)	; &M-09381; [12-06]
-    (=daikanwa		. 09381)	; &I-M-09381;
-    (=ucs@jis		. #x5EB9)	; &M-09381;
+    (->subsumptive
+     ((=daikanwa	  . 09380)	; &M-09380;
+      )
+     ((=cns11643-6	  . #x3F44)	; &C6-3F44; [31-36]
+      )
+     ((=ucs@iso		  . #x22244)	; &U-00022244;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9381 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5EB9)	; 庹
-    (=gb2312		. #x6255)	; &I-G0-6255; [66-53]
-    (=cns11643-2	. #x352D)	; &I-C2-352D; [21-13]
     (=big5		. #xD549)	; &I-B-D549;
+    (->subsumptive
+     ((=jis-x0213-2-2000  . #x2C26)	; &M-09381; [12-06]
+      (=daikanwa	  . 09381)	; &I-M-09381;
+      (=ucs@jis		  . #x5EB9)	; &M-09381;
+      )
+     ((=gb2312		  . #x6255)	; &G0-6255; [66-53]
+      (=ucs@unicode	  . #x5EB9)	; &G0-6255;
+      )
+     ((=cns11643-2	  . #x352D)	; &C2-352D; [21-13]
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x22245)	; 𢉅
-    (=cns11643-5	. #x3243)	; &I-C5-3243; [18-35]
-    (=daikanwa		. 09382)	; &I-M-09382;
+    (->subsumptive
+     ((=daikanwa	  . 09382)	; &M-09382;
+      )
+     ((=cns11643-5	  . #x3243)	; &C5-3243; [18-35]
+      (=ucs@iso		  . #x22245)	; &C5-3243;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5EBA)	; 庺
-    (=daikanwa		. 09383)	; &I-M-09383;
+    (->subsumptive
+     ((=daikanwa	  . 09383)	; &M-09383;
+      )
+     ((=ucs@unicode	  . #x5EBA)	; &UU+5EBA;
+      )
+     ((=cns11643-3	  . #x3561)	; &C3-3561; [21-65]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5EBA)	; 庺
-    (morohashi-daikanwa	9383 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=cns11643-3	. #x3561)	; &C3-3561; [21-65]
+    (=ucs		. #x22247)	; 𢉇
+    (->subsumptive
+     ((=daikanwa	  . 09385)	; &M-09385;
+      )
+     ((=ucs@iso		  . #x22247)	; &U-00022247;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=daikanwa		. 09385)	; &M-09385;
+    (=ucs		. #x22248)	; 𢉈
+    (->subsumptive
+     ((=daikanwa	  . 09386)	; &M-09386;
+      )
+     ((=cns11643-6	  . #x3F41)	; &C6-3F41; [31-33]
+      (=ucs@iso		  . #x22248)	; &C6-3F41;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x22248)	; 𢉈
-    (=cns11643-6	. #x3F41)	; &I-C6-3F41; [31-33]
-    (=daikanwa		. 09386)	; &I-M-09386;
+    (=ucs		. #x22258)	; 𢉘
+    (->subsumptive
+     ((=daikanwa	  . 09387)	; &M-09387;
+      )
+     ((=ucs@iso		  . #x22258)	; &U-00022258;
+      )
+     ((=cns11643-5	  . #x323A)	; &C5-323A; [18-26]
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x22258)	; 𢉘
-    (=cns11643-5	. #x323A)	; &I-C5-323A; [18-26]
-    (=daikanwa		. 09387)	; &I-M-09387;
+    (=ucs		. #x2225A)	; 𢉚
     ))
 (define-char
-  '((=>ucs		. #x2225A)	; 𢉚
+  '((<-denotational
+     ((=ucs		  . #x2225A)	; 𢉚
+      ))
     (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=daikanwa		. 09388)	; &M-09388;
     ))
 (define-char
-  '((morohashi-daikanwa	9388 0 3)
+  '((<-denotational
+     ((=ucs		  . #x2225A)	; 𢉚
+      ))
     (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x2225A)	; 𢉚
-    (=cns11643-5	. #x3240)	; &I-C5-3240; [18-32]
+    (=cns11643-5	. #x3240)	; &C5-3240; [18-32]
+    (=ucs@iso		. #x2225A)	; &C5-3240;
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x22255)	; 𢉕
-    (=cns11643-6	. #x3F47)	; &I-C6-3F47; [31-39]
-    (=daikanwa		. 09389)	; &I-M-09389;
+    (->subsumptive
+     ((=daikanwa	  . 09389)	; &M-09389;
+      )
+     ((=ucs@iso		  . #x22255)	; &U-00022255;
+      )
+     ((=cns11643-6	  . #x3F47)	; &C6-3F47; [31-39]
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=daikanwa		. 09390)	; &M-09390;
+    (=ucs		. #x22257)	; 𢉗
+    (->subsumptive
+     ((=daikanwa	  . 09390)	; &M-09390;
+      )
+     ((=ucs@iso		  . #x22257)	; &U-00022257;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 53)	; â¼´
+  '((=>ucs		. #x22251)	; 𢉑
+    (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=daikanwa		. 09391)	; &M-09391;
     ))
 (define-char
-  '((ideographic-radical . 53)	; â¼´
+  '((=>daikanwa		. 09391)	; &M-09391;
+    (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=daikanwa		. 09392)	; &M-09392;
+    (=ucs		. #x22251)	; 𢉑
     ))
 (define-char
-  '((=>ucs		. #x22246)	; 𢉆
-    (morohashi-daikanwa	9392 1)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=gt		. 11849)	; &GT-11849;
-    (=gt-pj-3		. #x446E)	; &GT-11849; [36-78]
-    ))
-(define-char
-  '((morohashi-daikanwa	9392 1 0)
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=ucs		. #x22246)	; 𢉆
-    (=cns11643-5	. #x3828)	; &I-C5-3828; [24-08]
+    (=ucs		. #x22253)	; 𢉓
+    (->subsumptive
+     ((=daikanwa	  . 09392)	; &M-09392;
+      )
+     ((=ucs@iso		  . #x22253)	; &U-00022253;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
@@ -2563,9 +2647,16 @@
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
+    (=ucs		. #x3890)	; 㢐
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3890)	; 㢐
+      ))
+    (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x3890)	; 㢐
+    (=ucs@unicode	. #x3890)	; &UU+3890;
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
@@ -2604,9 +2695,27 @@
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (=ucs		. #x22246)	; 𢉆
+    (->subsumptive
+     ((morohashi-daikanwa	9392 1)
+      (=gt		  . 11849)	; &GT-11849;
+      (=gt-pj-3		  . #x446E)	; &GT-11849; [36-78]
+      )
+     ((=cns11643-5	  . #x3828)	; &C5-3828; [24-08]
+      (=ucs@iso		  . #x22246)	; &C5-3828;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 53)	; â¼´
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
     (=ucs		. #x2225B)	; 𢉛
-    (=cns11643-6	. #x484A)	; &I-C6-484A; [40-42]
-    (=daikanwa		. 09393)	; &I-M-09393;
+    (->subsumptive
+     ((=daikanwa	  . 09393)	; &M-09393;
+      )
+     ((=cns11643-6	  . #x484A)	; &C6-484A; [40-42]
+      (=ucs@iso		  . #x2225B)	; &C6-484A;
+      ))
     ))
 (define-char
   '((=>ucs		. #x2225C)	; 𢉜
@@ -2939,23 +3048,25 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x2226B)	; 𢉫
-    (=cns11643-6	. #x4846)	; &I-C6-4846; [40-38]
-    (=daikanwa		. 09418)	; &I-M-09418;
+    (->subsumptive
+     ((=daikanwa	  . 09418)	; &M-09418;
+      )
+     ((=cns11643-6	  . #x4846)	; &C6-4846; [40-38]
+      (=ucs@iso		  . #x2226B)	; &C6-4846;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x2226C)	; 𢉬
-    (=daikanwa		. 09419)	; &I-M-09419;
-    ))
-(define-char
-  '((=>ucs		. #x2226C)	; 𢉬
-    (morohashi-daikanwa	9419 0 2)
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=cns11643-6	. #x4847)	; &C6-4847; [40-39]
+    (->subsumptive
+     ((=daikanwa	  . 09419)	; &M-09419;
+      )
+     ((=ucs@iso		  . #x2226C)	; &U-0002226C;
+      )
+     ((=cns11643-6	  . #x4847)	; &C6-4847; [40-39]
+      ))
     ))
 (define-char
   '((=>ucs		. #x2226D)	; 𢉭
@@ -2965,7 +3076,7 @@
     (=daikanwa		. 09420)	; &M-09420;
     ))
 (define-char
-  '((morohashi-daikanwa	9420 0 5)
+  '((=>daikanwa		. 09420)	; &M-09420;
     (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -2977,16 +3088,24 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x22274)	; 𢉴
-    (=cns11643-6	. #x4848)	; &I-C6-4848; [40-40]
-    (=daikanwa		. 09421)	; &I-M-09421;
+    (->subsumptive
+     ((=daikanwa	  . 09421)	; &M-09421;
+      )
+     ((=cns11643-6	  . #x4848)	; &C6-4848; [40-40]
+      (=ucs@iso		  . #x22274)	; &C6-4848;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x22276)	; 𢉶
-    (=cns11643-6	. #x484C)	; &I-C6-484C; [40-44]
-    (=daikanwa		. 09422)	; &I-M-09422;
+    (->subsumptive
+     ((=daikanwa	  . 09422)	; &M-09422;
+      )
+     ((=cns11643-6	  . #x484C)	; &C6-484C; [40-44]
+      (=ucs@iso		  . #x22276)	; &C6-484C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
@@ -2998,36 +3117,41 @@
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=daikanwa		. 09424)	; &M-09424;
-    ))
-(define-char
-  '((=>ucs		. #x5EC3)	; 廃
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5726)	; &GT-11952; [55-06]
-      (=ks-x1001	  . #x7848)	; &I-K0-7848; [88-40]
-      (=daikanwa	  . 09492)	; &I-M-09492;
+    (=ucs		. #x22275)	; 𢉵
+    (->subsumptive
+     ((=daikanwa	  . 09424)	; &M-09424;
+      )
+     ((=ucs@iso		  . #x22275)	; &U-00022275;
       ))
-    (shinjigen-2	. 2194)
-    (=jis-x0208		. #x4751)	; &GT-11854; [39-49]
-    (=gt		. 11854)	; &I-GT-11854;
-    (=gt-k		. 09121)	; &I-GT-K09121;
-    (=gt-pj-1		. #x4751)	; &I-GT-11854; [39-49]
-    (=daikanwa		. 09425)	; &I-M-09425;
-    (=ucs@jis		. #x5EC3)	; &GT-11854;
     ))
 (define-char
-  '((morohashi-daikanwa	9425 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5EC3)	; 廃
-    (=cns11643-6	. #x4845)	; &I-C6-4845; [40-37]
+    (->subsumptive
+     ((shinjigen-1	  . 2194)
+      (shinjigen-2	  . 2194)
+      (=jis-x0208	  . #x4751)	; &GT-11854; [39-49]
+      (=gt		  . 11854)	; &I-GT-11854;
+      (=gt-k		  . 09121)	; &I-GT-K09121;
+      (=gt-pj-1		  . #x4751)	; &I-GT-11854; [39-49]
+      (=daikanwa	  . 09425)	; &I-M-09425;
+      (=ucs@jis		  . #x5EC3)	; &GT-11854;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5726)	; &GT-11952; [55-06]
+	(=ks-x1001	    . #x7848)	; &I-K0-7848; [88-40]
+	(=daikanwa	    . 09492)	; &I-M-09492;
+	))
+      )
+     ((=cns11643-6	  . #x4845)	; &C6-4845; [40-37]
+      (=ucs@unicode	  . #x5EC3)	; &C6-4845;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x3890)	; 㢐
+  '((<-denotational
+     ((=ucs		  . #x3890)	; 㢐
+      ))
     (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -3045,74 +3169,72 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5EC4)	; 廄
-    (=cns11643-1	. #x5F23)	; &I-C1-5F23; [63-03]
-    ))
-(define-char
-  '((=>ucs		. #x5EC4)	; 廄
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (mojikyo		. 059581)	; &MCS-6000E8BD;
-    ))
-(define-char
-  '((=>ucs		. #x5EC4)	; 廄
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=big5		. #xB45C)	; &B-B45C;
-    (=ucs@big5		. #x5EC4)	; &B-B45C;
-    ))
-(define-char
-  '((=>ucs		. #x3891)	; 㢑
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=daikanwa		. 09426)	; &M-09426;
-    (=jef-china3	. #x4CC8)	; &I-JC3-4CC8;
+    (=big5		. #xB45C)	; &I-B-B45C;
+    (->subsumptive
+     ((mojikyo		  . 059581)	; &MCS-6000E8BD;
+      )
+     ((=cns11643-1	  . #x5F23)	; &C1-5F23; [63-03]
+      (=ucs@unicode	  . #x5EC4)	; &C1-5F23;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9426 0 1)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x3891)	; 㢑
-    (=cns11643-5	. #x3F21)	; &I-C5-3F21; [31-01]
+    (->subsumptive
+     ((=daikanwa	  . 09426)	; &M-09426;
+      (=jef-china3	  . #x4CC8)	; &I-JC3-4CC8;
+      )
+     ((=cns11643-5	  . #x3F21)	; &C5-3F21; [31-01]
+      (=ucs@unicode	  . #x3891)	; &C5-3F21;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x5EC5)	; 廅
-    (=cns11643-2	. #x4263)	; &I-C2-4263; [34-67]
     (=big5		. #xDD5D)	; &I-B-DD5D;
-    (=daikanwa		. 09427)	; &I-M-09427;
+    (->subsumptive
+     ((=daikanwa	  . 09427)	; &M-09427;
+      )
+     ((=cns11643-2	  . #x4263)	; &C2-4263; [34-67]
+      (=ucs@unicode	  . #x5EC5)	; &C2-4263;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x2227F)	; 𢉿
-    (=cns11643-4	. #x3D2B)	; &I-C4-3D2B; [29-11]
-    (=daikanwa		. 09428)	; &I-M-09428;
-    ))
-(define-char
-  '((=>ucs		. #x5EC6)	; 廆
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=jis-x0212		. #x3C50)	; &M-09429; [28-48]
-    (=jis-x0213-2-2000	. #x2C28)	; &I-JX2-2C28; [12-08]
-    (=daikanwa		. 09429)	; &I-M-09429;
-    (=ucs@jis		. #x5EC6)	; &M-09429;
+    (->subsumptive
+     ((=daikanwa	  . 09428)	; &M-09428;
+      )
+     ((=cns11643-4	  . #x3D2B)	; &C4-3D2B; [29-11]
+      (=ucs@iso		  . #x2227F)	; &C4-3D2B;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9429 0 0)
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
+  '((ideographic-radical . 53)	; â¼´
     (=ucs		. #x5EC6)	; 廆
-    (=cns11643-2	. #x4265)	; &I-C2-4265; [34-69]
     (=big5		. #xDD5F)	; &I-B-DD5F;
+    (->subsumptive
+     ((ideographic-strokes . 10)
+      (total-strokes	   . 13)
+      (=jis-x0212	  . #x3C50)	; &M-09429; [28-48]
+      (=jis-x0213-2-2000  . #x2C28)	; &I-JX2-2C28; [12-08]
+      (=daikanwa	  . 09429)	; &I-M-09429;
+      (=ucs@jis		  . #x5EC6)	; &M-09429;
+      )
+     ((ideographic-strokes . 10)
+      (total-strokes	   . 13)
+      (=cns11643-2	  . #x4265)	; &C2-4265; [34-69]
+      )
+     ((ideographic-strokes . 9)
+      (total-strokes	   . 12)
+      (=ucs@unicode	  . #x5EC6)	; &UU+5EC6;
+      ))
     ))
 (define-char
   '((=>ucs		. #x22280)	; 𢊀
@@ -3315,15 +3437,15 @@
     (=big5		. #xB459)	; &B-B459;
     (=ucs@big5		. #x5ECA)	; &B-B459;
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=ucs		    . #xF928)	; 廊
-	(=jis-x0213-1-2000  . #x742E)	; &I-JX1-742E; [84-14]
-	))
-      (=jis-x0208	  . #x4F2D)	; &GT-11865; [47-13]
+     ((=jis-x0208	  . #x4F2D)	; &GT-11865; [47-13]
       (=gt		  . 11865)	; &I-GT-11865;
       (=gt-pj-1		  . #x4F2D)	; &I-GT-11865; [47-13]
       (=ucs@jis		  . #x5ECA)	; &GT-11865;
       (mojikyo		  . 054433)	; &MCS-6000D4A1;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #xF928)	; 廊
+	(=jis-x0213-1-2000  . #x742E)	; &I-JX1-742E; [84-14]
+	))
       )
      ((=gb2312		  . #x4048)	; &C1-5E7E; [32-40]
       (=cns11643-1	  . #x5E7E)	; &I-C1-5E7E; [62-94]
@@ -3592,17 +3714,17 @@
     (->subsumptive
      ((ideographic-strokes . 11)
       (total-strokes	   . 14)
+      (=jis-x0208	  . #x567D)	; &GT-11900; [54-93]
+      (=gt		  . 11900)	; &I-GT-11900;
+      (=gt-pj-1		  . #x567D)	; &I-GT-11900; [54-93]
+      (=daikanwa	  . 09454)	; &I-M-09454;
+      (=ucs@jis		  . #x5ED0)	; &GT-11900;
       (<-vulgar
        ((=jis-x0208	    . #x567E)	; &GT-11899; [54-94]
 	(=daikanwa	    . 09453)	; &I-M-09453;
 	))
       (<-vulgar*sources
        jiyun daikanwa)
-      (=jis-x0208	  . #x567D)	; &GT-11900; [54-93]
-      (=gt		  . 11900)	; &I-GT-11900;
-      (=gt-pj-1		  . #x567D)	; &I-GT-11900; [54-93]
-      (=daikanwa	  . 09454)	; &I-M-09454;
-      (=ucs@jis		  . #x5ED0)	; &GT-11900;
       )
      ((ideographic-strokes . 11)
       (total-strokes	   . 14)
@@ -3628,15 +3750,15 @@
     (->subsumptive
      ((ideographic-strokes . 11)
       (total-strokes	   . 14)
+      (shinjigen-1	  . 2209)
+      (=gt		  . 11901)	; &GT-11901;
+      (=gt-pj-9		  . #x4C55)	; &GT-11901; [44-53]
       (<-vulgar
        ((shinjigen-1	    . 2207)
 	(=gt		    . 11902)	; &GT-11902;
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 2209)
-      (=gt		  . 11901)	; &GT-11901;
-      (=gt-pj-9		  . #x4C55)	; &GT-11901; [44-53]
       )
      ((ideographic-strokes . 10)
       (total-strokes	   . 13)
@@ -4226,17 +4348,17 @@
     (total-strokes	 . 15)
     (=big5		. #xBC71)	; &B-BC71;
     (->subsumptive
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x4940)	; &GT-11955; [41-32]
-	(=ks-x1001	    . #x5959)	; &I-K0-5959; [57-57]
-	(=daikanwa	    . 09489)	; &I-M-09489;
-	))
-      (=jis-x0208@1983	  . #x4940)	; &GT-11956; [41-32]
+     ((=jis-x0208@1983	  . #x4940)	; &GT-11956; [41-32]
       (=jis-x0208@1990	  . #x4940)	; &I-J90-4940; [41-32]
       (=gt		  . 11956)	; &I-GT-11956;
       (=gt-pj-1		  . #x4940)	; &I-GT-11956; [41-32]
       (=jef-china3	  . #x4CD2)	; &I-JC3-4CD2;
       (=ucs@jis		  . #x5EDF)	; &GT-11956;
+      (<-simplified@JP
+       ((=jis-x0208@1978    . #x4940)	; &GT-11955; [41-32]
+	(=ks-x1001	    . #x5959)	; &I-K0-5959; [57-57]
+	(=daikanwa	    . 09489)	; &I-M-09489;
+	))
       )
      ((=cns11643-1	  . #x6C5B)	; &C1-6C5B; [76-59]
       (=gb12345		  . #x436D)	; &C1-6C5B; [35-77]
@@ -4285,51 +4407,47 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x5EE1)	; 廡
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (shinjigen-2	. 2225)
-    (=jis-x0208		. #x5727)	; &GT-11957; [55-07]
-    (=gt		. 11957)	; &I-GT-11957;
-    (=gt-k		. 11973)	; &I-GT-K11973;
-    (=gt-pj-1		. #x5727)	; &I-GT-11957; [55-07]
-    (=daikanwa		. 09491)	; &I-M-09491;
-    (=ucs@jis		. #x5EE1)	; &GT-11957;
-    ))
-(define-char
-  '((morohashi-daikanwa	9491 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x5EE1)	; 廡
-    (=cns11643-2	. #x503E)	; &I-C2-503E; [48-30]
-    (=gb12345		. #x6250)	; 廡 [66-48]
     (=big5		. #xE575)	; &I-B-E575;
+    (->subsumptive
+     ((shinjigen-1	  . 2225)
+      (shinjigen-2	  . 2225)
+      (=jis-x0208	  . #x5727)	; &GT-11957; [55-07]
+      (=gt		  . 11957)	; &I-GT-11957;
+      (=gt-k		  . 11973)	; &I-GT-K11973;
+      (=gt-pj-1		  . #x5727)	; &I-GT-11957; [55-07]
+      (=daikanwa	  . 09491)	; &I-M-09491;
+      (=ucs@jis		  . #x5EE1)	; &GT-11957;
+      )
+     ((=cns11643-2	  . #x503E)	; &C2-503E; [48-30]
+      (=gb12345		  . #x6250)	; &C2-503E; [66-48]
+      (=ucs@unicode	  . #x5EE1)	; &C2-503E;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5EE2)	; 廢
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (shinjigen-2	. 2195)
-    (=jis-x0208		. #x5726)	; &GT-11952; [55-06]
-    (=ks-x1001		. #x7848)	; &I-K0-7848; [88-40]
-    (=gt		. 11952)	; &I-GT-11952;
-    (=gt-k		. 11972)	; &I-GT-K11972;
-    (=gt-pj-1		. #x5726)	; &I-GT-11952; [55-06]
-    (=daikanwa		. 09492)	; &I-M-09492;
-    (=ucs@jis		. #x5EE2)	; &GT-11952;
-    ))
-(define-char
-  '((morohashi-daikanwa	9492 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x5EE2)	; 廢
-    (=cns11643-1	. #x6C59)	; &I-C1-6C59; [76-57]
-    (=gb12345		. #x374F)	; 廢 [23-47]
     (=big5		. #xBC6F)	; &I-B-BC6F;
+    (->subsumptive
+     ((shinjigen-1	  . 2195)
+      (shinjigen-2	  . 2195)
+      (=jis-x0208	  . #x5726)	; &GT-11952; [55-06]
+      (=ks-x1001	  . #x7848)	; &I-K0-7848; [88-40]
+      (=gt		  . 11952)	; &I-GT-11952;
+      (=gt-k		  . 11972)	; &I-GT-K11972;
+      (=gt-pj-1		  . #x5726)	; &I-GT-11952; [55-06]
+      (=daikanwa	  . 09492)	; &I-M-09492;
+      (=ucs@jis		  . #x5EE2)	; &GT-11952;
+      )
+     ((=cns11643-1	  . #x6C59)	; &C1-6C59; [76-57]
+      (=gb12345		  . #x374F)	; &C1-6C59; [23-47]
+      (=ucs@unicode	  . #x5EE2)	; &C1-6C59;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
@@ -5470,85 +5588,78 @@
     (=cns11643-7	. #x5E64)	; &I-C7-5E64; [62-68]
     ))
 (define-char
-  '((=>ucs		. #x5EF3)	; 廳
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 22)
     (total-strokes	 . 25)
-    (shinjigen-2	. 2170)
-    (=jis-x0208		. #x572C)	; &GT-12047; [55-12]
-    (=ks-x1001		. #x7466)	; &I-K0-7466; [84-70]
-    (=big5		. #xC655)	; &I-B-C655;
-    (=gt		. 12047)	; &I-GT-12047;
-    (=gt-pj-1		. #x572C)	; &I-GT-12047; [55-12]
-    (=daikanwa		. 09562)	; &I-M-09562;
-    (=ucs@jis		. #x5EF3)	; &GT-12047;
-    (=ucs@big5		. #x5EF3)	; &GT-12047;
+    (=ucs		. #x5EF3)	; 廳
     ))
 (define-char
-  '((morohashi-daikanwa	9562 0 1)
+  '((<-denotational
+     ((=ucs		  . #x5EF3)	; 廳
+      ))
     (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 22)
     (total-strokes	 . 25)
-    (=ucs		. #x5EF3)	; 廳
-    (=gb12345		. #x4C7C)	; 廳 [44-92]
+    (=big5		. #xC655)	; &B-C655;
+    (=ucs@big5		. #x5EF3)	; &B-C655;
+    (->subsumptive
+     ((shinjigen-1	  . 2170)
+      (shinjigen-2	  . 2170)
+      (=jis-x0208	  . #x572C)	; &GT-12047; [55-12]
+      (=ks-x1001	  . #x7466)	; &I-K0-7466; [84-70]
+      (=gt		  . 12047)	; &I-GT-12047;
+      (=gt-pj-1		  . #x572C)	; &I-GT-12047; [55-12]
+      (=daikanwa	  . 09562)	; &I-M-09562;
+      (=ucs@jis		  . #x5EF3)	; &GT-12047;
+      )
+     ((=gb12345		  . #x4C7C)	; &UU+5EF3; [44-92]
+      (=ucs@unicode	  . #x5EF3)	; &UU+5EF3;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5EF3)	; 廳
-    (morohashi-daikanwa	9562 0 2)
+  '((<-denotational
+     ((=ucs		  . #x5EF3)	; 廳
+      ))
     (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 22)
     (total-strokes	 . 25)
     (=cns11643-1	. #x7D22)	; &C1-7D22; [93-02]
     ))
 (define-char
-  '((=>ucs		. #x22313)	; 𢌓
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 23)
-    (total-strokes	 . 26)
-    (=daikanwa		. 09563)	; &M-09563;
-    ))
-(define-char
-  '((morohashi-daikanwa	9563 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 23)
     (total-strokes	 . 26)
     (=ucs		. #x22313)	; 𢌓
-    (=cns11643-7	. #x6236)	; &I-C7-6236; [66-22]
+    (->subsumptive
+     ((=daikanwa	  . 09563)	; &M-09563;
+      )
+     ((=cns11643-7	  . #x6236)	; &C7-6236; [66-22]
+      (=ucs@iso		  . #x22313)	; &C7-6236;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 24)
     (total-strokes	 . 27)
     (=ucs		. #x22314)	; 𢌔
-    (=daikanwa		. 09564)	; &I-M-09564;
-    ))
-(define-char
-  '((=>ucs		. #x22314)	; 𢌔
-    (morohashi-daikanwa	9564 0 1)
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 24)
-    (total-strokes	 . 27)
-    (=cns11643-5	. #x7A68)	; &C5-7A68; [90-72]
-    ))
-(define-char
-  '((=>ucs		. #x22315)	; 𢌕
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 24)
-    (total-strokes	 . 27)
-    (=daikanwa		. 09565)	; &M-09565;
+    (->subsumptive
+     ((=daikanwa	  . 09564)	; &M-09564;
+      )
+     ((=ucs@iso		  . #x22314)	; &U-00022314;
+      )
+     ((=cns11643-5	  . #x7A68)	; &C5-7A68; [90-72]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9565 0 1)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 24)
     (total-strokes	 . 27)
     (=ucs		. #x22315)	; 𢌕
-    ))
-(define-char
-  '((=>ucs		. #x22315)	; 𢌕
-    (morohashi-daikanwa	9565 0 2)
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 24)
-    (total-strokes	 . 27)
-    (=cns11643-5	. #x7A67)	; &C5-7A67; [90-71]
+    (->subsumptive
+     ((=daikanwa	  . 09565)	; &M-09565;
+      )
+     ((=ucs@iso		  . #x22315)	; &U-00022315;
+      )
+     ((=cns11643-5	  . #x7A67)	; &C5-7A67; [90-71]
+      ))
     ))
diff --git a/lisp/utf-2000/Ideograph-R055-Two-Hands.el b/lisp/utf-2000/Ideograph-R055-Two-Hands.el
index 3a4ed3c..bf1ed06 100644
--- a/lisp/utf-2000/Ideograph-R055-Two-Hands.el
+++ b/lisp/utf-2000/Ideograph-R055-Two-Hands.el
@@ -93,6 +93,18 @@
   '((ideographic-radical . 55)	; ⼶
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
+    (shinjigen-1	. 2244)
+    (shinjigen-2	. 2244)
+    (=ucs		. #x5F01)	; 弁
+    (=jis-x0208		. #x4A5B)	; &I-J90-4A5B; [42-59]
+    (=gb2312		. #x5B4D)	; &I-G0-5B4D; [59-45]
+    (=ks-x1001		. #x5C27)	; &I-K0-5C27; [60-07]
+    (=cns11643-1	. #x464F)	; &I-C1-464F; [38-47]
+    (=big5		. #xA5AF)	; &I-B-A5AF;
+    (=gt		. 12084)	; &I-GT-12084;
+    (=gt-k		. 00999)	; &I-GT-K00999;
+    (=gt-pj-1		. #x4A5B)	; &I-GT-12084; [42-59]
+    (=daikanwa		. 09588)	; &I-M-09588;
     (<-simplified@JP/Jouyou
      ((=jis-x0208	  . #x517E)	; &GT-51594; [49-94]
       (=daikanwa	  . 38657)	; &I-M-38657;
@@ -105,17 +117,6 @@
       (=ks-x1001	  . #x5C2A)	; &I-K0-5C2A; [60-10]
       (=daikanwa	  . 38677)	; &I-M-38677;
       ))
-    (shinjigen-2	. 2244)
-    (=ucs		. #x5F01)	; 弁
-    (=jis-x0208		. #x4A5B)	; &I-J90-4A5B; [42-59]
-    (=gb2312		. #x5B4D)	; &I-G0-5B4D; [59-45]
-    (=ks-x1001		. #x5C27)	; &I-K0-5C27; [60-07]
-    (=cns11643-1	. #x464F)	; &I-C1-464F; [38-47]
-    (=big5		. #xA5AF)	; &I-B-A5AF;
-    (=gt		. 12084)	; &I-GT-12084;
-    (=gt-k		. 00999)	; &I-GT-K00999;
-    (=gt-pj-1		. #x4A5B)	; &I-GT-12084; [42-59]
-    (=daikanwa		. 09588)	; &I-M-09588;
     ))
 (define-char
   '((ideographic-radical . 55)	; ⼶
diff --git a/lisp/utf-2000/Ideograph-R056-Shoot.el b/lisp/utf-2000/Ideograph-R056-Shoot.el
index 270052c..379277e 100644
--- a/lisp/utf-2000/Ideograph-R056-Shoot.el
+++ b/lisp/utf-2000/Ideograph-R056-Shoot.el
@@ -124,37 +124,38 @@
   '((ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x8CB3)	; è²³
-      (=jis-x0208	  . #x6C48)	; &I-J90-6C48; [76-40]
-      ))
     (=ucs		. #x5F10)	; 弐
     (=jis-x0208		. #x4675)	; &I-J90-4675; [38-85]
     (=gt		. 12179)	; &I-GT-12179;
     (=gt-pj-1		. #x4675)	; &I-GT-12179; [38-85]
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x8CB3)	; è²³
+      (=jis-x0208	  . #x6C48)	; &I-J90-6C48; [76-40]
+      ))
     ))
 (define-char
   '((ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x2237F)	; 𢍿
-    (=cns11643-4	. #x242B)	; &I-C4-242B; [04-11]
-    (=daikanwa		. 09665)	; &I-M-09665;
+    (->subsumptive
+     ((=daikanwa	  . 09665)	; &M-09665;
+      (=ucs@iso		  . #x2237F)	; &M-09665;
+      )
+     ((=cns11643-4	  . #x242B)	; &C4-242B; [04-11]
+      ))
     ))
 (define-char
   '((ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x22380)	; 𢎀
-    (=daikanwa		. 09666)	; &I-M-09666;
-    ))
-(define-char
-  '((=>ucs		. #x22380)	; 𢎀
-    (morohashi-daikanwa	9666 0 0)
-    (ideographic-radical . 56)	; â¼·
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=cns11643-6	. #x2750)	; &C6-2750; [07-48]
+    (->subsumptive
+     ((=daikanwa	  . 09666)	; &M-09666;
+      (=ucs@iso		  . #x22380)	; &M-09666;
+      )
+     ((=cns11643-6	  . #x2750)	; &C6-2750; [07-48]
+      ))
     ))
 (define-char
   '((ideographic-radical . 56)	; â¼·
@@ -176,7 +177,8 @@
   '((ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=daikanwa		. 09669)	; &M-09669;
+    (=ucs		. #x22382)	; 𢎂
+    (=daikanwa		. 09669)	; &I-M-09669;
     ))
 (define-char
   '((ideographic-radical . 56)	; â¼·
@@ -187,12 +189,24 @@
     (=daikanwa		. 09670)	; &I-M-09670;
     ))
 (define-char
-  '((ideographic-radical . 56)	; â¼·
+  '((=>ucs		. #x22385)	; 𢎅
+    (ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=daikanwa		. 09671)	; &M-09671;
     ))
 (define-char
+  '((=>daikanwa		. 09671)	; &M-09671;
+    (ideographic-radical . 56)	; â¼·
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (=ucs		. #x22385)	; 𢎅
+    (=hanziku-2		. #xC2E7)	; &I-HZK02-C2E7;
+    (<-unknown
+     ((=daikanwa	  . 09671)	; &M-09671;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
@@ -200,27 +214,28 @@
     (=gb2312		. #x5F30)	; &I-G0-5F30; [63-16]
     ))
 (define-char
-  '((=>ucs		. #x22386)	; 𢎆
-    (ideographic-radical . 56)	; â¼·
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=cns11643-6	. #x3076)	; &M-09672; [16-86]
-    (=daikanwa		. 09672)	; &I-M-09672;
-    ))
-(define-char
-  '((morohashi-daikanwa	9672 0 0)
-    (ideographic-radical . 56)	; â¼·
+  '((ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x22386)	; 𢎆
+    (->subsumptive
+     ((=cns11643-6	  . #x3076)	; &M-09672; [16-86]
+      (=daikanwa	  . 09672)	; &I-M-09672;
+      )
+     ((=ucs@iso		  . #x22386)	; &U-00022386;
+      ))
     ))
 (define-char
   '((ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x38A5)	; 㢥
-    (=cns11643-4	. #x292B)	; &I-C4-292B; [09-11]
-    (=daikanwa		. 09673)	; &I-M-09673;
+    (->subsumptive
+     ((=cns11643-4	  . #x292B)	; &M-09673; [09-11]
+      (=daikanwa	  . 09673)	; &I-M-09673;
+      )
+     ((=ucs@unicode	  . #x38A5)	; &UU+38A5;
+      ))
     ))
 (define-char
   '((ideographic-radical . 56)	; â¼·
@@ -242,19 +257,23 @@
   '((ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=daikanwa		. 09676)	; &M-09676;
+    (=ucs		. #x22388)	; 𢎈
+    (=daikanwa		. 09676)	; &I-M-09676;
     ))
 (define-char
   '((ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=daikanwa		. 09677)	; &M-09677;
+    (=ucs		. #x22389)	; 𢎉
+    (=daikanwa		. 09677)	; &I-M-09677;
     ))
 (define-char
   '((ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=daikanwa		. 09678)	; &M-09678;
+    (=ucs		. #x2238B)	; 𢎋
+    (=daikanwa		. 09678)	; &I-M-09678;
+    (=hanziku-2		. #xC2EF)	; &I-HZK02-C2EF;
     ))
 (define-char
   '((ideographic-radical . 56)	; â¼·
@@ -265,73 +284,129 @@
     (=daikanwa		. 09679)	; &I-M-09679;
     ))
 (define-char
-  '((ideographic-radical . 56)	; â¼·
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x5736)	; &J97-5736; [55-22]
+      ))
+    (ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (shinjigen-2	. 2261)
     (=ucs		. #x5F11)	; 弑
-    (=jis-x0208		. #x5736)	; &I-J90-5736; [55-22]
-    (=gb2312		. #x5F31)	; &I-G0-5F31; [63-17]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5F11)	; 弑
+      ))
+    (ideographic-radical . 56)	; â¼·
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (shinjigen-1	. 2261)
+    (shinjigen-2	. 2261)
+    (=jis-x0208		. #x5736)	; &GT-12198; [55-22]
     (=ks-x1001		. #x633D)	; &I-K0-633D; [67-29]
     (=cns11643-3	. #x3B42)	; &I-C3-3B42; [27-34]
     (=gt		. 12198)	; &I-GT-12198;
     (=gt-pj-1		. #x5736)	; &I-GT-12198; [55-22]
     (=daikanwa		. 09680)	; &I-M-09680;
     (=cbeta		. 06128)	; &I-CB06128;
+    (=ucs@jis		. #x5F11)	; &GT-12198;
     ))
 (define-char
   '((ideographic-radical . 56)	; â¼·
+    (=jis-x0208@1997	. #x5736)	; &J97-5736; [55-22]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5F11)	; 弑
+      ))
+    (ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs		. #x2238E)	; 𢎎
-    (=daikanwa		. 09681)	; &I-M-09681;
+    (=gb2312		. #x5F31)	; &G0-5F31; [63-17]
+    (=ucs@unicode	. #x5F11)	; &G0-5F31;
     ))
 (define-char
-  '((=>ucs		. #x2238E)	; 𢎎
-    (morohashi-daikanwa	9681 0 1)
-    (ideographic-radical . 56)	; â¼·
+  '((ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=cns11643-5	. #x382E)	; &C5-382E; [24-14]
+    (=ucs		. #x2238E)	; 𢎎
+    (->subsumptive
+     ((=daikanwa	  . 09681)	; &M-09681;
+      (=ucs@iso		  . #x2238E)	; &M-09681;
+      )
+     ((=cns11643-5	  . #x382E)	; &C5-382E; [24-14]
+      ))
     ))
 (define-char
   '((ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x38A6)	; 㢦
-    (=cns11643-4	. #x3D2D)	; &I-C4-3D2D; [29-13]
-    (=daikanwa		. 09682)	; &I-M-09682;
     ))
 (define-char
-  '((ideographic-radical . 56)	; â¼·
+  '((<-denotational
+     ((=ucs		  . #x38A6)	; 㢦
+      ))
+    (ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs		. #x22390)	; 𢎐
-    (=cns11643-6	. #x524A)	; &I-C6-524A; [50-42]
-    (=daikanwa		. 09683)	; &I-M-09683;
+    (=daikanwa		. 09682)	; &M-09682;
     ))
 (define-char
-  '((ideographic-radical . 56)	; â¼·
+  '((<-denotational
+     ((=ucs		  . #x38A6)	; 㢦
+      ))
+    (ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=daikanwa		. 09684)	; &M-09684;
+    (->subsumptive
+     ((=ucs@unicode	  . #x38A6)	; &UU+38A6;
+      )
+     ((=cns11643-4	  . #x3D2D)	; &C4-3D2D; [29-13]
+      ))
     ))
 (define-char
   '((ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs		. #x5F12)	; 弒
-    (=daikanwa		. 09685)	; &I-M-09685;
+    (=ucs		. #x22390)	; 𢎐
+    (=cns11643-6	. #x524A)	; &I-C6-524A; [50-42]
+    (=daikanwa		. 09683)	; &I-M-09683;
     ))
 (define-char
-  '((=>ucs		. #x5F12)	; 弒
-    (morohashi-daikanwa	9685 0 0)
+  '((ideographic-radical@ucs . 77)	; ⽌
+    (ideographic-strokes@ucs . 9)
+    (ideographic-radical@daikanwa . 56)	; â¼·
+    (ideographic-strokes@daikanwa . 10)
+    (total-strokes	 . 13)
+    (hanyu-dazidian	1 560 3)
+    (=ucs		. #x2398F)	; 𣦏
+    (=daikanwa		. 09684)	; &I-M-09684;
+    (=hanziku-2		. #xC342)	; &I-HZK02-C342;
+    ))
+(define-char
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x5736)	; &J97-5736; [55-22]
+      ))
     (ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=cns11643-1	. #x636F)	; &C1-636F; [67-79]
+    (=ucs		. #x5F12)	; 弒
     (=big5		. #xB749)	; &I-B-B749;
-    (=ucs@big5		. #x5F12)	; &C1-636F;
+    (->subsumptive
+     ((=daikanwa	  . 09685)	; &M-09685;
+      (=ucs@unicode	  . #x5F12)	; &M-09685;
+      (<-original
+       ((=jis-x0208	    . #x5736)	; &GT-12198; [55-22]
+	(=ks-x1001	    . #x633D)	; &I-K0-633D; [67-29]
+	(=cns11643-3	    . #x3B42)	; &I-C3-3B42; [27-34]
+	(=daikanwa	    . 09680)	; &I-M-09680;
+	))
+      (<-original*sources
+       daikanwa)
+      )
+     ((=cns11643-1	  . #x636F)	; &C1-636F; [67-79]
+      (=ucs@cns		  . #x5F12)	; &C1-636F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 56)	; â¼·
diff --git a/lisp/utf-2000/Ideograph-R057-Bow.el b/lisp/utf-2000/Ideograph-R057-Bow.el
index 67b322f..a388cef 100644
--- a/lisp/utf-2000/Ideograph-R057-Bow.el
+++ b/lisp/utf-2000/Ideograph-R057-Bow.el
@@ -204,41 +204,32 @@
   '((ideographic-radical . 57)	; ⼸
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (<-original
-     ((=ucs		  . #x5F14)	; 弔
-      (=daikanwa	  . 09698)	; &I-M-09698;
-      ))
-    (<-original*sources
-     daikanwa)
     (hanyu-dazidian	1 37 4)
     (=ucs		. #x223A3)	; 𢎣
     (=cns11643-6	. #x2322)	; &I-C6-2322; [03-02]
     (=big5-cdp		. #x87DB)	; &I-CDP-87DB;
     (=daikanwa		. 09706)	; &I-M-09706;
-    ))
-(define-char
-  '((morohashi-daikanwa	9706 0 2)
-    (ideographic-radical . 57)	; ⼸
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
     (mojikyo		. 009706)	; &MCS-600025EA;
+    (<-original
+     ((=ucs		  . #x5F14)	; 弔
+      (=daikanwa	  . 09698)	; &I-M-09698;
+      ))
+    (<-original*sources
+     daikanwa)
     ))
 (define-char
-  '((=>ucs		. #x223A4)	; 𢎤
-    (ideographic-radical . 57)	; ⼸
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
-    (=daikanwa		. 09707)	; &M-09707;
-    ))
-(define-char
-  '((morohashi-daikanwa	9707 0 0)
-    (ideographic-radical . 57)	; ⼸
+  '((ideographic-radical . 57)	; ⼸
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (hanyu-dazidian	2 991 1)
     (=ucs		. #x223A4)	; 𢎤
-    (=cns11643-6	. #x227C)	; &I-C6-227C; [02-92]
-    (=hanziku-3		. #xCA70)	; &I-HZK03-CA70;
+    (->subsumptive
+     ((=daikanwa	  . 09707)	; &M-09707;
+      )
+     ((hanyu-dazidian	  2 991 1)
+      (=cns11643-6	  . #x227C)	; &HZK03-CA70; [02-92]
+      (=hanziku-3	  . #xCA70)	; &I-HZK03-CA70;
+      (=ucs@iso		  . #x223A4)	; &HZK03-CA70;
+      ))
     ))
 (define-char
   '((ideographic-radical . 57)	; ⼸
@@ -644,19 +635,28 @@
   '((ideographic-radical . 57)	; ⼸
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=daikanwa		. 09742)	; &M-09742;
+    (hanyu-dazidian	2 992 9)
+    (=ucs		. #x223C3)	; 𢏃
+    (=daikanwa		. 09742)	; &I-M-09742;
+    (=hanziku-3		. #xCABA)	; &I-HZK03-CABA;
     ))
 (define-char
   '((ideographic-radical . 57)	; ⼸
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=daikanwa		. 09743)	; &M-09743;
+    (hanyu-dazidian	2 992 13)
+    (=ucs		. #x223C4)	; 𢏄
+    (=daikanwa		. 09743)	; &I-M-09743;
+    (=hanziku-3		. #xCABE)	; &I-HZK03-CABE;
     ))
 (define-char
   '((ideographic-radical . 57)	; ⼸
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=daikanwa		. 09744)	; &M-09744;
+    (hanyu-dazidian	2 992 7)
+    (=ucs		. #x223C2)	; 𢏂
+    (=daikanwa		. 09744)	; &I-M-09744;
+    (=hanziku-3		. #xCAB8)	; &I-HZK03-CAB8;
     ))
 (define-char
   '((ideographic-radical . 57)	; ⼸
@@ -667,13 +667,34 @@
     ))
 (define-char
   '((ideographic-radical . 57)	; ⼸
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5F13)	; 弓
+      )
+     ((=jis-x0208	  . #x5D55)	; &GT-21300; [61-53]
+      (=daikanwa	  . 16613)	; &I-M-16613;
+      ))
+    (=big5-cdp		. #x8B7D)	; &CDP-8B7D;
+    (=cbeta		. 05942)	; &I-CB05942;
+    ))
+(define-char
+  '((ideographic-radical . 57)	; ⼸
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x5F21)	; 弡
-    (=jis-x0212		. #x3C64)	; &I-JSP-3C64; [28-68]
-    (=cns11643-3	. #x286E)	; &I-C3-286E; [08-78]
-    (=daikanwa		. 09745)	; &I-M-09745;
-    (=jef-china3	. #x4CEB)	; &I-JC3-4CEB;
+    (->subsumptive
+     ((=jis-x0212	  . #x3C64)	; &M-09745; [28-68]
+      (=cns11643-3	  . #x286E)	; &I-C3-286E; [08-78]
+      (=daikanwa	  . 09745)	; &I-M-09745;
+      (=ucs@jis		  . #x5F21)	; &M-09745;
+      )
+     ((=jef-china3	  . #x4CEB)	; &JC3-4CEB;
+      (=ucs@unicode	  . #x5F21)	; &JC3-4CEB;
+      ))
     ))
 (define-char
   '((ideographic-radical . 57)	; ⼸
@@ -690,20 +711,29 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x38AE)	; 㢮
-    (=cns11643-3	. #x286F)	; &I-C3-286F; [08-79]
-    (=daikanwa		. 09747)	; &I-M-09747;
-    (=cbeta		. 06114)	; &I-CB06114;
+    (->subsumptive
+     ((=daikanwa	  . 09747)	; &M-09747;
+      (=ucs@unicode	  . #x38AE)	; &M-09747;
+      )
+     ((=cns11643-3	  . #x286F)	; &CB06114; [08-79]
+      (=cbeta		  . 06114)	; &I-CB06114;
+      ))
     ))
 (define-char
   '((ideographic-radical . 57)	; ⼸
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x5F22)	; å¼¢
-    (=jis-x0212		. #x3C65)	; &I-JSP-3C65; [28-69]
-    (=iso-ir165		. #x7B35)	; &I-EGB-7B35; [91-21]
-    (=cns11643-2	. #x2652)	; &I-C2-2652; [06-50]
-    (=big5		. #xCC71)	; &I-B-CC71;
-    (=daikanwa		. 09748)	; &I-M-09748;
+    (->subsumptive
+     ((=jis-x0212	  . #x3C65)	; &M-09748; [28-69]
+      (=daikanwa	  . 09748)	; &I-M-09748;
+      (=ucs@jis		  . #x5F22)	; &M-09748;
+      )
+     ((=iso-ir165	  . #x7B35)	; &C2-2652; [91-21]
+      (=cns11643-2	  . #x2652)	; &I-C2-2652; [06-50]
+      (=big5		  . #xCC71)	; &I-B-CC71;
+      (=ucs@unicode	  . #x5F22)	; &C2-2652;
+      ))
     ))
 (define-char
   '((ideographic-radical . 57)	; ⼸
@@ -1964,42 +1994,44 @@
     (ideographic-radical . 57)	; ⼸
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5F48)	; 彈
-      (=jis-x0208	  . #x573C)	; &I-J90-573C; [55-28]
-      ))
     (=ucs		. #x5F3E)	; å¼¾
     (=jis-x0208		. #x4346)	; &I-J90-4346; [35-38]
     (=cns11643-3	. #x3B44)	; &I-C3-3B44; [27-36]
     (=gt		. 12385)	; &I-GT-12385;
     (=gt-pj-1		. #x4346)	; &I-GT-12385; [35-38]
     (mojikyo		. 050166)	; &MCS-6000C3F6;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x5F48)	; 彈
+      (=jis-x0208	  . #x573C)	; &I-J90-573C; [55-28]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x2240A)	; 𢐊
-    (ideographic-radical . 57)	; ⼸
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=daikanwa		. 09837)	; &M-09837;
-    ))
-(define-char
-  '((morohashi-daikanwa	9837 0 0)
-    (ideographic-radical . 57)	; ⼸
+  '((ideographic-radical . 57)	; ⼸
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (hanyu-dazidian	2 1001 13)
     (=ucs		. #x2240A)	; 𢐊
-    (=cns11643-5	. #x3F28)	; &I-C5-3F28; [31-08]
-    (=hanziku-3		. #xCCA4)	; &I-HZK03-CCA4;
+    (->subsumptive
+     ((=daikanwa	  . 09837)	; &M-09837;
+      )
+     ((hanyu-dazidian	  2 1001 13)
+      (=cns11643-5	  . #x3F28)	; &HZK03-CCA4; [31-08]
+      (=hanziku-3	  . #xCCA4)	; &I-HZK03-CCA4;
+      (=ucs@iso		  . #x2240A)	; &HZK03-CCA4;
+      ))
     ))
 (define-char
   '((ideographic-radical . 57)	; ⼸
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x5F3F)	; 弿
-    (=jis-x0212		. #x3C71)	; &I-JSP-3C71; [28-81]
-    (=cns11643-4	. #x3D30)	; &I-C4-3D30; [29-16]
-    (=daikanwa		. 09838)	; &I-M-09838;
+    (->subsumptive
+     ((=jis-x0212	  . #x3C71)	; &M-09838; [28-81]
+      (=daikanwa	  . 09838)	; &I-M-09838;
+      (=ucs@jis		  . #x5F3F)	; &M-09838;
+      )
+     ((=cns11643-4	  . #x3D30)	; &C4-3D30; [29-16]
+      (=ucs@unicode	  . #x5F3F)	; &C4-3D30;
+      ))
     ))
 (define-char
   '((=>ucs		. #x2240B)	; 𢐋
@@ -2366,24 +2398,36 @@
   '((ideographic-radical . 57)	; ⼸
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=gt		. 12408)	; &GT-12408;
-    (=gt-pj-3		. #x4948)	; &GT-12408; [41-40]
+    (hanyu-dazidian	2 1001 22)
+    (=ucs		. #x2241A)	; 𢐚
+    (=gt		. 12408)	; &I-GT-12408;
+    (=gt-pj-3		. #x4948)	; &I-GT-12408; [41-40]
     (=daikanwa		. 09858)	; &I-M-09858;
+    (=hanziku-3		. #xCCAD)	; &I-HZK03-CCAD;
     ))
 (define-char
   '((ideographic-radical . 57)	; ⼸
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x5F45)	; 彅
-    (=gt		. 12420)	; &I-GT-12420;
-    (=gt-k		. 11326)	; &I-GT-K11326;
-    (=gt-pj-11		. #x3E47)	; &I-GT-12420; [30-39]
     ))
 (define-char
-  '((=>ucs		. #x5F45)	; 彅
+  '((<-denotational
+     ((=ucs		  . #x5F45)	; 彅
+      ))
     (ideographic-radical . 57)	; ⼸
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5F13)	; 弓
+      )
+     ((=jis-x0208	  . #x5172)	; &GT-02704; [49-82]
+      (=ks-x1001	  . #x6E72)	; &I-K0-6E72; [78-82]
+      (=daikanwa	  . 02088)	; &I-M-02088;
+      ))
     (=jis-x0212		. #x3C74)	; &GT-12419; [28-84]
     (=jis-x0213-1-2000	. #x743A)	; &I-JX1-743A; [84-26]
     (=gt		. 12419)	; &I-GT-12419;
@@ -2392,6 +2436,26 @@
     (=ucs@jis		. #x5F45)	; &GT-12419;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x5F45)	; 彅
+      ))
+    (ideographic-radical . 57)	; ⼸
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5F13)	; 弓
+      )
+     ((=gb2312		  . #x3C74)	; &G0-3C74; [28-84]
+      ))
+    (=gt		. 12420)	; &GT-12420;
+    (=gt-k		. 11326)	; &I-GT-K11326;
+    (=gt-pj-11		. #x3E47)	; &GT-12420; [30-39]
+    (=ucs@unicode	. #x5F45)	; &GT-12420;
+    ))
+(define-char
   '((ideographic-radical . 57)	; ⼸
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
@@ -3273,24 +3337,6 @@
     ))
 (define-char
   '((ideographic-radical . 57)	; ⼸
-    (hanyu-dazidian	2 992 7)
-    (=ucs		. #x223C2)	; 𢏂
-    (=hanziku-3		. #xCAB8)	; &I-HZK03-CAB8;
-    ))
-(define-char
-  '((ideographic-radical . 57)	; ⼸
-    (hanyu-dazidian	2 992 9)
-    (=ucs		. #x223C3)	; 𢏃
-    (=hanziku-3		. #xCABA)	; &I-HZK03-CABA;
-    ))
-(define-char
-  '((ideographic-radical . 57)	; ⼸
-    (hanyu-dazidian	2 992 13)
-    (=ucs		. #x223C4)	; 𢏄
-    (=hanziku-3		. #xCABE)	; &I-HZK03-CABE;
-    ))
-(define-char
-  '((ideographic-radical . 57)	; ⼸
     (hanyu-dazidian	2 992 19)
     (=ucs		. #x223CD)	; 𢏍
     (=hanziku-3		. #xCAC4)	; &I-HZK03-CAC4;
@@ -3327,12 +3373,6 @@
     ))
 (define-char
   '((ideographic-radical . 57)	; ⼸
-    (hanyu-dazidian	2 1001 22)
-    (=ucs		. #x2241A)	; 𢐚
-    (=hanziku-3		. #xCCAD)	; &I-HZK03-CCAD;
-    ))
-(define-char
-  '((ideographic-radical . 57)	; ⼸
     (hanyu-dazidian	2 1002 2)
     (=ucs		. #x2241B)	; 𢐛
     (=hanziku-3		. #xCCB9)	; &I-HZK03-CCB9;
diff --git a/lisp/utf-2000/Ideograph-R058-Snout.el b/lisp/utf-2000/Ideograph-R058-Snout.el
index 3454fc3..d0ca85d 100644
--- a/lisp/utf-2000/Ideograph-R058-Snout.el
+++ b/lisp/utf-2000/Ideograph-R058-Snout.el
@@ -77,13 +77,6 @@
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
-    (<-same
-     ((=jis-x0212	  . #x3C77)	; &GT-12503; [28-87]
-      (=cns11643-3	  . #x2140)	; &I-C3-2140; [01-32]
-      (=daikanwa	  . 09908)	; &I-M-09908;
-      ))
-    (<-same*sources
-     guangyun daikanwa)
     (=ucs		. #x5F51)	; 彑
     (=jis-x0208		. #x5740)	; &I-J90-5740; [55-32]
     (=cns11643-3	. #x2141)	; &I-C3-2141; [01-33]
@@ -92,6 +85,13 @@
     (=gt-k		. 00234)	; &I-GT-K00234;
     (=gt-pj-1		. #x5740)	; &I-GT-12504; [55-32]
     (=daikanwa		. 09909)	; &I-M-09909;
+    (<-same
+     ((=jis-x0212	  . #x3C77)	; &GT-12503; [28-87]
+      (=cns11643-3	  . #x2140)	; &I-C3-2140; [01-32]
+      (=daikanwa	  . 09908)	; &I-M-09908;
+      ))
+    (<-same*sources
+     guangyun daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -101,13 +101,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E94)	; ⺔
     (<-formed@component
      ((=ucs		  . #x5F50)	; 彐
       ))
     (<-identical@component
      ((=ucs		  . #x5F51)	; 彑
       ))
-    (=ucs		. #x2E94)	; ⺔
     ))
 (define-char
   '((ideographic-radical . 58)	; â¼¹
@@ -116,6 +116,7 @@
     (=ucs		. #x5F52)	; 归
     (->subsumptive
      ((morohashi-daikanwa	9909 1)
+      (=cns11643-3	  . #x224A)	; &C3-224A; [02-42]
       (<-vulgar
        ((=jis-x0208	    . #x5D45)	; &GT-20995; [61-37]
 	(=ks-x1001	    . #x4F7D)	; &I-K0-4F7D; [47-93]
@@ -124,11 +125,14 @@
 	))
       (<-vulgar*sources
        daikanwa)
-      (=cns11643-3	  . #x224A)	; &C3-224A; [02-42]
       )
      ((=gb2312		  . #x3969)	; &G0-3969; [25-73]
       (=ucs@unicode	  . #x5F52)	; &G0-3969;
       (mojikyo		  . 050167)	; &MCS-6000C3F7;
+      (<-simplified@CN
+       ((=ucs		    . #x6B78)	; æ­¸
+	(=gb12345	    . #x3969)	; æ­¸ [25-73]
+	))
       ))
     ))
 (define-char
@@ -139,7 +143,7 @@
     (=daikanwa		. 09910)	; &M-09910;
     ))
 (define-char
-  '((morohashi-daikanwa	9910 0 1)
+  '((=>daikanwa		. 09910)	; &M-09910;
     (ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
@@ -151,35 +155,32 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x22451)	; 𢑑
-    (=cns11643-6	. #x246C)	; &I-C6-246C; [04-76]
-    (=daikanwa		. 09911)	; &I-M-09911;
+    (->subsumptive
+     ((=daikanwa	  . 09911)	; &M-09911;
+      )
+     ((=cns11643-6	  . #x246C)	; &C6-246C; [04-76]
+      (=ucs@iso		  . #x22451)	; &C6-246C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
+    (=ucs		. #x22450)	; 𢑐
+    (=cns11643-6	. #x246E)	; &I-C6-246E; [04-78]
+    (=daikanwa		. 09912)	; &I-M-09912;
+    (mojikyo		. 009912)	; &MCS-600026B8;
     (<-vulgar
      ((=ucs		  . #x7576)	; 當
       (=daikanwa	  . 21890)	; &I-M-21890;
       ))
     (<-vulgar*sources
      daikanwa)
-    (=ucs		. #x22450)	; 𢑐
-    (=cns11643-6	. #x246E)	; &I-C6-246E; [04-78]
-    (=daikanwa		. 09912)	; &I-M-09912;
-    (mojikyo		. 009912)	; &MCS-600026B8;
     ))
 (define-char
   '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x7576)	; 當
-      (=jis-x0208	  . #x6144)	; &I-J90-6144; [65-36]
-      (=daikanwa	  . 21890)	; &I-M-21890;
-      ))
-    (<-simplified@JP/Jouyou*sources
-     daikanwa JP/Jouyou)
     (shinjigen-2	. 5071)
     (=ucs		. #x5F53)	; 当
     (=jis-x0208		. #x4576)	; &I-J90-4576; [37-86]
@@ -190,21 +191,35 @@
     (=gt-pj-1		. #x4576)	; &I-GT-12509; [37-86]
     (=daikanwa		. 09913)	; &I-M-09913;
     (mojikyo		. 009913)	; &MCS-600026B9;
+    (<-simplified@CN
+     ((=ucs		  . #x7576)	; 當
+      (=gb12345		  . #x3531)	; 當 [21-17]
+      )
+     ((=ucs		  . #x5679)	; 噹
+      (=gb12345		  . #x782B)	; 噹 [88-11]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x7576)	; 當
+      (=jis-x0208	  . #x6144)	; &I-J90-6144; [65-36]
+      (=daikanwa	  . 21890)	; &I-M-21890;
+      ))
+    (<-simplified@JP/Jouyou*sources
+     daikanwa JP/Jouyou)
+    (<-simplified@ucs
+     ((=ucs		  . #x7576)	; 當
+      ))
     ))
 (define-char
-  '((=>ucs		. #x22453)	; 𢑓
-    (ideographic-radical . 58)	; â¼¹
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=daikanwa		. 09914)	; &M-09914;
-    ))
-(define-char
-  '((morohashi-daikanwa	9914 0 0)
-    (ideographic-radical . 58)	; â¼¹
+  '((ideographic-radical . 58)	; â¼¹
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x22453)	; 𢑓
-    (=cns11643-5	. #x2433)	; &I-C5-2433; [04-19]
+    (->subsumptive
+     ((=daikanwa	  . 09914)	; &M-09914;
+      )
+     ((=cns11643-5	  . #x2433)	; &C5-2433; [04-19]
+      (=ucs@iso		  . #x22453)	; &C5-2433;
+      ))
     ))
 (define-char
   '((ideographic-radical . 58)	; â¼¹
@@ -216,18 +231,17 @@
     ))
 (define-char
   '((ideographic-radical . 58)	; â¼¹
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
     (=ucs		. #x22454)	; 𢑔
-    (=daikanwa		. 09916)	; &I-M-09916;
-    ))
-(define-char
-  '((=>ucs		. #x22454)	; 𢑔
-    (morohashi-daikanwa	9916 0 2)
-    (ideographic-radical . 58)	; â¼¹
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=cns11643-6	. #x3121)	; &C6-3121; [17-01]
+    (->subsumptive
+     ((ideographic-strokes . 5)
+      (total-strokes	   . 8)
+      (=daikanwa	  . 09916)	; &M-09916;
+      (=ucs@iso		  . #x22454)	; &M-09916;
+      )
+     ((ideographic-strokes . 6)
+      (total-strokes	   . 9)
+      (=cns11643-6	  . #x3121)	; &C6-3121; [17-01]
+      ))
     ))
 (define-char
   '((ideographic-radical . 58)	; â¼¹
diff --git a/lisp/utf-2000/Ideograph-R059-Bristle.el b/lisp/utf-2000/Ideograph-R059-Bristle.el
index 4692446..1d3c446 100644
--- a/lisp/utf-2000/Ideograph-R059-Bristle.el
+++ b/lisp/utf-2000/Ideograph-R059-Bristle.el
@@ -486,20 +486,19 @@
     (mojikyo		. 057577)	; &MCS-6000E0E9;
     ))
 (define-char
-  '((=>daikanwa		. 09994)	; &M-09994;
-    (ideographic-radical . 59)	; ⼺
+  '((ideographic-radical . 59)	; ⼺
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-same
-     ((=jis-x0208	  . #x4937)	; &GT-12610; [41-23]
-      (=ks-x1001	  . #x7873)	; &I-K0-7873; [88-83]
-      (=daikanwa	  . 09993)	; &I-M-09993;
-      ))
-    (<-same*sources
-     zihui-bei daikanwa)
     (=ucs		. #x2249C)	; 𢒜
     (->subsumptive
      ((=daikanwa	  . 09994)	; &M-09994;
+      (<-same
+       ((=jis-x0208	    . #x4937)	; &GT-12610; [41-23]
+	(=ks-x1001	    . #x7873)	; &I-K0-7873; [88-83]
+	(=daikanwa	    . 09993)	; &I-M-09993;
+	))
+      (<-same*sources
+       zihui-bei daikanwa)
       )
      ((hanyu-dazidian	  2 854 20)
       (=hanziku-3	  . #xABF0)	; &HZK03-ABF0;
@@ -510,29 +509,42 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x2F89A)	; 彫
+  '((<-denotational
+     ((=big5		  . #xB16E)	; &B-B16E;
+      (=jis-x0208@1997	  . #x4426)	; &B-B16E; [36-06]
+      ))
     (=>ucs*		. #x5F6B)	; 彫
     (ideographic-radical . 59)	; ⼺
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=gt		. 12606)	; &GT-12606;
-    (=gt-k		. 07831)	; &I-GT-K07831;
-    (=gt-pj-3		. #x4A6E)	; &GT-12606; [42-78]
-    (=daikanwa		. 09995)	; &I-M-09995;
-    (=jef-china3	. #x4DA7)	; &I-JC3-4DA7;
-    (=ucs@JP		. #x2F89A)	; &GT-12606;
+    (=ucs		. #x2F89A)	; 彫
+    (->subsumptive
+     ((=gt		  . 12606)	; &GT-12606;
+      (=gt-k		  . 07831)	; &I-GT-K07831;
+      (=gt-pj-3		  . #x4A6E)	; &GT-12606; [42-78]
+      (=daikanwa	  . 09995)	; &I-M-09995;
+      (=jef-china3	  . #x4DA7)	; &I-JC3-4DA7;
+      (=ucs@JP		  . #x2F89A)	; &GT-12606;
+      )
+     ((=cns11643-6	  . #x3F5E)	; &C6-3F5E; [31-62]
+      (=ucs@iso		  . #x2F89A)	; &C6-3F5E;
+      ))
     ))
 (define-char
   '((=>ucs*		. #x5F6B)	; 彫
-    (morohashi-daikanwa	9995 0 0)
     (ideographic-radical . 59)	; ⼺
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x2F89A)	; 彫
-    (=cns11643-6	. #x3F5E)	; &I-C6-3F5E; [31-62]
+    (=big5		. #xB16E)	; &B-B16E;
+    (=jis-x0208@1997	. #x4426)	; &B-B16E; [36-06]
+    (=ucs@big5		. #x5F6B)	; &B-B16E;
     ))
 (define-char
-  '((morohashi-daikanwa	9995 1)
+  '((<-denotational
+     ((=big5		  . #xB16E)	; &B-B16E;
+      (=jis-x0208@1997	  . #x4426)	; &B-B16E; [36-06]
+      ))
+    (morohashi-daikanwa	9995 1)
     (ideographic-radical . 59)	; ⼺
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
@@ -540,7 +552,6 @@
     (=jis-x0208		. #x4426)	; &I-J90-4426; [36-06]
     (=ks-x1001		. #x7041)	; &I-K0-7041; [80-33]
     (=cns11643-1	. #x5A34)	; &I-C1-5A34; [58-20]
-    (=big5		. #xB16E)	; &I-B-B16E;
     (=gt		. 12607)	; &I-GT-12607;
     (=gt-k		. 07832)	; &I-GT-K07832;
     (=gt-pj-1		. #x4426)	; &I-GT-12607; [36-06]
diff --git a/lisp/utf-2000/Ideograph-R060-Step.el b/lisp/utf-2000/Ideograph-R060-Step.el
index d353436..3ebfc96 100644
--- a/lisp/utf-2000/Ideograph-R060-Step.el
+++ b/lisp/utf-2000/Ideograph-R060-Step.el
@@ -496,9 +496,6 @@
   '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-formed
-     ((=daikanwa	  . 38796)	; &M-38796;
-      ))
     (shinjigen-1	. 2339)
     (shinjigen-2	. 2339)
     (=ucs		. #x5F81)	; 征
@@ -511,6 +508,9 @@
     (=gt-k		. 03757)	; &I-GT-K03757;
     (=gt-pj-1		. #x402C)	; &I-GT-12689; [32-12]
     (=daikanwa		. 10077)	; &I-M-10077;
+    (<-formed
+     ((=daikanwa	  . 38796)	; &M-38796;
+      ))
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
@@ -532,48 +532,64 @@
   '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=daikanwa		. 10079)	; &M-10079;
+    (=ucs		. #x224D9)	; 𢓙
+    (=daikanwa		. 10079)	; &I-M-10079;
     ))
 (define-char
-  '((=>ucs		. #x224D8)	; 𢓘
-    (ideographic-radical . 60)	; â¼»
+  '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=daikanwa		. 10080)	; &M-10080;
+    (=ucs		. #x224D8)	; 𢓘
+    (->subsumptive
+     ((=daikanwa	  . 10080)	; &M-10080;
+      )
+     ((=cns11643-6	  . #x2B3F)	; &C6-2B3F; [11-31]
+      (=ucs@iso		  . #x224D8)	; &C6-2B3F;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	10080 0 1)
-    (ideographic-radical . 60)	; â¼»
+  '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=ucs		. #x224D8)	; 𢓘
-    (=cns11643-6	. #x2B3F)	; &I-C6-2B3F; [11-31]
+    (=ucs		. #x5F84)	; 径
+    (<-simplified@ucs
+     ((=ucs		  . #x5F91)	; 徑
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5F84)	; 径
+  '((<-denotational
+     ((=ucs		  . #x5F84)	; 径
+      ))
     (morohashi-daikanwa	10080 1)
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5F91)	; 徑
-      (=jis-x0208	  . #x574D)	; &I-J90-574D; [55-45]
-      ))
     (=jis-x0208		. #x3742)	; &GT-12687; [23-34]
     (=cns11643-3	. #x2875)	; &I-C3-2875; [08-85]
     (=gt		. 12687)	; &I-GT-12687;
     (=gt-pj-1		. #x3742)	; &I-GT-12687; [23-34]
     (=ucs@jis		. #x5F84)	; &GT-12687;
     (mojikyo		. 050169)	; &MCS-6000C3F9;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x5F91)	; 徑
+      (=jis-x0208	  . #x574D)	; &I-J90-574D; [55-45]
+      ))
     ))
 (define-char
-  '((script		CN Simplified Ideograph)
+  '((<-denotational
+     ((=ucs		  . #x5F84)	; 径
+      ))
+    (script		CN Simplified Ideograph)
     (morohashi-daikanwa	10080 1 5)
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=ucs		. #x5F84)	; 径
-    (=gb2312		. #x3E36)	; &I-G0-3E36; [30-22]
+    (=gb2312		. #x3E36)	; &G0-3E36; [30-22]
+    (=ucs@unicode	. #x5F84)	; &G0-3E36;
+    (<-simplified@CN
+     ((=ucs		  . #x5F91)	; 徑
+      (=gb12345		  . #x3E36)	; 徑 [30-22]
+      ))
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
@@ -865,27 +881,24 @@
     (=daikanwa		. 10103)	; &I-M-10103;
     ))
 (define-char
-  '((=>ucs		. #x38E0)	; 㣠
-    (ideographic-radical . 60)	; â¼»
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (<-same
-     ((=jis-x0212	  . #x3070)	; &M-00522; [16-80]
-      (=jis-x0213-1-2000  . #x2E31)	; &I-JX1-2E31; [14-17]
-      (=daikanwa	  . 00522)	; &I-M-00522;
-      ))
-    (<-same*sources
-     chuanpian daikanwa)
-    (=daikanwa		. 10104)	; &M-10104;
-    (=jef-china3	. #x4DB3)	; &I-JC3-4DB3;
-    ))
-(define-char
-  '((morohashi-daikanwa	10104 0 1)
-    (ideographic-radical . 60)	; â¼»
+  '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x38E0)	; 㣠
-    (=cns11643-6	. #x3125)	; &I-C6-3125; [17-05]
+    (->subsumptive
+     ((=daikanwa	  . 10104)	; &M-10104;
+      (=jef-china3	  . #x4DB3)	; &I-JC3-4DB3;
+      (<-same
+       ((=jis-x0212	    . #x3070)	; &M-00522; [16-80]
+	(=jis-x0213-1-2000  . #x2E31)	; &I-JX1-2E31; [14-17]
+	(=daikanwa	    . 00522)	; &I-M-00522;
+	))
+      (<-same*sources
+       chuanpian daikanwa)
+      )
+     ((=cns11643-6	  . #x3125)	; &C6-3125; [17-05]
+      (=ucs@unicode	  . #x38E0)	; &C6-3125;
+      ))
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
@@ -1165,15 +1178,15 @@
   '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (=ucs		. #x224F6)	; 𢓶
+    (=cns11643-6	. #x3749)	; &I-C6-3749; [23-41]
+    (=daikanwa		. 10124)	; &I-M-10124;
     (<-ancient
      ((=ks-x1001	  . #x7757)	; &M-38892; [87-55]
       (=daikanwa	  . 38892)	; &I-M-38892;
       ))
     (<-ancient*sources
      zihui-bei daikanwa)
-    (=ucs		. #x224F6)	; 𢓶
-    (=cns11643-6	. #x3749)	; &I-C6-3749; [23-41]
-    (=daikanwa		. 10124)	; &I-M-10124;
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
@@ -1203,7 +1216,12 @@
   '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=daikanwa		. 10128)	; &M-10128;
+    (=ucs		. #x224FB)	; 𢓻
+    (->subsumptive
+     ((=daikanwa	  . 10128)	; &M-10128;
+      )
+     ((=ucs@iso		  . #x224FB)	; &U-000224FB;
+      ))
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
@@ -1218,45 +1236,36 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x224FD)	; 𢓽
-    (=daikanwa		. 10130)	; &I-M-10130;
-    ))
-(define-char
-  '((=>ucs		. #x224FD)	; 𢓽
-    (morohashi-daikanwa	10130 0 0)
-    (ideographic-radical . 60)	; â¼»
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=cns11643-6	. #x3750)	; &C6-3750; [23-48]
+    (->subsumptive
+     ((=daikanwa	  . 10130)	; &M-10130;
+      (=ucs@iso		  . #x224FD)	; &M-10130;
+      )
+     ((=cns11643-6	  . #x3750)	; &C6-3750; [23-48]
+      ))
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=daikanwa		. 10131)	; &M-10131;
+    (=ucs		. #x224FF)	; 𢓿
+    (=daikanwa		. 10131)	; &I-M-10131;
     ))
 (define-char
-  '((=>ucs		. #x224FC)	; 𢓼
-    (ideographic-radical . 60)	; â¼»
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=daikanwa		. 10132)	; &M-10132;
-    ))
-(define-char
-  '((morohashi-daikanwa	10132 0 0)
-    (ideographic-radical . 60)	; â¼»
+  '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x224FC)	; 𢓼
-    (=cns11643-6	. #x374B)	; &I-C6-374B; [23-43]
+    (->subsumptive
+     ((=daikanwa	  . 10132)	; &M-10132;
+      )
+     ((=cns11643-6	  . #x374B)	; &C6-374B; [23-43]
+      (=ucs@iso		  . #x224FC)	; &C6-374B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5F9E)	; 從
-      (=jis-x0208	  . #x574F)	; &I-J90-574F; [55-47]
-      ))
     (shinjigen-1	. 2354)
     (shinjigen-2	. 2354)
     (=ucs		. #x5F93)	; 従
@@ -1266,6 +1275,10 @@
     (=gt-k		. 06458)	; &I-GT-K06458;
     (=gt-pj-1		. #x3D3E)	; &I-GT-12746; [29-30]
     (=daikanwa		. 10133)	; &I-M-10133;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x5F9E)	; 從
+      (=jis-x0208	  . #x574F)	; &I-J90-574F; [55-47]
+      ))
     ))
 (define-char
   '((=>ucs		. #x5F94)	; 徔
@@ -1807,15 +1820,15 @@
   '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (=ucs		. #x5FA6)	; 徦
+    (=cns11643-2	. #x3B59)	; &I-C2-3B59; [27-57]
+    (=big5		. #xD8F5)	; &I-B-D8F5;
+    (=daikanwa		. 10173)	; &I-M-10173;
     (<-formed
      ((=jis-x0208	  . #x6E22)	; &GT-52321; [78-02]
       (=ks-x1001	  . #x7946)	; &I-K0-7946; [89-38]
       (=daikanwa	  . 39005)	; &I-M-39005;
       ))
-    (=ucs		. #x5FA6)	; 徦
-    (=cns11643-2	. #x3B59)	; &I-C2-3B59; [27-57]
-    (=big5		. #xD8F5)	; &I-B-D8F5;
-    (=daikanwa		. 10173)	; &I-M-10173;
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
@@ -1917,11 +1930,6 @@
   '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-formed
-     ((=jis-x0208	  . #x6E23)	; &GT-52330; [78-03]
-      (=ks-x1001	  . #x7C5A)	; &I-K0-7C5A; [92-58]
-      (=daikanwa	  . 39006)	; &I-M-39006;
-      ))
     (shinjigen-1	. 2370)
     (shinjigen-2	. 2370)
     (=ucs		. #x5FA8)	; 徨
@@ -1933,6 +1941,11 @@
     (=gt		. 12825)	; &I-GT-12825;
     (=gt-pj-1		. #x5753)	; &I-GT-12825; [55-51]
     (=daikanwa		. 10178)	; &I-M-10178;
+    (<-formed
+     ((=jis-x0208	  . #x6E23)	; &GT-52330; [78-03]
+      (=ks-x1001	  . #x7C5A)	; &I-K0-7C5A; [92-58]
+      (=daikanwa	  . 39006)	; &I-M-39006;
+      ))
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
@@ -2421,30 +2434,33 @@
     (=daikanwa		. 10207)	; &I-M-10207;
     ))
 (define-char
-  '((=>ucs		. #x22538)	; 𢔸
-    (ideographic-radical . 60)	; â¼»
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=daikanwa		. 10208)	; &M-10208;
-    ))
-(define-char
-  '((morohashi-daikanwa	10208 0 0)
-    (ideographic-radical . 60)	; â¼»
+  '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x22538)	; 𢔸
-    (=cns11643-6	. #x5253)	; &I-C6-5253; [50-51]
+    (->subsumptive
+     ((=daikanwa	  . 10208)	; &M-10208;
+      )
+     ((=ucs@iso		  . #x22538)	; &U-00022538;
+      )
+     ((=cns11643-6	  . #x5253)	; &C6-5253; [50-51]
+      ))
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=daikanwa		. 10209)	; &M-10209;
+    (=ucs		. #x22539)	; 𢔹
+    (=daikanwa		. 10209)	; &I-M-10209;
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
+    (=ucs		. #x5FB0)	; å¾°
+    (=jis-x0212		. #x3D35)	; &I-JSP-3D35; [29-21]
+    (=cns11643-4	. #x3D34)	; &I-C4-3D34; [29-20]
+    (=daikanwa		. 10210)	; &I-M-10210;
     (<-ancient@r060
      ((=ucs		  . #x5F81)	; 征
       (=daikanwa	  . 10077)	; &I-M-10077;
@@ -2454,10 +2470,6 @@
     (<-ancient@r162
      ((=daikanwa	  . 38796)	; &M-38796;
       ))
-    (=ucs		. #x5FB0)	; å¾°
-    (=jis-x0212		. #x3D35)	; &I-JSP-3D35; [29-21]
-    (=cns11643-4	. #x3D34)	; &I-C4-3D34; [29-20]
-    (=daikanwa		. 10210)	; &I-M-10210;
     ))
 (define-char
   '((=>ucs		. #x2254E)	; 𢕎
@@ -2752,132 +2764,152 @@
     (=daikanwa		. 10234)	; &I-M-10234;
     ))
 (define-char
-  '((=>ucs		. #x2255F)	; 𢕟
-    (ideographic-radical . 60)	; â¼»
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=daikanwa		. 10235)	; &M-10235;
-    ))
-(define-char
-  '((morohashi-daikanwa	10235 0 0)
-    (ideographic-radical . 60)	; â¼»
+  '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x2255F)	; 𢕟
-    (=cns11643-6	. #x5C64)	; &I-C6-5C64; [60-68]
     ))
 (define-char
-  '((ideographic-radical . 60)	; â¼»
+  '((<-denotational
+     ((=ucs		  . #x2255F)	; 𢕟
+      ))
+    (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=daikanwa		. 10236)	; &M-10236;
+    (=daikanwa		. 10235)	; &M-10235;
     ))
 (define-char
-  '((=>ucs		. #x22567)	; 𢕧
+  '((<-denotational
+     ((=ucs		  . #x2255F)	; 𢕟
+      ))
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=daikanwa		. 10237)	; &M-10237;
+    (=cns11643-6	. #x5C64)	; &C6-5C64; [60-68]
+    (=ucs@iso		. #x2255F)	; &C6-5C64;
     ))
 (define-char
-  '((morohashi-daikanwa	10237 0 0)
-    (ideographic-radical . 60)	; â¼»
+  '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=ucs		. #x22567)	; 𢕧
-    (=cns11643-6	. #x5C65)	; &I-C6-5C65; [60-69]
+    (=ucs		. #x22566)	; 𢕦
+    (->subsumptive
+     ((=daikanwa	  . 10236)	; &M-10236;
+      )
+     ((=ucs@iso		  . #x22566)	; &U-00022566;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5FB3)	; å¾³
-    (morohashi-daikanwa	10237 1)
-    (ideographic-radical . 60)	; â¼»
+  '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5FB7)	; å¾·
-      (=jis-x0213-1-2000  . #x7445)	; &I-JX1-7445; [84-37]
+    (=ucs		. #x22567)	; 𢕧
+    (->subsumptive
+     ((=daikanwa	  . 10237)	; &M-10237;
+      )
+     ((=cns11643-6	  . #x5C65)	; &C6-5C65; [60-69]
+      (=ucs@iso		  . #x22567)	; &C6-5C65;
       ))
-    (=jis-x0208		. #x4641)	; &GT-12896; [38-33]
-    (=gt		. 12896)	; &I-GT-12896;
-    (=gt-k		. 11158)	; &I-GT-K11158;
-    (=gt-pj-1		. #x4641)	; &I-GT-12896; [38-33]
-    (=ucs@jis		. #x5FB3)	; &GT-12896;
-    (mojikyo		. 050170)	; &MCS-6000C3FA;
     ))
 (define-char
-  '((morohashi-daikanwa	10237 1 0)
-    (ideographic-radical . 60)	; â¼»
+  '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x5FB3)	; å¾³
-    (=cns11643-3	. #x4663)	; &I-C3-4663; [38-67]
+    (->subsumptive
+     ((morohashi-daikanwa	10237 1)
+      (=jis-x0208	  . #x4641)	; &GT-12896; [38-33]
+      (=gt		  . 12896)	; &I-GT-12896;
+      (=gt-k		  . 11158)	; &I-GT-K11158;
+      (=gt-pj-1		  . #x4641)	; &I-GT-12896; [38-33]
+      (=ucs@jis		  . #x5FB3)	; &GT-12896;
+      (mojikyo		  . 050170)	; &MCS-6000C3FA;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x5FB7)	; å¾·
+	(=jis-x0213-1-2000  . #x7445)	; &I-JX1-7445; [84-37]
+	))
+      )
+     ((=cns11643-3	  . #x4663)	; &C3-4663; [38-67]
+      (=ucs@unicode	  . #x5FB3)	; &C3-4663;
+      ))
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=daikanwa		. 10238)	; &M-10238;
+    (=ucs		. #x22568)	; 𢕨
+    (->subsumptive
+     ((=daikanwa	  . 10238)	; &M-10238;
+      )
+     ((=ucs@iso		  . #x22568)	; &U-00022568;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5FB4)	; å¾´
-    (morohashi-daikanwa	10238 1)
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x4427)	; &J97-4427; [36-07]
+      ))
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=cns11643-1	  . #x6C62)	; &JX1-7444; [76-66]
-      (=jis-x0213-1-2000  . #x7444)	; &I-JX1-7444; [84-36]
+    (=ucs		. #x5FB4)	; å¾´
+    (->subsumptive
+     ((morohashi-daikanwa	10238 1)
+      (=jis-x0208	  . #x4427)	; &GT-12893; [36-07]
+      (=cns11643-3	  . #x4664)	; &I-C3-4664; [38-68]
+      (=gt		  . 12893)	; &I-GT-12893;
+      (=gt-k		  . 11152)	; &I-GT-K11152;
+      (=gt-pj-1		  . #x4427)	; &I-GT-12893; [36-07]
+      (=ucs@jis		  . #x5FB4)	; &GT-12893;
+      (<-simplified@JP/Jouyou
+       ((=cns11643-1	    . #x6C62)	; &JX1-7444; [76-66]
+	(=jis-x0213-1-2000  . #x7444)	; &I-JX1-7444; [84-36]
+	))
+      )
+     ((mojikyo		  . 050171)	; &MCS-6000C3FB;
+      )
+     ((=ucs@unicode	  . #x5FB4)	; &UU+5FB4;
       ))
-    (=jis-x0208		. #x4427)	; &GT-12893; [36-07]
-    (=cns11643-3	. #x4664)	; &I-C3-4664; [38-68]
-    (=gt		. 12893)	; &I-GT-12893;
-    (=gt-k		. 11152)	; &I-GT-K11152;
-    (=gt-pj-1		. #x4427)	; &I-GT-12893; [36-07]
-    (=ucs@jis		. #x5FB4)	; &GT-12893;
     ))
 (define-char
-  '((=>ucs		. #x5FB4)	; å¾´
-    (morohashi-daikanwa	10238 1 0)
-    (ideographic-radical . 60)	; â¼»
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (mojikyo		. 050171)	; &MCS-6000C3FB;
+  '((ideographic-radical . 60)	; â¼»
+    (=jis-x0208@1997	. #x4427)	; &J97-4427; [36-07]
     ))
 (define-char
-  '((morohashi-daikanwa	10238 1 1)
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x4427)	; &J97-4427; [36-07]
+      ))
     (ideographic-radical . 60)	; â¼»
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=ucs		. #x5FB4)	; å¾´
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x5FB5)	; å¾µ
+    (=big5		. #xBC78)	; &I-B-BC78;
     ))
 (define-char
-  '((=>ucs		. #x5FB5)	; å¾µ
+  '((<-denotational
+     ((=ucs		  . #x5FB5)	; å¾µ
+      ))
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ks-x1001		. #x7323)	; &M-10239; [83-03]
-    (=daikanwa		. 10239)	; &I-M-10239;
-    (=jef-china3	. #x4DBF)	; &I-JC3-4DBF;
+    (->subsumptive
+     ((=ks-x1001	  . #x7323)	; &M-10239; [83-03]
+      (=daikanwa	  . 10239)	; &I-M-10239;
+      (=jef-china3	  . #x4DBF)	; &I-JC3-4DBF;
+      )
+     ((=gb2312		  . #x6167)	; &G0-6167; [65-71]
+      (=ucs@unicode	  . #x5FB5)	; &G0-6167;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5FB5)	; å¾µ
-    (morohashi-daikanwa	10239 0 1)
+  '((<-denotational
+     ((=ucs		  . #x5FB5)	; å¾µ
+      ))
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=cns11643-1	. #x6C62)	; &JX1-7444; [76-66]
     (=jis-x0213-1-2000	. #x7444)	; &I-JX1-7444; [84-36]
-    (=big5		. #xBC78)	; &I-B-BC78;
     (=ucs@jis		. #x5FB5)	; &JX1-7444;
-    (=ucs@big5		. #x5FB5)	; &JX1-7444;
-    ))
-(define-char
-  '((morohashi-daikanwa	10239 0 2)
-    (ideographic-radical . 60)	; â¼»
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x5FB5)	; å¾µ
-    (=gb2312		. #x6167)	; &I-G0-6167; [65-71]
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
@@ -3183,7 +3215,14 @@
     (=ucs		. #x5FBC)	; å¾¼
     (=big5		. #xE975)	; &I-B-E975;
     (->subsumptive
-     ((<-formed
+     ((shinjigen-1	  . 2388)
+      (shinjigen-2	  . 2388)
+      (=jis-x0208	  . #x5755)	; &GT-12935; [55-53]
+      (=gt		  . 12935)	; &I-GT-12935;
+      (=gt-pj-1		  . #x5755)	; &I-GT-12935; [55-53]
+      (=daikanwa	  . 10261)	; &I-M-10261;
+      (=ucs@jis		  . #x5FBC)	; &GT-12935;
+      (<-formed
        ((=jis-x0208	    . #x6E33)	; &GT-52731; [78-19]
 	(=ks-x1001	    . #x692D)	; &I-K0-692D; [73-13]
 	(=daikanwa	    . 39168)	; &I-M-39168;
@@ -3195,13 +3234,6 @@
 	))
       (<-same*sources
        jiyun daikanwa)
-      (shinjigen-1	  . 2388)
-      (shinjigen-2	  . 2388)
-      (=jis-x0208	  . #x5755)	; &GT-12935; [55-53]
-      (=gt		  . 12935)	; &I-GT-12935;
-      (=gt-pj-1		  . #x5755)	; &I-GT-12935; [55-53]
-      (=daikanwa	  . 10261)	; &I-M-10261;
-      (=ucs@jis		  . #x5FBC)	; &GT-12935;
       )
      ((=gb2312		  . #x6168)	; &C2-5721; [65-72]
       (=cns11643-2	  . #x5721)	; &I-C2-5721; [55-01]
@@ -3268,6 +3300,7 @@
 (define-char
   '((ideographic-radical . 60)	; â¼»
     (=ucs		. #x5FBD)	; å¾½
+    (=jis-x0208@1997	. #x352B)	; å¾½ [21-11]
     ))
 (define-char
   '((<-denotational
@@ -3295,17 +3328,17 @@
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
+    (=jis-x0208@1983	. #x352B)	; &GT-35717; [21-11]
+    (=jis-x0208@1990	. #x352B)	; &I-J90-352B; [21-11]
+    (=gt		. 35717)	; &I-GT-35717;
+    (=gt-pj-1		. #x352B)	; &I-GT-35717; [21-11]
+    (=ucs@jis		. #x5FBD)	; &GT-35717;
     (<-simplified@JP
      ((=jis-x0208@1978	  . #x352B)	; &M-10267; [21-11]
       (=ks-x1001	  . #x7D45)	; &I-K0-7D45; [93-37]
       (=cns11643-1	  . #x735B)	; &I-C1-735B; [83-59]
       (=daikanwa	  . 10267)	; &I-M-10267;
       ))
-    (=jis-x0208@1983	. #x352B)	; &GT-35717; [21-11]
-    (=jis-x0208@1990	. #x352B)	; &I-J90-352B; [21-11]
-    (=gt		. 35717)	; &I-GT-35717;
-    (=gt-pj-1		. #x352B)	; &I-GT-35717; [21-11]
-    (=ucs@jis		. #x5FBD)	; &GT-35717;
     ))
 (define-char
   '((=>ucs		. #x2256C)	; 𢕬
diff --git a/lisp/utf-2000/Ideograph-R061-Heart.el b/lisp/utf-2000/Ideograph-R061-Heart.el
index 86c9c35..09ba35c 100644
--- a/lisp/utf-2000/Ideograph-R061-Heart.el
+++ b/lisp/utf-2000/Ideograph-R061-Heart.el
@@ -30,12 +30,6 @@
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
-    (<-formed@component/connect-right
-     ((=ucs		  . #x5FC3)	; 心
-      (=daikanwa	  . 10295)	; &I-M-10295;
-      ))
-    (<-formed@component/connect-right*sources
-     leibian daikanwa)
     (=ucs		. #x5FC4)	; 忄
     (=gb2312		. #x6260)	; &I-G0-6260; [66-64]
     (=jis-x0212		. #x3D38)	; &I-JSP-3D38; [29-24]
@@ -47,6 +41,12 @@
     (=gt-pj-3		. #x4D5F)	; &I-GT-12992; [45-63]
     (=daikanwa		. 10297)	; &I-M-10297;
     (=jef-china3	. #x4DC3)	; &I-JC3-4DC3;
+    (<-formed@component/connect-right
+     ((=ucs		  . #x5FC3)	; 心
+      (=daikanwa	  . 10295)	; &I-M-10295;
+      ))
+    (<-formed@component/connect-right*sources
+     leibian daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -56,10 +56,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E96)	; ⺖
     (<-identical@component/connect-right
      ((=ucs		  . #x5FC4)	; 忄
       ))
-    (=ucs		. #x2E96)	; ⺖
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -74,15 +74,15 @@
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=cns11643-6	. #x217E)	; &M-10298; [01-94]
+    (=daikanwa		. 10298)	; &I-M-10298;
+    (=ucs@unicode	. #x38FA)	; &M-10298;
     (<-formed@component/connect-above
      ((=ucs		  . #x5FC3)	; 心
       (=daikanwa	  . 10295)	; &I-M-10295;
       ))
     (<-formed@component/connect-above*sources
      leibian daikanwa)
-    (=cns11643-6	. #x217E)	; &M-10298; [01-94]
-    (=daikanwa		. 10298)	; &I-M-10298;
-    (=ucs@unicode	. #x38FA)	; &M-10298;
     ))
 (define-char
   '((<-denotational
@@ -91,11 +91,11 @@
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=jis-x0213-2-2000	. #x2C3B)	; &JX2-2C3B; [12-27]
+    (=ucs@jis		. #x38FA)	; &JX2-2C3B;
     (<-formed@component/connect-above
      ((=ucs		  . #x5FC3)	; 心
       ))
-    (=jis-x0213-2-2000	. #x2C3B)	; &JX2-2C3B; [12-27]
-    (=ucs@jis		. #x38FA)	; &JX2-2C3B;
     ))
 (define-char
   '((<-denotational
@@ -105,10 +105,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E97)	; ⺗
     (<-identical@component/connect-above
      ((=jis-x0213-2-2000  . #x2C3B)	; &JX2-2C3B; [12-27]
       ))
-    (=ucs		. #x2E97)	; ⺗
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -699,12 +699,22 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x5FDB)	; 忛
-    (=daikanwa		. 10344)	; &I-M-10344;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5FDB)	; 忛
+      ))
+    (ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
+    (=daikanwa		. 10344)	; &M-10344;
     (=cbeta		. 05410)	; &I-CB05410;
+    (=ucs@unicode	. #x5FDB)	; &M-10344;
     ))
 (define-char
-  '((=>ucs		. #x5FDB)	; 忛
-    (morohashi-daikanwa	10344 0 0)
+  '((<-denotational
+     ((=ucs		  . #x5FDB)	; 忛
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
@@ -714,13 +724,16 @@
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (=daikanwa		. 10345)	; &M-10345;
+    (=ucs		. #x225BF)	; 𢖿
+    (=daikanwa		. 10345)	; &I-M-10345;
+    (=hanziku-6		. #xD5BD)	; &I-HZK06-D5BD;
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (=daikanwa		. 10346)	; &M-10346;
+    (=ucs		. #x225C0)	; 𢗀
+    (=daikanwa		. 10346)	; &I-M-10346;
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -731,29 +744,26 @@
     (=daikanwa		. 10347)	; &I-M-10347;
     ))
 (define-char
-  '((=>ucs		. #x5FDC)	; 応
-    (morohashi-daikanwa	10347 1)
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 3)
-    (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5866)	; &GT-14298; [56-70]
-      (=ks-x1001	  . #x6B6B)	; &I-K0-6B6B; [75-75]
-      (=daikanwa	  . 11330)	; &I-M-11330;
-      ))
-    (=jis-x0208		. #x317E)	; &GT-13034; [17-94]
-    (=gt		. 13034)	; &I-GT-13034;
-    (=gt-pj-1		. #x317E)	; &I-GT-13034; [17-94]
-    (=ucs@jis		. #x5FDC)	; &GT-13034;
-    (mojikyo		. 050173)	; &MCS-6000C3FD;
-    ))
-(define-char
-  '((morohashi-daikanwa	10347 1 0)
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x5FDC)	; 応
-    (=cns11643-3	. #x2577)	; &I-C3-2577; [05-87]
+    (->subsumptive
+     ((morohashi-daikanwa	10347 1)
+      (=jis-x0208	  . #x317E)	; &GT-13034; [17-94]
+      (=gt		  . 13034)	; &I-GT-13034;
+      (=gt-pj-1		  . #x317E)	; &I-GT-13034; [17-94]
+      (=ucs@jis		  . #x5FDC)	; &GT-13034;
+      (mojikyo		  . 050173)	; &MCS-6000C3FD;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5866)	; &GT-14298; [56-70]
+	(=ks-x1001	    . #x6B6B)	; &I-K0-6B6B; [75-75]
+	(=daikanwa	    . 11330)	; &I-M-11330;
+	))
+      )
+     ((=cns11643-3	  . #x2577)	; &C3-2577; [05-87]
+      (=ucs@unicode	  . #x5FDC)	; &C3-2577;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -1275,58 +1285,56 @@
     (=daikanwa		. 10387)	; &I-M-10387;
     ))
 (define-char
-  '((=>ucs		. #x5FF3)	; 忳
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=jis-x0212		. #x3D4D)	; &M-10388; [29-45]
-    (=jis-x0213-2-2000	. #x2C44)	; &I-JX2-2C44; [12-36]
-    (=big5		. #xCADC)	; &I-B-CADC;
-    (=daikanwa		. 10388)	; &I-M-10388;
-    (=jef-china3	. #x4DF3)	; &I-JC3-4DF3;
-    (=ucs@jis		. #x5FF3)	; &M-10388;
-    (=ucs@big5		. #x5FF3)	; &M-10388;
-    ))
-(define-char
-  '((morohashi-daikanwa	10388 0 0)
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x5FF3)	; 忳
-    (=cns11643-2	. #x237C)	; &I-C2-237C; [03-92]
+    (=big5		. #xCADC)	; &I-B-CADC;
+    (->subsumptive
+     ((=jis-x0212	  . #x3D4D)	; &M-10388; [29-45]
+      (=jis-x0213-2-2000  . #x2C44)	; &I-JX2-2C44; [12-36]
+      (=daikanwa	  . 10388)	; &I-M-10388;
+      (=jef-china3	  . #x4DF3)	; &I-JC3-4DF3;
+      (=ucs@jis		  . #x5FF3)	; &M-10388;
+      )
+     ((=cns11643-2	  . #x237C)	; &C2-237C; [03-92]
+      (=ucs@unicode	  . #x5FF3)	; &C2-237C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x5FF4)	; å¿´
-    (=cns11643-2	. #x2427)	; &I-C2-2427; [04-07]
     (=big5		. #xCAE5)	; &I-B-CAE5;
-    (=daikanwa		. 10389)	; &I-M-10389;
-    ))
-(define-char
-  '((=>ucs		. #x5FF5)	; 念
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (shinjigen-2	. 2419)
-    (=jis-x0208		. #x4730)	; &GT-13174; [39-16]
-    (=ks-x1001		. #x5237)	; &I-K0-5237; [50-23]
-    (=cns11643-1	. #x4D42)	; &I-C1-4D42; [45-34]
-    (=gt		. 13174)	; &I-GT-13174;
-    (=gt-k		. 03794)	; &I-GT-K03794;
-    (=gt-pj-1		. #x4730)	; &I-GT-13174; [39-16]
-    (=daikanwa		. 10390)	; &I-M-10390;
-    (=ucs@jis		. #x5FF5)	; &GT-13174;
+    (->subsumptive
+     ((=cns11643-2	  . #x2427)	; &M-10389; [04-07]
+      (=daikanwa	  . 10389)	; &I-M-10389;
+      )
+     ((=ucs@unicode	  . #x5FF4)	; &UU+5FF4;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	10390 0 1)
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x5FF5)	; 念
-    (=gb2312		. #x446E)	; &I-G0-446E; [36-78]
     (=big5		. #xA9C0)	; &I-B-A9C0;
+    (->subsumptive
+     ((shinjigen-1	  . 2419)
+      (shinjigen-2	  . 2419)
+      (=jis-x0208	  . #x4730)	; &GT-13174; [39-16]
+      (=ks-x1001	  . #x5237)	; &I-K0-5237; [50-23]
+      (=cns11643-1	  . #x4D42)	; &I-C1-4D42; [45-34]
+      (=gt		  . 13174)	; &I-GT-13174;
+      (=gt-k		  . 03794)	; &I-GT-K03794;
+      (=gt-pj-1		  . #x4730)	; &I-GT-13174; [39-16]
+      (=daikanwa	  . 10390)	; &I-M-10390;
+      (=ucs@jis		  . #x5FF5)	; &GT-13174;
+      )
+     ((=gb2312		  . #x446E)	; &G0-446E; [36-78]
+      (=ucs@unicode	  . #x5FF5)	; &G0-446E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -1443,33 +1451,44 @@
     (=daikanwa		. 10402)	; &I-M-10402;
     ))
 (define-char
-  '((=>ucs		. #x5FFC)	; 忼
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=jis-x0212		. #x3D50)	; &M-10403; [29-48]
-    (=jis-x0213-2-2000	. #x2C45)	; &I-JX2-2C45; [12-37]
-    (=daikanwa		. 10403)	; &I-M-10403;
-    (=cbeta		. 02638)	; &I-CB02638;
-    (=jef-china3	. #x91D3)	; &I-JC3-91D3;
-    (=ucs@jis		. #x5FFC)	; &M-10403;
-    (mojikyo		. 010403)	; &MCS-600028A3;
-    ))
-(define-char
-  '((morohashi-daikanwa	10403 0 0)
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x5FFC)	; 忼
-    (=cns11643-3	. #x257A)	; &I-C3-257A; [05-90]
+    (->subsumptive
+     ((shinjigen-1	  . 2648)
+      (=jis-x0212	  . #x3D50)	; &M-10403; [29-48]
+      (=jis-x0213-2-2000  . #x2C45)	; &I-JX2-2C45; [12-37]
+      (=daikanwa	  . 10403)	; &I-M-10403;
+      (=cbeta		  . 02638)	; &I-CB02638;
+      (=jef-china3	  . #x91D3)	; &I-JC3-91D3;
+      (=ucs@jis		  . #x5FFC)	; &M-10403;
+      (mojikyo		  . 010403)	; &MCS-600028A3;
+      (<-original
+       ((shinjigen-1	    . 2647)
+	(=jis-x0208	    . #x584D)	; &GT-13958; [56-45]
+	(=ks-x1001	    . #x4B2F)	; &I-K0-4B2F; [43-15]
+	(=daikanwa	    . 11146)	; &I-M-11146;
+	))
+      (<-original*sources
+       shinjigen-1)
+      )
+     ((=cns11643-3	  . #x257A)	; &HZK06-D765; [05-90]
+      (=hanziku-6	  . #xD765)	; &I-HZK06-D765;
+      (=ucs@unicode	  . #x5FFC)	; &HZK06-D765;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x390A)	; 㤊
-    (=cns11643-4	. #x2432)	; &I-C4-2432; [04-18]
-    (=daikanwa		. 10404)	; &I-M-10404;
+    (->subsumptive
+     ((=daikanwa	  . 10404)	; &M-10404;
+      )
+     ((=cns11643-4	  . #x2432)	; &C4-2432; [04-18]
+      (=ucs@unicode	  . #x390A)	; &C4-2432;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -3042,10 +3061,6 @@
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6046)	; 恆
-      (=jis-x0208	  . #x5771)	; &I-J90-5771; [55-81]
-      ))
     (shinjigen-2	. 2481)
     (=ucs		. #x6052)	; 恒
     (=jis-x0208		. #x3931)	; &I-J90-3931; [25-17]
@@ -3057,6 +3072,10 @@
     (=gt-k		. 05075)	; &I-GT-K05075;
     (=gt-pj-1		. #x3931)	; &I-GT-13246; [25-17]
     (=daikanwa		. 10527)	; &I-M-10527;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x6046)	; 恆
+      (=jis-x0208	  . #x5771)	; &I-J90-5771; [55-81]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -3167,40 +3186,58 @@
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=daikanwa		. 10536)	; &M-10536;
+    (=ucs		. #x22639)	; 𢘹
+    (->subsumptive
+     ((=daikanwa	  . 10536)	; &M-10536;
+      )
+     ((=ucs@iso		  . #x22639)	; &U-00022639;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x604B)	; 恋
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5878)	; &GT-14527; [56-88]
-      (=ks-x1001	  . #x557C)	; &I-K0-557C; [53-92]
-      (=daikanwa	  . 11504)	; &I-M-11504;
+    (=ucs		. #x604B)	; 恋
+    (<-simplified@ucs
+     ((=ucs		  . #x6200)	; 戀
       ))
-    (shinjigen-2	. 2501)
-    (=jis-x0208		. #x4E78)	; &GT-13446; [46-88]
-    (=gt		. 13446)	; &I-GT-13446;
-    (=gt-pj-1		. #x4E78)	; &I-GT-13446; [46-88]
-    (=daikanwa		. 10537)	; &I-M-10537;
-    (=ucs@jis		. #x604B)	; &GT-13446;
     ))
 (define-char
-  '((=>ucs		. #x604B)	; 恋
-    (morohashi-daikanwa	10537 0 0)
+  '((<-denotational
+     ((=ucs		  . #x604B)	; 恋
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=cns11643-3	. #x3079)	; &C3-3079; [16-89]
+    (->subsumptive
+     ((shinjigen-2	  . 2501)
+      (=jis-x0208	  . #x4E78)	; &GT-13446; [46-88]
+      (=gt		  . 13446)	; &I-GT-13446;
+      (=gt-pj-1		  . #x4E78)	; &I-GT-13446; [46-88]
+      (=daikanwa	  . 10537)	; &I-M-10537;
+      (=ucs@jis		  . #x604B)	; &GT-13446;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5878)	; &GT-14527; [56-88]
+	(=ks-x1001	    . #x557C)	; &I-K0-557C; [53-92]
+	(=daikanwa	    . 11504)	; &I-M-11504;
+	))
+      )
+     ((=cns11643-3	  . #x3079)	; &C3-3079; [16-89]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	10537 0 1)
+  '((<-denotational
+     ((=ucs		  . #x604B)	; 恋
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=ucs		. #x604B)	; 恋
-    (=gb2312		. #x4135)	; &I-G0-4135; [33-21]
+    (=gb2312		. #x4135)	; &G0-4135; [33-21]
+    (=ucs@unicode	. #x604B)	; &G0-4135;
+    (<-simplified@CN
+     ((=ucs		  . #x6200)	; 戀
+      (=gb12345		  . #x4135)	; 戀 [33-21]
+      ))
     ))
 (define-char
   '((=>ucs		. #x391E)	; 㤞
@@ -4134,23 +4171,32 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x6072)	; 恲
-    (=cns11643-2	. #x2A43)	; &I-C2-2A43; [10-35]
     (=big5		. #xCEC2)	; &I-B-CEC2;
-    (=daikanwa		. 10613)	; &I-M-10613;
+    (->subsumptive
+     ((=cns11643-2	  . #x2A43)	; &M-10613; [10-35]
+      (=daikanwa	  . 10613)	; &I-M-10613;
+      (=ucs@unicode	  . #x6072)	; &M-10613;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x2264E)	; 𢙎
-    (=cns11643-4	. #x2D2A)	; &I-C4-2D2A; [13-10]
-    (=daikanwa		. 10614)	; &I-M-10614;
+    (->subsumptive
+     ((=daikanwa	  . 10614)	; &M-10614;
+      (=ucs@iso		  . #x2264E)	; &M-10614;
+      )
+     ((=cns11643-4	  . #x2D2A)	; &C4-2D2A; [13-10]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=daikanwa		. 10615)	; &M-10615;
+    (=ucs		. #x2266F)	; 𢙯
+    (=daikanwa		. 10615)	; &I-M-10615;
+    (=hanziku-6		. #xD9CE)	; &I-HZK06-D9CE;
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -4161,19 +4207,16 @@
     (=daikanwa		. 10616)	; &I-M-10616;
     ))
 (define-char
-  '((=>ucs		. #x6074)	; 恴
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=daikanwa		. 10617)	; &M-10617;
-    ))
-(define-char
-  '((morohashi-daikanwa	10617 0 0)
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6074)	; 恴
-    (=cns11643-3	. #x3078)	; &I-C3-3078; [16-88]
+    (->subsumptive
+     ((=daikanwa	  . 10617)	; &M-10617;
+      )
+     ((=cns11643-3	  . #x3078)	; &C3-3078; [16-88]
+      (=ucs@unicode	  . #x6074)	; &C3-3078;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -4188,10 +4231,6 @@
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA3D)	; 悔
-      (=jis-x0213-1-2000  . #x7450)	; &I-JX1-7450; [84-48]
-      ))
     (=ucs		. #x2F8A3)	; 悔
     (=jis-x0208		. #x3279)	; &I-J90-3279; [18-89]
     (=cns11643-4	. #x294A)	; &I-C4-294A; [09-42]
@@ -4199,6 +4238,10 @@
     (=gt-pj-1		. #x3279)	; &I-GT-13226; [18-89]
     (=ucs@jis		. #x6094)	; 悔
     (mojikyo		. 050174)	; &MCS-6000C3FE;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA3D)	; 悔
+      (=jis-x0213-1-2000  . #x7450)	; &I-JX1-7450; [84-48]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -4213,10 +4256,6 @@
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x60E0)	; 惠
-      (=jis-x0208	  . #x582A)	; &I-J90-582A; [56-10]
-      ))
     (=ucs		. #x6075)	; 恵
     (=jis-x0208		. #x3743)	; &I-J90-3743; [23-35]
     (=cns11643-3	. #x307B)	; &I-C3-307B; [16-91]
@@ -4224,6 +4263,10 @@
     (=gt-k		. 06413)	; &I-GT-K06413;
     (=gt-pj-1		. #x3743)	; &I-GT-13362; [23-35]
     (mojikyo		. 050175)	; &MCS-6000C3FF;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x60E0)	; 惠
+      (=jis-x0208	  . #x582A)	; &I-J90-582A; [56-10]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -5199,24 +5242,20 @@
     (=cbeta		. 00384)	; &I-CB00384;
     ))
 (define-char
-  '((=>ucs		. #x60A2)	; 悢
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=jis-x0212		. #x3D78)	; &M-10690; [29-88]
-    (=big5		. #xD1A2)	; &I-B-D1A2;
-    (=daikanwa		. 10690)	; &I-M-10690;
-    (=jef-china3	. #x4EB3)	; &I-JC3-4EB3;
-    (=ucs@jis		. #x60A2)	; &M-10690;
-    (=ucs@big5		. #x60A2)	; &M-10690;
-    ))
-(define-char
-  '((morohashi-daikanwa	10690 0 0)
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x60A2)	; 悢
-    (=cns11643-2	. #x2F24)	; &I-C2-2F24; [15-04]
+    (=big5		. #xD1A2)	; &I-B-D1A2;
+    (->subsumptive
+     ((=jis-x0212	  . #x3D78)	; &M-10690; [29-88]
+      (=daikanwa	  . 10690)	; &I-M-10690;
+      (=jef-china3	  . #x4EB3)	; &I-JC3-4EB3;
+      (=ucs@jis		  . #x60A2)	; &M-10690;
+      )
+     ((=cns11643-2	  . #x2F24)	; &C2-2F24; [15-04]
+      (=ucs@unicode	  . #x60A2)	; &C2-2F24;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -5239,45 +5278,55 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x22685)	; 𢚅
-    (=daikanwa		. 10692)	; &I-M-10692;
+    (->subsumptive
+     ((=daikanwa	  . 10692)	; &M-10692;
+      )
+     ((=ucs@iso		  . #x22685)	; &U-00022685;
+      )
+     ((=cns11643-5	  . #x3254)	; &C5-3254; [18-52]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x22685)	; 𢚅
-    (morohashi-daikanwa	10692 0 0)
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=cns11643-5	. #x3254)	; &C5-3254; [18-52]
+    (=ucs		. #x60A4)	; 悤
     ))
 (define-char
-  '((=>ucs		. #x60A4)	; 悤
+  '((<-denotational
+     ((=ucs		  . #x60A4)	; 悤
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ks-x1001		. #x7542)	; &M-10693; [85-34]
     (=jis-x0212		. #x3D79)	; &I-JSP-3D79; [29-89]
     (=daikanwa		. 10693)	; &I-M-10693;
-    (=cbeta		. 04160)	; &I-CB04160;
     (=ucs@jis		. #x60A4)	; &M-10693;
     ))
 (define-char
-  '((morohashi-daikanwa	10693 0 1)
+  '((<-denotational
+     ((=ucs		  . #x60A4)	; 悤
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x60A4)	; 悤
+    (=ucs@unicode	. #x60A4)	; &UU+60A4;
     ))
 (define-char
-  '((=>ucs		. #x60A4)	; 悤
-    (morohashi-daikanwa	10693 0 2)
+  '((<-denotational
+     ((=ucs		  . #x60A4)	; 悤
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=cns11643-3	. #x3572)	; &C3-3572; [21-82]
+    (=cns11643-3	. #x3572)	; &CB04160; [21-82]
+    (=cbeta		. 04160)	; &I-CB04160;
     ))
 (define-char
-  '((=>ucs		. #x60A4)	; 悤
-    (morohashi-daikanwa	10693 0 4)
+  '((<-denotational
+     ((=ucs		  . #x60A4)	; 悤
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
@@ -5496,25 +5545,21 @@
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x60F1)	; 惱
-      (=jis-x0208	  . #x583D)	; &I-J90-583D; [56-29]
-      ))
     (=ucs		. #x60A9)	; 悩
     (=jis-x0208		. #x473A)	; &I-J90-473A; [39-26]
     (=cns11643-3	. #x3121)	; &I-C3-3121; [17-01]
     (=gt		. 13421)	; &I-GT-13421;
     (=gt-pj-1		. #x473A)	; &I-GT-13421; [39-26]
     (mojikyo		. 050177)	; &MCS-6000C401;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x60F1)	; 惱
+      (=jis-x0208	  . #x583D)	; &I-J90-583D; [56-29]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x60E1)	; 惡
-      (=jis-x0208	  . #x5828)	; &I-J90-5828; [56-08]
-      ))
     (shinjigen-1	. 2507)
     (shinjigen-2	. 2507)
     (=ucs		. #x60AA)	; 悪
@@ -5523,6 +5568,10 @@
     (=gt		. 13457)	; &I-GT-13457;
     (=gt-pj-1		. #x302D)	; &I-GT-13457; [16-13]
     (=daikanwa		. 10717)	; &I-M-10717;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x60E1)	; 惡
+      (=jis-x0208	  . #x5828)	; &I-J90-5828; [56-08]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -5730,13 +5779,6 @@
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (<-ancient
-     ((shinjigen-1	  . 2385)
-      (=ucs		  . #x5FB7)	; å¾·
-      (=jis-x0213-1-2000  . #x7445)	; &I-JX1-7445; [84-37]
-      ))
-    (<-ancient*sources
-     shinjigen-1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -5755,6 +5797,13 @@
     (=gt-pj-1		. #x575C)	; &I-GT-13735; [55-60]
     (=daikanwa		. 10724)	; &I-M-10724;
     (=ucs@jis		. #x60B3)	; &GT-13735;
+    (<-ancient
+     ((shinjigen-1	  . 2385)
+      (=ucs		  . #x5FB7)	; å¾·
+      (=jis-x0213-1-2000  . #x7445)	; &I-JX1-7445; [84-37]
+      ))
+    (<-ancient*sources
+     shinjigen-1)
     ))
 (define-char
   '((<-denotational
@@ -7353,6 +7402,29 @@
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (=ucs		. #x60E8)	; 惨
+    (<-simplified@ucs
+     ((=ucs		  . #x6158)	; 慘
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x60E8)	; 惨
+      ))
+    (ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (shinjigen-2	. 2543)
+    (=jis-x0208		. #x3B34)	; &GT-13517; [27-20]
+    (=gb2312		. #x3252)	; &I-G0-3252; [18-50]
+    (=gt		. 13517)	; &I-GT-13517;
+    (=gt-pj-1		. #x3B34)	; &I-GT-13517; [27-20]
+    (=daikanwa		. 10850)	; &I-M-10850;
+    (=ucs@unicode	. #x60E8)	; &GT-13517;
+    (<-simplified@CN
+     ((=ucs		  . #x6158)	; 慘
+      (=gb12345		  . #x3252)	; 慘 [18-50]
+      ))
     (<-simplified@JP/Jouyou
      ((=jis-x0208	  . #x584E)	; &GT-13968; [56-46]
       (=daikanwa	  . 11094)	; &I-M-11094;
@@ -7363,17 +7435,11 @@
       ))
     (<-vulgar*sources
      daikanwa)
-    (shinjigen-2	. 2543)
-    (=ucs		. #x60E8)	; 惨
-    (=jis-x0208		. #x3B34)	; &I-J90-3B34; [27-20]
-    (=gb2312		. #x3252)	; &I-G0-3252; [18-50]
-    (=gt		. 13517)	; &I-GT-13517;
-    (=gt-pj-1		. #x3B34)	; &I-GT-13517; [27-20]
-    (=daikanwa		. 10850)	; &I-M-10850;
     ))
 (define-char
-  '((=>ucs		. #x60E8)	; 惨
-    (morohashi-daikanwa	10850 0 4)
+  '((<-denotational
+     ((=ucs		  . #x60E8)	; 惨
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
@@ -7452,12 +7518,6 @@
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (<-same
-     ((=jis-x0208	  . #x575C)	; &GT-13735; [55-60]
-      (=ks-x1001	  . #x536D)	; &I-K0-536D; [51-77]
-      (=cns11643-3	  . #x3B54)	; &I-C3-3B54; [27-52]
-      (=daikanwa	  . 10724)	; &I-M-10724;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -7469,6 +7529,12 @@
     (=ucs		. #x60EA)	; 惪
     (=cns11643-3	. #x3B4D)	; &I-C3-3B4D; [27-45]
     (mojikyo		. 053306)	; &MCS-6000D03A;
+    (<-same
+     ((=jis-x0208	  . #x575C)	; &GT-13735; [55-60]
+      (=ks-x1001	  . #x536D)	; &I-K0-536D; [51-77]
+      (=cns11643-3	  . #x3B54)	; &I-C3-3B54; [27-52]
+      (=daikanwa	  . 10724)	; &I-M-10724;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -9881,26 +9947,27 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x22797)	; 𢞗
-    (=cns11643-5	. #x3F44)	; &I-C5-3F44; [31-36]
-    (=daikanwa		. 11018)	; &I-M-11018;
-    ))
-(define-char
-  '((=>ucs		. #x6139)	; 愹
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=jis-x0212		. #x3E4E)	; &M-11019; [30-46]
-    (=daikanwa		. 11019)	; &I-M-11019;
-    (=jef-china3	. #x4ED1)	; &I-JC3-4ED1;
-    (=ucs@jis		. #x6139)	; &M-11019;
+    (->subsumptive
+     ((=daikanwa	  . 11018)	; &M-11018;
+      (=ucs@iso		  . #x22797)	; &M-11018;
+      )
+     ((=cns11643-5	  . #x3F44)	; &C5-3F44; [31-36]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	11019 0 0)
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x6139)	; 愹
-    (=cns11643-6	. #x5264)	; &I-C6-5264; [50-68]
+    (->subsumptive
+     ((=jis-x0212	  . #x3E4E)	; &M-11019; [30-46]
+      (=daikanwa	  . 11019)	; &I-M-11019;
+      (=jef-china3	  . #x4ED1)	; &I-JC3-4ED1;
+      (=ucs@jis		  . #x6139)	; &M-11019;
+      )
+     ((=cns11643-6	  . #x5264)	; &C6-5264; [50-68]
+      (=ucs@unicode	  . #x6139)	; &C6-5264;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -9911,95 +9978,121 @@
     (=daikanwa		. 11020)	; &I-M-11020;
     ))
 (define-char
-  '((=>ucs		. #x613A)	; 愺
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
+  '((ideographic-radical . 61)	; â¼¼
+    (=ucs		. #x613A)	; 愺
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x613A)	; 愺
+      ))
+    (ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
     (=cns11643-3	. #x4128)	; &M-11021; [33-08]
     (=daikanwa		. 11021)	; &I-M-11021;
     ))
 (define-char
-  '((morohashi-daikanwa	11021 0 2)
+  '((<-denotational
+     ((=ucs		  . #x613A)	; 愺
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs		. #x613A)	; 愺
-    (=jis-x0213-2-2000	. #x2C5F)	; &I-JX2-2C5F; [12-63]
+    (=jis-x0213-2-2000	. #x2C5F)	; &JX2-2C5F; [12-63]
+    (=ucs@unicode	. #x613A)	; &JX2-2C5F;
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x22799)	; 𢞙
-    (=daikanwa		. 11022)	; &I-M-11022;
-    ))
-(define-char
-  '((=>ucs		. #x22799)	; 𢞙
-    (morohashi-daikanwa	11022 0 1)
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=cns11643-6	. #x526F)	; &C6-526F; [50-79]
+    (->subsumptive
+     ((=daikanwa	  . 11022)	; &M-11022;
+      (=ucs@iso		  . #x22799)	; &M-11022;
+      )
+     ((=cns11643-6	  . #x526F)	; &C6-526F; [50-79]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x613B)	; 愻
-    (=cns11643-2	. #x4A39)	; &I-C2-4A39; [42-25]
-    (=big5		. #xE1D2)	; &I-B-E1D2;
-    (=daikanwa		. 11023)	; &I-M-11023;
+    (->subsumptive
+     ((=cns11643-2	  . #x4A39)	; &M-11023; [42-25]
+      (=big5		  . #xE1D2)	; &I-B-E1D2;
+      (=daikanwa	  . 11023)	; &I-M-11023;
+      )
+     ((=ucs@unicode	  . #x613B)	; &UU+613B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (shinjigen-2	. 2631)
     (=ucs		. #x613C)	; 愼
-    (=jis-x0208		. #x5846)	; &I-J90-5846; [56-38]
-    (=ks-x1001		. #x6365)	; &I-K0-6365; [67-69]
-    (=gt		. 13857)	; &I-GT-13857;
-    (=gt-pj-1		. #x5846)	; &I-GT-13857; [56-38]
-    (=daikanwa		. 11024)	; &I-M-11024;
+    (->subsumptive
+     ((shinjigen-1	  . 2631)
+      (shinjigen-2	  . 2631)
+      (=jis-x0208	  . #x5846)	; &GT-13857; [56-38]
+      (=ks-x1001	  . #x6365)	; &I-K0-6365; [67-69]
+      (=gt		  . 13857)	; &I-GT-13857;
+      (=gt-pj-1		  . #x5846)	; &I-GT-13857; [56-38]
+      (=daikanwa	  . 11024)	; &I-M-11024;
+      (=ucs@unicode	  . #x613C)	; &GT-13857;
+      )
+     ((=cns11643-3	  . #x466C)	; &C3-466C; [38-76]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x613C)	; 愼
-    (morohashi-daikanwa	11024 0 1)
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=cns11643-3	. #x466C)	; &C3-466C; [38-76]
+    (=ucs		. #x614E)	; 慎
     ))
 (define-char
-  '((=>ucs		. #x614E)	; 慎
+  '((<-denotational
+     ((=ucs		  . #x614E)	; 慎
+      ))
     (morohashi-daikanwa	11024 1)
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x613C)	; 愼
-      (=jis-x0208	  . #x5846)	; &I-J90-5846; [56-38]
-      ))
     (=jis-x0208		. #x3F35)	; &GT-13858; [31-21]
     (=cns11643-6	. #x5266)	; &I-C6-5266; [50-70]
     (=gt		. 13858)	; &I-GT-13858;
     (=gt-pj-1		. #x3F35)	; &I-GT-13858; [31-21]
     (=ucs@jis		. #x614E)	; &GT-13858;
     (mojikyo		. 050181)	; &MCS-6000C405;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5846)	; &GT-13857; [56-38]
+      (=ks-x1001	  . #x6365)	; &I-K0-6365; [67-69]
+      (=daikanwa	  . 11024)	; &I-M-11024;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	11024 1 3)
+  '((<-denotational
+     ((=ucs		  . #x614E)	; 慎
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs		. #x614E)	; 慎
-    (=gb2312		. #x4977)	; &I-G0-4977; [41-87]
+    (=gb2312		. #x4977)	; &C1-637C; [41-87]
     (=cns11643-1	. #x637C)	; &I-C1-637C; [67-92]
     (=big5		. #xB756)	; &I-B-B756;
+    (=ucs@unicode	. #x614E)	; &C1-637C;
     (mojikyo		. 053483)	; &MCS-6000D0EB;
     ))
 (define-char
-  '((=>ucs		. #x3972)	; 㥲
+  '((ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x3972)	; 㥲
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3972)	; 㥲
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
@@ -10018,7 +10111,9 @@
     (=jef-china3	. #x4DDB)	; &I-JC3-4DDB;
     ))
 (define-char
-  '((morohashi-daikanwa	11025 0 5)
+  '((<-denotational
+     ((=ucs		  . #x3972)	; 㥲
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
@@ -10026,12 +10121,13 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=cns11643-6	  . #x3A2D)	; &C6-3A2D; [26-13]
+     ((=gb2312		  . #x5566)	; &C1-5678; [53-70]
+      (=cns11643-1	  . #x5678)	; &I-C1-5678; [54-88]
       )
      ((=ucs		  . #x5FC3)	; 心
       ))
-    (=ucs		. #x3972)	; 㥲
-    (=cns11643-3	. #x4667)	; &I-C3-4667; [38-71]
+    (=cns11643-3	. #x4667)	; &C3-4667; [38-71]
+    (=ucs@unicode	. #x3972)	; &C3-4667;
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -11493,37 +11589,46 @@
       )
      ((ideographic-strokes . 10)
       (total-strokes	   . 13)
-      (<-simplified@JP/Jouyou
-       ((=ucs		    . #xFA3E)	; 慨
-	(=jis-x0213-1-2000  . #x745C)	; &I-JX1-745C; [84-60]
-	))
       (=jis-x0208@1990	  . #x3334)	; &GT-13800; [19-20]
       (=gt		  . 13800)	; &I-GT-13800;
       (=gt-pj-1		  . #x3334)	; &I-GT-13800; [19-20]
       (=ucs@jis		  . #x6168)	; &GT-13800;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #xFA3E)	; 慨
+	(=jis-x0213-1-2000  . #x745C)	; &I-JX1-745C; [84-60]
+	))
       ))
     ))
 (define-char
-  '((=>ucs		. #x3980)	; 㦀
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=daikanwa		. 11123)	; &M-11123;
+  '((ideographic-radical . 61)	; â¼¼
+    (=ucs		. #x3980)	; 㦀
     ))
 (define-char
-  '((=>ucs		. #x3980)	; 㦀
-    (morohashi-daikanwa	11123 0 2)
+  '((<-denotational
+     ((=ucs		  . #x3980)	; 㦀
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=cns11643-4	. #x434D)	; &C4-434D; [35-45]
+    (=daikanwa		. 11123)	; &M-11123;
     ))
 (define-char
-  '((morohashi-daikanwa	11123 0 3)
+  '((<-denotational
+     ((=ucs		  . #x3980)	; 㦀
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs		. #x3980)	; 㦀
+    (=ucs@unicode	. #x3980)	; &UU+3980;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3980)	; 㦀
+      ))
+    (ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=cns11643-4	. #x434D)	; &C4-434D; [35-45]
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -11663,24 +11768,22 @@
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (shinjigen-2	. 2672)
     (=ucs		. #x616E)	; 慮
-    (=jis-x0208		. #x4E38)	; &I-J90-4E38; [46-24]
-    (=ks-x1001		. #x5567)	; &I-K0-5567; [53-71]
-    (=gb12345		. #x4247)	; 慮 [34-39]
     (=big5		. #xBC7B)	; &I-B-BC7B;
-    (=gt		. 14186)	; &I-GT-14186;
-    (=gt-k		. 11957)	; &I-GT-K11957;
-    (=gt-pj-1		. #x4E38)	; &I-GT-14186; [46-24]
-    (=daikanwa		. 11132)	; &I-M-11132;
-    ))
-(define-char
-  '((=>ucs		. #x616E)	; 慮
-    (morohashi-daikanwa	11132 0 0)
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-1	. #x6C65)	; &C1-6C65; [76-69]
+    (->subsumptive
+     ((shinjigen-1	  . 2672)
+      (shinjigen-2	  . 2672)
+      (=jis-x0208	  . #x4E38)	; &GT-14186; [46-24]
+      (=ks-x1001	  . #x5567)	; &I-K0-5567; [53-71]
+      (=gb12345		  . #x4247)	; &GT-14186; [34-39]
+      (=gt		  . 14186)	; &I-GT-14186;
+      (=gt-k		  . 11957)	; &I-GT-K11957;
+      (=gt-pj-1		  . #x4E38)	; &I-GT-14186; [46-24]
+      (=daikanwa	  . 11132)	; &I-M-11132;
+      (=ucs@unicode	  . #x616E)	; &GT-14186;
+      )
+     ((=cns11643-1	  . #x6C65)	; &C1-6C65; [76-69]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -11699,42 +11802,49 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x227EC)	; 𢟬
-    (=cns11643-7	. #x2272)	; &I-C7-2272; [02-82]
-    (=daikanwa		. 11134)	; &I-M-11134;
-    ))
-(define-char
-  '((=>ucs		. #x6170)	; 慰
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-1	. #x6C6A)	; &M-11135; [76-74]
-    (=daikanwa		. 11135)	; &I-M-11135;
+    (->subsumptive
+     ((=daikanwa	  . 11134)	; &M-11134;
+      )
+     ((=ucs@iso		  . #x227EC)	; &U-000227EC;
+      )
+     ((=gt		  . 14055)	; &GT-14055;
+      (=gt-pj-3		  . #x555D)	; &GT-14055; [53-61]
+      )
+     ((=cns11643-7	  . #x2272)	; &C7-2272; [02-82]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	11135 0 0)
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (shinjigen-1	. 2641)
-    (shinjigen-2	. 2641)
     (=ucs		. #x6170)	; 慰
-    (=jis-x0208		. #x3056)	; &I-J90-3056; [16-54]
-    (=gb2312		. #x4E3F)	; &I-G0-4E3F; [46-31]
-    (=ks-x1001		. #x6A50)	; &I-K0-6A50; [74-48]
-    (=big5		. #xBCA2)	; &I-B-BCA2;
-    (=gt		. 14056)	; &I-GT-14056;
-    (=gt-k		. 11888)	; &I-GT-K11888;
-    (=gt-pj-1		. #x3056)	; &I-GT-14056; [16-54]
+    (->subsumptive
+     ((=cns11643-1	  . #x6C6A)	; &M-11135; [76-74]
+      (=daikanwa	  . 11135)	; &I-M-11135;
+      )
+     ((shinjigen-1	  . 2641)
+      (shinjigen-2	  . 2641)
+      (=jis-x0208	  . #x3056)	; &GT-14056; [16-54]
+      (=gb2312		  . #x4E3F)	; &I-G0-4E3F; [46-31]
+      (=ks-x1001	  . #x6A50)	; &I-K0-6A50; [74-48]
+      (=big5		  . #xBCA2)	; &I-B-BCA2;
+      (=gt		  . 14056)	; &I-GT-14056;
+      (=gt-k		  . 11888)	; &I-GT-K11888;
+      (=gt-pj-1		  . #x3056)	; &I-GT-14056; [16-54]
+      (=ucs@unicode	  . #x6170)	; &GT-14056;
+      ))
     ))
 (define-char
   '((=>ucs		. #x22820)	; 𢠠
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=daikanwa		. 11136)	; &M-11136;
+    (=gt		. 13957)	; &GT-13957;
+    (=gt-pj-3		. #x555E)	; &GT-13957; [53-62]
+    (=daikanwa		. 11136)	; &I-M-11136;
     ))
 (define-char
-  '((morohashi-daikanwa	11136 0 7)
+  '((=>daikanwa		. 11136)	; &GT-13957;
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
@@ -11758,28 +11868,39 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x6172)	; 慲
-    (=jis-x0212		. #x3E56)	; &I-JSP-3E56; [30-54]
-    (=cns11643-2	. #x4A31)	; &I-C2-4A31; [42-17]
-    (=big5		. #xE1CA)	; &I-B-E1CA;
-    (=daikanwa		. 11138)	; &I-M-11138;
+    (->subsumptive
+     ((=jis-x0212	  . #x3E56)	; &M-11138; [30-54]
+      (=big5		  . #xE1CA)	; &I-B-E1CA;
+      (=daikanwa	  . 11138)	; &I-M-11138;
+      (=ucs@jis		  . #x6172)	; &M-11138;
+      )
+     ((=cns11643-2	  . #x4A31)	; &C2-4A31; [42-17]
+      (=ucs@unicode	  . #x6172)	; &C2-4A31;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x227EE)	; 𢟮
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 11139)	; &M-11139;
+    (=ucs		. #x227EE)	; 𢟮
     ))
 (define-char
-  '((morohashi-daikanwa	11139 0 1)
+  '((<-denotational
+     ((=ucs		  . #x227EE)	; 𢟮
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x227EE)	; 𢟮
+    (->subsumptive
+     ((=daikanwa	  . 11139)	; &M-11139;
+      )
+     ((=ucs@iso		  . #x227EE)	; &U-000227EE;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x227EE)	; 𢟮
-    (morohashi-daikanwa	11139 0 5)
+  '((<-denotational
+     ((=ucs		  . #x227EE)	; 𢟮
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
@@ -11800,40 +11921,76 @@
     (=daikanwa		. 11140)	; &I-M-11140;
     ))
 (define-char
-  '((=>ucs		. #x3983)	; 㦃
+  '((ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=ucs		. #x3983)	; 㦃
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3983)	; 㦃
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=daikanwa		. 11141)	; &M-11141;
+    (->subsumptive
+     ((=daikanwa	  . 11141)	; &M-11141;
+      )
+     ((=cns11643-3	  . #x4669)	; &C3-4669; [38-73]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	11141 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3983)	; 㦃
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=ucs		. #x3983)	; 㦃
-    (=cns11643-3	. #x4669)	; &I-C3-4669; [38-73]
+    (=ucs@unicode	. #x3983)	; &UU+3983;
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x3984)	; 㦄
-    (=daikanwa		. 11142)	; &I-M-11142;
     ))
 (define-char
-  '((=>ucs		. #x3984)	; 㦄
-    (morohashi-daikanwa	11142 0 1)
+  '((<-denotational
+     ((=ucs		  . #x3984)	; 㦄
+      ))
+    (ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=daikanwa		. 11142)	; &M-11142;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3984)	; 㦄
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=cns11643-3	. #x4B7B)	; &C3-4B7B; [43-91]
+    (->subsumptive
+     ((=ucs@unicode	  . #x3984)	; &UU+3984;
+      )
+     ((=cns11643-3	  . #x4B7B)	; &C3-4B7B; [43-91]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=ucs		. #x6174)	; 慴
+    (=big5		. #xE1CD)	; &I-B-E1CD;
     ))
 (define-char
-  '((=>ucs		. #x6174)	; 慴
+  '((<-denotational
+     ((=ucs		  . #x6174)	; 慴
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (shinjigen-1	. 2652)
     (shinjigen-2	. 2652)
     (=jis-x0208		. #x5852)	; &GT-13979; [56-50]
     (=gt		. 13979)	; &I-GT-13979;
@@ -11842,79 +11999,99 @@
     (=ucs@jis		. #x6174)	; &GT-13979;
     ))
 (define-char
-  '((morohashi-daikanwa	11143 0 2)
+  '((<-denotational
+     ((=ucs		  . #x6174)	; 慴
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=ucs		. #x6174)	; 慴
-    (=cns11643-2	. #x4A34)	; &I-C2-4A34; [42-20]
-    (=big5		. #xE1CD)	; &I-B-E1CD;
+    (->subsumptive
+     ((=ucs@unicode	  . #x6174)	; &UU+6174;
+      )
+     ((=cns11643-2	  . #x4A34)	; &C2-4A34; [42-20]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (shinjigen-2	. 2670)
     (=ucs		. #x6175)	; 慵
-    (=jis-x0208		. #x5859)	; &I-J90-5859; [56-57]
-    (=gb2312		. #x633C)	; &I-G0-633C; [67-28]
-    (=cns11643-1	. #x686F)	; &I-C1-686F; [72-79]
     (=big5		. #xBA48)	; &I-B-BA48;
-    (=gt		. 14038)	; &I-GT-14038;
-    (=gt-pj-1		. #x5859)	; &I-GT-14038; [56-57]
-    (=daikanwa		. 11144)	; &I-M-11144;
+    (->subsumptive
+     ((shinjigen-2	  . 2670)
+      (=jis-x0208	  . #x5859)	; &GT-14038; [56-57]
+      (=gt		  . 14038)	; &I-GT-14038;
+      (=gt-pj-1		  . #x5859)	; &I-GT-14038; [56-57]
+      (=daikanwa	  . 11144)	; &I-M-11144;
+      (=ucs@jis		  . #x6175)	; &GT-14038;
+      )
+     ((=gb2312		  . #x633C)	; &C1-686F; [67-28]
+      (=cns11643-1	  . #x686F)	; &I-C1-686F; [72-79]
+      (=ucs@unicode	  . #x6175)	; &C1-686F;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6176)	; 慶
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 11145)	; &M-11145;
+    (=ucs		. #x6176)	; 慶
     ))
 (define-char
-  '((=>ucs		. #x6176)	; 慶
-    (morohashi-daikanwa	11145 0 0)
+  '((<-denotational
+     ((=ucs		  . #x6176)	; 慶
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=cns11643-1	. #x6C63)	; &C1-6C63; [76-67]
+    (->subsumptive
+     ((=daikanwa	  . 11145)	; &M-11145;
+      )
+     ((=cns11643-1	  . #x6C63)	; &C1-6C63; [76-67]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	11145 0 1)
+  '((<-denotational
+     ((=ucs		  . #x6176)	; 慶
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (shinjigen-2	. 2645)
-    (=ucs		. #x6176)	; 慶
-    (=jis-x0208		. #x3744)	; &I-J90-3744; [23-36]
-    (=ks-x1001		. #x4C54)	; &I-K0-4C54; [44-52]
-    (=gb12345		. #x476C)	; 慶 [39-76]
-    (=big5		. #xBC79)	; &I-B-BC79;
-    (=gt		. 14092)	; &I-GT-14092;
-    (=gt-k		. 11900)	; &I-GT-K11900;
-    (=gt-pj-1		. #x3744)	; &I-GT-14092; [23-36]
+    (=big5		. #xBC79)	; &B-BC79;
+    (->subsumptive
+     ((shinjigen-1	  . 2645)
+      (shinjigen-2	  . 2645)
+      (=jis-x0208	  . #x3744)	; &GT-14092; [23-36]
+      (=ks-x1001	  . #x4C54)	; &I-K0-4C54; [44-52]
+      (=gt		  . 14092)	; &I-GT-14092;
+      (=gt-k		  . 11900)	; &I-GT-K11900;
+      (=gt-pj-1		  . #x3744)	; &I-GT-14092; [23-36]
+      (=ucs@jis		  . #x6176)	; &GT-14092;
+      )
+     ((=gb12345		  . #x476C)	; &UU+6176; [39-76]
+      (=ucs@unicode	  . #x6176)	; &UU+6176;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (shinjigen-2	. 2647)
     (=ucs		. #x6177)	; 慷
-    (=jis-x0208		. #x584D)	; &I-J90-584D; [56-45]
-    (=gb2312		. #x3F36)	; &I-G0-3F36; [31-22]
-    (=ks-x1001		. #x4B2F)	; &I-K0-4B2F; [43-15]
     (=big5		. #xBA42)	; &I-B-BA42;
-    (=gt		. 13958)	; &I-GT-13958;
-    (=gt-pj-1		. #x584D)	; &I-GT-13958; [56-45]
-    (=daikanwa		. 11146)	; &I-M-11146;
-    ))
-(define-char
-  '((=>ucs		. #x6177)	; 慷
-    (morohashi-daikanwa	11146 0 0)
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=cns11643-1	. #x6869)	; &C1-6869; [72-73]
+    (->subsumptive
+     ((shinjigen-1	  . 2647)
+      (shinjigen-2	  . 2647)
+      (=jis-x0208	  . #x584D)	; &GT-13958; [56-45]
+      (=ks-x1001	  . #x4B2F)	; &I-K0-4B2F; [43-15]
+      (=gt		  . 13958)	; &I-GT-13958;
+      (=gt-pj-1		  . #x584D)	; &I-GT-13958; [56-45]
+      (=daikanwa	  . 11146)	; &I-M-11146;
+      (=ucs@jis		  . #x6177)	; &GT-13958;
+      )
+     ((=gb2312		  . #x3F36)	; &G0-3F36; [31-22]
+      (=ucs@unicode	  . #x6177)	; &G0-3F36;
+      )
+     ((=cns11643-1	  . #x6869)	; &C1-6869; [72-73]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -12204,34 +12381,40 @@
     (=cns11643-3	. #x466B)	; &C3-466B; [38-75]
     ))
 (define-char
-  '((=>ucs		. #x6182)	; 憂
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 11170)	; &M-11170;
+    (=ucs		. #x6182)	; 憂
     ))
 (define-char
-  '((=>ucs		. #x6182)	; 憂
-    (morohashi-daikanwa	11170 0 0)
+  '((<-denotational
+     ((=ucs		  . #x6182)	; 憂
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=cns11643-1	. #x6C68)	; &C1-6C68; [76-72]
+    (->subsumptive
+     ((=daikanwa	  . 11170)	; &M-11170;
+      )
+     ((=cns11643-1	  . #x6C68)	; &C1-6C68; [76-72]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	11170 0 1)
+  '((<-denotational
+     ((=ucs		  . #x6182)	; 憂
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (shinjigen-2	. 2667)
-    (=ucs		. #x6182)	; 憂
-    (=jis-x0208		. #x4D2B)	; &I-J90-4D2B; [45-11]
+    (=jis-x0208		. #x4D2B)	; &GT-14181; [45-11]
     (=ks-x1001		. #x6958)	; &I-K0-6958; [73-56]
-    (=gb12345		. #x5347)	; 憂 [51-39]
+    (=gb12345		. #x5347)	; &GT-14181; [51-39]
     (=big5		. #xBC7E)	; &I-B-BC7E;
     (=gt		. 14181)	; &I-GT-14181;
     (=gt-k		. 11954)	; &I-GT-K11954;
     (=gt-pj-1		. #x4D2B)	; &I-GT-14181; [45-11]
+    (=ucs@unicode	. #x6182)	; &GT-14181;
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -12246,10 +12429,15 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x6183)	; 憃
-    (=jis-x0212		. #x3E5D)	; &I-JSP-3E5D; [30-61]
-    (=cns11643-2	. #x5042)	; &I-C2-5042; [48-34]
     (=big5		. #xE579)	; &I-B-E579;
-    (=daikanwa		. 11172)	; &I-M-11172;
+    (->subsumptive
+     ((=jis-x0212	  . #x3E5D)	; &M-11172; [30-61]
+      (=daikanwa	  . 11172)	; &I-M-11172;
+      (=ucs@jis		  . #x6183)	; &M-11172;
+      )
+     ((=cns11643-2	  . #x5042)	; &C2-5042; [48-34]
+      (=ucs@unicode	  . #x6183)	; &C2-5042;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -12269,9 +12457,27 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x6184)	; 憄
-    (=jis-x0212		. #x3E5E)	; &I-JSP-3E5E; [30-62]
-    (=cns11643-5	. #x4D2A)	; &I-C5-4D2A; [45-10]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6184)	; 憄
+      ))
+    (ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=jis-x0212		. #x3E5E)	; &M-11174; [30-62]
     (=daikanwa		. 11174)	; &I-M-11174;
+    (=ucs@jis		. #x6184)	; &M-11174;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6184)	; 憄
+      ))
+    (ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-5	. #x4D2A)	; &C5-4D2A; [45-10]
+    (=ucs@unicode	. #x6184)	; &C5-4D2A;
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -12411,18 +12617,27 @@
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=daikanwa		. 11188)	; &M-11188;
+    (=ucs		. #x2284C)	; 𢡌
+    (->subsumptive
+     ((=daikanwa	  . 11188)	; &M-11188;
+      )
+     ((=ucs@iso		  . #x2284C)	; &U-0002284C;
+      ))
     ))
 (define-char
-  '((=>ucs*		. #x618E)	; 憎
+  '((ideographic-radical . 61)	; â¼¼
+    (=ucs		. #x618E)	; 憎
+    (=jis-x0208@1997	. #x417E)	; 憎 [33-94]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x618E)	; 憎
+      ))
+    (=>ucs*		. #x618E)	; 憎
     (morohashi-daikanwa	11188 1)
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA3F)	; 憎
-      (=jis-x0213-1-2000  . #x745E)	; &I-JX1-745E; [84-62]
-      ))
     (=ucs		. #x2F8AB)	; 憎
     (=jis-x0208		. #x417E)	; &I-J90-417E; [33-94]
     (=cns11643-4	. #x4351)	; &I-C4-4351; [35-49]
@@ -12430,6 +12645,10 @@
     (=gt-pj-1		. #x417E)	; &I-GT-13995; [33-94]
     (=ucs@jis		. #x618E)	; 憎
     (mojikyo		. 050182)	; &MCS-6000C406;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA3F)	; 憎
+      (=jis-x0213-1-2000  . #x745E)	; &I-JX1-745E; [84-62]
+      ))
     ))
 (define-char
   '((=>ucs		. #x3996)	; 㦖
@@ -12690,41 +12909,52 @@
     (=daikanwa		. 11201)	; &I-M-11201;
     ))
 (define-char
-  '((=>ucs*		. #x618E)	; 憎
+  '((<-denotational
+     ((=ucs		  . #x618E)	; 憎
+      ))
+    (ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=big5		. #xBCA8)	; &B-BCA8;
+    ))
+(define-char
+  '((<-denotational
+     ((=big5		  . #xBCA8)	; &B-BCA8;
+      ))
+    (=>ucs*		. #x618E)	; 憎
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 12)
+    (total-strokes	 . 15)
     (=ucs		. #xFA3F)	; 憎
     (=ks-x1001		. #x7173)	; &I-K0-7173; [81-83]
     (=jis-x0213-1-2000	. #x745E)	; &I-JX1-745E; [84-62]
-    (=big5-cdp		. #xBCA8)	; &I-B-BCA8;
     (=daikanwa		. 11202)	; &I-M-11202;
     (=jef-china3	. #x4ED8)	; &I-JC3-4ED8;
     (=ucs@ks		. #x618E)	; 憎
     ))
 (define-char
-  '((morohashi-daikanwa	11202 0 2)
+  '((<-denotational
+     ((=big5		  . #xBCA8)	; &B-BCA8;
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x618E)	; 憎
-    (=gb2312		. #x5477)	; &I-G0-5477; [52-87]
+    (=gb2312		. #x5477)	; &C1-6C70; [52-87]
     (=cns11643-1	. #x6C70)	; &I-C1-6C70; [76-80]
-    (=big5		. #xBCA8)	; &I-B-BCA8;
+    (=ucs@unicode	. #x618E)	; &C1-6C70;
     ))
 (define-char
-  '((=>ucs		. #x398C)	; 㦌
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=daikanwa		. 11203)	; &M-11203;
-    ))
-(define-char
-  '((morohashi-daikanwa	11203 0 0)
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x398C)	; 㦌
-    (=cns11643-4	. #x5038)	; &I-C4-5038; [48-24]
+    (->subsumptive
+     ((=daikanwa	  . 11203)	; &M-11203;
+      )
+     ((=cns11643-4	  . #x5038)	; &C4-5038; [48-24]
+      )
+     ((=ucs@unicode	  . #x398C)	; &UU+398C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -13621,65 +13851,50 @@
     (=daikanwa		. 11268)	; &I-M-11268;
     ))
 (define-char
-  '((=>ucs		. #x61B2)	; 憲
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=daikanwa		. 11269)	; &M-11269;
-    ))
-(define-char
-  '((=>ucs		. #x61B2)	; 憲
-    (morohashi-daikanwa	11269 0 0)
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=jef-china3	. #x4DE4)	; &JC3-4DE4;
-    ))
-(define-char
-  '((=>ucs		. #x61B2)	; 憲
-    (morohashi-daikanwa	11269 0 1)
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=cns11643-7	. #x2D69)	; &C7-2D69; [13-73]
-    ))
-(define-char
-  '((morohashi-daikanwa	11269 0 2)
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x61B2)	; 憲
-    (=gb12345		. #x4F5C)	; 憲 [47-60]
-    ))
-(define-char
-  '((=>ucs		. #x61B2)	; 憲
-    (morohashi-daikanwa	11269 1)
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=jis-x0208		. #x377B)	; &GT-14230; [23-91]
-    (=ks-x1001		. #x7A4A)	; &I-K0-7A4A; [90-42]
-    (=gt		. 14230)	; &I-GT-14230;
-    (=gt-pj-1		. #x377B)	; &I-GT-14230; [23-91]
-    (=ucs@jis		. #x61B2)	; &GT-14230;
-    (mojikyo		. 050183)	; &MCS-6000C407;
+    (=big5		. #xBECB)	; &I-B-BECB;
     ))
 (define-char
-  '((=>ucs		. #x61B2)	; 憲
-    (morohashi-daikanwa	11269 1 0)
+  '((<-denotational
+     ((=ucs		  . #x61B2)	; 憲
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=big5		. #xBECB)	; &B-BECB;
-    (=ucs@big5		. #x61B2)	; &B-BECB;
+    (->subsumptive
+     ((=daikanwa	  . 11269)	; &M-11269;
+      )
+     ((=cns11643-7	  . #x2D69)	; &C7-2D69; [13-73]
+      )
+     ((shinjigen-1	  . 2684)
+      (=jef-china3	  . #x4DE4)	; &JC3-4DE4;
+      )
+     ((=gb12345		  . #x4F5C)	; &UU+61B2; [47-60]
+      (=ucs@unicode	  . #x61B2)	; &UU+61B2;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x61B2)	; 憲
-    (morohashi-daikanwa	11269 1 1)
+  '((<-denotational
+     ((=ucs		  . #x61B2)	; 憲
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=cns11643-1	. #x7054)	; &C1-7054; [80-52]
+    (->subsumptive
+     ((morohashi-daikanwa	11269 1)
+      (shinjigen-1	  . 2683)
+      (=jis-x0208	  . #x377B)	; &GT-14230; [23-91]
+      (=ks-x1001	  . #x7A4A)	; &I-K0-7A4A; [90-42]
+      (=gt		  . 14230)	; &I-GT-14230;
+      (=gt-pj-1		  . #x377B)	; &I-GT-14230; [23-91]
+      (=ucs@jis		  . #x61B2)	; &GT-14230;
+      (mojikyo		  . 050183)	; &MCS-6000C407;
+      )
+     ((=cns11643-1	  . #x7054)	; &C1-7054; [80-52]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -14855,47 +15070,55 @@
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (=daikanwa		. 11350)	; &M-11350;
+    (=ucs		. #x228B9)	; 𢢹
+    (=daikanwa		. 11350)	; &I-M-11350;
     ))
 (define-char
-  '((=>ucs		. #x61D0)	; 懐
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5867)	; &GT-14417; [56-71]
-      (=ks-x1001	  . #x7C63)	; &I-K0-7C63; [92-67]
-      (=daikanwa	  . 11456)	; &I-M-11456;
+    (=ucs		. #x61D0)	; 懐
+    (->subsumptive
+     ((shinjigen-2	  . 2708)
+      (=jis-x0208	  . #x327B)	; &GT-14202; [18-91]
+      (=gt		  . 14202)	; &I-GT-14202;
+      (=gt-pj-1		  . #x327B)	; &I-GT-14202; [18-91]
+      (=daikanwa	  . 11351)	; &I-M-11351;
+      (=ucs@jis		  . #x61D0)	; &GT-14202;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5867)	; &GT-14417; [56-71]
+	(=ks-x1001	    . #x7C63)	; &I-K0-7C63; [92-67]
+	(=daikanwa	    . 11456)	; &I-M-11456;
+	))
+      )
+     ((=cns11643-3	  . #x506B)	; &C3-506B; [48-75]
+      (=ucs@unicode	  . #x61D0)	; &C3-506B;
       ))
-    (shinjigen-2	. 2708)
-    (=jis-x0208		. #x327B)	; &GT-14202; [18-91]
-    (=gt		. 14202)	; &I-GT-14202;
-    (=gt-pj-1		. #x327B)	; &I-GT-14202; [18-91]
-    (=daikanwa		. 11351)	; &I-M-11351;
-    (=ucs@jis		. #x61D0)	; &GT-14202;
     ))
 (define-char
-  '((morohashi-daikanwa	11351 0 3)
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x61D0)	; 懐
-    (=cns11643-3	. #x506B)	; &I-C3-506B; [48-75]
+    (total-strokes	 . 17)
+    (=ucs		. #x228B1)	; 𢢱
     ))
 (define-char
-  '((=>ucs		. #x228B1)	; 𢢱
+  '((<-denotational
+     ((=ucs		  . #x228B1)	; 𢢱
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (=daikanwa		. 49114)	; &M-49114;
     ))
 (define-char
-  '((morohashi-daikanwa	49114 0 2)
+  '((<-denotational
+     ((=ucs		  . #x228B1)	; 𢢱
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (=ucs		. #x228B1)	; 𢢱
-    (=cns11643-7	. #x3822)	; &I-C7-3822; [24-02]
+    (=cns11643-7	. #x3822)	; &C7-3822; [24-02]
+    (=ucs@iso		. #x228B1)	; &C7-3822;
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -15528,9 +15751,6 @@
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0213-1-2000  . #x7461)	; &JX1-7461; [84-65]
-      ))
     (=ucs		. #x2F8B0)	; 懲
     (=jis-x0208		. #x4428)	; &I-J90-4428; [36-08]
     (=cns11643-4	. #x5B2C)	; &I-C4-5B2C; [59-12]
@@ -15538,6 +15758,9 @@
     (=gt-pj-1		. #x4428)	; &I-GT-14384; [36-08]
     (=ucs@jis		. #x61F2)	; 懲
     (mojikyo		. 050185)	; &MCS-6000C409;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0213-1-2000  . #x7461)	; &JX1-7461; [84-65]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -16242,41 +16465,53 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (=ucs		. #x22928)	; 𢤨
-    (=cns11643-7	. #x4727)	; &I-C7-4727; [39-07]
-    (=daikanwa		. 11444)	; &I-M-11444;
+    (->subsumptive
+     ((=daikanwa	  . 11444)	; &M-11444;
+      (=ucs@iso		  . #x22928)	; &M-11444;
+      )
+     ((=cns11643-7	  . #x4727)	; &C7-4727; [39-07]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (=ucs		. #x22929)	; 𢤩
-    (=cns11643-5	. #x6774)	; &I-C5-6774; [71-84]
-    (=daikanwa		. 11445)	; &I-M-11445;
+    (->subsumptive
+     ((=daikanwa	  . 11445)	; &M-11445;
+      (=ucs@iso		  . #x22929)	; &M-11445;
+      )
+     ((=cns11643-5	  . #x6774)	; &C5-6774; [71-84]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (<-original
-     ((shinjigen-1	  . 2743)
-      (=jis-x0208	  . #x5874)	; &GT-14505; [56-84]
-      (=ks-x1001	  . #x6B73)	; &I-K0-6B73; [75-83]
-      (=daikanwa	  . 11501)	; &I-M-11501;
-      ))
-    (<-original*sources
-     shinjigen-1)
-    (<-same
-     ((=jis-x0208	  . #x5874)	; &GT-14505; [56-84]
-      (=ks-x1001	  . #x6B73)	; &I-K0-6B73; [75-83]
-      (=daikanwa	  . 11501)	; &I-M-11501;
-      ))
-    (<-same*sources
-     zhengzi-tong daikanwa)
-    (shinjigen-1	. 2744)
     (=ucs		. #x39A4)	; 㦤
-    (=cns11643-4	. #x6343)	; &I-C4-6343; [67-35]
-    (=daikanwa		. 11446)	; &I-M-11446;
-    (=jef-china3	. #x4DEA)	; &I-JC3-4DEA;
+    (->subsumptive
+     ((shinjigen-1	  . 2744)
+      (=daikanwa	  . 11446)	; &M-11446;
+      (=ucs@unicode	  . #x39A4)	; &M-11446;
+      (<-original
+       ((shinjigen-1	    . 2743)
+	(=jis-x0208	    . #x5874)	; &GT-14505; [56-84]
+	(=ks-x1001	    . #x6B73)	; &I-K0-6B73; [75-83]
+	(=daikanwa	    . 11501)	; &I-M-11501;
+	))
+      (<-original*sources
+       shinjigen-1)
+      (<-same
+       ((=jis-x0208	    . #x5874)	; &GT-14505; [56-84]
+	(=ks-x1001	    . #x6B73)	; &I-K0-6B73; [75-83]
+	(=daikanwa	    . 11501)	; &I-M-11501;
+	))
+      (<-same*sources
+       zhengzitong daikanwa)
+      )
+     ((=cns11643-4	  . #x6343)	; &C4-6343; [67-35]
+      (=jef-china3	  . #x4DEA)	; &I-JC3-4DEA;
+      ))
     ))
 (define-char
   '((=>ucs		. #x2292A)	; 𢤪
diff --git a/lisp/utf-2000/Ideograph-R062-Halberd.el b/lisp/utf-2000/Ideograph-R062-Halberd.el
index 7cf5d14..ba50720 100644
--- a/lisp/utf-2000/Ideograph-R062-Halberd.el
+++ b/lisp/utf-2000/Ideograph-R062-Halberd.el
@@ -66,29 +66,36 @@
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 1)
     (total-strokes	 . 5)
-    (=daikanwa		. 11533)	; &M-11533;
+    (=ucs		. #x2298C)	; 𢦌
+    (->subsumptive
+     ((=daikanwa	  . 11533)	; &M-11533;
+      )
+     ((=hanziku-4	  . #xC9F4)	; &HZK04-C9F4;
+      (=ucs@iso		  . #x2298C)	; &HZK04-C9F4;
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 1)
     (total-strokes	 . 5)
-    (=daikanwa		. 11534)	; &M-11534;
+    (=ucs		. #x2298D)	; 𢦍
+    (->subsumptive
+     ((=daikanwa	  . 11534)	; &M-11534;
+      )
+     ((=ucs@iso		  . #x2298D)	; &U-0002298D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 1)
     (total-strokes	 . 5)
+    (=ucs		. #x620B)	; 戋
+    (=gb2312		. #x6A27)	; &I-G0-6A27; [74-07]
+    (=big5-cdp		. #x89DC)	; &I-CDP-89DC;
     (<-simplified@CN
      ((=ucs		  . #x6214)	; 戔
       (=gb12345		  . #x6A27)	; 戔 [74-07]
       ))
-    (=ucs		. #x620B)	; 戋
-    (->subsumptive
-     ((=gb2312		  . #x6A27)	; &G0-6A27; [74-07]
-      (=ucs@unicode	  . #x620B)	; &G0-6A27;
-      )
-     ((=big5-cdp	  . #x89DC)	; &CDP-89DC;
-      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -144,27 +151,25 @@
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
     (=ucs		. #x620E)	; 戎
-    (=gb2312		. #x4856)	; &I-G0-4856; [40-54]
-    (=ks-x1001		. #x6B54)	; &I-K0-6B54; [75-52]
-    (=gt		. 14554)	; &I-GT-14554;
-    (=gt-k		. 01639)	; &I-GT-K01639;
-    (=gt-pj-1		. #x3D3F)	; &I-GT-14554; [29-31]
-    (=daikanwa		. 11539)	; &I-M-11539;
-    ))
-(define-char
-  '((=>ucs		. #x620E)	; 戎
-    (morohashi-daikanwa	11539 0 0)
-    (ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 2)
-    (total-strokes	 . 6)
-    (shinjigen-2	. 2759)
-    (=jis-x0208		. #x3D3F)	; &GT-K01640; [29-31]
-    (=cns11643-1	. #x4826)	; &I-C1-4826; [40-06]
     (=big5		. #xA6A5)	; &I-B-A6A5;
-    (=gt-k		. 01640)	; &I-GT-K01640;
-    (=gt-pj-k2		. #x4A5D)	; &GT-K01640; [42-61]
-    (=ucs@jis		. #x620E)	; &GT-K01640;
-    (=ucs@big5		. #x620E)	; &GT-K01640;
+    (->subsumptive
+     ((=gb2312		  . #x4856)	; &GT-14554; [40-54]
+      (=ks-x1001	  . #x6B54)	; &I-K0-6B54; [75-52]
+      (=gt		  . 14554)	; &I-GT-14554;
+      (=gt-k		  . 01639)	; &I-GT-K01639;
+      (=gt-pj-1		  . #x3D3F)	; &I-GT-14554; [29-31]
+      (=daikanwa	  . 11539)	; &I-M-11539;
+      (=ucs@unicode	  . #x620E)	; &GT-14554;
+      )
+     ((shinjigen-1	  . 2759)
+      (shinjigen-2	  . 2759)
+      (=jis-x0208	  . #x3D3F)	; &GT-K01640; [29-31]
+      (=cns11643-1	  . #x4826)	; &I-C1-4826; [40-06]
+      (=gt-k		  . 01640)	; &I-GT-K01640;
+      (=gt-pj-k2	  . #x4A5D)	; &GT-K01640; [42-61]
+      (=ucs@jis		  . #x620E)	; &GT-K01640;
+      (=ucs@big5	  . #x620E)	; &GT-K01640;
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -178,24 +183,29 @@
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
-    (=daikanwa		. 11541)	; &M-11541;
+    (=ucs		. #x22991)	; 𢦑
+    (->subsumptive
+     ((=daikanwa	  . 11541)	; &M-11541;
+      )
+     ((=ucs@iso		  . #x22991)	; &U-00022991;
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
+    (=ucs		. #x39AE)	; 㦮
     (<-simplified@component
      ((=ucs		  . #x6214)	; 戔
       ))
-    (=ucs		. #x39AE)	; 㦮
     (->subsumptive
-     ((<-simplified
+     ((=daikanwa	  . 11542)	; &M-11542;
+      (<-simplified
        ((=ucs		    . #x9322)	; 錢
 	(=daikanwa	    . 40563)	; &I-M-40563;
 	))
       (<-simplified*sources
        daikanwa)
-      (=daikanwa	  . 11542)	; &M-11542;
       )
      ((=cns11643-3	  . #x236A)	; &C3-236A; [03-74]
       )
@@ -211,11 +221,11 @@
     (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x39AE)	; 㦮
-      ))
     (=gt-k		. 02180)	; &GT-K02180;
     (=gt-pj-k1		. #x3564)	; &GT-K02180; [21-68]
+    (<-identical@component/connect-left
+     ((=ucs		  . #x39AE)	; 㦮
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	11542 1)
@@ -1252,10 +1262,6 @@
     (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6230)	; 戰
-      (=jis-x0208	  . #x5925)	; &I-J90-5925; [57-05]
-      ))
     (=ucs		. #x6226)	; 戦
     (=jis-x0208		. #x406F)	; &I-J90-406F; [32-79]
     (=cns11643-4	. #x3D43)	; &I-C4-3D43; [29-35]
@@ -1263,21 +1269,22 @@
     (=gt-k		. 10232)	; &I-GT-K10232;
     (=gt-pj-1		. #x406F)	; &I-GT-14653; [32-79]
     (mojikyo		. 050189)	; &MCS-6000C40D;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x6230)	; 戰
+      (=jis-x0208	  . #x5925)	; &I-J90-5925; [57-05]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x229DC)	; 𢧜
-    (ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=daikanwa		. 49122)	; &M-49122;
-    ))
-(define-char
-  '((morohashi-daikanwa	49122 0 0)
-    (ideographic-radical . 62)	; â¼½
+  '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x229DC)	; 𢧜
-    (=cns11643-4	. #x3D41)	; &I-C4-3D41; [29-33]
+    (->subsumptive
+     ((=daikanwa	  . 49122)	; &M-49122;
+      )
+     ((=cns11643-4	  . #x3D41)	; &C4-3D41; [29-33]
+      (=ucs@iso		  . #x229DC)	; &C4-3D41;
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -1640,19 +1647,22 @@
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 11660)	; &M-11660;
+    (=ucs		. #x229FD)	; 𢧽
+    (=daikanwa		. 11660)	; &I-M-11660;
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 11661)	; &M-11661;
+    (=ucs		. #x22A02)	; 𢨂
+    (=daikanwa		. 11661)	; &I-M-11661;
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 11662)	; &M-11662;
+    (=ucs		. #x22A01)	; 𢨁
+    (=daikanwa		. 11662)	; &I-M-11662;
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -1665,60 +1675,57 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x229FF)	; 𢧿
-    (=daikanwa		. 11664)	; &I-M-11664;
-    ))
-(define-char
-  '((=>ucs		. #x229FF)	; 𢧿
-    (morohashi-daikanwa	11664 0 0)
-    (ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-7	. #x2326)	; &C7-2326; [03-06]
+    (->subsumptive
+     ((=daikanwa	  . 11664)	; &M-11664;
+      (=ucs@iso		  . #x229FF)	; &M-11664;
+      )
+     ((=cns11643-7	  . #x2326)	; &C7-2326; [03-06]
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6232)	; 戲
-      (=jis-x0208	  . #x5926)	; &I-J90-5926; [57-06]
-      ))
-    (shinjigen-2	. 2785)
     (=ucs		. #x622F)	; 戯
-    (=jis-x0208		. #x353A)	; &I-J90-353A; [21-26]
-    (=gt		. 14684)	; &I-GT-14684;
-    (=gt-pj-1		. #x353A)	; &I-GT-14684; [21-26]
-    (=daikanwa		. 11665)	; &I-M-11665;
-    ))
-(define-char
-  '((=>ucs		. #x622F)	; 戯
-    (morohashi-daikanwa	11665 0 0)
-    (ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-3	. #x4C2C)	; &C3-4C2C; [44-12]
+    (->subsumptive
+     ((shinjigen-1	  . 2785)
+      (shinjigen-2	  . 2785)
+      (=jis-x0208	  . #x353A)	; &GT-14684; [21-26]
+      (=gt		  . 14684)	; &I-GT-14684;
+      (=gt-pj-1		  . #x353A)	; &I-GT-14684; [21-26]
+      (=daikanwa	  . 11665)	; &I-M-11665;
+      (=ucs@unicode	  . #x622F)	; &GT-14684;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5926)	; &GT-14715; [57-06]
+	(=daikanwa	    . 11681)	; &I-M-11681;
+	))
+      )
+     ((=cns11643-3	  . #x4C2C)	; &C3-4C2C; [44-12]
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x229FE)	; 𢧾
-    (=daikanwa		. 49123)	; &I-M-49123;
-    ))
-(define-char
-  '((=>ucs		. #x229FE)	; 𢧾
-    (morohashi-daikanwa	49123 0 0)
-    (ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-7	. #x2329)	; &C7-2329; [03-09]
+    (->subsumptive
+     ((=daikanwa	  . 49123)	; &M-49123;
+      )
+     ((=ucs@iso		  . #x229FE)	; &U-000229FE;
+      )
+     ((=cns11643-7	  . #x2329)	; &C7-2329; [03-09]
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x229FA)	; 𢧺
-    (=cns11643-7	. #x2323)	; &I-C7-2323; [03-03]
+    (->subsumptive
+     ((=ucs@iso		  . #x229FA)	; &U-000229FA;
+      )
+     ((=cns11643-7	  . #x2323)	; &C7-2323; [03-03]
+      ))
     ))
 (define-char
   '((=>ucs		. #x22A07)	; 𢨇
@@ -1825,8 +1832,12 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x22A0A)	; 𢨊
-    (=cns11643-7	. #x2E24)	; &I-C7-2E24; [14-04]
-    (=daikanwa		. 11672)	; &I-M-11672;
+    (->subsumptive
+     ((=daikanwa	  . 11672)	; &M-11672;
+      )
+     ((=cns11643-7	  . #x2E24)	; &C7-2E24; [14-04]
+      (=ucs@iso		  . #x22A0A)	; &C7-2E24;
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -1837,59 +1848,74 @@
     (=daikanwa		. 11673)	; &I-M-11673;
     ))
 (define-char
-  '((=>ucs		. #x22A0C)	; 𢨌
-    (ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=daikanwa		. 11674)	; &M-11674;
-    ))
-(define-char
-  '((morohashi-daikanwa	11674 0 0)
-    (ideographic-radical . 62)	; â¼½
+  '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x22A0C)	; 𢨌
-    (=cns11643-7	. #x2E26)	; &I-C7-2E26; [14-06]
+    (->subsumptive
+     ((=daikanwa	  . 11674)	; &M-11674;
+      )
+     ((=ucs@iso		  . #x22A0C)	; &U-00022A0C;
+      )
+     ((=cns11643-7	  . #x2E26)	; &C7-2E26; [14-06]
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x22A0D)	; 𢨍
-    (=cns11643-7	. #x2E29)	; &I-C7-2E29; [14-09]
-    (=daikanwa		. 11675)	; &I-M-11675;
-    ))
-(define-char
-  '((=>ucs		. #x22A0E)	; 𢨎
-    (ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=daikanwa		. 11676)	; &M-11676;
+    (->subsumptive
+     ((=daikanwa	  . 11675)	; &M-11675;
+      )
+     ((=ucs@iso		  . #x22A0D)	; &U-00022A0D;
+      )
+     ((=cns11643-7	  . #x2E29)	; &C7-2E29; [14-09]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	11676 0 1)
-    (ideographic-radical . 62)	; â¼½
+  '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x22A0E)	; 𢨎
-    (=cns11643-7	. #x2E28)	; &I-C7-2E28; [14-08]
+    (->subsumptive
+     ((=daikanwa	  . 11676)	; &M-11676;
+      )
+     ((=cns11643-7	  . #x2E28)	; &C7-2E28; [14-08]
+      (=ucs@iso		  . #x22A0E)	; &C7-2E28;
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=daikanwa		. 11677)	; &M-11677;
+    (=ucs		. #x22A0F)	; 𢨏
+    (->subsumptive
+     ((=daikanwa	  . 11677)	; &M-11677;
+      )
+     ((=ucs@iso		  . #x22A0F)	; &U-00022A0F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (=ucs		. #x22A13)	; 𢨓
-    (=daikanwa		. 11678)	; &I-M-11678;
     ))
 (define-char
-  '((=>ucs		. #x22A13)	; 𢨓
-    (morohashi-daikanwa	11678 0 0)
+  '((<-denotational
+     ((=ucs		  . #x22A13)	; 𢨓
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 13)
+    (total-strokes	 . 17)
+    (=daikanwa		. 11678)	; &M-11678;
+    (=ucs@iso		. #x22A13)	; &M-11678;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22A13)	; 𢨓
+      ))
     (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
@@ -1900,8 +1926,12 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (=ucs		. #x39BD)	; 㦽
-    (=cns11643-3	. #x5462)	; &I-C3-5462; [52-66]
-    (=daikanwa		. 11679)	; &I-M-11679;
+    (->subsumptive
+     ((=daikanwa	  . 11679)	; &M-11679;
+      (=ucs@unicode	  . #x39BD)	; &M-11679;
+      )
+     ((=cns11643-3	  . #x5462)	; &C3-5462; [52-66]
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -1915,62 +1945,72 @@
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (shinjigen-2	. 2786)
     (=ucs		. #x6232)	; 戲
-    (=jis-x0208		. #x5926)	; &I-J90-5926; [57-06]
-    (=gb12345		. #x4F37)	; 戲 [47-23]
     (=big5		. #xC0B8)	; &I-B-C0B8;
-    (=gt		. 14715)	; &I-GT-14715;
-    (=gt-pj-1		. #x5926)	; &I-GT-14715; [57-06]
-    (=daikanwa		. 11681)	; &I-M-11681;
+    (->subsumptive
+     ((shinjigen-1	  . 2786)
+      (shinjigen-2	  . 2786)
+      (=jis-x0208	  . #x5926)	; &GT-14715; [57-06]
+      (=gb12345		  . #x4F37)	; &GT-14715; [47-23]
+      (=gt		  . 14715)	; &I-GT-14715;
+      (=gt-pj-1		  . #x5926)	; &I-GT-14715; [57-06]
+      (=daikanwa	  . 11681)	; &I-M-11681;
+      (=ucs@unicode	  . #x6232)	; &GT-14715;
+      )
+     ((=cns11643-1	  . #x7361)	; &C1-7361; [83-65]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6232)	; 戲
-    (morohashi-daikanwa	11681 0 0)
-    (ideographic-radical . 62)	; â¼½
+  '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (=cns11643-1	. #x7361)	; &C1-7361; [83-65]
+    (=ucs		. #x22A16)	; 𢨖
+    (=daikanwa		. 11682)	; &I-M-11682;
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (=daikanwa		. 11682)	; &M-11682;
+    (=ucs		. #x22A17)	; 𢨗
+    (->subsumptive
+     ((=daikanwa	  . 11683)	; &M-11683;
+      )
+     ((=ucs@iso		  . #x22A17)	; &U-00022A17;
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 13)
-    (total-strokes	 . 17)
-    (=daikanwa		. 11683)	; &M-11683;
+    (ideographic-strokes . 14)
+    (total-strokes	 . 18)
+    (=ucs		. #x6233)	; 戳
+    (=big5		. #xC257)	; &I-B-C257;
     ))
 (define-char
-  '((=>ucs		. #x6233)	; 戳
+  '((<-denotational
+     ((=ucs		  . #x6233)	; 戳
+      ))
     (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
     (=jis-x0208		. #x5927)	; &GT-14725; [57-07]
-    (=big5		. #xC257)	; &I-B-C257;
     (=gt		. 14725)	; &I-GT-14725;
     (=gt-pj-1		. #x5927)	; &I-GT-14725; [57-07]
     (=daikanwa		. 11684)	; &I-M-11684;
     (=ucs@jis		. #x6233)	; &GT-14725;
     ))
 (define-char
-  '((morohashi-daikanwa	11684 0 2)
-    (ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 14)
-    (total-strokes	 . 18)
-    (=ucs		. #x6233)	; 戳
-    (=gb2312		. #x3441)	; &I-G0-3441; [20-33]
-    ))
-(define-char
-  '((=>ucs		. #x6233)	; 戳
-    (morohashi-daikanwa	11684 0 3)
+  '((<-denotational
+     ((=ucs		  . #x6233)	; 戳
+      ))
     (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (=cns11643-1	. #x7643)	; &C1-7643; [86-35]
+    (->subsumptive
+     ((=gb2312		  . #x3441)	; &G0-3441; [20-33]
+      (=ucs@unicode	  . #x6233)	; &G0-3441;
+      )
+     ((=cns11643-1	  . #x7643)	; &C1-7643; [86-35]
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
@@ -1991,37 +2031,57 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
     (=ucs		. #x22A19)	; 𢨙
-    (=cns11643-7	. #x3F60)	; &I-C7-3F60; [31-64]
-    (=daikanwa		. 49124)	; &I-M-49124;
-    ))
-(define-char
-  '((=>ucs		. #x22A1B)	; 𢨛
-    (ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 15)
-    (total-strokes	 . 19)
-    (=daikanwa		. 11686)	; &M-11686;
+    (->subsumptive
+     ((=daikanwa	  . 49124)	; &M-49124;
+      )
+     ((=cns11643-7	  . #x3F60)	; &C7-3F60; [31-64]
+      (=ucs@iso		  . #x22A19)	; &C7-3F60;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	11686 0 0)
-    (ideographic-radical . 62)	; â¼½
+  '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
     (=ucs		. #x22A1B)	; 𢨛
-    (=cns11643-4	. #x5F65)	; &I-C4-5F65; [63-69]
+    (->subsumptive
+     ((=daikanwa	  . 11686)	; &M-11686;
+      )
+     ((=cns11643-4	  . #x5F65)	; &C4-5F65; [63-69]
+      )
+     ((=ucs@iso		  . #x22A1B)	; &U-00022A1B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=daikanwa		. 11687)	; &M-11687;
+    (=ucs		. #x22A1C)	; 𢨜
+    (=daikanwa		. 11687)	; &I-M-11687;
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
+    (=ucs		. #x22A1D)	; 𢨝
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22A1D)	; 𢨝
+      ))
+    (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
     (=daikanwa		. 11688)	; &M-11688;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x22A1D)	; 𢨝
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 14)
+    (total-strokes	 . 18)
+    (=hanziku-4		. #xCDA4)	; &HZK04-CDA4;
+    (=ucs@iso		. #x22A1D)	; &HZK04-CDA4;
+    ))
+(define-char
   '((ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
@@ -2031,11 +2091,26 @@
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
+    (=ucs		. #x22A1E)	; 𢨞
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22A1E)	; 𢨞
+      ))
+    (ideographic-radical . 62)	; â¼½
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=daikanwa		. 11691)	; &M-11691;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22A1E)	; 𢨞
+      ))
+    (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x22A1E)	; 𢨞
-    (=cns11643-7	. #x472E)	; &I-C7-472E; [39-14]
-    (=daikanwa		. 11691)	; &I-M-11691;
+    (=cns11643-7	. #x472E)	; &C7-472E; [39-14]
+    (=ucs@iso		. #x22A1E)	; &C7-472E;
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
diff --git a/lisp/utf-2000/Ideograph-R063-Door.el b/lisp/utf-2000/Ideograph-R063-Door.el
index 96045eb..f388962 100644
--- a/lisp/utf-2000/Ideograph-R063-Door.el
+++ b/lisp/utf-2000/Ideograph-R063-Door.el
@@ -101,11 +101,28 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x623A)	; 戺
-    (=cns11643-2	. #x2428)	; &I-C2-2428; [04-08]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x623A)	; 戺
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
+    (=cns11643-2	. #x2428)	; &M-11703; [04-08]
     (=big5		. #xCAE6)	; &I-B-CAE6;
     (=daikanwa		. 11703)	; &I-M-11703;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x623A)	; 戺
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
+    (=ucs@unicode	. #x623A)	; &UU+623A;
+    ))
+(define-char
   '((ideographic-radical . 63)	; â¼¾
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
@@ -118,17 +135,32 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x39BE)	; 㦾
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x39BE)	; 㦾
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
     (->subsumptive
      ((->subsumptive
        ((=daikanwa	    . 11705)	; &M-11705;
 	)
        ((=cns11643-6	    . #x276E)	; &C6-276E; [07-78]
 	))
-      )
-     ((=ucs@unicode	  . #x39BE)	; &UU+39BE;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x39BE)	; 㦾
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
+    (=ucs@unicode	. #x39BE)	; &UU+39BE;
+    ))
+(define-char
   '((ideographic-radical . 63)	; â¼¾
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
@@ -153,7 +185,7 @@
       (=daikanwa	  . 11712)	; &I-M-11712;
       ))
     (->mistakable*sources
-     zihui zhengzi-tong daikanwa)
+     zihui zhengzitong daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -162,12 +194,6 @@
     (ideographic-radical . 63)	; â¼¾
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x5568)	; &M-11712; [53-72]
-      (=cns11643-1	  . #x4D53)	; &I-C1-4D53; [45-51]
-      (=jis-x0213-1-2000  . #x7463)	; &I-JX1-7463; [84-67]
-      (=daikanwa	  . 11712)	; &I-M-11712;
-      ))
     (shinjigen-1	. 2795)
     (shinjigen-2	. 2795)
     (=jis-x0208		. #x4C61)	; &GT-14766; [44-65]
@@ -175,6 +201,12 @@
     (=gt-k		. 02658)	; &I-GT-K02658;
     (=gt-pj-1		. #x4C61)	; &I-GT-14766; [44-65]
     (=ucs@jis		. #x623B)	; &GT-14766;
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x5568)	; &M-11712; [53-72]
+      (=cns11643-1	  . #x4D53)	; &I-C1-4D53; [45-51]
+      (=jis-x0213-1-2000  . #x7463)	; &I-JX1-7463; [84-67]
+      (=daikanwa	  . 11712)	; &I-M-11712;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -191,6 +223,12 @@
   '((ideographic-radical . 63)	; â¼¾
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (hanyu-dazidian	1 53 15)
+    (shinjigen-1	. 849)
+    (=ucs		. #x623C)	; 戼
+    (=cns11643-3	. #x2629)	; &I-C3-2629; [06-09]
+    (=big5-cdp		. #x89B5)	; &I-CDP-89B5;
+    (=daikanwa		. 11708)	; &I-M-11708;
     (<-original
      ((shinjigen-1	  . 848)
       (=ucs		  . #x536F)	; 卯
@@ -198,24 +236,31 @@
       (=daikanwa	  . 02847)	; &I-M-02847;
       ))
     (<-original*sources
-     zhengzi-tong daikanwa shinjigen-1)
-    (hanyu-dazidian	1 53 15)
-    (shinjigen-1	. 849)
-    (=ucs		. #x623C)	; 戼
-    (=cns11643-3	. #x2629)	; &I-C3-2629; [06-09]
-    (=big5-cdp		. #x89B5)	; &I-CDP-89B5;
-    (=daikanwa		. 11708)	; &I-M-11708;
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 63)	; â¼¾
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x22A2E)	; 𢨮
-    (->subsumptive
-     ((=daikanwa	  . 11709)	; &M-11709;
-      )
-     ((=ucs@iso		  . #x22A2E)	; &U-00022A2E;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22A2E)	; 𢨮
       ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
+    (=daikanwa		. 11709)	; &M-11709;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22A2E)	; 𢨮
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
+    (=ucs@iso		. #x22A2E)	; &U-00022A2E;
     ))
 (define-char
   '((ideographic-radical . 63)	; â¼¾
diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el
index 202163e..c65fc89 100644
--- a/lisp/utf-2000/Ideograph-R064-Hand.el
+++ b/lisp/utf-2000/Ideograph-R064-Hand.el
@@ -58,12 +58,6 @@
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
-    (<-formed@component/connect-right
-     ((=ucs		  . #x624B)	; 手
-      (=daikanwa	  . 11768)	; &I-M-11768;
-      ))
-    (<-formed@component/connect-right*sources
-     kangxi/char-index daikanwa)
     (=ucs		. #x624C)	; 扌
     (=gb2312		. #x5E50)	; &I-G0-5E50; [62-48]
     (=jis-x0212		. #x3F37)	; &I-JSP-3F37; [31-23]
@@ -76,6 +70,12 @@
     (=daikanwa		. 11770)	; &I-M-11770;
     (=cbeta		. 02854)	; &I-CB02854;
     (=jef-china3	. #x4FA3)	; &I-JC3-4FA3;
+    (<-formed@component/connect-right
+     ((=ucs		  . #x624B)	; 手
+      (=daikanwa	  . 11768)	; &I-M-11768;
+      ))
+    (<-formed@component/connect-right*sources
+     kangxi/char-index daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -85,10 +85,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E98)	; ⺘
     (<-identical@component/connect-right
      ((=ucs		  . #x624C)	; 扌
       ))
-    (=ucs		. #x2E98)	; ⺘
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -117,18 +117,18 @@
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 1)
     (total-strokes	 . 5)
-    (<-original
-     ((=ucs		  . #x5931)	; 失
-      (=daikanwa	  . 05844)	; &I-M-05844;
-      ))
-    (<-original*sources
-     zhengzi-tong daikanwa)
     (=ucs		. #x22A65)	; 𢩥
     (->subsumptive
      ((=cns11643-6	  . #x2328)	; &GT-14896; [03-08]
       (=gt		  . 14896)	; &I-GT-14896;
       (=gt-pj-3		  . #x5B73)	; &I-GT-14896; [59-83]
       (=daikanwa	  . 11772)	; &I-M-11772;
+      (<-original
+       ((=ucs		    . #x5931)	; 失
+	(=daikanwa	    . 05844)	; &I-M-05844;
+	))
+      (<-original*sources
+       zhengzitong daikanwa)
       )
      ((hanyu-dazidian	  3 1825 2)
       (=hanziku-5	  . #xCE43)	; &HZK05-CE43;
@@ -148,8 +148,7 @@
     (=hanziku-5		. #xCE42)	; &I-HZK05-CE42;
     ))
 (define-char
-  '((=>daikanwa		. 11774)	; &GT-14891;
-    (ideographic-radical . 64)	; ⼿
+  '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
     (=ucs		. #x39C3)	; 㧃
@@ -288,16 +287,16 @@
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x62C2)	; 拂
-      (=jis-x0208	  . #x5944)	; &I-J90-5944; [57-36]
-      ))
     (shinjigen-2	. 2810)
     (=ucs		. #x6255)	; 払
     (=jis-x0208		. #x4A27)	; &I-J90-4A27; [42-07]
     (=gt		. 14902)	; &I-GT-14902;
     (=gt-pj-1		. #x4A27)	; &I-GT-14902; [42-07]
     (=daikanwa		. 11784)	; &I-M-11784;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x62C2)	; 拂
+      (=jis-x0208	  . #x5944)	; &I-J90-5944; [57-36]
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -310,8 +309,7 @@
     (=hanziku-5		. #xCE45)	; &I-HZK05-CE45;
     ))
 (define-char
-  '((=>daikanwa		. 11786)	; &GT-14895;
-    (ideographic-radical . 64)	; ⼿
+  '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
     (=ucs		. #x22A69)	; 𢩩
@@ -1023,16 +1021,16 @@
     (->subsumptive
      ((=daikanwa	  . 11839)	; &M-11839;
       )
-     ((<-vulgar
+     ((shinjigen-1	  . 3238)
+      (=cns11643-3	  . #x2639)	; &C3-2639; [06-25]
+      (=ucs@unicode	  . #x6275)	; &C3-2639;
+      (<-vulgar
        ((shinjigen-1	    . 3237)
 	(=jis-x0208	    . #x3177)	; &GT-17222; [17-87]
 	(=ks-x1001	    . #x655A)	; &I-K0-655A; [69-58]
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 3238)
-      (=cns11643-3	  . #x2639)	; &C3-2639; [06-25]
-      (=ucs@unicode	  . #x6275)	; &C3-2639;
       ))
     ))
 (define-char
@@ -1859,12 +1857,6 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5936)	; &GT-15087; [57-22]
-      (=ks-x1001	  . #x5A7B)	; &I-K0-5A7B; [58-91]
-      (=cns11643-1	  . #x4D60)	; &I-C1-4D60; [45-64]
-      (=daikanwa	  . 11959)	; &I-M-11959;
-      ))
     (=ucs		. #x629C)	; 抜
     (=jis-x0208		. #x4834)	; &I-J90-4834; [40-20]
     (=cns11643-3	. #x2634)	; &I-C3-2634; [06-20]
@@ -1872,6 +1864,12 @@
     (=gt-k		. 02634)	; &I-GT-K02634;
     (=gt-pj-1		. #x4834)	; &I-GT-15005; [40-20]
     (mojikyo		. 050191)	; &MCS-6000C40F;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5936)	; &GT-15087; [57-22]
+      (=ks-x1001	  . #x5A7B)	; &I-K0-5A7B; [58-91]
+      (=cns11643-1	  . #x4D60)	; &I-C1-4D60; [45-64]
+      (=daikanwa	  . 11959)	; &I-M-11959;
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -1887,16 +1885,16 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5A24)	; &GT-16210; [58-04]
-      (=daikanwa	  . 12796)	; &I-M-12796;
-      ))
     (=ucs		. #x629E)	; 択
     (=jis-x0208		. #x4272)	; &I-J90-4272; [34-82]
     (=cns11643-3	. #x2631)	; &I-C3-2631; [06-17]
     (=gt		. 14992)	; &I-GT-14992;
     (=gt-pj-1		. #x4272)	; &I-GT-14992; [34-82]
     (mojikyo		. 050192)	; &MCS-6000C410;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5A24)	; &GT-16210; [58-04]
+      (=daikanwa	  . 12796)	; &I-M-12796;
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -2422,7 +2420,15 @@
     (=hanziku-5		. #xD375)	; &I-HZK05-D375;
     ))
 (define-char
-  '((=>ucs		. #x62C4)	; 拄
+  '((ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (=ucs		. #x62C4)	; 拄
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x62C4)	; 拄
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
@@ -2433,24 +2439,22 @@
     (=ucs@jis		. #x62C4)	; &M-11940;
     ))
 (define-char
-  '((morohashi-daikanwa	11940 0 0)
+  '((<-denotational
+     ((=ucs		  . #x62C4)	; 拄
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=ucs		. #x62C4)	; 拄
-    (=gb2312		. #x5674)	; &I-G0-5674; [54-84]
+    (=gb2312		. #x5674)	; &C1-4D58; [54-84]
     (=cns11643-1	. #x4D58)	; &I-C1-4D58; [45-56]
     (=big5		. #xA9D6)	; &I-B-A9D6;
+    (=ucs@unicode	. #x62C4)	; &C1-4D58;
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x593F)	; &GT-16213; [57-31]
-      (=ks-x1001	  . #x533D)	; &I-K0-533D; [51-29]
-      (=daikanwa	  . 12828)	; &I-M-12828;
-      ))
+    (shinjigen-1	. 2875)
     (shinjigen-2	. 2875)
     (=ucs		. #x62C5)	; 担
     (=jis-x0208		. #x4334)	; &I-J90-4334; [35-20]
@@ -2460,40 +2464,61 @@
     (=gt-pj-1		. #x4334)	; &I-GT-15074; [35-20]
     (=daikanwa		. 11941)	; &I-M-11941;
     (=cbeta		. 00797)	; &I-CB00797;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x593F)	; &GT-16213; [57-31]
+      (=ks-x1001	  . #x533D)	; &I-K0-533D; [51-29]
+      (=daikanwa	  . 12828)	; &I-M-12828;
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x39D6)	; 㧖
-    (=cns11643-3	. #x2938)	; &I-C3-2938; [09-24]
-    (=daikanwa		. 11942)	; &I-M-11942;
     ))
 (define-char
-  '((ideographic-radical . 64)	; ⼿
+  '((<-denotational
+     ((=ucs		  . #x39D6)	; 㧖
+      ))
+    (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (shinjigen-2	. 2874)
-    (=ucs		. #x62C6)	; 拆
-    (=jis-x0208		. #x593E)	; &I-J90-593E; [57-30]
-    (=gb2312		. #x3270)	; &I-G0-3270; [18-80]
-    (=big5		. #xA9EE)	; &I-B-A9EE;
-    (=gt		. 15072)	; &I-GT-15072;
-    (=gt-pj-1		. #x593E)	; &I-GT-15072; [57-30]
-    (=daikanwa		. 11943)	; &I-M-11943;
+    (=cns11643-3	. #x2938)	; &M-11942; [09-24]
+    (=daikanwa		. 11942)	; &I-M-11942;
     ))
 (define-char
-  '((=>ucs		. #x62C6)	; 拆
-    (morohashi-daikanwa	11943 0 1)
+  '((<-denotational
+     ((=ucs		  . #x39D6)	; 㧖
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=cns11643-1	. #x4D70)	; &C1-4D70; [45-80]
+    (=ucs@unicode	. #x39D6)	; &UU+39D6;
+    ))
+(define-char
+  '((ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (=ucs		. #x62C6)	; 拆
+    (->subsumptive
+     ((shinjigen-1	  . 2874)
+      (shinjigen-2	  . 2874)
+      (=jis-x0208	  . #x593E)	; &GT-15072; [57-30]
+      (=gb2312		  . #x3270)	; &I-G0-3270; [18-80]
+      (=big5		  . #xA9EE)	; &I-B-A9EE;
+      (=gt		  . 15072)	; &I-GT-15072;
+      (=gt-pj-1		  . #x593E)	; &I-GT-15072; [57-30]
+      (=daikanwa	  . 11943)	; &I-M-11943;
+      (=ucs@unicode	  . #x62C6)	; &GT-15072;
+      )
+     ((=cns11643-1	  . #x4D70)	; &C1-4D70; [45-80]
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
+    (shinjigen-1	. 2888)
     (shinjigen-2	. 2888)
     (=ucs		. #x62C7)	; 拇
     (=jis-x0208		. #x5945)	; &I-J90-5945; [57-37]
@@ -2509,6 +2534,7 @@
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
+    (shinjigen-1	. 2880)
     (shinjigen-2	. 2880)
     (=ucs		. #x62C8)	; 拈
     (=jis-x0208		. #x5940)	; &I-J90-5940; [57-32]
@@ -2917,6 +2943,7 @@
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
+    (shinjigen-1	. 2865)
     (shinjigen-2	. 2865)
     (=ucs		. #x62DB)	; 招
     (=jis-x0208		. #x3E37)	; &I-J90-3E37; [30-23]
@@ -2930,40 +2957,34 @@
     (=daikanwa		. 11968)	; &I-M-11968;
     ))
 (define-char
-  '((=>ucs		. #x62DC)	; 拜
-    (ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (shinjigen-2	. 2882)
-    (=jis-x0208		. #x5941)	; &GT-15211; [57-33]
-    (=ks-x1001		. #x5B48)	; &I-K0-5B48; [59-40]
-    (=big5		. #xABF4)	; &I-B-ABF4;
-    (=gt		. 15211)	; &I-GT-15211;
-    (=gt-k		. 05249)	; &I-GT-K05249;
-    (=gt-pj-1		. #x5941)	; &I-GT-15211; [57-33]
-    (=daikanwa		. 11969)	; &I-M-11969;
-    (=ucs@jis		. #x62DC)	; &GT-15211;
-    (=ucs@big5		. #x62DC)	; &GT-15211;
-    ))
-(define-char
-  '((morohashi-daikanwa	11969 0 0)
-    (ideographic-radical . 64)	; ⼿
+  '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x62DC)	; 拜
-    (=gb2312		. #x305D)	; &I-G0-305D; [16-61]
-    (=cns11643-1	. #x5138)	; &I-C1-5138; [49-24]
+    (->subsumptive
+     ((shinjigen-1	  . 2882)
+      (shinjigen-2	  . 2882)
+      (=jis-x0208	  . #x5941)	; &GT-15211; [57-33]
+      (=ks-x1001	  . #x5B48)	; &I-K0-5B48; [59-40]
+      (=big5		  . #xABF4)	; &I-B-ABF4;
+      (=gt		  . 15211)	; &I-GT-15211;
+      (=gt-k		  . 05249)	; &I-GT-K05249;
+      (=gt-pj-1		  . #x5941)	; &I-GT-15211; [57-33]
+      (=daikanwa	  . 11969)	; &I-M-11969;
+      (=ucs@jis		  . #x62DC)	; &GT-15211;
+      (=ucs@big5	  . #x62DC)	; &GT-15211;
+      )
+     ((=gb2312		  . #x305D)	; &C1-5138; [16-61]
+      (=cns11643-1	  . #x5138)	; &I-C1-5138; [49-24]
+      (=ucs@unicode	  . #x62DC)	; &C1-5138;
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	11969 1)
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5941)	; &GT-15211; [57-33]
-      (=ks-x1001	  . #x5B48)	; &I-K0-5B48; [59-40]
-      (=daikanwa	  . 11969)	; &I-M-11969;
-      ))
+    (shinjigen-1	. 2881)
     (=ucs		. #x62DD)	; 拝
     (=jis-x0208		. #x4752)	; &I-J90-4752; [39-50]
     (=cns11643-3	. #x2930)	; &I-C3-2930; [09-16]
@@ -2971,6 +2992,11 @@
     (=gt-k		. 03796)	; &I-GT-K03796;
     (=gt-pj-1		. #x4752)	; &I-GT-15083; [39-50]
     (mojikyo		. 050194)	; &MCS-6000C412;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5941)	; &GT-15211; [57-33]
+      (=ks-x1001	  . #x5B48)	; &I-K0-5B48; [59-40]
+      (=daikanwa	  . 11969)	; &I-M-11969;
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -3138,50 +3164,45 @@
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5A21)	; &GT-16169; [58-01]
-      (=ks-x1001	  . #x4B60)	; &I-K0-4B60; [43-64]
-      (=daikanwa	  . 12839)	; &I-M-12839;
-      ))
-    (shinjigen-2	. 2860)
     (=ucs		. #x62E0)	; 拠
-    (=jis-x0208		. #x3572)	; &I-J90-3572; [21-82]
-    (=gt		. 15043)	; &I-GT-15043;
-    (=gt-pj-1		. #x3572)	; &I-GT-15043; [21-82]
-    (=daikanwa		. 11985)	; &I-M-11985;
-    ))
-(define-char
-  '((=>ucs		. #x62E0)	; 拠
-    (morohashi-daikanwa	11985 0 0)
-    (ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=cns11643-3	. #x2936)	; &C3-2936; [09-22]
-    ))
-(define-char
-  '((=>ucs		. #x62E1)	; 拡
-    (morohashi-daikanwa	11985 1)
-    (ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5A32)	; &GT-16319; [58-18]
-      (=ks-x1001	  . #x7C2A)	; &I-K0-7C2A; [92-10]
-      (=daikanwa	  . 12895)	; &I-M-12895;
+    (->subsumptive
+     ((shinjigen-1	  . 2860)
+      (shinjigen-2	  . 2860)
+      (=jis-x0208	  . #x3572)	; &GT-15043; [21-82]
+      (=gt		  . 15043)	; &I-GT-15043;
+      (=gt-pj-1		  . #x3572)	; &I-GT-15043; [21-82]
+      (=daikanwa	  . 11985)	; &I-M-11985;
+      (=ucs@unicode	  . #x62E0)	; &GT-15043;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5A21)	; &GT-16169; [58-01]
+	(=ks-x1001	    . #x4B60)	; &I-K0-4B60; [43-64]
+	(=daikanwa	    . 12839)	; &I-M-12839;
+	))
+      )
+     ((=cns11643-3	  . #x2936)	; &C3-2936; [09-22]
       ))
-    (=jis-x0208		. #x3348)	; &GT-15035; [19-40]
-    (=gt		. 15035)	; &I-GT-15035;
-    (=gt-pj-1		. #x3348)	; &I-GT-15035; [19-40]
-    (=ucs@jis		. #x62E1)	; &GT-15035;
-    (mojikyo		. 050195)	; &MCS-6000C413;
     ))
 (define-char
-  '((morohashi-daikanwa	11985 1 0)
-    (ideographic-radical . 64)	; ⼿
+  '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x62E1)	; 拡
-    (=cns11643-3	. #x292F)	; &I-C3-292F; [09-15]
+    (->subsumptive
+     ((morohashi-daikanwa	11985 1)
+      (=jis-x0208	  . #x3348)	; &GT-15035; [19-40]
+      (=gt		  . 15035)	; &I-GT-15035;
+      (=gt-pj-1		  . #x3348)	; &I-GT-15035; [19-40]
+      (=ucs@jis		  . #x62E1)	; &GT-15035;
+      (mojikyo		  . 050195)	; &MCS-6000C413;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5A32)	; &GT-16319; [58-18]
+	(=ks-x1001	    . #x7C2A)	; &I-K0-7C2A; [92-10]
+	(=daikanwa	    . 12895)	; &I-M-12895;
+	))
+      )
+     ((=cns11643-3	  . #x292F)	; &C3-292F; [09-15]
+      (=ucs@unicode	  . #x62E1)	; &C3-292F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -3288,12 +3309,6 @@
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (<-formed
-     ((=ks-x1001	  . #x4E41)	; &M-38844; [46-33]
-      (=jis-x0212	  . #x614B)	; &I-JSP-614B; [65-43]
-      (=jis-x0213-2-2000  . #x7977)	; &I-JX2-7977; [89-87]
-      (=daikanwa	  . 38844)	; &I-M-38844;
-      ))
     (shinjigen-1	. 2899)
     (shinjigen-2	. 2899)
     (=ucs		. #x62EC)	; 括
@@ -3306,6 +3321,12 @@
     (=gt-k		. 05039)	; &I-GT-K05039;
     (=gt-pj-1		. #x3367)	; &I-GT-15137; [19-71]
     (=daikanwa		. 11988)	; &I-M-11988;
+    (<-formed
+     ((=ks-x1001	  . #x4E41)	; &M-38844; [46-33]
+      (=jis-x0212	  . #x614B)	; &I-JSP-614B; [65-43]
+      (=jis-x0213-2-2000  . #x7977)	; &I-JX2-7977; [89-87]
+      (=daikanwa	  . 38844)	; &I-M-38844;
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -4573,19 +4594,20 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x6318)	; 挘
-    (=jis-x0212		. #x3F63)	; &I-JSP-3F63; [31-67]
-    (=jis-x0213-1-2000	. #x746D)	; &I-JX1-746D; [84-77]
-    (=daikanwa		. 12081)	; &I-M-12081;
+    (->subsumptive
+     ((=jis-x0212	  . #x3F63)	; &M-12081; [31-67]
+      (=jis-x0213-1-2000  . #x746D)	; &I-JX1-746D; [84-77]
+      (=daikanwa	  . 12081)	; &I-M-12081;
+      (=ucs@jis		  . #x6318)	; &M-12081;
+      )
+     ((=ucs@unicode	  . #x6318)	; &UU+6318;
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	12081 1)
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x64E7)	; 擧
-      (=jis-x0208	  . #x5A29)	; &I-J90-5A29; [58-09]
-      ))
     (=ucs		. #x6319)	; 挙
     (=jis-x0208		. #x3573)	; &I-J90-3573; [21-83]
     (=cns11643-3	. #x3132)	; &I-C3-3132; [17-18]
@@ -4593,6 +4615,10 @@
     (=gt-k		. 06401)	; &I-GT-K06401;
     (=gt-pj-1		. #x3573)	; &I-GT-15248; [21-83]
     (mojikyo		. 050196)	; &MCS-6000C414;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x64E7)	; 擧
+      (=jis-x0208	  . #x5A29)	; &I-J90-5A29; [58-09]
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -5276,29 +5302,33 @@
     (=daikanwa		. 12118)	; &I-M-12118;
     ))
 (define-char
-  '((morohashi-daikanwa	12118 0 5)
+  '((=>daikanwa		. 12118)	; 挾
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x633E)	; 挾
-      (=jis-x0208	  . #x5951)	; &I-J90-5951; [57-49]
-      ))
     (=ucs		. #x631F)	; 挟
     (=jis-x0208		. #x3634)	; &I-J90-3634; [22-20]
     (=gb2312		. #x502E)	; &I-G0-502E; [48-14]
     (=cns11643-3	. #x2C6B)	; &I-C3-2C6B; [12-75]
     (=gt		. 15143)	; &I-GT-15143;
     (=gt-pj-1		. #x3634)	; &I-GT-15143; [22-20]
+    (<-simplified@CN
+     ((=ucs		  . #x633E)	; 挾
+      (=gb12345		  . #x502E)	; 挾 [48-14]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x633E)	; 挾
+      (=jis-x0208	  . #x5951)	; &I-J90-5951; [57-49]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x633E)	; 挾
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x63D2)	; 插
-      (=jis-x0208	  . #x5967)	; &I-J90-5967; [57-71]
-      ))
+    (shinjigen-1	. 3013)
     (shinjigen-2	. 2939)
     (=ucs		. #x633F)	; 挿
     (=jis-x0208		. #x415E)	; &I-J90-415E; [33-62]
@@ -5306,6 +5336,19 @@
     (=gt		. 15298)	; &I-GT-15298;
     (=gt-pj-1		. #x415E)	; &I-GT-15298; [33-62]
     (=daikanwa		. 12119)	; &I-M-12119;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5967)	; &GT-15629; [57-71]
+      (=gb2312		  . #x3265)	; &I-G0-3265; [18-69]
+      (=daikanwa	  . 12346)	; &I-M-12346;
+      ))
+    (<-vulgar
+     ((shinjigen-1	  . 3012)
+      (=jis-x0208	  . #x5967)	; &GT-15629; [57-71]
+      (=gb2312		  . #x3265)	; &I-G0-3265; [18-69]
+      (=daikanwa	  . 12346)	; &I-M-12346;
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -5922,37 +5965,59 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x443D)	; &M-12160; [36-29]
-      (=daikanwa	  . 12160)	; &I-M-12160;
-      ))
     (=jis-x0208@1983	. #x443D)	; &GT-15474; [36-29]
     (=jis-x0208@1990	. #x443D)	; &I-J90-443D; [36-29]
     (=gt		. 15474)	; &I-GT-15474;
     (=gt-pj-1		. #x443D)	; &I-GT-15474; [36-29]
     (=jef-china3	. #x50BC)	; &I-JC3-50BC;
     (=ucs@jis		. #x6357)	; &GT-15474;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x443D)	; &M-12160; [36-29]
+      (=daikanwa	  . 12160)	; &I-M-12160;
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x6358)	; 捘
+    (=big5		. #xD1C1)	; &I-B-D1C1;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6358)	; 捘
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
     (->subsumptive
      ((=daikanwa	  . 12161)	; &M-12161;
       )
      ((=cns11643-2	  . #x2F43)	; &C2-2F43; [15-35]
       (=ucs@cns		  . #x6358)	; &C2-2F43;
-      )
-     ((=jis-x0212	  . #x3F76)	; &JSP-3F76; [31-86]
-      (=big5		  . #xD1C1)	; &I-B-D1C1;
-      (=jef-china3	  . #x4FD3)	; &I-JC3-4FD3;
-      (=ucs@jis		  . #x6358)	; &JSP-3F76;
-      )
-     ((=ucs@unicode	  . #x6358)	; &UU+6358;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x6358)	; 捘
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=ucs@unicode	. #x6358)	; &UU+6358;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6358)	; 捘
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=jis-x0212		. #x3F76)	; &JSP-3F76; [31-86]
+    (=jef-china3	. #x4FD3)	; &I-JC3-4FD3;
+    (=ucs@jis		. #x6358)	; &JSP-3F76;
+    ))
+(define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
@@ -5972,9 +6037,38 @@
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (=ucs		. #x22B47)	; 𢭇
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22B47)	; 𢭇
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
     (=daikanwa		. 12163)	; &M-12163;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x22B47)	; 𢭇
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=cns11643-6	. #x377A)	; &C6-377A; [23-90]
+    (=ucs@iso		. #x22B47)	; &C6-377A;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22B47)	; 𢭇
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (hanyu-dazidian	3 1884 16)
+    (=hanziku-5		. #xDA55)	; &HZK05-DA55;
+    ))
+(define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
@@ -6114,37 +6208,24 @@
     (=daikanwa		. 12178)	; &I-M-12178;
     ))
 (define-char
-  '((=>ucs		. #x22B52)	; 𢭒
-    (ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=daikanwa		. 12179)	; &M-12179;
-    ))
-(define-char
-  '((=>ucs		. #x22B52)	; 𢭒
-    (morohashi-daikanwa	12179 0 0)
-    (ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (mojikyo		. 012179)	; &MCS-60002F93;
-    ))
-(define-char
-  '((morohashi-daikanwa	12179 0 1)
-    (ideographic-radical . 64)	; ⼿
+  '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x22B52)	; 𢭒
-    (=cns11643-6	. #x377C)	; &I-C6-377C; [23-92]
+    (->subsumptive
+     ((=daikanwa	  . 12179)	; &M-12179;
+      )
+     ((mojikyo		  . 012179)	; &MCS-60002F93;
+      )
+     ((=cns11643-6	  . #x377C)	; &C6-377C; [23-92]
+      (=ucs@iso		  . #x22B52)	; &C6-377C;
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	12179 1)
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x641C)	; 搜
-      (=jis-x0208	  . #x5953)	; &I-J90-5953; [57-51]
-      ))
     (=ucs		. #x635C)	; 捜
     (=jis-x0208		. #x415C)	; &I-J90-415C; [33-60]
     (=cns11643-3	. #x313B)	; &I-C3-313B; [17-27]
@@ -6152,6 +6233,10 @@
     (=gt-pj-1		. #x415C)	; &I-GT-15302; [33-60]
     (=jef-china3	. #x4FF0)	; &I-JC3-4FF0;
     (mojikyo		. 050197)	; &MCS-6000C415;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x641C)	; 搜
+      (=jis-x0208	  . #x5953)	; &I-J90-5953; [57-51]
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -6204,21 +6289,6 @@
     (mojikyo		. 060413)	; &MCS-6000EBFD;
     ))
 (define-char
-  '((ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=ucs		. #x22B47)	; 𢭇
-    (=cns11643-6	. #x377A)	; &I-C6-377A; [23-90]
-    ))
-(define-char
-  '((=>ucs		. #x22B47)	; 𢭇
-    (ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (hanyu-dazidian	3 1884 16)
-    (=hanziku-5		. #xDA55)	; &HZK05-DA55;
-    ))
-(define-char
   '((=>ucs		. #x22B87)	; 𢮇
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
@@ -8291,13 +8361,6 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x63ED)	; 揭
-      (=jis-x0213-1-2000  . #x7473)	; &I-JX1-7473; [84-83]
-      (=daikanwa	  . 12389)	; &I-M-12389;
-      ))
-    (<-simplified@JP/Jouyou*sources
-     daikanwa JP/Jouyou)
     (shinjigen-1	. 2959)
     (shinjigen-2	. 2962)
     (=ucs		. #x63B2)	; 掲
@@ -8307,20 +8370,27 @@
     (=gt-k		. 07753)	; &I-GT-K07753;
     (=gt-pj-1		. #x3747)	; &I-GT-15400; [23-39]
     (mojikyo		. 050200)	; &MCS-6000C418;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x63ED)	; 揭
+      (=jis-x0213-1-2000  . #x7473)	; &I-JX1-7473; [84-83]
+      (=daikanwa	  . 12389)	; &I-M-12389;
+      ))
+    (<-simplified@JP/Jouyou*sources
+     daikanwa JP/Jouyou)
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (=ucs		. #x22BAE)	; 𢮮
+    (=cns11643-6	. #x402E)	; &I-C6-402E; [32-14]
+    (=daikanwa		. 49129)	; &I-M-49129;
     (<-same
      ((=ucs		  . #x6291)	; 抑
       (=daikanwa	  . 11883)	; &I-M-11883;
       ))
     (<-same*sources
      daikanwa)
-    (=ucs		. #x22BAE)	; 𢮮
-    (=cns11643-6	. #x402E)	; &I-C6-402E; [32-14]
-    (=daikanwa		. 49129)	; &I-M-49129;
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -8975,15 +9045,20 @@
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (shinjigen-2	. 2940)
     (=ucs		. #x63D2)	; 插
-    (=jis-x0208		. #x5967)	; &I-J90-5967; [57-71]
-    (=gb2312		. #x3265)	; &I-G0-3265; [18-69]
-    (=cns11643-1	. #x5F46)	; &I-C1-5F46; [63-38]
-    (=big5		. #xB4A1)	; &I-B-B4A1;
-    (=gt		. 15629)	; &I-GT-15629;
-    (=gt-pj-1		. #x5967)	; &I-GT-15629; [57-71]
-    (=daikanwa		. 12346)	; &I-M-12346;
+    (->subsumptive
+     ((shinjigen-1	  . 3012)
+      (shinjigen-2	  . 2940)
+      (=jis-x0208	  . #x5967)	; &GT-15629; [57-71]
+      (=gb2312		  . #x3265)	; &I-G0-3265; [18-69]
+      (=big5		  . #xB4A1)	; &I-B-B4A1;
+      (=gt		  . 15629)	; &I-GT-15629;
+      (=gt-pj-1		  . #x5967)	; &I-GT-15629; [57-71]
+      (=daikanwa	  . 12346)	; &I-M-12346;
+      (=ucs@unicode	  . #x63D2)	; &GT-15629;
+      )
+     ((=cns11643-1	  . #x5F46)	; &C1-5F46; [63-38]
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	12346 1)
@@ -10483,6 +10558,13 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (shinjigen-1	. 3022)
+    (=ucs		. #x63FA)	; 揺
+    (=jis-x0208		. #x4D49)	; &I-J90-4D49; [45-41]
+    (=cns11643-4	. #x376F)	; &I-C4-376F; [23-79]
+    (=gt		. 15703)	; &I-GT-15703;
+    (=gt-pj-1		. #x4D49)	; &I-GT-15703; [45-41]
+    (mojikyo		. 050202)	; &MCS-6000C41A;
     (<-simplified@JP/Jouyou
      ((shinjigen-1	  . 3023)
       (=jis-x0208	  . #x596A)	; &GT-15861; [57-74]
@@ -10491,13 +10573,6 @@
       ))
     (<-simplified@JP/Jouyou*sources
      shinjigen-1 JP/Jouyou daikanwa)
-    (shinjigen-1	. 3022)
-    (=ucs		. #x63FA)	; 揺
-    (=jis-x0208		. #x4D49)	; &I-J90-4D49; [45-41]
-    (=cns11643-4	. #x376F)	; &I-C4-376F; [23-79]
-    (=gt		. 15703)	; &I-GT-15703;
-    (=gt-pj-1		. #x4D49)	; &I-GT-15703; [45-41]
-    (mojikyo		. 050202)	; &MCS-6000C41A;
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -11169,13 +11244,7 @@
     (total-strokes	 . 13)
     (=ucs		. #x6416)	; 搖
     (->subsumptive
-     ((<-formed
-       ((=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]
-	(=daikanwa	    . 39035)	; &I-M-39035;
-	))
-      (shinjigen-1	  . 3023)
+     ((shinjigen-1	  . 3023)
       (shinjigen-2	  . 3026)
       (=jis-x0208	  . #x596A)	; &GT-15861; [57-74]
       (=ks-x1001	  . #x6874)	; &I-K0-6874; [72-84]
@@ -11184,6 +11253,12 @@
       (=gt-pj-1		  . #x596A)	; &I-GT-15861; [57-74]
       (=daikanwa	  . 12479)	; &I-M-12479;
       (=ucs@unicode	  . #x6416)	; &GT-15861;
+      (<-formed
+       ((=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]
+	(=daikanwa	    . 39035)	; &I-M-39035;
+	))
       )
      ((=cns11643-1	  . #x6436)	; &C1-6436; [68-22]
       ))
@@ -12532,14 +12607,14 @@
       (=jis-x0208@1983	  . #x405D)	; &I-J83-405D; [32-61]
       (=ucs@unicode	  . #x6442)	; &J83-405D;
       )
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208@1990    . #x5970)	; &J90-5970; [57-80]
-	))
-      (=jis-x0208@1990	  . #x405D)	; &GT-15795; [32-61]
+     ((=jis-x0208@1990	  . #x405D)	; &GT-15795; [32-61]
       (=gt		  . 15795)	; &I-GT-15795;
       (=gt-pj-1		  . #x405D)	; &I-GT-15795; [32-61]
       (=ucs@jis		  . #x6442)	; &GT-15795;
       (mojikyo		  . 050203)	; &MCS-6000C41B;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208@1990    . #x5970)	; &J90-5970; [57-80]
+	))
       ))
     ))
 (define-char
@@ -12553,21 +12628,18 @@
     (=hanziku-5		. #xE56B)	; &I-HZK05-E56B;
     ))
 (define-char
-  '((=>ucs		. #x22C98)	; 𢲘
-    (ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=daikanwa		. 49132)	; &M-49132;
-    ))
-(define-char
-  '((morohashi-daikanwa	49132 0 1)
-    (ideographic-radical . 64)	; ⼿
+  '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (hanyu-dazidian	8 25 20)
     (=ucs		. #x22C98)	; 𢲘
-    (=cns11643-6	. #x5276)	; &I-C6-5276; [50-86]
-    (=hanziku-12	. #xEE47)	; &I-HZK12-EE47;
+    (->subsumptive
+     ((=daikanwa	  . 49132)	; &M-49132;
+      )
+     ((hanyu-dazidian	  8 25 20)
+      (=cns11643-6	  . #x5276)	; &HZK12-EE47; [50-86]
+      (=hanziku-12	  . #xEE47)	; &I-HZK12-EE47;
+      (=ucs@iso		  . #x22C98)	; &HZK12-EE47;
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -14374,72 +14446,78 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x3A3F)	; 㨿
-    (=daikanwa		. 12674)	; &I-M-12674;
-    (=cbeta		. 07043)	; &I-CB07043;
-    ))
-(define-char
-  '((=>ucs		. #x3A3F)	; 㨿
-    (morohashi-daikanwa	12674 0 0)
-    (ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=cns11643-3	. #x472B)	; &C3-472B; [39-11]
-    ))
-(define-char
-  '((=>ucs		. #x6483)	; 撃
-    (morohashi-daikanwa	12674 1)
-    (ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x64CA)	; 擊
-      (=jis-x0212	  . #x4123)	; &I-JSP-4123; [33-03]
-      (=jis-x0213-1-2000  . #x7522)	; &I-JX1-7522; [85-02]
+    (->subsumptive
+     ((=daikanwa	  . 12674)	; &M-12674;
+      (=cbeta		  . 07043)	; &I-CB07043;
+      (=ucs@unicode	  . #x3A3F)	; &M-12674;
+      )
+     ((=cns11643-3	  . #x472B)	; &C3-472B; [39-11]
       ))
-    (=jis-x0208		. #x3762)	; &GT-16048; [23-66]
-    (=gt		. 16048)	; &I-GT-16048;
-    (=gt-pj-1		. #x3762)	; &I-GT-16048; [23-66]
-    (=ucs@jis		. #x6483)	; &GT-16048;
     ))
 (define-char
-  '((morohashi-daikanwa	12674 1 0)
-    (ideographic-radical . 64)	; ⼿
+  '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x6483)	; 撃
-    (=cns11643-3	. #x4C35)	; &I-C3-4C35; [44-21]
+    (->subsumptive
+     ((morohashi-daikanwa	12674 1)
+      (=jis-x0208	  . #x3762)	; &GT-16048; [23-66]
+      (=gt		  . 16048)	; &I-GT-16048;
+      (=gt-pj-1		  . #x3762)	; &I-GT-16048; [23-66]
+      (=ucs@jis		  . #x6483)	; &GT-16048;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x64CA)	; 擊
+	(=jis-x0212	    . #x4123)	; &I-JSP-4123; [33-03]
+	(=jis-x0213-1-2000  . #x7522)	; &I-JX1-7522; [85-02]
+	))
+      )
+     ((=cns11643-3	  . #x4C35)	; &C3-4C35; [44-21]
+      (=ucs@unicode	  . #x6483)	; &C3-4C35;
+      )
+     ((mojikyo		  . 050205)	; &MCS-6000C41D;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6483)	; 撃
-    (morohashi-daikanwa	12674 1 1)
-    (ideographic-radical . 64)	; ⼿
+  '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (mojikyo		. 050205)	; &MCS-6000C41D;
+    (total-strokes	 . 14)
+    (=ucs		. #x22D00)	; 𢴀
+    (->subsumptive
+     ((=daikanwa	  . 49133)	; &M-49133;
+      )
+     ((hanyu-dazidian	  3 1950 2)
+      (=cns11643-6	  . #x5D30)	; &HZK05-E7B0; [61-16]
+      (=hanziku-5	  . #xE7B0)	; &I-HZK05-E7B0;
+      (=ucs@iso		  . #x22D00)	; &HZK05-E7B0;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x22D00)	; 𢴀
-    (ideographic-radical . 64)	; ⼿
+  '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=daikanwa		. 49133)	; &M-49133;
+    (=ucs		. #x3A40)	; 㩀
     ))
 (define-char
-  '((morohashi-daikanwa	49133 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3A40)	; 㩀
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (hanyu-dazidian	3 1950 2)
-    (=ucs		. #x22D00)	; 𢴀
-    (=cns11643-6	. #x5D30)	; &I-C6-5D30; [61-16]
-    (=hanziku-5		. #xE7B0)	; &I-HZK05-E7B0;
+    (->subsumptive
+     ((=daikanwa	  . 49134)	; &M-49134;
+      )
+     ((=ucs@unicode	  . #x3A40)	; &UU+3A40;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 64)	; ⼿
+  '((<-denotational
+     ((=ucs		  . #x3A40)	; 㩀
+      ))
+    (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=ucs		. #x3A40)	; 㩀
-    (=cns11643-3	. #x472C)	; &I-C3-472C; [39-12]
+    (=cns11643-3	. #x472C)	; &C3-472C; [39-12]
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -20506,14 +20584,14 @@
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 19)
     (total-strokes	 . 22)
-    (<-same@unknown
-     ((=ucs		  . #x7C61)	; 籡
-      ))
     (hanyu-dazidian	3 1991 1)
     (=ucs		. #x22E85)	; 𢺅
     (=cns11643-5	. #x7347)	; &I-C5-7347; [83-39]
     (=daikanwa		. 13027)	; &I-M-13027;
     (=hanziku-5		. #xEFE7)	; &I-HZK05-EFE7;
+    (<-same@unknown
+     ((=ucs		  . #x7C61)	; 籡
+      ))
     ))
 (define-char
   '((=>ucs		. #x22E91)	; 𢺑
@@ -20770,12 +20848,6 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (<-simplified@JP
-     ((=ucs		  . #x652A)	; 攪
-      (=jis-x0208@1978	  . #x3349)	; &I-J78-3349; [19-41]
-      (=jis-x0208@1983	  . #x5978)	; &I-J83-5978; [57-88]
-      (=jis-x0208@1990	  . #x5978)	; &I-J90-5978; [57-88]
-      ))
     (=ucs		. #x64B9)	; 撹
     (=jis-x0208@1978	. #x5978)	; &I-J78-5978; [57-88]
     (=jis-x0208@1983	. #x3349)	; &I-J83-3349; [19-41]
@@ -20783,6 +20855,12 @@
     (=cns11643-3	. #x4C37)	; &I-C3-4C37; [44-23]
     (=gt		. 16022)	; &I-GT-16022;
     (=gt-pj-1		. #x3349)	; &I-GT-16022; [19-41]
+    (<-simplified@JP
+     ((=ucs		  . #x652A)	; 攪
+      (=jis-x0208@1978	  . #x3349)	; &I-J78-3349; [19-41]
+      (=jis-x0208@1983	  . #x5978)	; &I-J83-5978; [57-88]
+      (=jis-x0208@1990	  . #x5978)	; &I-J90-5978; [57-88]
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
diff --git a/lisp/utf-2000/Ideograph-R066-Rap.el b/lisp/utf-2000/Ideograph-R066-Rap.el
index 4168a40..0fc8044 100644
--- a/lisp/utf-2000/Ideograph-R066-Rap.el
+++ b/lisp/utf-2000/Ideograph-R066-Rap.el
@@ -26,12 +26,6 @@
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-formed@component/connect-left
-     ((=ucs		  . #x6534)	; 攴
-      (=daikanwa	  . 13108)	; &I-M-13108;
-      ))
-    (<-formed@component/connect-left*sources
-     zhengzitong daikanwa)
     (=ucs		. #x6535)	; 攵
     (=jis-x0208		. #x5A3E)	; &I-J90-5A3E; [58-30]
     (=gb2312		. #x6B36)	; &I-G0-6B36; [75-22]
@@ -41,6 +35,12 @@
     (=gt-k		. 00530)	; &I-GT-K00530;
     (=gt-pj-1		. #x5A3E)	; &I-GT-16577; [58-30]
     (=daikanwa		. 13109)	; &I-M-13109;
+    (<-formed@component/connect-left
+     ((=ucs		  . #x6534)	; 攴
+      (=daikanwa	  . 13108)	; &I-M-13108;
+      ))
+    (<-formed@component/connect-left*sources
+     zhengzitong daikanwa)
     (->Bopomofo
      ((name		  . "BOPOMOFO LETTER P")
       (=ucs		  . #x3106)	; ㄆ
@@ -56,10 +56,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E99)	; ⺙
     (<-identical@component/connect-left
      ((=ucs		  . #x6535)	; 攵
       ))
-    (=ucs		. #x2E99)	; ⺙
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -790,8 +790,7 @@
     (=daikanwa		. 13170)	; &I-M-13170;
     ))
 (define-char
-  '((=>daikanwa		. 13171)	; &M-13171;
-    (ideographic-radical@ucs . 113)	; â½°
+  '((ideographic-radical@ucs . 113)	; â½°
     (ideographic-strokes@ucs . 4)
     (ideographic-radical@cns . 66)	; ⽁
     (ideographic-strokes@cns . 5)
@@ -812,13 +811,6 @@
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x22F20)	; 𢼠
-    (=cns11643-6	. #x315F)	; &I-C6-315F; [17-63]
-    ))
-(define-char
-  '((ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -936,9 +928,19 @@
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=daikanwa		. 13181)	; &M-13181;
+    (ideographic-strokes@ucs . 6)
+    (total-strokes@ucs	     . 10)
+    (ideographic-strokes@ucs*sources
+     daikanwa)
+    (ideographic-strokes@cns . 5)
+    (total-strokes@cns	     . 9)
+    (=ucs		. #x22F20)	; 𢼠
+    (->subsumptive
+     ((=daikanwa	  . 13181)	; &M-13181;
+      (=ucs@iso		  . #x22F20)	; &M-13181;
+      )
+     ((=cns11643-6	  . #x315F)	; &C6-315F; [17-63]
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -953,10 +955,27 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x22F22)	; 𢼢
-    (=cns11643-6	. #x3828)	; &I-C6-3828; [24-08]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22F22)	; 𢼢
+      ))
+    (ideographic-radical . 66)	; ⽁
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=cns11643-6	. #x3828)	; &M-13183; [24-08]
     (=daikanwa		. 13183)	; &I-M-13183;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x22F22)	; 𢼢
+      ))
+    (ideographic-radical . 66)	; ⽁
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=ucs@iso		. #x22F22)	; &U-00022F22;
+    ))
+(define-char
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
@@ -967,33 +986,32 @@
 (define-char
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 6)
-    (=daikanwa		. 13185)	; &M-13185;
-    ))
-(define-char
-  '((=>ucs		. #x6548)	; 效
-    (ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (shinjigen-1	. 725)
-    (shinjigen-2	. 725)
-    (=jis-x0208		. #x5A43)	; &GT-16660; [58-35]
-    (=ks-x1001		. #x7C79)	; &I-K0-7C79; [92-89]
-    (=big5		. #xAEC4)	; &I-B-AEC4;
-    (=gt		. 16660)	; &I-GT-16660;
-    (=gt-k		. 06595)	; &I-GT-K06595;
-    (=gt-pj-1		. #x5A43)	; &I-GT-16660; [58-35]
-    (=daikanwa		. 13186)	; &I-M-13186;
-    (=ucs@jis		. #x6548)	; &GT-16660;
-    (=ucs@big5		. #x6548)	; &GT-16660;
+    (=ucs		. #x22F24)	; 𢼤
+    (=daikanwa		. 13185)	; &I-M-13185;
+    (=hanziku-4		. #xD5F8)	; &I-HZK04-D5F8;
     ))
 (define-char
-  '((morohashi-daikanwa	13186 0 0)
-    (ideographic-radical . 66)	; ⽁
+  '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6548)	; 效
-    (=gb2312		. #x5027)	; &I-G0-5027; [48-07]
-    (=cns11643-1	. #x5566)	; &I-C1-5566; [53-70]
+    (=big5		. #xAEC4)	; &I-B-AEC4;
+    (->subsumptive
+     ((shinjigen-1	  . 725)
+      (shinjigen-2	  . 725)
+      (=jis-x0208	  . #x5A43)	; &GT-16660; [58-35]
+      (=ks-x1001	  . #x7C79)	; &I-K0-7C79; [92-89]
+      (=gt		  . 16660)	; &I-GT-16660;
+      (=gt-k		  . 06595)	; &I-GT-K06595;
+      (=gt-pj-1		  . #x5A43)	; &I-GT-16660; [58-35]
+      (=daikanwa	  . 13186)	; &I-M-13186;
+      (=ucs@jis		  . #x6548)	; &GT-16660;
+      )
+     ((=gb2312		  . #x5027)	; &C1-5566; [48-07]
+      (=cns11643-1	  . #x5566)	; &I-C1-5566; [53-70]
+      (=ucs@unicode	  . #x6548)	; &C1-5566;
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -1011,12 +1029,15 @@
     (=daikanwa		. 13188)	; &I-M-13188;
     ))
 (define-char
-  '((morohashi-daikanwa	13188 0 5)
+  '((=>daikanwa		. 13188)	; 𢼦
     (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x22F2D)	; 𢼭
     (=cns11643-5	. #x2D71)	; &I-C5-2D71; [13-81]
+    (<-unknown
+     ((=ucs		  . #x22F26)	; 𢼦
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -1098,61 +1119,79 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x22F2C)	; 𢼬
-    (=cns11643-5	. #x2D73)	; &I-C5-2D73; [13-83]
-    (=daikanwa		. 13195)	; &I-M-13195;
+    (->subsumptive
+     ((=daikanwa	  . 13195)	; &M-13195;
+      )
+     ((=cns11643-5	  . #x2D73)	; &C5-2D73; [13-83]
+      (=ucs@iso		  . #x22F2C)	; &C5-2D73;
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=daikanwa		. 13196)	; &M-13196;
+    (=ucs		. #x22F37)	; 𢼷
+    (=daikanwa		. 13196)	; &I-M-13196;
+    (=hanziku-4		. #xD67A)	; &I-HZK04-D67A;
     ))
 (define-char
-  '((ideographic-radical . 66)	; ⽁
+  '((=>ucs		. #x22F32)	; 𢼲
+    (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=daikanwa		. 13197)	; &M-13197;
     ))
 (define-char
-  '((ideographic-radical . 66)	; ⽁
+  '((=>daikanwa		. 13197)	; &M-13197;
+    (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=ucs		. #x22F2F)	; 𢼯
-    (=cns11643-6	. #x3827)	; &I-C6-3827; [24-07]
-    (=daikanwa		. 13198)	; &I-M-13198;
+    (=ucs		. #x22F32)	; 𢼲
+    (=hanziku-4		. #xD5F6)	; &I-HZK04-D5F6;
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=daikanwa		. 13199)	; &M-13199;
+    (=ucs		. #x22F2F)	; 𢼯
+    (=cns11643-6	. #x3827)	; &I-C6-3827; [24-07]
+    (=daikanwa		. 13198)	; &I-M-13198;
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=daikanwa		. 13200)	; &M-13200;
+    (=ucs		. #x22F31)	; 𢼱
+    (=daikanwa		. 13199)	; &I-M-13199;
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=daikanwa		. 13201)	; &M-13201;
+    (=ucs		. #x22F35)	; 𢼵
+    (->subsumptive
+     ((=daikanwa	  . 13200)	; &M-13200;
+      )
+     ((=ucs@iso		  . #x22F35)	; &U-00022F35;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x22F57)	; 𢽗
-    (ideographic-radical . 66)	; ⽁
+  '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=daikanwa		. 13202)	; &M-13202;
+    (=ucs		. #x22F30)	; 𢼰
+    (=daikanwa		. 13201)	; &I-M-13201;
+    (=hanziku-4		. #xD5E7)	; &I-HZK04-D5E7;
     ))
 (define-char
-  '((morohashi-daikanwa	13202 0 0)
-    (ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
+  '((ideographic-radical . 66)	; ⽁
+    (ideographic-strokes@daikanwa . 6)
+    (total-strokes@daikanwa	  . 10)
+    (ideographic-strokes@cns . 7)
+    (total-strokes@cns	     . 11)
     (=ucs		. #x22F57)	; 𢽗
     (=cns11643-5	. #x326A)	; &I-C5-326A; [18-74]
+    (=daikanwa		. 13202)	; &I-M-13202;
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -1167,10 +1206,6 @@
     (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA41)	; 敏
-      (=jis-x0213-1-2000  . #x7528)	; &I-JX1-7528; [85-08]
-      ))
     (=ucs		. #x2F8C8)	; 敏
     (=jis-x0208		. #x4952)	; &I-J90-4952; [41-50]
     (=cns11643-4	. #x2D46)	; &I-C4-2D46; [13-38]
@@ -1179,6 +1214,10 @@
     (=gt-pj-1		. #x4952)	; &I-GT-16681; [41-50]
     (=ucs@jis		. #x654F)	; 敏
     (mojikyo		. 050208)	; &MCS-6000C420;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA41)	; 敏
+      (=jis-x0213-1-2000  . #x7528)	; &I-JX1-7528; [85-08]
+      ))
     ))
 (define-char
   '((ideographic-radical@ucs . 66)	; ⽁
@@ -1547,10 +1586,17 @@
     (=daikanwa		. 13225)	; &I-M-13225;
     ))
 (define-char
-  '((=>ucs		. #x6556)	; 敖
+  '((ideographic-radical . 66)	; ⽁
+    (=ucs		. #x6556)	; 敖
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6556)	; 敖
+      ))
     (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (shinjigen-1	. 3173)
     (shinjigen-2	. 3173)
     (=jis-x0208		. #x5A44)	; &GT-16699; [58-36]
     (=ks-x1001		. #x6779)	; &I-K0-6779; [71-89]
@@ -1561,29 +1607,22 @@
     (=ucs@jis		. #x6556)	; &GT-16699;
     ))
 (define-char
-  '((=>ucs		. #x6556)	; 敖
-    (morohashi-daikanwa	13226 0 2)
+  '((<-denotational
+     ((=ucs		  . #x6556)	; 敖
+      ))
     (ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
     (=big5		. #xB1CE)	; &B-B1CE;
     (=ucs@big5		. #x6556)	; &B-B1CE;
-    ))
-(define-char
-  '((=>ucs		. #x6556)	; 敖
-    (morohashi-daikanwa	13226 0 3)
-    (ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=cns11643-1	. #x5A72)	; &C1-5A72; [58-82]
-    ))
-(define-char
-  '((morohashi-daikanwa	13226 0 4)
-    (ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=ucs		. #x6556)	; 敖
-    (=gb2312		. #x303D)	; &I-G0-303D; [16-29]
+    (->subsumptive
+     ((ideographic-strokes . 6)
+      (total-strokes	   . 10)
+      (=gb2312		  . #x303D)	; &G0-303D; [16-29]
+      (=ucs@unicode	  . #x6556)	; &G0-303D;
+      )
+     ((ideographic-strokes . 7)
+      (total-strokes	   . 11)
+      (=cns11643-1	  . #x5A72)	; &C1-5A72; [58-82]
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -1606,31 +1645,49 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x22F40)	; 𢽀
-    (=cns11643-6	. #x403B)	; &I-C6-403B; [32-27]
-    (=daikanwa		. 13228)	; &I-M-13228;
+    (->subsumptive
+     ((=daikanwa	  . 13228)	; &M-13228;
+      (=ucs@iso		  . #x22F40)	; &M-13228;
+      )
+     ((=cns11643-6	  . #x403B)	; &C6-403B; [32-27]
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x22F41)	; 𢽁
-    (=cns11643-6	. #x403D)	; &I-C6-403D; [32-29]
-    (=daikanwa		. 13229)	; &I-M-13229;
     ))
 (define-char
-  '((=>ucs		. #x22F42)	; 𢽂
+  '((<-denotational
+     ((=ucs		  . #x22F41)	; 𢽁
+      ))
     (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=daikanwa		. 13230)	; &M-13230;
+    (=cns11643-6	. #x403D)	; &M-13229; [32-29]
+    (=daikanwa		. 13229)	; &I-M-13229;
     ))
 (define-char
-  '((morohashi-daikanwa	13230 0 0)
+  '((<-denotational
+     ((=ucs		  . #x22F41)	; 𢽁
+      ))
     (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=ucs@iso		. #x22F41)	; &U-00022F41;
+    ))
+(define-char
+  '((ideographic-radical . 66)	; ⽁
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
     (=ucs		. #x22F42)	; 𢽂
-    (=cns11643-5	. #x326F)	; &I-C5-326F; [18-79]
+    (->subsumptive
+     ((=daikanwa	  . 13230)	; &M-13230;
+      )
+     ((=cns11643-5	  . #x326F)	; &C5-326F; [18-79]
+      (=ucs@iso		  . #x22F42)	; &C5-326F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -1846,29 +1903,38 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x655E)	; 敞
+  '((ideographic-radical . 66)	; ⽁
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=ucs		. #x655E)	; 敞
+    (=big5		. #xB4AF)	; &I-B-B4AF;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x655E)	; 敞
+      ))
     (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (shinjigen-2	. 3181)
     (=jis-x0208		. #x5A48)	; &GT-16763; [58-40]
     (=ks-x1001		. #x7362)	; &I-K0-7362; [83-66]
-    (=big5		. #xB4AF)	; &I-B-B4AF;
     (=gt		. 16763)	; &I-GT-16763;
     (=gt-k		. 09194)	; &I-GT-K09194;
     (=gt-pj-1		. #x5A48)	; &I-GT-16763; [58-40]
     (=daikanwa		. 13246)	; &I-M-13246;
     (=ucs@jis		. #x655E)	; &GT-16763;
-    (=ucs@big5		. #x655E)	; &GT-16763;
     ))
 (define-char
-  '((morohashi-daikanwa	13246 0 3)
+  '((<-denotational
+     ((=ucs		  . #x655E)	; 敞
+      ))
     (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=ucs		. #x655E)	; 敞
-    (=gb2312		. #x3328)	; &I-G0-3328; [19-08]
+    (=gb2312		. #x3328)	; &C1-5F54; [19-08]
     (=cns11643-1	. #x5F54)	; &I-C1-5F54; [63-52]
+    (=ucs@unicode	. #x655E)	; &C1-5F54;
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -1881,27 +1947,28 @@
     (=jef-china3	. #x50CD)	; &I-JC3-50CD;
     ))
 (define-char
-  '((=>ucs		. #x22F5D)	; 𢽝
-    (ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=daikanwa		. 13249)	; &M-13249;
-    ))
-(define-char
-  '((morohashi-daikanwa	13249 0 1)
-    (ideographic-radical . 66)	; ⽁
+  '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x22F5D)	; 𢽝
-    (=cns11643-5	. #x3922)	; &I-C5-3922; [25-02]
+    (->subsumptive
+     ((=daikanwa	  . 13249)	; &M-13249;
+      )
+     ((=cns11643-5	  . #x3922)	; &C5-3922; [25-02]
+      (=ucs@iso		  . #x22F5D)	; &C5-3922;
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x22F5E)	; 𢽞
-    (=cns11643-6	. #x4955)	; &I-C6-4955; [41-53]
-    (=daikanwa		. 13250)	; &I-M-13250;
+    (->subsumptive
+     ((=daikanwa	  . 13250)	; &M-13250;
+      )
+     ((=cns11643-6	  . #x4955)	; &C6-4955; [41-53]
+      (=ucs@iso		  . #x22F5E)	; &C6-4955;
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -2262,50 +2329,69 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x3A96)	; 㪖
-    (=cns11643-5	. #x387C)	; &I-C5-387C; [24-92]
-    (=daikanwa		. 13275)	; &I-M-13275;
     ))
 (define-char
-  '((=>ucs		. #x6566)	; 敦
+  '((<-denotational
+     ((=ucs		  . #x3A96)	; 㪖
+      ))
     (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (shinjigen-2	. 3182)
-    (=jis-x0208		. #x4658)	; &GT-16781; [38-56]
-    (=ks-x1001		. #x5444)	; &I-K0-5444; [52-36]
-    (=big5		. #xB4B0)	; &I-B-B4B0;
-    (=gt		. 16781)	; &I-GT-16781;
-    (=gt-k		. 09117)	; &I-GT-K09117;
-    (=gt-pj-1		. #x4658)	; &I-GT-16781; [38-56]
-    (=daikanwa		. 13276)	; &I-M-13276;
-    (=ucs@jis		. #x6566)	; &GT-16781;
-    (=ucs@big5		. #x6566)	; &GT-16781;
+    (=cns11643-5	. #x387C)	; &M-13275; [24-92]
+    (=daikanwa		. 13275)	; &I-M-13275;
     ))
 (define-char
-  '((morohashi-daikanwa	13276 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3A96)	; 㪖
+      ))
     (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=ucs@unicode	. #x3A96)	; &UU+3A96;
+    ))
+(define-char
+  '((ideographic-radical . 66)	; ⽁
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
     (=ucs		. #x6566)	; 敦
-    (=gb2312		. #x3658)	; &I-G0-3658; [22-56]
-    (=cns11643-1	. #x5F55)	; &I-C1-5F55; [63-53]
+    (=big5		. #xB4B0)	; &I-B-B4B0;
+    (->subsumptive
+     ((shinjigen-1	  . 3182)
+      (shinjigen-2	  . 3182)
+      (=jis-x0208	  . #x4658)	; &GT-16781; [38-56]
+      (=ks-x1001	  . #x5444)	; &I-K0-5444; [52-36]
+      (=gt		  . 16781)	; &I-GT-16781;
+      (=gt-k		  . 09117)	; &I-GT-K09117;
+      (=gt-pj-1		  . #x4658)	; &I-GT-16781; [38-56]
+      (=daikanwa	  . 13276)	; &I-M-13276;
+      (=ucs@jis		  . #x6566)	; &GT-16781;
+      )
+     ((=gb2312		  . #x3658)	; &C1-5F55; [22-56]
+      (=cns11643-1	  . #x5F55)	; &I-C1-5F55; [63-53]
+      (=ucs@unicode	  . #x6566)	; &C1-5F55;
+      ))
     ))
 (define-char
   '((=>ucs		. #x6568)	; 敨
     (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=big5		. #xD977)	; &M-13277;
-    (=daikanwa		. 13277)	; &I-M-13277;
-    (=ucs@big5		. #x6568)	; &M-13277;
+    (=daikanwa		. 13277)	; &M-13277;
     ))
 (define-char
-  '((morohashi-daikanwa	13277 0 0)
+  '((=>daikanwa		. 13277)	; &M-13277;
     (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x6568)	; 敨
-    (=cns11643-2	. #x3C3C)	; &I-C2-3C3C; [28-28]
+    (=big5		. #xD977)	; &I-B-D977;
+    (<-same
+     ((=daikanwa	  . 13277)	; &M-13277;
+      ))
+    (->subsumptive
+     ((=cns11643-2	  . #x3C3C)	; &C2-3C3C; [28-28]
+      (=ucs@unicode	  . #x6568)	; &C2-3C3C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -2852,57 +2938,61 @@
     (=daikanwa		. 13313)	; &I-M-13313;
     ))
 (define-char
-  '((=>ucs		. #x22F92)	; 𢾒
-    (ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=daikanwa		. 13314)	; &M-13314;
-    ))
-(define-char
-  '((morohashi-daikanwa	13314 0 0)
-    (ideographic-radical . 66)	; ⽁
+  '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x22F92)	; 𢾒
-    (=cns11643-5	. #x3F56)	; &I-C5-3F56; [31-54]
-    ))
-(define-char
-  '((=>ucs		. #x22F93)	; 𢾓
-    (ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=daikanwa		. 13315)	; &M-13315;
+    (->subsumptive
+     ((=daikanwa	  . 13314)	; &M-13314;
+      )
+     ((=cns11643-5	  . #x3F56)	; &C5-3F56; [31-54]
+      (=ucs@iso		  . #x22F92)	; &C5-3F56;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13315 0 0)
-    (ideographic-radical . 66)	; ⽁
+  '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x22F93)	; 𢾓
-    (=cns11643-6	. #x5331)	; &I-C6-5331; [51-17]
+    (->subsumptive
+     ((=daikanwa	  . 13315)	; &M-13315;
+      )
+     ((=cns11643-6	  . #x5331)	; &C6-5331; [51-17]
+      (=ucs@iso		  . #x22F93)	; &C6-5331;
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x22F94)	; 𢾔
-    (=cns11643-5	. #x3F59)	; &I-C5-3F59; [31-57]
-    (=daikanwa		. 13316)	; &I-M-13316;
-    ))
-(define-char
-  '((=>ucs		. #x3A9F)	; 㪟
-    (ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=daikanwa		. 13317)	; &M-13317;
+    (->subsumptive
+     ((=daikanwa	  . 13316)	; &M-13316;
+      (=ucs@iso		  . #x22F94)	; &M-13316;
+      )
+     ((=cns11643-5	  . #x3F59)	; &C5-3F59; [31-57]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13317 0 0)
-    (ideographic-radical . 66)	; ⽁
+  '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x3A9F)	; 㪟
-    (=cns11643-3	. #x414C)	; &I-C3-414C; [33-44]
+    (->subsumptive
+     ((shinjigen-1	  . 3183)
+      (=daikanwa	  . 13317)	; &M-13317;
+      (<-formed
+       ((shinjigen-1	    . 3182)
+	(=jis-x0208	    . #x4658)	; &GT-16781; [38-56]
+	(=ks-x1001	    . #x5444)	; &I-K0-5444; [52-36]
+	(=daikanwa	    . 13276)	; &I-M-13276;
+	))
+      (<-formed*sources
+       shinjigen-1)
+      )
+     ((=cns11643-3	  . #x414C)	; &C3-414C; [33-44]
+      (=ucs@unicode	  . #x3A9F)	; &C3-414C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -2917,26 +3007,30 @@
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
+    (=ucs		. #x6570)	; 数
+    (<-simplified@ucs
      ((=ucs		  . #x6578)	; 數
-      (=jis-x0208	  . #x5A4B)	; &I-J90-5A4B; [58-43]
       ))
-    (shinjigen-2	. 3185)
-    (=ucs		. #x6570)	; 数
-    (=jis-x0208		. #x3F74)	; &I-J90-3F74; [31-84]
-    (=gb2312		. #x4A7D)	; &I-G0-4A7D; [42-93]
-    (=gt		. 16816)	; &I-GT-16816;
-    (=gt-k		. 10227)	; &I-GT-K10227;
-    (=gt-pj-1		. #x3F74)	; &I-GT-16816; [31-84]
-    (=daikanwa		. 13319)	; &I-M-13319;
-    ))
-(define-char
-  '((=>ucs		. #x6570)	; 数
-    (morohashi-daikanwa	13319 0 1)
-    (ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=cns11643-3	. #x414D)	; &C3-414D; [33-45]
+    (->subsumptive
+     ((shinjigen-1	  . 3185)
+      (shinjigen-2	  . 3185)
+      (=jis-x0208	  . #x3F74)	; &GT-16816; [31-84]
+      (=gb2312		  . #x4A7D)	; &I-G0-4A7D; [42-93]
+      (=gt		  . 16816)	; &I-GT-16816;
+      (=gt-k		  . 10227)	; &I-GT-K10227;
+      (=gt-pj-1		  . #x3F74)	; &I-GT-16816; [31-84]
+      (=daikanwa	  . 13319)	; &I-M-13319;
+      (=ucs@unicode	  . #x6570)	; &GT-16816;
+      (<-simplified@CN
+       ((=ucs		    . #x6578)	; 數
+	))
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5A4B)	; &M-13363; [58-43]
+	(=daikanwa	    . 13363)	; &I-M-13363;
+	))
+      )
+     ((=cns11643-3	  . #x414D)	; &C3-414D; [33-45]
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -3361,40 +3455,51 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x3AA5)	; 㪥
-    (=cns11643-4	. #x4A2A)	; &I-C4-4A2A; [42-10]
-    (=daikanwa		. 13353)	; &I-M-13353;
+    (->subsumptive
+     ((=daikanwa	  . 13353)	; &M-13353;
+      (=ucs@unicode	  . #x3AA5)	; &M-13353;
+      )
+     ((=cns11643-4	  . #x4A2A)	; &C4-4A2A; [42-10]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6575)	; 敵
-    (ideographic-radical . 66)	; ⽁
+  '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (shinjigen-2	. 3190)
-    (=jis-x0208		. #x4528)	; &GT-16898; [37-08]
-    (=ks-x1001		. #x6E58)	; &I-K0-6E58; [78-56]
-    (=big5		. #xBCC4)	; &I-B-BCC4;
-    (=gt		. 16898)	; &I-GT-16898;
-    (=gt-k		. 11927)	; &I-GT-K11927;
-    (=gt-pj-1		. #x4528)	; &I-GT-16898; [37-08]
-    (=daikanwa		. 13354)	; &I-M-13354;
-    (=ucs@jis		. #x6575)	; &GT-16898;
-    (=ucs@big5		. #x6575)	; &GT-16898;
+    (=ucs		. #x6575)	; 敵
     ))
 (define-char
-  '((morohashi-daikanwa	13354 0 0)
+  '((<-denotational
+     ((=ucs		  . #x6575)	; 敵
+      ))
     (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x6575)	; 敵
-    (=cns11643-1	. #x6D2E)	; &I-C1-6D2E; [77-14]
-    (=gb12345		. #x3550)	; 敵 [21-48]
+    (=big5		. #xBCC4)	; &B-BCC4;
+    (->subsumptive
+     ((shinjigen-1	  . 3190)
+      (shinjigen-2	  . 3190)
+      (=jis-x0208	  . #x4528)	; &GT-16898; [37-08]
+      (=ks-x1001	  . #x6E58)	; &I-K0-6E58; [78-56]
+      (=gt		  . 16898)	; &I-GT-16898;
+      (=gt-k		  . 11927)	; &I-GT-K11927;
+      (=gt-pj-1		  . #x4528)	; &I-GT-16898; [37-08]
+      (=daikanwa	  . 13354)	; &I-M-13354;
+      (=ucs@jis		  . #x6575)	; &GT-16898;
+      )
+     ((=cns11643-1	  . #x6D2E)	; &C1-6D2E; [77-14]
+      (=gb12345		  . #x3550)	; &C1-6D2E; [21-48]
+      (=ucs@unicode	  . #x6575)	; &C1-6D2E;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6575)	; 敵
-    (morohashi-daikanwa	13354 0 1)
+  '((<-denotational
+     ((=ucs		  . #x6575)	; 敵
+      ))
     (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (shinjigen-1	. 3191)
     (=jef-china3	. #x50D0)	; &JC3-50D0;
     ))
 (define-char
@@ -3403,12 +3508,12 @@
     (total-strokes	 . 15)
     (=ucs		. #x22FCC)	; 𢿌
     (->subsumptive
-     ((<-original
+     ((=daikanwa	  . 13355)	; &M-13355;
+      (<-original
        ((=daikanwa	    . 05731)	; &M-05731;
 	))
       (<-original*sources
-       zhengzi-tong daikanwa)
-      (=daikanwa	  . 13355)	; &M-13355;
+       zhengzitong daikanwa)
       )
      ((=ucs@iso		  . #x22FCC)	; &U-00022FCC;
       ))
@@ -3416,6 +3521,7 @@
 (define-char
   '((<-denotational
      ((=big5		  . #xE5C0)	; &B-E5C0;
+      (=jis-x0208@1997	  . #x546B)	; &B-E5C0; [52-75]
       ))
     (=>daikanwa		. 13355)	; &M-13355;
     (ideographic-radical . 66)	; ⽁
@@ -3441,19 +3547,16 @@
     (=ucs@big5		. #x657B)	; &B-E5C0;
     ))
 (define-char
-  '((=>ucs		. #x3AA6)	; 㪦
-    (ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=daikanwa		. 13356)	; &M-13356;
-    ))
-(define-char
-  '((morohashi-daikanwa	13356 0 0)
-    (ideographic-radical . 66)	; ⽁
+  '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x3AA6)	; 㪦
-    (=cns11643-4	. #x4A29)	; &I-C4-4A29; [42-09]
+    (->subsumptive
+     ((=daikanwa	  . 13356)	; &M-13356;
+      )
+     ((=cns11643-4	  . #x4A29)	; &C4-4A29; [42-09]
+      (=ucs@unicode	  . #x3AA6)	; &C4-4A29;
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -3541,31 +3644,35 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x22FD0)	; 𢿐
-    (=cns11643-7	. #x2352)	; &I-C7-2352; [03-50]
-    (=daikanwa		. 13362)	; &I-M-13362;
+    (->subsumptive
+     ((=daikanwa	  . 13362)	; &M-13362;
+      )
+     ((=cns11643-7	  . #x2352)	; &C7-2352; [03-50]
+      (=ucs@iso		  . #x22FD0)	; &C7-2352;
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (shinjigen-2	. 3186)
     (=ucs		. #x6578)	; 數
-    (=jis-x0208		. #x5A4B)	; &I-J90-5A4B; [58-43]
-    (=ks-x1001		. #x6226)	; &I-K0-6226; [66-06]
-    (=gb12345		. #x4A7D)	; 數 [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]
-    (=daikanwa		. 13363)	; &I-M-13363;
-    ))
-(define-char
-  '((=>ucs		. #x6578)	; 數
-    (morohashi-daikanwa	13363 0 1)
-    (ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-1	. #x6D30)	; &C1-6D30; [77-16]
+    (->subsumptive
+     ((=jis-x0208	  . #x5A4B)	; &M-13363; [58-43]
+      (=daikanwa	  . 13363)	; &I-M-13363;
+      (=ucs@jis		  . #x6578)	; &M-13363;
+      )
+     ((shinjigen-1	  . 3186)
+      (shinjigen-2	  . 3186)
+      (=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]
+      (=ucs@unicode	  . #x6578)	; &GT-16891;
+      )
+     ((=cns11643-1	  . #x6D30)	; &C1-6D30; [77-16]
+      ))
     ))
 (define-char
   '((=>ucs		. #x22FD8)	; 𢿘
@@ -4439,6 +4546,7 @@
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
+    (shinjigen-1	. 1784)
     (=ucs		. #x6585)	; 斅
     (=ks-x1001		. #x7C7A)	; &I-K0-7C7A; [92-90]
     (=jis-x0212		. #x4157)	; &I-JSP-4157; [33-55]
@@ -4447,9 +4555,16 @@
     (=daikanwa		. 13431)	; &I-M-13431;
     (=cbeta		. 00577)	; &I-CB00577;
     (=jef-china3	. #x49F8)	; &I-JC3-49F8;
+    (<-original
+     ((shinjigen-1	  . 1783)
+      (=ucs		  . #x5B78)	; å­¸
+      (=jis-x0208	  . #x555C)	; &I-J90-555C; [53-60]
+      ))
+    (<-original*sources
+     shinjigen-1)
     ))
 (define-char
-  '((morohashi-daikanwa	13431 0 4)
+  '((=>daikanwa		. 13431)	; 斅
     (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
diff --git a/lisp/utf-2000/Ideograph-R067-Script.el b/lisp/utf-2000/Ideograph-R067-Script.el
index f1456fd..879b911 100644
--- a/lisp/utf-2000/Ideograph-R067-Script.el
+++ b/lisp/utf-2000/Ideograph-R067-Script.el
@@ -33,11 +33,11 @@
     (ideographic-radical . 67)	; ⽂
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=gt-k		. 00488)	; &GT-K00488;
+    (=gt-pj-k1		. #x3437)	; &GT-K00488; [20-23]
     (<-formed@component/connect-right
      ((=jis-x0208	  . #x4A38)	; &GT-17008; [42-24]
       ))
-    (=gt-k		. 00488)	; &GT-K00488;
-    (=gt-pj-k1		. #x3437)	; &GT-K00488; [20-23]
     ))
 (define-char
   '((ideographic-radical@ucs . 210)	; ⿑
@@ -51,6 +51,7 @@
     (->subsumptive
      ((ideographic-radical . 67)	; ⽂
       (ideographic-strokes . 2)
+      (=daikanwa	  . 13451)	; &M-13451;
       (<-vulgar
        ((=jis-x0208	    . #x736E)	; &GT-66354; [83-78]
 	(=ks-x1001	    . #x703A)	; &I-K0-703A; [80-26]
@@ -58,15 +59,14 @@
 	))
       (<-vulgar*sources
        songyuan-yilai-suzipu daikanwa)
-      (=daikanwa	  . 13451)	; &M-13451;
       )
-     ((<-simplified@CN
+     ((=gb2312		  . #x466B)	; &C3-2370; [38-75]
+      (=cns11643-3	  . #x2370)	; &I-C3-2370; [03-80]
+      (=ucs@unicode	  . #x9F50)	; &C3-2370;
+      (<-simplified@CN
        ((=cns11643-1	    . #x6B7D)	; &C1-6B7D; [75-93]
 	(=gb12345	    . #x466B)	; &C1-6B7D; [38-75]
 	))
-      (=gb2312		  . #x466B)	; &C3-2370; [38-75]
-      (=cns11643-3	  . #x2370)	; &I-C3-2370; [03-80]
-      (=ucs@unicode	  . #x9F50)	; &C3-2370;
       ))
     ))
 (define-char
@@ -77,13 +77,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EEC)	; ⻬
     (<-identical@component
      ((=ucs		  . #x9F50)	; 齐
       ))
     (<-simplified@CN/component
      ((=ucs		  . #x9F4A)	; 齊
       ))
-    (=ucs		. #x2EEC)	; ⻬
     ))
 (define-char
   '((ideographic-radical . 67)	; ⽂
@@ -109,27 +109,27 @@
     (total-strokes	 . 7)
     (=ucs		. #x6588)	; 斈
     (->subsumptive
-     ((<-vulgar
+     ((=jis-x0208	  . #x555D)	; &M-13453; [53-61]
+      (=daikanwa	  . 13453)	; &I-M-13453;
+      (=ucs@jis		  . #x6588)	; &M-13453;
+      (<-vulgar
        ((=ucs		    . #x5B78)	; å­¸
 	(=daikanwa	    . 07033)	; &I-M-07033;
 	))
       (<-vulgar*sources
        daikanwa)
-      (=jis-x0208	  . #x555D)	; &M-13453; [53-61]
-      (=daikanwa	  . 13453)	; &I-M-13453;
-      (=ucs@jis		  . #x6588)	; &M-13453;
       )
-     ((<-vulgar
+     ((shinjigen-1	  . 1786)
+      (shinjigen-2	  . 1786)
+      (=gt		  . 17011)	; &GT-17011;
+      (=gt-pj-1		  . #x555D)	; &GT-17011; [53-61]
+      (<-vulgar
        ((shinjigen-1	    . 1783)
 	(=ucs		    . #x5B78)	; å­¸
 	(=jis-x0208	    . #x555C)	; &I-J90-555C; [53-60]
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 1786)
-      (shinjigen-2	  . 1786)
-      (=gt		  . 17011)	; &GT-17011;
-      (=gt-pj-1		  . #x555D)	; &GT-17011; [53-61]
       )
      ((=cns11643-3	  . #x2558)	; &C3-2558; [05-56]
       (=ucs@unicode	  . #x6588)	; &C3-2558;
@@ -143,18 +143,18 @@
     (->subsumptive
      ((=daikanwa	  . 13454)	; &M-13454;
       )
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x736E)	; &GT-66354; [83-78]
-	(=ks-x1001	    . #x703A)	; &I-K0-703A; [80-26]
-	(=daikanwa	    . 48560)	; &I-M-48560;
-	))
-      (shinjigen-1	  . 9880)
+     ((shinjigen-1	  . 9880)
       (shinjigen-2	  . 9880)
       (=jis-x0208	  . #x4046)	; &GT-17014; [32-38]
       (=gt		  . 17014)	; &I-GT-17014;
       (=gt-k		  . 03759)	; &I-GT-K03759;
       (=gt-pj-1		  . #x4046)	; &I-GT-17014; [32-38]
       (=ucs@jis		  . #x6589)	; &GT-17014;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x736E)	; &GT-66354; [83-78]
+	(=ks-x1001	    . #x703A)	; &I-K0-703A; [80-26]
+	(=daikanwa	    . 48560)	; &I-M-48560;
+	))
       )
      ((=cns11643-3	  . #x2939)	; &C3-2939; [09-25]
       (=ucs@unicode	  . #x6589)	; &C3-2939;
@@ -168,10 +168,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EEB)	; ⻫
     (<-identical@component
      ((=ucs		  . #x6589)	; 斉
       ))
-    (=ucs		. #x2EEB)	; ⻫
     ))
 (define-char
   '((ideographic-radical . 67)	; ⽂
@@ -244,7 +244,14 @@
     (total-strokes	 . 10)
     (=ucs		. #x658B)	; 斋
     (->subsumptive
-     ((=daikanwa	  . 13460)	; &M-13460;
+     ((shinjigen-1	  . 5547)
+      (=daikanwa	  . 13460)	; &M-13460;
+      (<-vulgar
+       ((=jis-x0208	    . #x6337)	; &GT-66359; [67-23]
+	(=daikanwa	    . 48565)	; &I-M-48565;
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       )
      ((=gb2312		  . #x552B)	; &C3-3140; [53-11]
       (=cns11643-3	  . #x3140)	; &I-C3-3140; [17-32]
@@ -323,18 +330,20 @@
     (->subsumptive
      ((=daikanwa	  . 13467)	; &M-13467;
       )
+     ((shinjigen-1	  . 5545)
+      )
      ((=cns11643-3	  . #x3639)	; &C3-3639; [22-25]
       )
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6337)	; &GT-66359; [67-23]
-	(=daikanwa	    . 48565)	; &I-M-48565;
-	))
-      (shinjigen-2	  . 5545)
+     ((shinjigen-2	  . 5545)
       (=jis-x0208	  . #x3A58)	; &GT-17026; [26-56]
       (=gt		  . 17026)	; &I-GT-17026;
       (=gt-k		  . 07766)	; &I-GT-K07766;
       (=gt-pj-1		  . #x3A58)	; &I-GT-17026; [26-56]
       (=ucs@jis		  . #x658E)	; &GT-17026;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6337)	; &GT-66359; [67-23]
+	(=daikanwa	    . 48565)	; &I-M-48565;
+	))
       )
      ((=ucs@unicode	  . #x658E)	; &UU+658E;
       ))
@@ -594,14 +603,14 @@
     (ideographic-radical . 67)	; ⽂
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=daikanwa		. 13483)	; &M-13483;
     (<-original
      ((=jis-x0208	  . #x4843)	; &GT-17031; [40-35]
       (=ks-x1001	  . #x5A68)	; &I-K0-5A68; [58-72]
       (=daikanwa	  . 13470)	; &I-M-13470;
       ))
     (<-original*sources
-     zhengzi-tong daikanwa)
-    (=daikanwa		. 13483)	; &M-13483;
+     zhengzitong daikanwa)
     ))
 (define-char
   '((ideographic-radical . 67)	; ⽂
diff --git a/lisp/utf-2000/Ideograph-R069-Axe.el b/lisp/utf-2000/Ideograph-R069-Axe.el
index 9cac80a..30e7634 100644
--- a/lisp/utf-2000/Ideograph-R069-Axe.el
+++ b/lisp/utf-2000/Ideograph-R069-Axe.el
@@ -200,7 +200,24 @@
   '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=daikanwa		. 13549)	; &M-13549;
+    (=ucs		. #x3ABD)	; 㪽
+    (=daikanwa		. 13549)	; &I-M-13549;
+    (=hanziku-5		. #xF6BC)	; &I-HZK05-F6BC;
+    ))
+(define-char
+  '((ideographic-radical . 69)	; ⽄
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x211A5)	; 𡆥
+      )
+     ((=ucs		  . #x65A4)	; 斤
+      ))
+    (sources		bos=A2001-16138-00013)
+    (=ruimoku-v6	. #xE00B)	; &RUI6-E00B;
     ))
 (define-char
   '((ideographic-radical . 69)	; ⽄
@@ -214,39 +231,40 @@
   '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=daikanwa		. 13551)	; &M-13551;
+    (=ucs		. #x2309D)	; 𣂝
+    (=daikanwa		. 13551)	; &I-M-13551;
+    (=hanziku-5		. #xF6C3)	; &I-HZK05-F6C3;
     ))
 (define-char
   '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=daikanwa		. 13552)	; &M-13552;
+    (=ucs		. #x2309C)	; 𣂜
+    (=daikanwa		. 13552)	; &I-M-13552;
+    (=hanziku-5		. #xF6C2)	; &I-HZK05-F6C2;
     (mojikyo		. 013552)	; &MCS-600034F0;
     ))
 (define-char
-  '((morohashi-daikanwa	13552 0 9)
+  '((=>ucs		. #x2309C)	; 𣂜
+    (=>daikanwa		. 13552)	; 𣂜
     (ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=jef-china3	. #x8FCF)	; &JC3-8FCF;
     ))
 (define-char
-  '((=>ucs		. #x230A0)	; 𣂠
-    (ideographic-radical . 69)	; ⽄
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=daikanwa		. 13553)	; &M-13553;
-    ))
-(define-char
-  '((morohashi-daikanwa	13553 0 0)
-    (ideographic-radical . 69)	; ⽄
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
+  '((ideographic-radical . 69)	; ⽄
+    (ideographic-strokes@daikanwa . 6)
+    (total-strokes@daikanwa	  . 10)
+    (ideographic-strokes@cns . 7)
+    (total-strokes@cns	     . 11)
     (=ucs		. #x230A0)	; 𣂠
     (=cns11643-6	. #x4047)	; &I-C6-4047; [32-39]
+    (=daikanwa		. 13553)	; &I-M-13553;
     ))
 (define-char
-  '((ideographic-radical . 69)	; ⽄
+  '((morohashi-daikanwa	13553 1)
+    (ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x3ABF)	; 㪿
@@ -302,10 +320,7 @@
   '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x65B7)	; 斷
-      (=jis-x0208	  . #x5A52)	; &I-J90-5A52; [58-50]
-      ))
+    (shinjigen-1	. 3228)
     (shinjigen-2	. 3228)
     (=ucs		. #x65AD)	; 断
     (=jis-x0208		. #x4347)	; &I-J90-4347; [35-39]
@@ -314,6 +329,10 @@
     (=gt		. 17133)	; &I-GT-17133;
     (=gt-pj-1		. #x4347)	; &I-GT-17133; [35-39]
     (=daikanwa		. 13557)	; &I-M-13557;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x65B7)	; 斷
+      (=jis-x0208	  . #x5A52)	; &I-J90-5A52; [58-50]
+      ))
     ))
 (define-char
   '((=>ucs		. #x230A1)	; 𣂡
@@ -981,6 +1000,7 @@
   '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (shinjigen-1	. 3229)
     (shinjigen-2	. 3229)
     (=ucs		. #x65B7)	; 斷
     (=jis-x0208		. #x5A52)	; &I-J90-5A52; [58-50]
@@ -1004,7 +1024,12 @@
   '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (=daikanwa		. 13613)	; &M-13613;
+    (=ucs		. #x230CE)	; 𣃎
+    (->subsumptive
+     ((=daikanwa	  . 13613)	; &M-13613;
+      )
+     ((=ucs@iso		  . #x230CE)	; &U-000230CE;
+      ))
     ))
 (define-char
   '((ideographic-radical . 69)	; ⽄
@@ -1026,54 +1051,54 @@
   '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=daikanwa		. 13616)	; &M-13616;
+    (=ucs		. #x230D2)	; 𣃒
+    (=daikanwa		. 13616)	; &I-M-13616;
     ))
 (define-char
   '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
     (=ucs		. #x230D4)	; 𣃔
-    (=daikanwa		. 13617)	; &I-M-13617;
-    ))
-(define-char
-  '((=>ucs		. #x230D4)	; 𣃔
-    (morohashi-daikanwa	13617 0 1)
-    (ideographic-radical . 69)	; ⽄
-    (ideographic-strokes . 16)
-    (total-strokes	 . 20)
-    (=cns11643-7	. #x4D78)	; &C7-4D78; [45-88]
-    ))
-(define-char
-  '((=>ucs		. #x230D6)	; 𣃖
-    (ideographic-radical . 69)	; ⽄
-    (ideographic-strokes . 18)
-    (total-strokes	 . 22)
-    (=daikanwa		. 13618)	; &M-13618;
+    (->subsumptive
+     ((=daikanwa	  . 13617)	; &M-13617;
+      (=ucs@iso		  . #x230D4)	; &M-13617;
+      )
+     ((shinjigen-1	  . 3230)
+      (=cns11643-7	  . #x4D78)	; &C7-4D78; [45-88]
+      (<-original
+       ((shinjigen-1	    . 3229)
+	(=ucs		    . #x65B7)	; 斷
+	(=jis-x0208	    . #x5A52)	; &I-J90-5A52; [58-50]
+	))
+      (<-original*sources
+       shinjigen-1)
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13618 0 1)
-    (ideographic-radical . 69)	; ⽄
+  '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
     (=ucs		. #x230D6)	; 𣃖
-    (=cns11643-7	. #x577D)	; &I-C7-577D; [55-93]
-    ))
-(define-char
-  '((=>ucs		. #x65B8)	; 斸
-    (ideographic-radical . 69)	; ⽄
-    (ideographic-strokes . 21)
-    (total-strokes	 . 25)
-    (=jis-x0213-2-2000	. #x2D6C)	; &M-13619; [13-76]
-    (=big5		. #xF8F0)	; &I-B-F8F0;
-    (=daikanwa		. 13619)	; &I-M-13619;
-    (=ucs@jis		. #x65B8)	; &M-13619;
-    (=ucs@big5		. #x65B8)	; &M-13619;
+    (->subsumptive
+     ((=daikanwa	  . 13618)	; &M-13618;
+      )
+     ((=cns11643-7	  . #x577D)	; &C7-577D; [55-93]
+      (=ucs@iso		  . #x230D6)	; &C7-577D;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13619 0 1)
-    (ideographic-radical . 69)	; ⽄
+  '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 21)
     (total-strokes	 . 25)
     (=ucs		. #x65B8)	; 斸
-    (=cns11643-2	. #x707E)	; &I-C2-707E; [80-94]
+    (->subsumptive
+     ((=jis-x0213-2-2000  . #x2D6C)	; &M-13619; [13-76]
+      (=big5		  . #xF8F0)	; &I-B-F8F0;
+      (=daikanwa	  . 13619)	; &I-M-13619;
+      (=ucs@jis		  . #x65B8)	; &M-13619;
+      (=ucs@big5	  . #x65B8)	; &M-13619;
+      )
+     ((=cns11643-2	  . #x707E)	; &C2-707E; [80-94]
+      (=ucs@unicode	  . #x65B8)	; &C2-707E;
+      ))
     ))
diff --git a/lisp/utf-2000/Ideograph-R070-Square.el b/lisp/utf-2000/Ideograph-R070-Square.el
index 7f168c6..960d7f2 100644
--- a/lisp/utf-2000/Ideograph-R070-Square.el
+++ b/lisp/utf-2000/Ideograph-R070-Square.el
@@ -27,39 +27,63 @@
     (total-strokes	 . 6)
     (=ucs		. #x3AC3)	; 㫃
     (->subsumptive
-     ((=daikanwa	  . 13621)	; &M-13621;
+     ((=big5-cdp	  . #x8A7E)	; &CDP-8A7E;
+      (=daikanwa	  . 13621)	; &I-M-13621;
+      (=cbeta		  . 08182)	; &I-CB08182;
       )
      ((=cns11643-3	  . #x2371)	; &C3-2371; [03-81]
       (=ucs@unicode	  . #x3AC3)	; &C3-2371;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x3AC3)	; 㫃
+      ))
+    (ideographic-radical . 70)	; ⽅
+    (ideographic-strokes . 2)
+    (total-strokes	 . 6)
+    (=cbeta		. 09247)	; &CB09247;
+    (<-formed@component
+     ((=big5-cdp	  . #x8A7E)	; &CDP-8A7E;
+      (=daikanwa	  . 13621)	; &I-M-13621;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x230D8)	; 𣃘
-    (=cns11643-4	. #x2442)	; &I-C4-2442; [04-34]
+    (->subsumptive
+     ((=daikanwa	  . 13623)	; &M-13623;
+      )
+     ((=cns11643-4	  . #x2442)	; &C4-2442; [04-34]
+      (=ucs@iso		  . #x230D8)	; &C4-2442;
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x230D9)	; 𣃙
-    (=cns11643-6	. #x277B)	; &I-C6-277B; [07-91]
-    ))
-(define-char
-  '((=>ucs		. #x65BA)	; 斺
-    (ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 4)
-    (=daikanwa		. 13625)	; &M-13625;
+    (->subsumptive
+     ((=daikanwa	  . 13624)	; &M-13624;
+      )
+     ((=cns11643-6	  . #x277B)	; &C6-277B; [07-91]
+      (=ucs@iso		  . #x230D9)	; &C6-277B;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13625 0 0)
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x65BA)	; 斺
-    (=cns11643-3	. #x293C)	; &I-C3-293C; [09-28]
+    (->subsumptive
+     ((=daikanwa	  . 13625)	; &M-13625;
+      )
+     ((=ucs@unicode	  . #x65BA)	; &UU+65BA;
+      )
+     ((=cns11643-3	  . #x293C)	; &C3-293C; [09-28]
+      ))
     ))
 (define-char
   '((=>ucs		. #x65BB)	; 斻
@@ -68,37 +92,32 @@
     (=daikanwa		. 13626)	; &M-13626;
     ))
 (define-char
-  '((=>ucs		. #x65BB)	; 斻
-    (morohashi-daikanwa	13626 0 5)
-    (ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (=big5		. #xCCC3)	; &B-CCC3;
-    (=ucs@big5		. #x65BB)	; &B-CCC3;
-    ))
-(define-char
-  '((morohashi-daikanwa	13626 0 6)
+  '((=>daikanwa		. 13626)	; &M-13626;
     (ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x65BB)	; 斻
-    (=cns11643-2	. #x2724)	; &I-C2-2724; [07-04]
-    ))
-(define-char
-  '((=>ucs		. #x3AC4)	; 㫄
-    (ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (=daikanwa		. 13627)	; &M-13627;
-    (=jef-china3	. #x50EA)	; &I-JC3-50EA;
+    (=big5		. #xCCC3)	; &I-B-CCC3;
+    (<-same
+     ((=daikanwa	  . 13626)	; &M-13626;
+      ))
+    (->subsumptive
+     ((=cns11643-2	  . #x2724)	; &C2-2724; [07-04]
+      (=ucs@unicode	  . #x65BB)	; &C2-2724;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13627 0 0)
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x3AC4)	; 㫄
-    (=cns11643-6	. #x2B70)	; &I-C6-2B70; [11-80]
+    (->subsumptive
+     ((=daikanwa	  . 13627)	; &M-13627;
+      (=jef-china3	  . #x50EA)	; &I-JC3-50EA;
+      )
+     ((=cns11643-6	  . #x2B70)	; &C6-2B70; [11-80]
+      (=ucs@unicode	  . #x3AC4)	; &C6-2B70;
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
@@ -129,39 +148,33 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x23B35)	; 𣬵
-    (=cns11643-5	. #x2643)	; &I-C5-2643; [06-35]
-    ))
-(define-char
-  '((=>ucs		. #x65BD)	; 施
-    (ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (shinjigen-2	. 3239)
-    (=jis-x0208		. #x3B5C)	; &GT-17227; [27-60]
-    (=ks-x1001		. #x633F)	; &I-K0-633F; [67-31]
-    (=big5		. #xAC49)	; &I-B-AC49;
-    (=gt		. 17227)	; &I-GT-17227;
-    (=gt-k		. 05089)	; &I-GT-K05089;
-    (=gt-pj-1		. #x3B5C)	; &I-GT-17227; [27-60]
-    (=daikanwa		. 13629)	; &I-M-13629;
-    (=ucs@jis		. #x65BD)	; &GT-17227;
-    (=ucs@big5		. #x65BD)	; &GT-17227;
+    (->subsumptive
+     ((=ucs@iso		  . #x23B35)	; &U-00023B35;
+      )
+     ((=cns11643-5	  . #x2643)	; &C5-2643; [06-35]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13629 0 0)
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x65BD)	; 施
-    (=gb2312		. #x4A29)	; &I-G0-4A29; [42-09]
-    ))
-(define-char
-  '((=>ucs		. #x65BD)	; 施
-    (morohashi-daikanwa	13629 0 1)
-    (ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (=cns11643-1	. #x514C)	; &C1-514C; [49-44]
+    (=big5		. #xAC49)	; &I-B-AC49;
+    (->subsumptive
+     ((shinjigen-2	  . 3239)
+      (=jis-x0208	  . #x3B5C)	; &GT-17227; [27-60]
+      (=ks-x1001	  . #x633F)	; &I-K0-633F; [67-31]
+      (=gt		  . 17227)	; &I-GT-17227;
+      (=gt-k		  . 05089)	; &I-GT-K05089;
+      (=gt-pj-1		  . #x3B5C)	; &I-GT-17227; [27-60]
+      (=daikanwa	  . 13629)	; &I-M-13629;
+      (=ucs@jis		  . #x65BD)	; &GT-17227;
+      )
+     ((=gb2312		  . #x4A29)	; &G0-4A29; [42-09]
+      (=ucs@unicode	  . #x65BD)	; &G0-4A29;
+      )
+     ((=cns11643-1	  . #x514C)	; &C1-514C; [49-44]
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
@@ -169,169 +182,252 @@
     (total-strokes	 . 9)
     (=ucs		. #x65BE)	; 斾
     (->subsumptive
-     ((<-vulgar
+     ((shinjigen-1	  . 3246)
+      (=daikanwa	  . 13630)	; &M-13630;
+      (=cbeta		  . 01816)	; &I-CB01816;
+      (<-vulgar
        ((shinjigen-1	    . 3245)
 	(=jis-x0208	    . #x5A54)	; &GT-17240; [58-52]
 	(=daikanwa	    . 13646)	; &I-M-13646;
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 3246)
-      (=daikanwa	  . 13630)	; &M-13630;
-      (=cbeta		  . 01816)	; &I-CB01816;
       )
      ((=cns11643-3	  . #x2C77)	; &C3-2C77; [12-87]
       (=ucs@unicode	  . #x65BE)	; &C3-2C77;
       ))
     ))
 (define-char
-  '((=>ucs		. #x65BF)	; 斿
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=jis-x0212		. #x4164)	; &M-13632; [33-68]
-    (=jis-x0213-2-2000	. #x2D6D)	; &I-JX2-2D6D; [13-77]
-    (=big5		. #xCEEA)	; &I-B-CEEA;
-    (=daikanwa		. 13632)	; &I-M-13632;
-    (=ucs@jis		. #x65BF)	; &M-13632;
-    (=ucs@big5		. #x65BF)	; &M-13632;
+    (=ucs		. #x230DD)	; 𣃝
+    (->subsumptive
+     ((=daikanwa	  . 13631)	; &M-13631;
+      )
+     ((=ucs@iso		  . #x230DD)	; &U-000230DD;
+      )
+     ((=cns11643-5	  . #x294D)	; &C5-294D; [09-45]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13632 0 0)
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x65BF)	; 斿
-    (=cns11643-2	. #x2A6B)	; &I-C2-2A6B; [10-75]
+    (=big5		. #xCEEA)	; &I-B-CEEA;
+    (->subsumptive
+     ((=jis-x0212	  . #x4164)	; &M-13632; [33-68]
+      (=jis-x0213-2-2000  . #x2D6D)	; &I-JX2-2D6D; [13-77]
+      (=daikanwa	  . 13632)	; &I-M-13632;
+      (=ucs@jis		  . #x65BF)	; &M-13632;
+      )
+     ((=cns11643-2	  . #x2A6B)	; &C2-2A6B; [10-75]
+      (=ucs@unicode	  . #x65BF)	; &C2-2A6B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x65C0)	; 旀
-    (=gb12345		. #x7D3C)	; 旀 [93-28]
+    (=ucs		. #x230DE)	; 𣃞
+    (->subsumptive
+     ((=daikanwa	  . 13633)	; &M-13633;
+      )
+     ((=cns11643-6	  . #x3164)	; &C6-3164; [17-68]
+      (=ucs@iso		  . #x230DE)	; &C6-3164;
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x230DD)	; 𣃝
-    (=cns11643-5	. #x294D)	; &I-C5-294D; [09-45]
+    (=ucs		. #x230DF)	; 𣃟
     ))
 (define-char
-  '((ideographic-radical . 70)	; ⽅
+  '((<-denotational
+     ((=ucs		  . #x230DF)	; 𣃟
+      ))
+    (ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x230DE)	; 𣃞
-    (=cns11643-6	. #x3164)	; &I-C6-3164; [17-68]
+    (->subsumptive
+     ((=daikanwa	  . 13634)	; &M-13634;
+      )
+     ((=ucs@iso		  . #x230DF)	; &U-000230DF;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 70)	; ⽅
+  '((<-denotational
+     ((=ucs		  . #x230DF)	; 𣃟
+      ))
+    (ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x230DF)	; 𣃟
-    (=cns11643-6	. #x3163)	; &I-C6-3163; [17-67]
+    (=cns11643-6	. #x3163)	; &C6-3163; [17-67]
     ))
 (define-char
-  '((ideographic-radical . 70)	; ⽅
+  '((=>ucs		. #x230E2)	; 𣃢
+    (ideographic-radical . 70)	; ⽅
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=daikanwa		. 13635)	; &M-13635;
+    ))
+(define-char
+  '((=>daikanwa		. 13635)	; &M-13635;
+    (ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x230E2)	; 𣃢
     (=cns11643-6	. #x3162)	; &I-C6-3162; [17-66]
+    (<-unknown
+     ((=daikanwa	  . 13635)	; &M-13635;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x65C1)	; 旁
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=ucs		. #x65C0)	; 旀
+    (=gb12345		. #x7D3C)	; 旀 [93-28]
+    ))
+(define-char
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (shinjigen-2	. 3247)
-    (=jis-x0208		. #x5A55)	; &GT-17242; [58-53]
-    (=ks-x1001		. #x5B31)	; &I-K0-5B31; [59-17]
+    (=ucs		. #x65C1)	; 旁
     (=big5		. #xAEC7)	; &I-B-AEC7;
-    (=gt		. 17242)	; &I-GT-17242;
-    (=gt-k		. 06597)	; &I-GT-K06597;
-    (=gt-pj-1		. #x5A55)	; &I-GT-17242; [58-53]
-    (=daikanwa		. 13637)	; &I-M-13637;
-    (=ucs@jis		. #x65C1)	; &GT-17242;
-    (=ucs@big5		. #x65C1)	; &GT-17242;
+    (->subsumptive
+     ((shinjigen-2	  . 3247)
+      (=jis-x0208	  . #x5A55)	; &GT-17242; [58-53]
+      (=ks-x1001	  . #x5B31)	; &I-K0-5B31; [59-17]
+      (=gt		  . 17242)	; &I-GT-17242;
+      (=gt-k		  . 06597)	; &I-GT-K06597;
+      (=gt-pj-1		  . #x5A55)	; &I-GT-17242; [58-53]
+      (=daikanwa	  . 13637)	; &I-M-13637;
+      (=ucs@jis		  . #x65C1)	; &GT-17242;
+      )
+     ((=gb2312		  . #x4554)	; &C1-5569; [37-52]
+      (=cns11643-1	  . #x5569)	; &I-C1-5569; [53-73]
+      (=ucs@unicode	  . #x65C1)	; &C1-5569;
+      )
+     ((shinjigen-1	  . 3247)
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13637 0 0)
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=ucs		. #x65C1)	; 旁
-    (=gb2312		. #x4554)	; &I-G0-4554; [37-52]
-    (=cns11643-1	. #x5569)	; &I-C1-5569; [53-73]
+    (=ucs		. #x65C2)	; 旂
+    (=big5		. #xD1D2)	; &I-B-D1D2;
+    (->subsumptive
+     ((=jis-x0212	  . #x4165)	; &M-13638; [33-69]
+      (=jis-x0213-2-2000  . #x2D6E)	; &I-JX2-2D6E; [13-78]
+      (=daikanwa	  . 13638)	; &I-M-13638;
+      (=jef-china3	  . #x50EB)	; &I-JC3-50EB;
+      (=ucs@jis		  . #x65C2)	; &M-13638;
+      )
+     ((=iso-ir165	  . #x2D7E)	; &C2-2F54; [13-94]
+      (=cns11643-2	  . #x2F54)	; &I-C2-2F54; [15-52]
+      (=ucs@unicode	  . #x65C2)	; &C2-2F54;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x65C2)	; 旂
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=jis-x0212		. #x4165)	; &M-13638; [33-69]
-    (=jis-x0213-2-2000	. #x2D6E)	; &I-JX2-2D6E; [13-78]
-    (=big5		. #xD1D2)	; &I-B-D1D2;
-    (=daikanwa		. 13638)	; &I-M-13638;
-    (=ucs@jis		. #x65C2)	; &M-13638;
-    (=ucs@big5		. #x65C2)	; &M-13638;
+    (=ucs		. #x230E6)	; 𣃦
+    (->subsumptive
+     ((=daikanwa	  . 13639)	; &M-13639;
+      )
+     ((=cns11643-4	  . #x2D4A)	; &C4-2D4A; [13-42]
+      (=ucs@iso		  . #x230E6)	; &C4-2D4A;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13638 0 0)
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=ucs		. #x65C2)	; 旂
-    (=iso-ir165		. #x2D7E)	; &I-EGB-2D7E; [13-94]
-    (=cns11643-2	. #x2F54)	; &I-C2-2F54; [15-52]
-    (=jef-china3	. #x50EB)	; &I-JC3-50EB;
+    (=ucs		. #x65C3)	; 旃
+    (=big5		. #xD1D0)	; &I-B-D1D0;
     ))
 (define-char
-  '((=>ucs		. #x65C3)	; 旃
+  '((<-denotational
+     ((=ucs		  . #x65C3)	; 旃
+      ))
     (ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (shinjigen-2	. 3242)
     (=jis-x0208		. #x5A53)	; &GT-17237; [58-51]
-    (=big5		. #xD1D0)	; &I-B-D1D0;
     (=gt		. 17237)	; &I-GT-17237;
     (=gt-k		. 06596)	; &I-GT-K06596;
     (=gt-pj-1		. #x5A53)	; &I-GT-17237; [58-51]
     (=daikanwa		. 13640)	; &I-M-13640;
     (=ucs@jis		. #x65C3)	; &GT-17237;
-    (=ucs@big5		. #x65C3)	; &GT-17237;
     ))
 (define-char
-  '((morohashi-daikanwa	13640 0 0)
+  '((<-denotational
+     ((=ucs		  . #x65C3)	; 旃
+      ))
     (ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=ucs		. #x65C3)	; 旃
-    (=gb2312		. #x6C39)	; &I-G0-6C39; [76-25]
+    (=gb2312		. #x6C39)	; &C2-2F52; [76-25]
     (=cns11643-2	. #x2F52)	; &I-C2-2F52; [15-50]
+    (=ucs@unicode	. #x65C3)	; &C2-2F52;
     ))
 (define-char
-  '((=>ucs		. #x65C4)	; 旄
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (shinjigen-2	. 3249)
-    (=jis-x0208		. #x5A56)	; &GT-17243; [58-54]
-    (=big5		. #xD1D1)	; &I-B-D1D1;
-    (=gt		. 17243)	; &I-GT-17243;
-    (=gt-pj-1		. #x5A56)	; &I-GT-17243; [58-54]
-    (=daikanwa		. 13642)	; &I-M-13642;
-    (=ucs@jis		. #x65C4)	; &GT-17243;
-    (=ucs@big5		. #x65C4)	; &GT-17243;
+    (=ucs		. #x230EF)	; 𣃯
+    (->subsumptive
+     ((=gt		  . 17238)	; &GT-17238;
+      (=gt-pj-3		  . #x6D42)	; &GT-17238; [77-34]
+      (=daikanwa	  . 13641)	; &I-M-13641;
+      (<-same
+       ((=jis-x0208	    . #x5A53)	; &GT-17237; [58-51]
+	(=daikanwa	    . 13640)	; &I-M-13640;
+	))
+      (<-same*sources
+       zihui-bu daikanwa)
+      )
+     ((=cns11643-6	  . #x3832)	; &C6-3832; [24-18]
+      (=ucs@iso		  . #x230EF)	; &C6-3832;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13642 0 0)
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x65C4)	; 旄
-    (=gb2312		. #x6C38)	; &I-G0-6C38; [76-24]
-    (=cns11643-2	. #x2F53)	; &I-C2-2F53; [15-51]
+    (=big5		. #xD1D1)	; &I-B-D1D1;
+    (->subsumptive
+     ((shinjigen-2	  . 3249)
+      (=jis-x0208	  . #x5A56)	; &GT-17243; [58-54]
+      (=gt		  . 17243)	; &I-GT-17243;
+      (=gt-pj-1		  . #x5A56)	; &I-GT-17243; [58-54]
+      (=daikanwa	  . 13642)	; &I-M-13642;
+      (=ucs@jis		  . #x65C4)	; &GT-17243;
+      )
+     ((=gb2312		  . #x6C38)	; &G0-6C38; [76-24]
+      (=ucs@unicode	  . #x65C4)	; &G0-6C38;
+      )
+     ((=cns11643-2	  . #x2F53)	; &C2-2F53; [15-51]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 70)	; ⽅
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=ucs		. #x230E7)	; 𣃧
+    (->subsumptive
+     ((=daikanwa	  . 13643)	; &M-13643;
+      )
+     ((=cns11643-5	  . #x2D77)	; &C5-2D77; [13-87]
+      (=ucs@iso		  . #x230E7)	; &C5-2D77;
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
@@ -349,7 +445,10 @@
     (=big5		. #xAEC8)	; &B-AEC8;
     (->subsumptive
      ((shinjigen-1	  . 3251)
-      (=ks-x1001	  . #x5569)	; &M-13644; [53-73]
+      (=ks-x1001	  . #x5569)	; &GT-17246; [53-73]
+      (=gt		  . 17246)	; &I-GT-17246;
+      (=gt-k		  . 06560)	; &I-GT-K06560;
+      (=gt-pj-3		  . #x6D44)	; &I-GT-17246; [77-36]
       (=daikanwa	  . 13644)	; &I-M-13644;
       (=jef-china3	  . #x50EC)	; &I-JC3-50EC;
       )
@@ -377,6 +476,26 @@
   '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=ucs		. #x230E8)	; 𣃨
+    (->subsumptive
+     ((=gt		  . 17247)	; &GT-17247;
+      (=gt-pj-3		  . #x6D45)	; &GT-17247; [77-37]
+      (=daikanwa	  . 13645)	; &I-M-13645;
+      (<-ancient
+       ((=ks-x1001	    . #x5569)	; &GT-17246; [53-73]
+	(=daikanwa	    . 13644)	; &I-M-13644;
+	))
+      (<-ancient*sources
+       yupian daikanwa)
+      )
+     ((=cns11643-6	  . #x3831)	; &C6-3831; [24-17]
+      (=ucs@iso		  . #x230E8)	; &C6-3831;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 70)	; ⽅
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
     (=ucs		. #x65C6)	; 旆
     (=big5		. #xD1CF)	; &I-B-D1CF;
     (->subsumptive
@@ -398,173 +517,172 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x3AC5)	; 㫅
-    (=cns11643-6	. #x3834)	; &I-C6-3834; [24-20]
-    ))
-(define-char
-  '((ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=ucs		. #x230E6)	; 𣃦
-    (=cns11643-4	. #x2D4A)	; &I-C4-2D4A; [13-42]
-    ))
-(define-char
-  '((ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=ucs		. #x230E7)	; 𣃧
-    (=cns11643-5	. #x2D77)	; &I-C5-2D77; [13-87]
-    ))
-(define-char
-  '((ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=ucs		. #x230E8)	; 𣃨
-    (=cns11643-6	. #x3831)	; &I-C6-3831; [24-17]
+    (->subsumptive
+     ((=daikanwa	  . 13647)	; &M-13647;
+      )
+     ((=cns11643-6	  . #x3834)	; &C6-3834; [24-20]
+      (=ucs@unicode	  . #x3AC5)	; &C6-3834;
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x230E9)	; 𣃩
-    (=cns11643-6	. #x3833)	; &I-C6-3833; [24-19]
+    (->subsumptive
+     ((=daikanwa	  . 13648)	; &M-13648;
+      (<-wrong
+       ((=jis-x0208	    . #x5A54)	; &GT-17240; [58-52]
+	(=daikanwa	    . 13646)	; &I-M-13646;
+	))
+      (<-wrong*sources
+       wujingwenzi daikanwa)
+      )
+     ((=cns11643-6	  . #x3833)	; &C6-3833; [24-19]
+      (=ucs@iso		  . #x230E9)	; &C6-3833;
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x230EA)	; 𣃪
-    (=cns11643-6	. #x3835)	; &I-C6-3835; [24-21]
     ))
 (define-char
-  '((ideographic-radical . 70)	; ⽅
+  '((<-denotational
+     ((=ucs		  . #x230EA)	; 𣃪
+      ))
+    (ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=ucs		. #x230EF)	; 𣃯
-    (=cns11643-6	. #x3832)	; &I-C6-3832; [24-18]
+    (->subsumptive
+     ((=daikanwa	  . 13649)	; &M-13649;
+      )
+     ((=ucs@iso		  . #x230EA)	; &U-000230EA;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x65C7)	; 旇
+  '((<-denotational
+     ((=ucs		  . #x230EA)	; 𣃪
+      ))
     (ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=daikanwa		. 13650)	; &M-13650;
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=cns11643-6	. #x3835)	; &C6-3835; [24-21]
     ))
 (define-char
-  '((morohashi-daikanwa	13650 0 0)
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x65C7)	; 旇
-    (=cns11643-3	. #x363C)	; &I-C3-363C; [22-28]
-    ))
-(define-char
-  '((=>ucs		. #x65C8)	; 旈
-    (ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=jis-x0212		. #x4166)	; &M-13651; [33-70]
-    (=daikanwa		. 13651)	; &I-M-13651;
-    (=cbeta		. 02471)	; &I-CB02471;
-    (=ucs@jis		. #x65C8)	; &M-13651;
+    (->subsumptive
+     ((=daikanwa	  . 13650)	; &M-13650;
+      )
+     ((=cns11643-3	  . #x363C)	; &C3-363C; [22-28]
+      (=ucs@unicode	  . #x65C7)	; &C3-363C;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13651 0 0)
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x65C8)	; 旈
-    (=cns11643-4	. #x3234)	; &I-C4-3234; [18-20]
-    ))
-(define-char
-  '((=>ucs		. #x65C9)	; 旉
-    (ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=jis-x0212		. #x4167)	; &M-13654; [33-71]
-    (=jis-x0213-2-2000	. #x2D6F)	; &I-JX2-2D6F; [13-79]
-    (=daikanwa		. 13654)	; &I-M-13654;
-    (=jef-china3	. #x50E9)	; &I-JC3-50E9;
-    (=ucs@jis		. #x65C9)	; &M-13654;
+    (->subsumptive
+     ((=jis-x0212	  . #x4166)	; &M-13651; [33-70]
+      (=daikanwa	  . 13651)	; &I-M-13651;
+      (=cbeta		  . 02471)	; &I-CB02471;
+      (=ucs@jis		  . #x65C8)	; &M-13651;
+      )
+     ((=ucs@unicode	  . #x65C8)	; &UU+65C8;
+      )
+     ((=cns11643-4	  . #x3234)	; &C4-3234; [18-20]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13654 0 0)
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x65C9)	; 旉
-    ))
-(define-char
-  '((=>ucs		. #x65C9)	; 旉
-    (morohashi-daikanwa	13654 0 1)
-    (ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=cns11643-3	. #x363F)	; &C3-363F; [22-31]
+    (->subsumptive
+     ((=jis-x0212	  . #x4167)	; &M-13654; [33-71]
+      (=jis-x0213-2-2000  . #x2D6F)	; &I-JX2-2D6F; [13-79]
+      (=daikanwa	  . 13654)	; &I-M-13654;
+      (=jef-china3	  . #x50E9)	; &I-JC3-50E9;
+      (=ucs@jis		  . #x65C9)	; &M-13654;
+      )
+     ((=ucs@unicode	  . #x65C9)	; &UU+65C9;
+      )
+     ((=cns11643-3	  . #x363F)	; &C3-363F; [22-31]
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x65CA)	; 旊
-    (=cns11643-3	. #x363D)	; &I-C3-363D; [22-29]
-    (=daikanwa		. 13655)	; &I-M-13655;
-    ))
-(define-char
-  '((=>ucs		. #x65CB)	; 旋
-    (ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (shinjigen-2	. 5086)
-    (=jis-x0208		. #x407B)	; &GT-17256; [32-91]
-    (=ks-x1001		. #x6041)	; &I-K0-6041; [64-33]
-    (=big5		. #xB1DB)	; &I-B-B1DB;
-    (=gt		. 17256)	; &I-GT-17256;
-    (=gt-k		. 07810)	; &I-GT-K07810;
-    (=gt-pj-1		. #x407B)	; &I-GT-17256; [32-91]
-    (=daikanwa		. 13656)	; &I-M-13656;
-    (=ucs@jis		. #x65CB)	; &GT-17256;
-    (=ucs@big5		. #x65CB)	; &GT-17256;
+    (->subsumptive
+     ((=daikanwa	  . 13655)	; &M-13655;
+      )
+     ((=cns11643-3	  . #x363D)	; &C3-363D; [22-29]
+      (=ucs@unicode	  . #x65CA)	; &C3-363D;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13656 0 0)
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x65CB)	; 旋
-    (=gb2312		. #x507D)	; &I-G0-507D; [48-93]
-    (=cns11643-1	. #x5B21)	; &I-C1-5B21; [59-01]
+    (=big5		. #xB1DB)	; &I-B-B1DB;
+    (->subsumptive
+     ((shinjigen-1	  . 5086)
+      (shinjigen-2	  . 5086)
+      (=jis-x0208	  . #x407B)	; &GT-17256; [32-91]
+      (=ks-x1001	  . #x6041)	; &I-K0-6041; [64-33]
+      (=gt		  . 17256)	; &I-GT-17256;
+      (=gt-k		  . 07810)	; &I-GT-K07810;
+      (=gt-pj-1		  . #x407B)	; &I-GT-17256; [32-91]
+      (=daikanwa	  . 13656)	; &I-M-13656;
+      (=ucs@jis		  . #x65CB)	; &GT-17256;
+      )
+     ((=gb2312		  . #x507D)	; &C1-5B21; [48-93]
+      (=cns11643-1	  . #x5B21)	; &I-C1-5B21; [59-01]
+      (=ucs@unicode	  . #x65CB)	; &C1-5B21;
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=daikanwa		. 13657)	; &M-13657;
-    (=cbeta		. 03687)	; &I-CB03687;
-    ))
-(define-char
-  '((=>ucs		. #x65CC)	; 旌
-    (ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (shinjigen-2	. 3252)
-    (=jis-x0208		. #x5A57)	; &GT-17253; [58-55]
-    (=ks-x1001		. #x6F5B)	; &I-K0-6F5B; [79-59]
-    (=big5		. #xB1DC)	; &I-B-B1DC;
-    (=gt		. 17253)	; &I-GT-17253;
-    (=gt-k		. 07938)	; &I-GT-K07938;
-    (=gt-pj-1		. #x5A57)	; &I-GT-17253; [58-55]
-    (=daikanwa		. 13658)	; &I-M-13658;
-    (=ucs@jis		. #x65CC)	; &GT-17253;
-    (=ucs@big5		. #x65CC)	; &GT-17253;
+    (=ucs		. #x3ACA)	; 㫊
+    (->subsumptive
+     ((=daikanwa	  . 13657)	; &M-13657;
+      (=cbeta		  . 03687)	; &I-CB03687;
+      )
+     ((=cns11643-3	  . #x363B)	; &C3-363B; [22-27]
+      (=ucs@unicode	  . #x3ACA)	; &C3-363B;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	13658 0 0)
-    (ideographic-radical . 70)	; ⽅
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x65CC)	; 旌
-    (=gb2312		. #x6C3A)	; &I-G0-6C3A; [76-26]
-    (=cns11643-1	. #x5B22)	; &I-C1-5B22; [59-02]
+    (=big5		. #xB1DC)	; &I-B-B1DC;
+    (->subsumptive
+     ((shinjigen-1	  . 3252)
+      (shinjigen-2	  . 3252)
+      (=jis-x0208	  . #x5A57)	; &GT-17253; [58-55]
+      (=ks-x1001	  . #x6F5B)	; &I-K0-6F5B; [79-59]
+      (=gt		  . 17253)	; &I-GT-17253;
+      (=gt-k		  . 07938)	; &I-GT-K07938;
+      (=gt-pj-1		  . #x5A57)	; &I-GT-17253; [58-55]
+      (=daikanwa	  . 13658)	; &I-M-13658;
+      (=ucs@jis		  . #x65CC)	; &GT-17253;
+      )
+     ((=gb2312		  . #x6C3A)	; &C1-5B22; [76-26]
+      (=cns11643-1	  . #x5B22)	; &I-C1-5B22; [59-02]
+      (=ucs@unicode	  . #x65CC)	; &C1-5B22;
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
@@ -634,13 +752,6 @@
   '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x3ACA)	; 㫊
-    (=cns11643-3	. #x363B)	; &I-C3-363B; [22-27]
-    ))
-(define-char
-  '((ideographic-radical . 70)	; ⽅
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
     (=ucs		. #x3ACB)	; 㫋
     (=cns11643-3	. #x363E)	; &I-C3-363E; [22-30]
     ))
diff --git a/lisp/utf-2000/Ideograph-R071-Not.el b/lisp/utf-2000/Ideograph-R071-Not.el
index 2b8b513..349a54e 100644
--- a/lisp/utf-2000/Ideograph-R071-Not.el
+++ b/lisp/utf-2000/Ideograph-R071-Not.el
@@ -53,10 +53,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E9B)	; ⺛
     (<-identical@component
      ((=ucs		  . #x65E1)	; 旡
       ))
-    (=ucs		. #x2E9B)	; ⺛
     ))
 (define-char
   '((ideographic-radical . 71)	; ⽆
@@ -91,6 +91,13 @@
     (=ucs		. #x65E2)	; 既
     (->subsumptive
      ((total-strokes	   . 10)
+      (shinjigen-2	  . 3260)
+      (=jis-x0208	  . #x347B)	; &GT-17338; [20-91]
+      (=gt		  . 17338)	; &I-GT-17338;
+      (=gt-k		  . 06394)	; &I-GT-K06394;
+      (=gt-pj-1		  . #x347B)	; &I-GT-17338; [20-91]
+      (=daikanwa	  . 13721)	; &I-M-13721;
+      (=ucs@jis		  . #x65E2)	; &GT-17338;
       (<-simplified@JP/Jouyou
        ((=jis-x0213-1-2000  . #x752B)	; &JX1-752B; [85-11]
 	))
@@ -99,13 +106,6 @@
 	))
       (<-simplified@daikanwa*sources
        daikanwa)
-      (shinjigen-2	  . 3260)
-      (=jis-x0208	  . #x347B)	; &GT-17338; [20-91]
-      (=gt		  . 17338)	; &I-GT-17338;
-      (=gt-k		  . 06394)	; &I-GT-K06394;
-      (=gt-pj-1		  . #x347B)	; &I-GT-17338; [20-91]
-      (=daikanwa	  . 13721)	; &I-M-13721;
-      (=ucs@jis		  . #x65E2)	; &GT-17338;
       )
      ((total-strokes	   . 9)
       (=gb2312		  . #x3C48)	; &G0-3C48; [28-40]
diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el
index 8cda6f0..3c64daf 100644
--- a/lisp/utf-2000/Ideograph-R072-Sun.el
+++ b/lisp/utf-2000/Ideograph-R072-Sun.el
@@ -36,10 +36,6 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 1)
     (total-strokes	 . 5)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6751)	; &GT-39126; [71-49]
-      (=ks-x1001	  . #x4F41)	; &I-K0-4F41; [47-33]
-      ))
     (shinjigen-2	. 8973)
     (=ucs		. #x65E7)	; 旧
     (=jis-x0208		. #x356C)	; &I-J90-356C; [21-76]
@@ -50,6 +46,10 @@
     (=gt-pj-1		. #x356C)	; &I-GT-17360; [21-76]
     (=daikanwa		. 13737)	; &I-M-13737;
     (=hanziku-4		. #xDBA9)	; &I-HZK04-DBA9;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6751)	; &GT-39126; [71-49]
+      (=ks-x1001	  . #x4F41)	; &I-K0-4F41; [47-33]
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -229,6 +229,24 @@
     (=cns11643-6	. #x247C)	; &I-C6-247C; [04-92]
     ))
 (define-char
+  '((ideographic-radical@ucs . 72)	; ⽇
+    (ideographic-strokes@ucs . 3)
+    (ideographic-radical@daikanwa . 31)	; ⼞
+    (ideographic-strokes@daikanwa . 4)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=ucs		  . #x65E5)	; 日
+      ))
+    (=ucs		. #x2314D)	; 𣅍
+    (=daikanwa		. 04731)	; &I-M-04731;
+    (=cbeta		. 03191)	; &I-CB03191;
+    ))
+(define-char
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
@@ -238,7 +256,6 @@
     (=cns11643-2	. #x2439)	; &I-C2-2439; [04-25]
     (=big5		. #xCAF8)	; &I-B-CAF8;
     (=daikanwa		. 13751)	; &I-M-13751;
-    (=jef-china3	. #x8DF4)	; &I-JC3-8DF4;
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -318,6 +335,7 @@
     (=cns11643-2	. #x243A)	; &I-C2-243A; [04-26]
     (=big5		. #xCAF9)	; &I-B-CAF9;
     (=daikanwa		. 13761)	; &I-M-13761;
+    (=jef-china3	. #x8DF4)	; &I-JC3-8DF4;
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -388,6 +406,11 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (shinjigen-1	. 3269)
+    (shinjigen-2	. 3269)
+    (=ucs		. #x3AD6)	; 㫖
+    (=jis-x0213-2-2000	. #x2D71)	; &I-JX2-2D71; [13-81]
+    (=cbeta		. 11730)	; &I-CB11730;
     (<-vulgar
      ((shinjigen-1	  . 3267)
       (=jis-x0208	  . #x3B5D)	; &GT-17370; [27-61]
@@ -397,11 +420,6 @@
       ))
     (<-vulgar*sources
      shinjigen-1)
-    (shinjigen-1	. 3269)
-    (shinjigen-2	. 3269)
-    (=ucs		. #x3AD6)	; 㫖
-    (=jis-x0213-2-2000	. #x2D71)	; &I-JX2-2D71; [13-81]
-    (=cbeta		. 11730)	; &I-CB11730;
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -422,28 +440,28 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=gt-k		. 03318)	; &GT-K03318;
+    (=gt-pj-k1		. #x357D)	; &GT-K03318; [21-93]
     (<-simplified
      ((=jis-x0212	  . #x566B)	; &M-30177; [54-75]
       (=cns11643-4	  . #x276D)	; &I-C4-276D; [07-77]
       (=jis-x0213-2-2000  . #x755B)	; &I-JX2-755B; [85-59]
       (=daikanwa	  . 30177)	; &I-M-30177;
       ))
-    (=gt-k		. 03318)	; &GT-K03318;
-    (=gt-pj-k1		. #x357D)	; &GT-K03318; [21-93]
     ))
 (define-char
   '((=>ucs		. #x81FD)	; 臽
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=gt-k		. 03616)	; &GT-K03616;
+    (=gt-pj-k1		. #x5E44)	; &GT-K03616; [62-36]
     (<-simplified
      ((=jis-x0212	  . #x566B)	; &M-30177; [54-75]
       (=cns11643-4	  . #x276D)	; &I-C4-276D; [07-77]
       (=jis-x0213-2-2000  . #x755B)	; &I-JX2-755B; [85-59]
       (=daikanwa	  . 30177)	; &I-M-30177;
       ))
-    (=gt-k		. 03616)	; &GT-K03616;
-    (=gt-pj-k1		. #x5E44)	; &GT-K03616; [62-36]
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -784,6 +802,10 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (shinjigen-1	. 3288)
+    (=ucs		. #x23166)	; 𣅦
+    (=cns11643-6	. #x2B75)	; &I-C6-2B75; [11-85]
+    (=daikanwa		. 13786)	; &I-M-13786;
     (<-formed
      ((shinjigen-1	  . 3287)
       (=ucs		  . #x6603)	; 昃
@@ -791,10 +813,6 @@
       ))
     (<-formed*sources
      shinjigen-1)
-    (shinjigen-1	. 3288)
-    (=ucs		. #x23166)	; 𣅦
-    (=cns11643-6	. #x2B75)	; &I-C6-2B75; [11-85]
-    (=daikanwa		. 13786)	; &I-M-13786;
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -1915,12 +1933,6 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (<-same
-     ((=ucs		  . #x25055)	; 𥁕
-      (=daikanwa	  . 22978)	; &I-M-22978;
-      ))
-    (<-same*sources
-     guangyun daikanwa)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1936,6 +1948,12 @@
     (=daikanwa		. 13870)	; &I-M-13870;
     (=cbeta		. 03379)	; &I-CB03379;
     (=jef-china3	. #x5BB6)	; &I-JC3-5BB6;
+    (<-same
+     ((=ucs		  . #x25055)	; 𥁕
+      (=daikanwa	  . 22978)	; &I-M-22978;
+      ))
+    (<-same*sources
+     guangyun daikanwa)
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -1957,6 +1975,12 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (shinjigen-1	. 3278)
+    (=ucs		. #x663B)	; 昻
+    (=jis-x0208@1978	. #x3937)	; &I-J78-3937; [25-23]
+    (=ks-x1001		. #x6469)	; &I-K0-6469; [68-73]
+    (=cns11643-3	. #x2D22)	; &I-C3-2D22; [13-02]
+    (=daikanwa		. 13885)	; &I-M-13885;
     (<-vulgar
      ((shinjigen-1	  . 3277)
       (=ucs		  . #x6602)	; 昂
@@ -1966,31 +1990,32 @@
       ))
     (<-vulgar*sources
      pianhai daikanwa shinjigen-1)
-    (shinjigen-1	. 3278)
-    (=ucs		. #x663B)	; 昻
-    (=jis-x0208@1978	. #x3937)	; &I-J78-3937; [25-23]
-    (=ks-x1001		. #x6469)	; &I-K0-6469; [68-73]
-    (=cns11643-3	. #x2D22)	; &I-C3-2D22; [13-02]
-    (=daikanwa		. 13885)	; &I-M-13885;
     ))
 (define-char
   '((total-strokes	 . 9)
+    (shinjigen-2	. 3309)
+    (=ucs		. #x663C)	; 昼
+    (=jis-x0208		. #x436B)	; &I-J90-436B; [35-75]
+    (=gb2312		. #x5667)	; &I-G0-5667; [54-71]
+    (=gt		. 17517)	; &I-GT-17517;
+    (=gt-pj-1		. #x436B)	; &I-GT-17517; [35-75]
+    (<-simplified@CN
+     ((=ucs		  . #x665D)	; 晝
+      (=gb12345		  . #x5667)	; 晝 [54-71]
+      ))
     (<-simplified@JP/Jouyou
      ((=ucs		  . #x665D)	; 晝
       (=jis-x0208	  . #x5A6C)	; &I-J90-5A6C; [58-76]
       ))
+    (<-simplified@ucs
+     ((=ucs		  . #x665D)	; 晝
+      ))
     (<-vulgar
      ((=ucs		  . #x665D)	; 晝
       (=daikanwa	  . 13948)	; &I-M-13948;
       ))
     (<-vulgar*sources
      songyuan-yilai-suzipu daikanwa)
-    (shinjigen-2	. 3309)
-    (=ucs		. #x663C)	; 昼
-    (=jis-x0208		. #x436B)	; &I-J90-436B; [35-75]
-    (=gb2312		. #x5667)	; &I-G0-5667; [54-71]
-    (=gt		. 17517)	; &I-GT-17517;
-    (=gt-pj-1		. #x436B)	; &I-GT-17517; [35-75]
     (->subsumptive
      ((ideographic-radical . 44)	; ⼫
       (ideographic-strokes . 6)
@@ -2002,6 +2027,7 @@
       )
      ((ideographic-radical . 44)	; ⼫
       (ideographic-strokes . 6)
+      (shinjigen-1	  . 3309)
       (=cns11643-3	  . #x2C37)	; &C3-2C37; [12-23]
       ))
     ))
@@ -2568,6 +2594,9 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=ucs		. #x2F8CC)	; 書
+    (=cns11643-6	. #x3836)	; &I-C6-3836; [24-22]
+    (=daikanwa		. 13928)	; &I-M-13928;
     (<-Large-Seal
      ((=ucs		  . #x665D)	; 晝
       (=daikanwa	  . 13948)	; &I-M-13948;
@@ -2580,9 +2609,6 @@
       ))
     (<-same*sources
      daikanwa)
-    (=ucs		. #x2F8CC)	; 書
-    (=cns11643-6	. #x3836)	; &I-C6-3836; [24-22]
-    (=daikanwa		. 13928)	; &I-M-13928;
     (->mistakable
      ((=ucs		  . #x66F8)	; 書
       (=daikanwa	  . 14294)	; &I-M-14294;
@@ -2952,15 +2978,15 @@
     (->subsumptive
      ((ideographic-strokes . 7)
       (total-strokes	   . 11)
-      (<-unknown
-       ((=gt		    . 02031)	; &GT-02031;
-	(=daikanwa	    . 01546)	; &I-M-01546;
-	))
       (shinjigen-1	  . 3333)
       (=jis-x0208@1978	  . #x5A70)	; &M-13950; [58-80]
       (=jis-x0208@1983	  . #x5A70)	; &I-J83-5A70; [58-80]
       (=ks-x1001	  . #x6079)	; &I-K0-6079; [64-89]
       (=daikanwa	  . 13950)	; &I-M-13950;
+      (<-unknown
+       ((=gt		    . 02031)	; &GT-02031;
+	(=daikanwa	    . 01546)	; &I-M-01546;
+	))
       )
      ((ideographic-strokes . 6)
       (total-strokes	   . 10)
@@ -3115,13 +3141,6 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x3322)	; &M-13960; [19-02]
-      (=gb2312		  . #x3B5E)	; &I-G0-3B5E; [27-62]
-      (=ks-x1001	  . #x7C64)	; &I-K0-7C64; [92-68]
-      (=cns11643-1	  . #x5B28)	; &I-C1-5B28; [59-08]
-      (=daikanwa	  . 13960)	; &I-M-13960;
-      ))
     (=jis-x0208@1983	. #x3322)	; &GT-17551; [19-02]
     (=jis-x0208@1990	. #x3322)	; &I-J90-3322; [19-02]
     (=gt		. 17551)	; &I-GT-17551;
@@ -3129,9 +3148,24 @@
     (=jef-china3	. #x51FD)	; &I-JC3-51FD;
     (=ucs@jis		. #x6666)	; &GT-17551;
     (mojikyo		. 054042)	; &MCS-6000D31A;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x3322)	; &M-13960; [19-02]
+      (=gb2312		  . #x3B5E)	; &I-G0-3B5E; [27-62]
+      (=ks-x1001	  . #x7C64)	; &I-K0-7C64; [92-68]
+      (=cns11643-1	  . #x5B28)	; &I-C1-5B28; [59-08]
+      (=daikanwa	  . 13960)	; &I-M-13960;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6667)	; 晧
+  '((ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=ucs		. #x6667)	; 晧
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6667)	; 晧
+      ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
@@ -3154,7 +3188,9 @@
     (=ucs@jis		. #x6667)	; &GT-17613;
     ))
 (define-char
-  '((morohashi-daikanwa	13961 0 2)
+  '((<-denotational
+     ((=ucs		  . #x6667)	; 晧
+      ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
@@ -3166,11 +3202,11 @@
       )
      ((=ucs		  . #x544A)	; 告
       ))
-    (=ucs		. #x6667)	; 晧
-    (=iso-ir165		. #x2E4D)	; &I-EGB-2E4D; [14-45]
+    (=iso-ir165		. #x2E4D)	; &GT-17615; [14-45]
     (=cns11643-3	. #x3645)	; &I-C3-3645; [22-37]
     (=gt		. 17615)	; &I-GT-17615;
     (=gt-pj-9		. #x5F4C)	; &I-GT-17615; [63-44]
+    (=ucs@unicode	. #x6667)	; &GT-17615;
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -3928,10 +3964,6 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x665A)	; 晚
-      (=jis-x0213-1-2000  . #x753C)	; &I-JX1-753C; [85-28]
-      ))
     (=ucs		. #x6669)	; 晩
     (=jis-x0208		. #x4855)	; &I-J90-4855; [40-53]
     (=ks-x1001		. #x5839)	; &I-K0-5839; [56-25]
@@ -3939,32 +3971,37 @@
     (=gt		. 17718)	; &I-GT-17718;
     (=gt-pj-1		. #x4855)	; &I-GT-17718; [40-53]
     (mojikyo		. 050215)	; &MCS-6000C427;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x665A)	; 晚
+      (=jis-x0213-1-2000  . #x753C)	; &I-JX1-753C; [85-28]
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x66C9)	; 曉
-      (=jis-x0208	  . #x5A7C)	; &I-J90-5A7C; [58-92]
-      ))
-    (shinjigen-2	. 3342)
     (=ucs		. #x6681)	; 暁
-    (=jis-x0208		. #x3647)	; &I-J90-3647; [22-39]
-    (=cns11643-3	. #x3C24)	; &I-C3-3C24; [28-04]
-    (=gt		. 17672)	; &I-GT-17672;
-    (=gt-pj-1		. #x3647)	; &I-GT-17672; [22-39]
-    (=daikanwa		. 14031)	; &I-M-14031;
+    (->subsumptive
+     ((shinjigen-1	  . 3342)
+      (shinjigen-2	  . 3342)
+      (=cns11643-3	  . #x3C24)	; &GT-17672; [28-04]
+      (=gt		  . 17672)	; &I-GT-17672;
+      (=gt-pj-1		  . #x3647)	; &I-GT-17672; [22-39]
+      (=daikanwa	  . 14031)	; &I-M-14031;
+      )
+     ((=jis-x0208	  . #x3647)	; &J90-3647; [22-39]
+      (=ucs@unicode	  . #x6681)	; &J90-3647;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x66C9)	; 曉
+	(=jis-x0208	    . #x5A7C)	; &I-J90-5A7C; [58-92]
+	))
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	14031 1)
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA43)	; 暑
-      (=jis-x0213-1-2000  . #x7543)	; &I-JX1-7543; [85-35]
-      ))
     (=ucs		. #x6691)	; 暑
     (=jis-x0208		. #x3D6B)	; &I-J90-3D6B; [29-75]
     (=gb2312		. #x4A6E)	; &I-G0-4A6E; [42-78]
@@ -3974,6 +4011,10 @@
     (=gt-k		. 09069)	; &I-GT-K09069;
     (=gt-pj-1		. #x3D6B)	; &I-GT-17690; [29-75]
     (mojikyo		. 050216)	; &MCS-6000C428;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA43)	; 暑
+      (=jis-x0213-1-2000  . #x7543)	; &I-JX1-7543; [85-35]
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -5312,14 +5353,6 @@
     (=ucs		. #x66A6)	; 暦
     (->subsumptive
      ((morohashi-daikanwa	14111 1)
-      (<-simplified@JP/Jouyou
-       ((shinjigen-1	    . 3375)
-	(=ucs		    . #x66C6)	; 曆
-	(=jis-x0213-1-2000  . #x7547)	; &I-JX1-7547; [85-39]
-	(=daikanwa	    . 14171)	; &I-M-14171;
-	))
-      (<-simplified@JP/Jouyou*sources
-       JP/Touyou JP/Jouyou shinjigen-1 daikanwa)
       (shinjigen-1	  . 3374)
       (shinjigen-2	  . 3374)
       (=jis-x0208	  . #x4E71)	; &GT-17852; [46-81]
@@ -5328,6 +5361,14 @@
       (=gt-pj-1		  . #x4E71)	; &I-GT-17852; [46-81]
       (=ucs@unicode	  . #x66A6)	; &GT-17852;
       (mojikyo		  . 050217)	; &MCS-6000C429;
+      (<-simplified@JP/Jouyou
+       ((shinjigen-1	    . 3375)
+	(=ucs		    . #x66C6)	; 曆
+	(=jis-x0213-1-2000  . #x7547)	; &I-JX1-7547; [85-39]
+	(=daikanwa	    . 14171)	; &I-M-14171;
+	))
+      (<-simplified@JP/Jouyou*sources
+       JP/Touyou JP/Jouyou shinjigen-1 daikanwa)
       )
      ((=cns11643-3	  . #x4737)	; &C3-4737; [39-23]
       ))
@@ -5578,6 +5619,8 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 14132)	; &M-14132;
+    (=jef-china3	. #x51EA)	; &I-JC3-51EA;
     (<-same
      ((=jis-x0208	  . #x5A63)	; &GT-17503; [58-67]
       (=gb2312		  . #x6A47)	; &I-G0-6A47; [74-39]
@@ -5585,8 +5628,6 @@
       ))
     (<-same*sources
      shuowen daikanwa)
-    (=daikanwa		. 14132)	; &M-14132;
-    (=jef-china3	. #x51EA)	; &I-JC3-51EA;
     (->synonyms
      ((=jis-x0208	  . #x5034)	; &GT-00358; [48-20]
       (=cns11643-1	  . #x4F67)	; &I-C1-4F67; [47-71]
@@ -5615,6 +5656,9 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (shinjigen-1	. 3300)
+    (shinjigen-2	. 3300)
+    (=cns11643-1	. #x6D34)	; &C1-6D34; [77-20]
     (<-original
      ((shinjigen-1	  . 3299)
       (=jis-x0208	  . #x5A63)	; &GT-17503; [58-67]
@@ -5623,9 +5667,6 @@
       ))
     (<-original*sources
      shinjigen-1)
-    (shinjigen-1	. 3300)
-    (shinjigen-2	. 3300)
-    (=cns11643-1	. #x6D34)	; &C1-6D34; [77-20]
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -5985,9 +6026,9 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x66BD)	; 暽
+    (=big5		. #xE9B9)	; &I-B-E9B9;
     (->subsumptive
-     ((=big5		  . #xE9B9)	; &M-14156;
-      (=daikanwa	  . 14156)	; &I-M-14156;
+     ((=daikanwa	  . 14156)	; &M-14156;
       (=ucs@unicode	  . #x66BD)	; &M-14156;
       )
      ((=jef-china3	  . #x51EF)	; &JC3-51EF;
@@ -6060,6 +6101,7 @@
      ((=ucs		  . #x65E5)	; 日
       )
      ((=ks-x1001	  . #x4A72)	; &GT-16742; [42-82]
+      (=jis-x0208@1990	  . #x343A)	; &I-J90-343A; [20-26]
       (=cns11643-1	  . #x5F56)	; &I-C1-5F56; [63-54]
       (=daikanwa	  . 13260)	; &I-M-13260;
       ))
@@ -6897,11 +6939,6 @@
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x3D6C)	; &M-14220; [29-76]
-      (=ks-x1001	  . #x5F75)	; &I-K0-5F75; [63-85]
-      (=daikanwa	  . 14220)	; &I-M-14220;
-      ))
     (=gb2312		. #x4A6F)	; &GT-17977; [42-79]
     (=jis-x0208@1983	. #x3D6C)	; &I-J83-3D6C; [29-76]
     (=jis-x0208@1990	. #x3D6C)	; &I-J90-3D6C; [29-76]
@@ -6910,6 +6947,11 @@
     (=gt-pj-1		. #x3D6C)	; &I-GT-17977; [29-76]
     (=jef-china3	. #x51FE)	; &I-JC3-51FE;
     (=ucs@unicode	. #x66D9)	; &GT-17977;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x3D6C)	; &M-14220; [29-76]
+      (=ks-x1001	  . #x5F75)	; &I-K0-5F75; [63-85]
+      (=daikanwa	  . 14220)	; &I-M-14220;
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
diff --git a/lisp/utf-2000/Ideograph-R073-Say.el b/lisp/utf-2000/Ideograph-R073-Say.el
index dacfa33..e277bd3 100644
--- a/lisp/utf-2000/Ideograph-R073-Say.el
+++ b/lisp/utf-2000/Ideograph-R073-Say.el
@@ -330,6 +330,21 @@
   '((ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=ucs		. #x66FD)	; 曽
+    (=jis-x0208		. #x413E)	; &I-J90-413E; [33-30]
+    (=gt		. 18096)	; &I-GT-18096;
+    (=gt-k		. 07812)	; &I-GT-K07812;
+    (=gt-pj-1		. #x413E)	; &I-GT-18096; [33-30]
+    (<-simplified@JP/misc
+     ((=jis-x0208	  . #x413D)	; &GT-18103; [33-29]
+      (=ks-x1001	  . #x7174)	; &I-K0-7174; [81-84]
+      (=daikanwa	  . 14299)	; &I-M-14299;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 73)	; ⽈
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
     (=cns11643-6	. #x4057)	; &C6-4057; [32-55]
     ))
 (define-char
@@ -366,6 +381,10 @@
     (ideographic-radical@shinjigen*sources
      shinjigen-1 jisx0208/a jisx0208/b)
     (total-strokes	 . 12)
+    (hanyu-dazidian	2 1516 8)
+    (shinjigen-1	. 926)
+    (=cns11643-1	. #x5E32)	; &M-01597; [62-18]
+    (=daikanwa		. 01597)	; &I-M-01597;
     (<-original
      ((shinjigen-1	  . 925)
       (=jis-x0208	  . #x3A47)	; &GT-18101; [26-39]
@@ -374,71 +393,69 @@
       (=daikanwa	  . 14301)	; &I-M-14301;
       ))
     (<-original*sources
-     zhengzi-tong daikanwa shinjigen-1)
-    (hanyu-dazidian	2 1516 8)
-    (shinjigen-1	. 926)
-    (=cns11643-1	. #x5E32)	; &M-01597; [62-18]
-    (=daikanwa		. 01597)	; &I-M-01597;
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
-  '((=>ucs		. #x66FE)	; 曾
+  '((ideographic-radical . 73)	; ⽈
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=ucs		. #x66FE)	; 曾
+    (=big5		. #xB4BF)	; &I-B-B4BF;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x66FE)	; 曾
+      ))
     (ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (shinjigen-1	. 3417)
     (shinjigen-2	. 3417)
     (=jis-x0208		. #x413D)	; &GT-18103; [33-29]
     (=ks-x1001		. #x7174)	; &I-K0-7174; [81-84]
-    (=big5		. #xB4BF)	; &I-B-B4BF;
     (=gt		. 18103)	; &I-GT-18103;
     (=gt-k		. 09845)	; &I-GT-K09845;
     (=gt-pj-1		. #x413D)	; &I-GT-18103; [33-29]
     (=daikanwa		. 14299)	; &I-M-14299;
     (=ucs@jis		. #x66FE)	; &GT-18103;
-    (=ucs@big5		. #x66FE)	; &GT-18103;
     ))
 (define-char
-  '((morohashi-daikanwa	14299 0 2)
+  '((<-denotational
+     ((=ucs		  . #x66FE)	; 曾
+      ))
     (ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=ucs		. #x66FE)	; 曾
-    (=gb2312		. #x5478)	; &I-G0-5478; [52-88]
+    (shinjigen-1	. 3418)
+    (=gb2312		. #x5478)	; &C1-5F64; [52-88]
     (=cns11643-1	. #x5F64)	; &I-C1-5F64; [63-68]
-    ))
-(define-char
-  '((morohashi-daikanwa	14299 0 5)
-    (ideographic-radical . 73)	; ⽈
-    (ideographic-strokes . 7)
-    (kangxi-radical	 . 72)	; ⽇
-    (total-strokes	 . 11)
-    (=ucs		. #x66FD)	; 曽
-    (=jis-x0208		. #x413E)	; &I-J90-413E; [33-30]
-    (=gt		. 18096)	; &I-GT-18096;
-    (=gt-k		. 07812)	; &I-GT-K07812;
-    (=gt-pj-1		. #x413E)	; &I-GT-18096; [33-30]
+    (=ucs@unicode	. #x66FE)	; &C1-5F64;
+    (<-vulgar
+     ((=jis-x0208	  . #x413D)	; &GT-18103; [33-29]
+      (=ks-x1001	  . #x7174)	; &I-K0-7174; [81-84]
+      (=daikanwa	  . 14299)	; &I-M-14299;
+      ))
     ))
 (define-char
   '((ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (shinjigen-2	. 3419)
     (=ucs		. #x66FF)	; 替
-    (=jis-x0208		. #x4258)	; &I-J90-4258; [34-56]
-    (=gb2312		. #x4C66)	; &I-G0-4C66; [44-70]
-    (=ks-x1001		. #x7470)	; &I-K0-7470; [84-80]
-    (=big5		. #xB4C0)	; &I-B-B4C0;
-    (=gt		. 18106)	; &I-GT-18106;
-    (=gt-k		. 09093)	; &I-GT-K09093;
-    (=gt-pj-1		. #x4258)	; &I-GT-18106; [34-56]
-    (=daikanwa		. 14300)	; &I-M-14300;
-    ))
-(define-char
-  '((=>ucs		. #x66FF)	; 替
-    (morohashi-daikanwa	14300 0 0)
-    (ideographic-radical . 73)	; ⽈
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=cns11643-1	. #x5F65)	; &C1-5F65; [63-69]
+    (->subsumptive
+     ((shinjigen-1	  . 3419)
+      (shinjigen-2	  . 3419)
+      (=jis-x0208	  . #x4258)	; &GT-18106; [34-56]
+      (=gb2312		  . #x4C66)	; &I-G0-4C66; [44-70]
+      (=ks-x1001	  . #x7470)	; &I-K0-7470; [84-80]
+      (=big5		  . #xB4C0)	; &I-B-B4C0;
+      (=gt		  . 18106)	; &I-GT-18106;
+      (=gt-k		  . 09093)	; &I-GT-K09093;
+      (=gt-pj-1		  . #x4258)	; &I-GT-18106; [34-56]
+      (=daikanwa	  . 14300)	; &I-M-14300;
+      (=ucs@unicode	  . #x66FF)	; &GT-18106;
+      )
+     ((=cns11643-1	  . #x5F65)	; &C1-5F65; [63-69]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -477,29 +494,38 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x6701)	; 朁
-    (ideographic-radical . 73)	; ⽈
+  '((ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=daikanwa		. 14302)	; &M-14302;
+    (=ucs		. #x6701)	; 朁
     ))
 (define-char
-  '((=>ucs		. #x6701)	; 朁
-    (morohashi-daikanwa	14302 0 0)
+  '((<-denotational
+     ((=ucs		  . #x6701)	; 朁
+      ))
     (ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=jis-x0213-2-2000	. #x2E37)	; &JX2-2E37; [14-23]
-    (=ucs@jis		. #x6701)	; &JX2-2E37;
+    (->subsumptive
+     ((=daikanwa	  . 14302)	; &M-14302;
+      )
+     ((=jis-x0213-2-2000  . #x2E37)	; &JX2-2E37; [14-23]
+      (=ucs@jis		  . #x6701)	; &JX2-2E37;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	14302 0 5)
+  '((<-denotational
+     ((=ucs		  . #x6701)	; 朁
+      ))
     (ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=ucs		. #x6701)	; 朁
-    (=cns11643-2	. #x3C4C)	; &I-C2-3C4C; [28-44]
-    (=big5		. #xD9A9)	; &I-B-D9A9;
+    (=big5		. #xD9A9)	; &B-D9A9;
+    (->subsumptive
+     ((=ucs@unicode	  . #x6701)	; &UU+6701;
+      )
+     ((=cns11643-2	  . #x3C4C)	; &C2-3C4C; [28-44]
+      ))
     ))
 (define-char
   '((ideographic-radical . 73)	; ⽈
@@ -510,28 +536,25 @@
     (=daikanwa		. 14303)	; &I-M-14303;
     ))
 (define-char
-  '((=>ucs		. #x2333D)	; 𣌽
-    (ideographic-radical . 73)	; ⽈
+  '((ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=big5-cdp	  . #x88E1)	; &CDP-88E1;
+    (=ucs		. #x2333D)	; 𣌽
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=big5-cdp	    . #x88E1)	; &CDP-88E1;
+	)
+       ((=ucs		    . #x4E9A)	; 亚
+	))
+      (=daikanwa	  . 14304)	; &M-14304;
+      (=hanziku-1	  . #xA97A)	; &I-HZK01-A97A;
       )
-     ((=ucs		  . #x4E9A)	; 亚
+     ((=cns11643-6	  . #x4979)	; &C6-4979; [41-89]
+      (=ucs@iso		  . #x2333D)	; &C6-4979;
       ))
-    (=daikanwa		. 14304)	; &M-14304;
-    (=hanziku-1		. #xA97A)	; &I-HZK01-A97A;
-    ))
-(define-char
-  '((morohashi-daikanwa	14304 0 2)
-    (ideographic-radical . 73)	; ⽈
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=ucs		. #x2333D)	; 𣌽
-    (=cns11643-6	. #x4979)	; &I-C6-4979; [41-89]
     ))
 (define-char
   '((ideographic-radical . 73)	; ⽈
@@ -615,127 +638,173 @@
     (=jef-china3	. #x51AD)	; &I-JC3-51AD;
     ))
 (define-char
-  '((ideographic-radical . 73)	; ⽈
+  '((=>ucs*		. #x669C)	; 暜
+    (ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=cns11643-6	. #x5D5B)	; &M-14312; [61-59]
-    (=daikanwa		. 14312)	; &I-M-14312;
+    (=ucs		. #x2F8D5)	; 暜
+    (->subsumptive
+     ((=daikanwa	  . 14312)	; &M-14312;
+      (<-same
+       ((=jis-x0208	    . #x4258)	; &GT-18106; [34-56]
+	(=gb2312	    . #x4C66)	; &I-G0-4C66; [44-70]
+	(=ks-x1001	    . #x7470)	; &I-K0-7470; [84-80]
+	(=daikanwa	    . 14300)	; &I-M-14300;
+	))
+      (<-same*sources
+       shuowen daikanwa)
+      (->mistakable
+       ((=jis-x0212	    . #x4255)	; &M-14082; [34-53]
+	(=daikanwa	    . 14082)	; &I-M-14082;
+	))
+      )
+     ((=cns11643-6	  . #x5D5B)	; &C6-5D5B; [61-59]
+      (=ucs@iso		  . #x2F8D5)	; &C6-5D5B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x23346)	; 𣍆
-    (=cns11643-5	. #x4D57)	; &I-C5-4D57; [45-55]
-    (=daikanwa		. 14313)	; &I-M-14313;
-    ))
-(define-char
-  '((=>ucs		. #x23347)	; 𣍇
-    (ideographic-radical . 73)	; ⽈
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=daikanwa		. 14314)	; &M-14314;
+    (->subsumptive
+     ((=daikanwa	  . 14313)	; &M-14313;
+      )
+     ((=cns11643-5	  . #x4D57)	; &C5-4D57; [45-55]
+      (=ucs@iso		  . #x23346)	; &C5-4D57;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	14314 0 0)
-    (ideographic-radical . 73)	; ⽈
+  '((ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x23347)	; 𣍇
-    (=cns11643-5	. #x4D56)	; &I-C5-4D56; [45-54]
+    (->subsumptive
+     ((=daikanwa	  . 14314)	; &M-14314;
+      )
+     ((=cns11643-5	  . #x4D56)	; &C5-4D56; [45-54]
+      (=ucs@iso		  . #x23347)	; &C5-4D56;
+      ))
     ))
 (define-char
   '((ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x23348)	; 𣍈
-    (=daikanwa		. 14315)	; &I-M-14315;
-    ))
-(define-char
-  '((=>ucs		. #x23348)	; 𣍈
-    (morohashi-daikanwa	14315 0 1)
-    (ideographic-radical . 73)	; ⽈
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-7	. #x2363)	; &C7-2363; [03-67]
+    (->subsumptive
+     ((=daikanwa	  . 14315)	; &M-14315;
+      (=ucs@iso		  . #x23348)	; &M-14315;
+      )
+     ((=cns11643-7	  . #x2363)	; &C7-2363; [03-67]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x3B31)	; 㬱
-    (ideographic-radical . 73)	; ⽈
+  '((ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x515F)	; 兟
+    (=ucs		. #x3B31)	; 㬱
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x515F)	; 兟
+	)
+       ((=jis-x0208	    . #x5B29)	; &GT-18071; [59-09]
+	(=gb2312	    . #x543B)	; &I-G0-543B; [52-27]
+	(=ks-x1001	    . #x6858)	; &I-K0-6858; [72-56]
+	(=daikanwa	    . 14278)	; &I-M-14278;
+	))
+      (=daikanwa	  . 14316)	; &M-14316;
+      (mojikyo		  . 014316)	; &MCS-600037EC;
       )
-     ((=ucs		  . #x66F0)	; 曰
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x515F)	; 兟
+	)
+       ((=cns11643-1	    . #x454B)	; &C1-454B; [37-43]
+	))
+      (shinjigen-1	  . 3420)
+      (=cns11643-4	  . #x5056)	; &CB06796; [48-54]
+      (=cbeta		  . 06796)	; &I-CB06796;
+      (=ucs@unicode	  . #x3B31)	; &CB06796;
+      (<-formed
+       ((shinjigen-1	    . 3419)
+	(=jis-x0208	    . #x4258)	; &GT-18106; [34-56]
+	(=gb2312	    . #x4C66)	; &I-G0-4C66; [44-70]
+	(=ks-x1001	    . #x7470)	; &I-K0-7470; [84-80]
+	(=daikanwa	    . 14300)	; &I-M-14300;
+	))
+      (<-formed*sources
+       shinjigen-1)
       ))
-    (=daikanwa		. 14316)	; &M-14316;
-    (mojikyo		. 014316)	; &MCS-600037EC;
     ))
 (define-char
-  '((morohashi-daikanwa	14316 0 0)
-    (ideographic-radical . 73)	; ⽈
+  '((ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x515F)	; 兟
-      )
-     ((=cns11643-1	  . #x454B)	; &C1-454B; [37-43]
-      ))
-    (=ucs		. #x3B31)	; 㬱
-    (=cns11643-4	. #x5056)	; &I-C4-5056; [48-54]
-    (=cbeta		. 06796)	; &I-CB06796;
+    (=ucs		. #x6706)	; 朆
     ))
 (define-char
-  '((=>ucs		. #x6706)	; 朆
+  '((<-denotational
+     ((=ucs		  . #x6706)	; 朆
+      ))
     (ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=daikanwa		. 14317)	; &M-14317;
     ))
 (define-char
-  '((morohashi-daikanwa	14317 0 2)
+  '((<-denotational
+     ((=ucs		  . #x6706)	; 朆
+      ))
     (ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=ucs		. #x6706)	; 朆
-    (=cns11643-3	. #x5124)	; &I-C3-5124; [49-04]
+    (=cns11643-3	. #x5124)	; &C3-5124; [49-04]
+    (=ucs@unicode	. #x6706)	; &C3-5124;
     ))
 (define-char
-  '((=>ucs		. #x2334F)	; 𣍏
-    (ideographic-radical . 73)	; ⽈
+  '((ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (=daikanwa		. 14318)	; &M-14318;
+    (=ucs		. #x2334F)	; 𣍏
+    (->subsumptive
+     ((=daikanwa	  . 14318)	; &M-14318;
+      )
+     ((=cns11643-5	  . #x5B63)	; &C5-5B63; [59-67]
+      (=ucs@iso		  . #x2334F)	; &C5-5B63;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	14318 0 0)
-    (ideographic-radical . 73)	; ⽈
+  '((ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (=ucs		. #x2334F)	; 𣍏
-    (=cns11643-5	. #x5B63)	; &I-C5-5B63; [59-67]
+    (=ucs		. #x3B32)	; 㬲
     ))
 (define-char
-  '((=>ucs		. #x3B32)	; 㬲
+  '((<-denotational
+     ((=ucs		  . #x3B32)	; 㬲
+      ))
     (ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (=daikanwa		. 14319)	; &M-14319;
     ))
 (define-char
-  '((morohashi-daikanwa	14319 0 2)
+  '((<-denotational
+     ((=ucs		  . #x3B32)	; 㬲
+      ))
     (ideographic-radical . 73)	; ⽈
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (=ucs		. #x3B32)	; 㬲
-    (=cns11643-3	. #x5474)	; &I-C3-5474; [52-84]
+    (->subsumptive
+     ((=ucs@unicode	  . #x3B32)	; &UU+3B32;
+      )
+     ((=cns11643-3	  . #x5474)	; &C3-5474; [52-84]
+      ))
     ))
 (define-char
   '((ideographic-radical . 73)	; ⽈
diff --git a/lisp/utf-2000/Ideograph-R074-Moon.el b/lisp/utf-2000/Ideograph-R074-Moon.el
index 5436a55..4b272e5 100644
--- a/lisp/utf-2000/Ideograph-R074-Moon.el
+++ b/lisp/utf-2000/Ideograph-R074-Moon.el
@@ -32,10 +32,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E9D)	; ⺝
     (<-identical@component
      ((=ucs		  . #x6708)	; 月
       ))
-    (=ucs		. #x2E9D)	; ⺝
     ))
 (define-char
   '((ideographic-radical . 74)	; ⽉
@@ -168,15 +168,15 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x670B)	; 朋
-    (ideographic-radical . 74)	; ⽉
+  '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=jis-x0208@1997	. #x4A7E)	; &J97-4A7E; [42-94]
+    (=ucs		. #x670B)	; 朋
+    (=jis-x0208@1997	. #x4A7E)	; 朋 [42-94]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4A7E)	; &J97-4A7E; [42-94]
+     ((=ucs		  . #x670B)	; 朋
       ))
     (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 4)
@@ -191,15 +191,14 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4A7E)	; &J97-4A7E; [42-94]
+     ((=ucs		  . #x670B)	; 朋
       ))
     (morohashi-daikanwa	14340 1)
     (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (shinjigen-1	. 3430)
-    (=ucs		. #x670B)	; 朋
-    (=jis-x0208		. #x4A7E)	; &I-J90-4A7E; [42-94]
+    (=jis-x0208		. #x4A7E)	; &GT-18173; [42-94]
     (=gb2312		. #x4573)	; &I-G0-4573; [37-83]
     (=ks-x1001		. #x5D5B)	; &I-K0-5D5B; [61-59]
     (=cns11643-1	. #x4E25)	; &I-C1-4E25; [46-05]
@@ -207,6 +206,7 @@
     (=gt		. 18173)	; &I-GT-18173;
     (=gt-k		. 03824)	; &I-GT-K03824;
     (=gt-pj-1		. #x4A7E)	; &I-GT-18173; [42-94]
+    (=ucs@unicode	. #x670B)	; &GT-18173;
     (mojikyo		. 050219)	; &MCS-6000C42B;
     ))
 (define-char
@@ -351,6 +351,30 @@
   '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=ucs		. #x23365)	; 𣍥
+    (->subsumptive
+     ((=daikanwa	  . 14349)	; &M-14349;
+      )
+     ((=cns11643-5	  . #x2954)	; &C5-2954; [09-52]
+      (=ucs@iso		  . #x23365)	; &C5-2954;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 74)	; ⽉
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=ucs		. #x23366)	; 𣍦
+    (->subsumptive
+     ((=daikanwa	  . 14350)	; &M-14350;
+      )
+     ((=cns11643-4	  . #x2969)	; &C4-2969; [09-73]
+      (=ucs@iso		  . #x23366)	; &C4-2969;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 74)	; ⽉
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
     (=ucs		. #x670F)	; 朏
     (->subsumptive
      ((shinjigen-1	  . 3433)
@@ -418,242 +442,282 @@
   '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x23365)	; 𣍥
-    (=cns11643-5	. #x2954)	; &I-C5-2954; [09-52]
-    ))
-(define-char
-  '((ideographic-radical . 74)	; ⽉
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (=ucs		. #x23366)	; 𣍦
-    (=cns11643-4	. #x2969)	; &I-C4-2969; [09-73]
+    (=ucs		. #x2336C)	; 𣍬
+    (->subsumptive
+     ((=daikanwa	  . 14354)	; &M-14354;
+      )
+     ((=cns11643-6	  . #x3171)	; &C6-3171; [17-81]
+      (=ucs@iso		  . #x2336C)	; &C6-3171;
+      ))
     ))
 (define-char
   '((ideographic-radical . 74)	; ⽉
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (=ucs		. #x2336C)	; 𣍬
-    (=cns11643-6	. #x3171)	; &I-C6-3171; [17-81]
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=ucs		. #x3B34)	; 㬴
+    (->subsumptive
+     ((=daikanwa	  . 14355)	; &M-14355;
+      )
+     ((=cns11643-3	  . #x314E)	; &C3-314E; [17-46]
+      (=ucs@unicode	  . #x3B34)	; &C3-314E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6712)	; 朒
-    (=cns11643-2	. #x2F59)	; &I-C2-2F59; [15-57]
-    (=jis-x0213-2-2000	. #x2E39)	; &I-JX2-2E39; [14-25]
     (=big5		. #xD1D7)	; &I-B-D1D7;
-    (=daikanwa		. 14356)	; &I-M-14356;
+    (->subsumptive
+     ((=daikanwa	  . 14356)	; &M-14356;
+      )
+     ((=cns11643-2	  . #x2F59)	; &JX2-2E39; [15-57]
+      (=jis-x0213-2-2000  . #x2E39)	; &I-JX2-2E39; [14-25]
+      (=ucs@unicode	  . #x6712)	; &JX2-2E39;
+      ))
+    ))
+(define-char
+  '((ideographic-radical@ucs . 130)	; ⾁
+    (ideographic-strokes@ucs . 6)
+    (ideographic-radical@cns . 74)	; ⽉
+    (ideographic-strokes@cns . 6)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (total-strokes	 . 10)
+    (=ucs		. #x266B9)	; 𦚹
+    (->subsumptive
+     ((ideographic-radical . 74)	; ⽉
+      (ideographic-strokes . 6)
+      (=daikanwa	  . 14357)	; &M-14357;
+      )
+     ((hanyu-dazidian	  3 2067 2)
+      (=cns11643-5	  . #x2E24)	; &HZK06-A9C1; [14-04]
+      (=hanziku-6	  . #xA9C1)	; &I-HZK06-A9C1;
+      (=ucs@iso		  . #x266B9)	; &HZK06-A9C1;
+      ))
     ))
 (define-char
   '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6713)	; 朓
-    (=jis-x0212		. #x4271)	; &I-JSP-4271; [34-81]
-    (=iso-ir165		. #x7C53)	; &I-EGB-7C53; [92-51]
-    (=cns11643-2	. #x2F5A)	; &I-C2-2F5A; [15-58]
-    (=jis-x0213-1-2000	. #x754D)	; &I-JX1-754D; [85-45]
-    (=big5		. #xD1D8)	; &I-B-D1D8;
-    (=daikanwa		. 14358)	; &I-M-14358;
-    (=jef-china3	. #x52C0)	; &I-JC3-52C0;
+    (->subsumptive
+     ((=daikanwa	  . 14358)	; &M-14358;
+      )
+     ((=jis-x0212	  . #x4271)	; &JX1-754D; [34-81]
+      (=iso-ir165	  . #x7C53)	; &I-EGB-7C53; [92-51]
+      (=cns11643-2	  . #x2F5A)	; &I-C2-2F5A; [15-58]
+      (=jis-x0213-1-2000  . #x754D)	; &I-JX1-754D; [85-45]
+      (=big5		  . #xD1D8)	; &I-B-D1D8;
+      (=jef-china3	  . #x52C0)	; &I-JC3-52C0;
+      (=ucs@unicode	  . #x6713)	; &JX1-754D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6714)	; 朔
-    (=jis-x0208		. #x3A73)	; &I-J90-3A73; [26-83]
-    (=gb2312		. #x4B37)	; &I-G0-4B37; [43-23]
-    (=ks-x1001		. #x5E7D)	; &I-K0-5E7D; [62-93]
-    (=cns11643-1	. #x5574)	; &I-C1-5574; [53-84]
-    (=big5		. #xAED2)	; &I-B-AED2;
-    (=gt		. 18197)	; &I-GT-18197;
-    (=gt-k		. 06437)	; &I-GT-K06437;
-    (=gt-pj-1		. #x3A73)	; &I-GT-18197; [26-83]
-    (=daikanwa		. 14359)	; &I-M-14359;
-    ))
-(define-char
-  '((=>ucs		. #x6715)	; 朕
-    (ideographic-radical . 74)	; ⽉
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=ks-x1001		. #x7279)	; &M-14361; [82-89]
-    (=daikanwa		. 14361)	; &I-M-14361;
-    (=jef-china3	. #x52C2)	; &I-JC3-52C2;
+    (->subsumptive
+     ((=daikanwa	  . 14359)	; &M-14359;
+      )
+     ((=jis-x0208	  . #x3A73)	; &GT-18197; [26-83]
+      (=gb2312		  . #x4B37)	; &I-G0-4B37; [43-23]
+      (=ks-x1001	  . #x5E7D)	; &I-K0-5E7D; [62-93]
+      (=cns11643-1	  . #x5574)	; &I-C1-5574; [53-84]
+      (=big5		  . #xAED2)	; &I-B-AED2;
+      (=gt		  . 18197)	; &I-GT-18197;
+      (=gt-k		  . 06437)	; &I-GT-K06437;
+      (=gt-pj-1		  . #x3A73)	; &I-GT-18197; [26-83]
+      (=ucs@unicode	  . #x6714)	; &GT-18197;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6715)	; 朕
-    (morohashi-daikanwa	14361 0 1)
-    (ideographic-radical . 74)	; ⽉
+  '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=big5		. #xAED3)	; &B-AED3;
-    (=ucs@big5		. #x6715)	; &B-AED3;
+    (=ucs		. #x2336E)	; 𣍮
+    (->subsumptive
+     ((=daikanwa	  . 14360)	; &M-14360;
+      (<-ancient
+       ((=daikanwa	    . 14359)	; &M-14359;
+	))
+      (<-ancient*sources
+       jiyun daikanwa)
+      )
+     ((=cns11643-6	  . #x3843)	; &C6-3843; [24-35]
+      (=ucs@iso		  . #x2336E)	; &C6-3843;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	14361 0 2)
-    (ideographic-radical . 74)	; ⽉
+  '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6715)	; 朕
-    (=jis-x0208		. #x443F)	; &I-J90-443F; [36-31]
-    (=gb2312		. #x6B5E)	; &I-G0-6B5E; [75-62]
-    (=gt		. 18207)	; &I-GT-18207;
-    (=gt-k		. 06507)	; &I-GT-K06507;
-    (=gt-pj-1		. #x443F)	; &I-GT-18207; [36-31]
+    (=big5		. #xAED3)	; &I-B-AED3;
     ))
 (define-char
-  '((=>ucs		. #x6715)	; 朕
-    (morohashi-daikanwa	14361 0 3)
+  '((<-denotational
+     ((=ucs		  . #x6715)	; 朕
+      ))
     (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=cns11643-1	. #x5575)	; &C1-5575; [53-85]
+    (=ks-x1001		. #x7279)	; &M-14361; [82-89]
+    (=daikanwa		. 14361)	; &I-M-14361;
+    (=jef-china3	. #x52C2)	; &I-JC3-52C2;
     ))
 (define-char
-  '((=>ucs		. #x3B35)	; 㬵
+  '((<-denotational
+     ((=ucs		  . #x6715)	; 朕
+      ))
     (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=daikanwa		. 14362)	; &M-14362;
+    (->subsumptive
+     ((=jis-x0208	  . #x443F)	; &GT-18207; [36-31]
+      (=gb2312		  . #x6B5E)	; &I-G0-6B5E; [75-62]
+      (=gt		  . 18207)	; &I-GT-18207;
+      (=gt-k		  . 06507)	; &I-GT-K06507;
+      (=gt-pj-1		  . #x443F)	; &I-GT-18207; [36-31]
+      (=ucs@unicode	  . #x6715)	; &GT-18207;
+      )
+     ((=cns11643-1	  . #x5575)	; &C1-5575; [53-85]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	14362 0 0)
-    (ideographic-radical . 74)	; ⽉
+  '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x3B35)	; 㬵
-    (=cns11643-5	. #x2E25)	; &I-C5-2E25; [14-05]
-    ))
-(define-char
-  '((=>ucs		. #x6717)	; 朗
-    (morohashi-daikanwa	14362 1)
-    (ideographic-radical . 74)	; ⽉
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x5547)	; &M-14364; [53-39]
-      (=jis-x0213-1-2000  . #x754E)	; &I-JX1-754E; [85-46]
-      (=daikanwa	  . 14364)	; &I-M-14364;
+    (->subsumptive
+     ((=daikanwa	  . 14362)	; &M-14362;
+      )
+     ((=cns11643-5	  . #x2E25)	; &C5-2E25; [14-05]
+      (=ucs@unicode	  . #x3B35)	; &C5-2E25;
       ))
-    (=jis-x0208		. #x4F2F)	; &GT-18208; [47-15]
-    (=big5		. #xAED4)	; &I-B-AED4;
-    (=gt		. 18208)	; &I-GT-18208;
-    (=gt-pj-1		. #x4F2F)	; &I-GT-18208; [47-15]
-    (=ucs@jis		. #x6717)	; &GT-18208;
-    (=ucs@big5		. #x6717)	; &GT-18208;
-    (mojikyo		. 050221)	; &MCS-6000C42D;
     ))
 (define-char
-  '((morohashi-daikanwa	14362 1 0)
-    (ideographic-radical . 74)	; ⽉
+  '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6717)	; 朗
-    (=gb2312		. #x404A)	; &I-G0-404A; [32-42]
-    (=cns11643-1	. #x5576)	; &I-C1-5576; [53-86]
     ))
 (define-char
-  '((ideographic-radical . 74)	; ⽉
+  '((<-denotational
+     ((=ucs		  . #x6717)	; 朗
+      ))
+    (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=ucs		. #x3B34)	; 㬴
-    (=cns11643-3	. #x314E)	; &I-C3-314E; [17-46]
+    (=big5		. #xAED4)	; &B-AED4;
+    (->subsumptive
+     ((morohashi-daikanwa	14362 1)
+      (=jis-x0208	  . #x4F2F)	; &GT-18208; [47-15]
+      (=gt		  . 18208)	; &I-GT-18208;
+      (=gt-pj-1		  . #x4F2F)	; &I-GT-18208; [47-15]
+      (=ucs@jis		  . #x6717)	; &GT-18208;
+      (mojikyo		  . 050221)	; &MCS-6000C42D;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #xF929)	; 朗
+	(=jis-x0213-1-2000  . #x754E)	; &I-JX1-754E; [85-46]
+	))
+      )
+     ((=gb2312		  . #x404A)	; &C1-5576; [32-42]
+      (=cns11643-1	  . #x5576)	; &I-C1-5576; [53-86]
+      (=ucs@unicode	  . #x6717)	; &C1-5576;
+      ))
     ))
 (define-char
   '((ideographic-radical . 74)	; ⽉
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=ucs		. #x2336E)	; 𣍮
-    (=cns11643-6	. #x3843)	; &I-C6-3843; [24-35]
-    ))
-(define-char
-  '((ideographic-	(:radical	74 ; ⽉
-			 :strokes	6
-			 :sources	(cns-11643))
-			(:radical	130 ; ⾁
-			 :strokes	6
-			 :sources	(ucs)))
-    (total-strokes	 . 10)
-    (hanyu-dazidian	3 2067 2)
-    (=ucs		. #x266B9)	; 𦚹
-    (=cns11643-5	. #x2E24)	; &I-C5-2E24; [14-04]
-    (=hanziku-6		. #xA9C1)	; &I-HZK06-A9C1;
-    ))
-(define-char
-  '((=>ucs		. #x6716)	; 朖
-    (ideographic-radical . 74)	; ⽉
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (shinjigen-2	. 3442)
-    (=jis-x0208		. #x5B2D)	; &GT-18227; [59-13]
-    (=gt		. 18227)	; &I-GT-18227;
-    (=gt-pj-1		. #x5B2D)	; &I-GT-18227; [59-13]
-    (=daikanwa		. 14363)	; &I-M-14363;
-    (=ucs@jis		. #x6716)	; &GT-18227;
-    ))
-(define-char
-  '((morohashi-daikanwa	14363 0 0)
-    (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x6716)	; 朖
-    (=cns11643-3	. #x3648)	; &I-C3-3648; [22-40]
+    (->subsumptive
+     ((=daikanwa	  . 14363)	; &M-14363;
+      )
+     ((shinjigen-1	  . 3442)
+      (shinjigen-2	  . 3442)
+      (=jis-x0208	  . #x5B2D)	; &GT-18227; [59-13]
+      (=gt		  . 18227)	; &I-GT-18227;
+      (=gt-pj-1		  . #x5B2D)	; &I-GT-18227; [59-13]
+      (=ucs@jis		  . #x6716)	; &GT-18227;
+      )
+     ((=cns11643-3	  . #x3648)	; &C3-3648; [22-40]
+      (=ucs@unicode	  . #x6716)	; &C3-3648;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x2F8D8)	; 朗
+  '((<-denotational
+     ((=ucs		  . #x6717)	; 朗
+      ))
     (=>ucs*		. #x6717)	; 朗
     (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ks-x1001		. #x5547)	; &M-14364; [53-39]
-    (=jis-x0213-1-2000	. #x754E)	; &I-JX1-754E; [85-46]
-    (=daikanwa		. 14364)	; &I-M-14364;
-    (=jef-china3	. #x52AD)	; &I-JC3-52AD;
-    (=ucs@jis		. #xF929)	; &M-14364;
-    (=ucs@ks		. #x6717)	; &M-14364;
+    (=ucs		. #x2F8D8)	; 朗
+    (->subsumptive
+     ((=ucs		  . #xF929)	; 朗
+      (=jis-x0213-1-2000  . #x754E)	; &I-JX1-754E; [85-46]
+      (=daikanwa	  . 14364)	; &I-M-14364;
+      (->subsumptive
+       ((=ks-x1001	    . #x5547)	; &K0-5547; [53-39]
+	(=ucs@ks	    . #x6717)	; &K0-5547;
+	)
+       ((=ks-x1001	    . #x5228)	; &K0-5228; [50-08]
+	(=ucs@ks	    . #xF929)	; &K0-5228;
+	))
+      )
+     ((=jef-china3	  . #x52AD)	; &JC3-52AD;
+      )
+     ((=cns11643-4	  . #x323E)	; &C4-323E; [18-30]
+      (=ucs@iso		  . #x2F8D8)	; &C4-323E;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x2F8D8)	; 朗
-    (=>ucs*		. #x6717)	; 朗
-    (morohashi-daikanwa	14364 0 0)
-    (ideographic-radical . 74)	; ⽉
+  '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #xF929)	; 朗
-    (=ks-x1001		. #x5228)	; &I-K0-5228; [50-08]
+    (=ucs		. #x6718)	; 朘
+    (=big5		. #xD5AF)	; &I-B-D5AF;
     ))
 (define-char
-  '((=>ucs*		. #x6717)	; 朗
-    (morohashi-daikanwa	14364 0 1)
+  '((<-denotational
+     ((=ucs		  . #x6718)	; 朘
+      ))
     (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x2F8D8)	; 朗
-    (=cns11643-4	. #x323E)	; &I-C4-323E; [18-30]
-    ))
-(define-char
-  '((ideographic-radical . 74)	; ⽉
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=ucs		. #x6718)	; 朘
-    (=big5		. #xD5AF)	; &I-B-D5AF;
     (->subsumptive
      ((=daikanwa	  . 14365)	; &M-14365;
       )
      ((=cns11643-2	  . #x3571)	; &C2-3571; [21-81]
       (=ucs@cns		  . #x6718)	; &C2-3571;
-      )
-     ((=iso-ir165	  . #x7C54)	; &EGB-7C54; [92-52]
-      (=ucs@unicode	  . #x6718)	; &EGB-7C54;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x6718)	; 朘
+      ))
+    (ideographic-radical . 74)	; ⽉
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=iso-ir165		. #x7C54)	; &EGB-7C54; [92-52]
+    (=ucs@unicode	. #x6718)	; &EGB-7C54;
+    ))
+(define-char
   '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x6719)	; 朙
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6719)	; 朙
+      ))
+    (ideographic-radical . 74)	; ⽉
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
     (->subsumptive
      ((=jis-x0212	  . #x4272)	; &M-14366; [34-82]
       (=jis-x0213-2-2000  . #x2E3B)	; &I-JX2-2E3B; [14-27]
@@ -662,120 +726,119 @@
       )
      ((=cns11643-3	  . #x3647)	; &C3-3647; [22-39]
       (=jef-china3	  . #x52AE)	; &I-JC3-52AE;
-      )
-     ((=ucs@unicode	  . #x6719)	; &UU+6719;
       ))
     ))
 (define-char
-  '((=>ucs		. #x671A)	; 朚
-    (ideographic-radical . 74)	; ⽉
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=daikanwa	  . 00287)	; &I-M-00287;
-      )
-     ((=ucs		  . #x660E)	; 明
+  '((<-denotational
+     ((=ucs		  . #x6719)	; 朙
       ))
-    (=daikanwa		. 14367)	; &M-14367;
-    ))
-(define-char
-  '((=>ucs		. #x671A)	; 朚
-    (morohashi-daikanwa	14367 0 0)
     (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=jis-x0208	  . #x4B34)	; &GT-00378; [43-20]
-      (=ks-x1001	  . #x584C)	; &I-K0-584C; [56-44]
-      )
-     ((=ucs		  . #x660E)	; 明
-      ))
-    (=cbeta		. 02732)	; &CB02732;
+    (=ucs@unicode	. #x6719)	; &UU+6719;
     ))
 (define-char
-  '((=>ucs		. #x671A)	; 朚
-    (morohashi-daikanwa	14367 0 1)
-    (ideographic-radical . 74)	; ⽉
+  '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=cns11643-1	  . #x4441)	; &C1-4441; [36-33]
+    (=ucs		. #x671A)	; 朚
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=daikanwa	    . 00287)	; &I-M-00287;
+	)
+       ((=gt		    . 17473)	; &GT-17473;
+	(=daikanwa	    . 13805)	; &I-M-13805;
+	))
+      (=daikanwa	  . 14367)	; &M-14367;
       )
-     ((=ucs		  . #x660E)	; 明
-      ))
-    (=cns11643-3	. #x3646)	; &C3-3646; [22-38]
-    ))
-(define-char
-  '((morohashi-daikanwa	14367 0 2)
-    (ideographic-radical . 74)	; ⽉
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=jis-x0208	    . #x4B34)	; &GT-00378; [43-20]
+	(=ks-x1001	    . #x584C)	; &I-K0-584C; [56-44]
+	)
+       ((=jis-x0208	    . #x4C40)	; &GT-17472; [44-32]
+	(=gb2312	    . #x4377)	; &I-G0-4377; [35-87]
+	(=ks-x1001	    . #x5925)	; &I-K0-5925; [57-05]
+	(=cns11643-1	    . #x4D7C)	; &I-C1-4D7C; [45-92]
+	))
+      (=cbeta		  . 02732)	; &CB02732;
       )
-     ((=ucs		  . #x4EA1)	; 亡
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=cns11643-1	    . #x4441)	; &C1-4441; [36-33]
+	)
+       ((=jis-x0208	    . #x4C40)	; &GT-17472; [44-32]
+	(=gb2312	    . #x4377)	; &I-G0-4377; [35-87]
+	(=ks-x1001	    . #x5925)	; &I-K0-5925; [57-05]
+	(=cns11643-1	    . #x4D7C)	; &I-C1-4D7C; [45-92]
+	))
+      (=cns11643-3	  . #x3646)	; &C3-3646; [22-38]
       )
-     ((=ucs		  . #x660E)	; 明
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=gb2312	    . #x4D76)	; &G0-4D76; [45-86]
+	)
+       ((=jis-x0208	    . #x4C40)	; &GT-17472; [44-32]
+	(=gb2312	    . #x4377)	; &I-G0-4377; [35-87]
+	(=ks-x1001	    . #x5925)	; &I-K0-5925; [57-05]
+	(=cns11643-1	    . #x4D7C)	; &I-C1-4D7C; [45-92]
+	))
+      (=ucs@unicode	  . #x671A)	; &UU+671A;
       ))
-    (=ucs		. #x671A)	; 朚
-    ))
-(define-char
-  '((=>ucs		. #x671B)	; 望
-    (ideographic-radical . 74)	; ⽉
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=big5		. #xB1E6)	; &M-14368;
-    (=daikanwa		. 14368)	; &I-M-14368;
-    (=jef-china3	. #x52A6)	; &I-JC3-52A6;
-    (=ucs@big5		. #x671B)	; &M-14368;
-    ))
-(define-char
-  '((=>ucs		. #x671B)	; 望
-    (morohashi-daikanwa	14368 0 2)
-    (ideographic-radical . 74)	; ⽉
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=cns11643-1	. #x5B2C)	; &C1-5B2C; [59-12]
     ))
 (define-char
-  '((=>ucs		. #x671B)	; 望
-    (morohashi-daikanwa	14368 1)
-    (ideographic-radical . 74)	; ⽉
+  '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=jis-x0208		. #x4B3E)	; &GT-18223; [43-30]
-    (=ks-x1001		. #x5850)	; &I-K0-5850; [56-48]
-    (=gt		. 18223)	; &I-GT-18223;
-    (=gt-k		. 07876)	; &I-GT-K07876;
-    (=gt-pj-1		. #x4B3E)	; &I-GT-18223; [43-30]
-    (=ucs@jis		. #x671B)	; &GT-18223;
-    (mojikyo		. 050222)	; &MCS-6000C42E;
+    (=ucs		. #x671B)	; 望
     ))
 (define-char
-  '((=>ucs		. #x671B)	; 望
-    (morohashi-daikanwa	14368 1 0)
+  '((<-denotational
+     ((=ucs		  . #x671B)	; 望
+      ))
     (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=cns11643-6	. #x4058)	; &C6-4058; [32-56]
+    (=big5		. #xB1E6)	; &B-B1E6;
+    (=ucs@big5		. #x671B)	; &B-B1E6;
+    (->subsumptive
+     ((=daikanwa	  . 14368)	; &M-14368;
+      (=jef-china3	  . #x52A6)	; &I-JC3-52A6;
+      )
+     ((=cns11643-1	  . #x5B2C)	; &C1-5B2C; [59-12]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	14368 1 1)
+  '((<-denotational
+     ((=ucs		  . #x671B)	; 望
+      ))
     (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x671B)	; 望
-    (=gb2312		. #x4D7B)	; &I-G0-4D7B; [45-91]
+    (->subsumptive
+     ((morohashi-daikanwa	14368 1)
+      (=jis-x0208	  . #x4B3E)	; &GT-18223; [43-30]
+      (=ks-x1001	  . #x5850)	; &I-K0-5850; [56-48]
+      (=gt		  . 18223)	; &I-GT-18223;
+      (=gt-k		  . 07876)	; &I-GT-K07876;
+      (=gt-pj-1		  . #x4B3E)	; &I-GT-18223; [43-30]
+      (=ucs@jis		  . #x671B)	; &GT-18223;
+      (mojikyo		  . 050222)	; &MCS-6000C42E;
+      )
+     ((=cns11643-6	  . #x4058)	; &C6-4058; [32-56]
+      )
+     ((=gb2312		  . #x4D7B)	; &G0-4D7B; [45-91]
+      (=ucs@unicode	  . #x671B)	; &G0-4D7B;
+      ))
     ))
 (define-char
   '((=>ucs		. #x3B36)	; 㬶
@@ -1142,6 +1205,17 @@
       ))
     ))
 (define-char
+  '((=>daikanwa		. 29675)	; &M-29675;
+    (ideographic-radical@ucs . 74)	; ⽉
+    (ideographic-radical@misc . 130)	; ⾁
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=ucs		. #x23386)	; 𣎆
+    (<-same
+     ((=ucs		  . #x26760)	; 𦝠
+      ))
+    ))
+(define-char
   '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
@@ -1272,12 +1346,12 @@
     (total-strokes	 . 15)
     (=ucs		. #x23393)	; 𣎓
     (->subsumptive
-     ((<-wrong
+     ((=daikanwa	  . 14394)	; &M-14394;
+      (<-wrong
        ((=daikanwa	    . 29821)	; &M-29821;
 	))
       (<-wrong*sources
        daikanwa)
-      (=daikanwa	  . 14394)	; &M-14394;
       )
      ((=cns11643-4	  . #x4A34)	; &C4-4A34; [42-20]
       (=ucs@iso		  . #x23393)	; &C4-4A34;
diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el
index c9758c0..26d0f31 100644
--- a/lisp/utf-2000/Ideograph-R075-Tree.el
+++ b/lisp/utf-2000/Ideograph-R075-Tree.el
@@ -1117,11 +1117,11 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x675F)	; 束
-      ))
     (=gt-k		. 02598)	; &GT-K02598;
     (=gt-pj-k1		. #x3472)	; &GT-K02598; [20-82]
+    (<-formed@component/connect-right
+     ((=ucs		  . #x675F)	; 束
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -1176,15 +1176,18 @@
     (=daikanwa		. 14485)	; &M-14485;
     ))
 (define-char
-  '((=>ucs		. #x6761)	; 条
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5B6A)	; &GT-18893; [59-74]
-      (=ks-x1001	  . #x7049)	; &I-K0-7049; [80-41]
-      (=daikanwa	  . 14859)	; &I-M-14859;
+    (=ucs		. #x6761)	; 条
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6761)	; 条
       ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
     (shinjigen-2	. 3478)
     (=jis-x0208		. #x3E72)	; &GT-18408; [30-82]
     (=gt		. 18408)	; &I-GT-18408;
@@ -1192,24 +1195,32 @@
     (=gt-pj-1		. #x3E72)	; &I-GT-18408; [30-82]
     (=daikanwa		. 14486)	; &I-M-14486;
     (=ucs@jis		. #x6761)	; &GT-18408;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5B6A)	; &GT-18893; [59-74]
+      (=ks-x1001	  . #x7049)	; &I-K0-7049; [80-41]
+      (=daikanwa	  . 14859)	; &I-M-14859;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6761)	; 条
-    (morohashi-daikanwa	14486 0 1)
+  '((<-denotational
+     ((=ucs		  . #x6761)	; 条
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
-    (=cns11643-3	. #x264A)	; &C3-264A; [06-42]
+    (hanyu-dazidian	2 1161 8)
+    (=gb2312		. #x4C75)	; &HZK03-ED40; [44-85]
+    (=hanziku-3		. #xED40)	; &I-HZK03-ED40;
+    (=ucs@unicode	. #x6761)	; &HZK03-ED40;
     ))
 (define-char
-  '((morohashi-daikanwa	14486 0 2)
+  '((<-denotational
+     ((=ucs		  . #x6761)	; 条
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
-    (hanyu-dazidian	2 1161 8)
-    (=ucs		. #x6761)	; 条
-    (=gb2312		. #x4C75)	; &I-G0-4C75; [44-85]
-    (=hanziku-3		. #xED40)	; &I-HZK03-ED40;
+    (=cns11643-3	. #x264A)	; &C3-264A; [06-42]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -1251,10 +1262,6 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x4F86)	; 來
-      (=jis-x0208	  . #x5054)	; &I-J90-5054; [48-52]
-      ))
     (hanyu-dazidian	1 21 9)
     (shinjigen-1	. 240)
     (shinjigen-2	. 240)
@@ -1267,6 +1274,10 @@
     (=gt-k		. 02665)	; &I-GT-K02665;
     (=gt-pj-1		. #x4D68)	; &I-GT-18432; [45-72]
     (=daikanwa		. 14489)	; &I-M-14489;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x4F86)	; 來
+      (=jis-x0208	  . #x5054)	; &I-J90-5054; [48-52]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -2786,10 +2797,6 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6A1E)	; 樞
-      (=jis-x0208	  . #x5C64)	; &I-J90-5C64; [60-68]
-      ))
     (hanyu-dazidian	2 1166 3)
     (=jis-x0208		. #x3F75)	; &GT-18486; [31-85]
     (=gb2312		. #x4A60)	; &I-G0-4A60; [42-64]
@@ -2799,6 +2806,11 @@
     (=hanziku-3		. #xEDFD)	; &I-HZK03-EDFD;
     (=ucs@unicode	. #x67A2)	; &GT-18486;
     (mojikyo		. 050225)	; &MCS-6000C431;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5C64)	; &GT-19746; [60-68]
+      (=ks-x1001	  . #x7552)	; &I-K0-7552; [85-50]
+      (=daikanwa	  . 15450)	; &I-M-15450;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -4454,6 +4466,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x67F6)	; 柶
+    (=big5		. #xCF4E)	; &I-B-CF4E;
     (->subsumptive
      ((shinjigen-1	  . 3553)
       (=ks-x1001	  . #x5E5A)	; &M-14666; [62-58]
@@ -4461,8 +4474,7 @@
       (=daikanwa	  . 14666)	; &I-M-14666;
       (=ucs@jis		  . #x67F6)	; &M-14666;
       )
-     ((=big5		  . #xCF4E)	; &B-CF4E;
-      (=ucs@unicode	  . #x67F6)	; &B-CF4E;
+     ((=ucs@unicode	  . #x67F6)	; &UU+67F6;
       )
      ((=cns11643-2	  . #x2B30)	; &C2-2B30; [11-16]
       ))
@@ -4490,23 +4502,20 @@
     (=daikanwa		. 14669)	; &I-M-14669;
     ))
 (define-char
-  '((=>ucs		. #x67FC)	; 柼
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (=jis-x0213-1-2000	. #x755C)	; &M-14671; [85-60]
-    (=big5		. #xCF57)	; &I-B-CF57;
-    (=daikanwa		. 14671)	; &I-M-14671;
-    (=ucs@jis		. #x67FC)	; &M-14671;
-    (=ucs@big5		. #x67FC)	; &M-14671;
-    ))
-(define-char
-  '((morohashi-daikanwa	14671 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x67FC)	; 柼
-    (=cns11643-2	. #x2B39)	; &I-C2-2B39; [11-25]
+    (=big5		. #xCF57)	; &I-B-CF57;
+    (->subsumptive
+     ((=jis-x0213-1-2000  . #x755C)	; &M-14671; [85-60]
+      (=daikanwa	  . 14671)	; &I-M-14671;
+      (=ucs@jis		  . #x67FC)	; &M-14671;
+      )
+     ((=cns11643-2	  . #x2B39)	; &C2-2B39; [11-25]
+      )
+     ((=ucs@unicode	  . #x67FC)	; &UU+67FC;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -4715,6 +4724,7 @@
       )
      ((=ucs		  . #x6BCD)	; 母
       ))
+    (shinjigen-1	. 3581)
     (shinjigen-2	. 3581)
     (=ucs		. #x6802)	; 栂
     (=jis-x0208		. #x444E)	; &I-J90-444E; [36-46]
@@ -4725,46 +4735,41 @@
     (=cbeta		. 01267)	; &I-CB01267;
     ))
 (define-char
-  '((=>ucs		. #x6803)	; 栃
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (shinjigen-2	. 3582)
-    (=daikanwa		. 14687)	; &M-14687;
-    ))
-(define-char
-  '((morohashi-daikanwa	14687 0 1)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x6803)	; 栃
-    (=jis-x0208		. #x464A)	; &I-J90-464A; [38-42]
-    (=gt		. 18636)	; &I-GT-18636;
-    (=gt-pj-1		. #x464A)	; &I-GT-18636; [38-42]
-    ))
-(define-char
-  '((morohashi-daikanwa	14687 1)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x69AE)	; 榮
-      (=jis-x0208	  . #x5C46)	; &I-J90-5C46; [60-38]
+    (->subsumptive
+     ((shinjigen-1	  . 3582)
+      (shinjigen-2	  . 3582)
+      (=daikanwa	  . 14687)	; &M-14687;
+      )
+     ((=jis-x0208	  . #x464A)	; &GT-18636; [38-42]
+      (=gt		  . 18636)	; &I-GT-18636;
+      (=gt-pj-1		  . #x464A)	; &I-GT-18636; [38-42]
+      (=ucs@unicode	  . #x6803)	; &GT-18636;
       ))
-    (=ucs		. #x6804)	; 栄
-    (=jis-x0208		. #x3149)	; &I-J90-3149; [17-41]
-    (=gt		. 18547)	; &I-GT-18547;
-    (=gt-k		. 05023)	; &I-GT-K05023;
-    (=gt-pj-1		. #x3149)	; &I-GT-18547; [17-41]
-    (mojikyo		. 050226)	; &MCS-6000C432;
     ))
 (define-char
-  '((=>ucs		. #x6804)	; 栄
-    (morohashi-daikanwa	14687 1 2)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=cns11643-6	. #x3172)	; &C6-3172; [17-82]
+    (=ucs		. #x6804)	; 栄
+    (->subsumptive
+     ((morohashi-daikanwa	14687 1)
+      (=jis-x0208	  . #x3149)	; &GT-18547; [17-41]
+      (=gt		  . 18547)	; &I-GT-18547;
+      (=gt-k		  . 05023)	; &I-GT-K05023;
+      (=gt-pj-1		  . #x3149)	; &I-GT-18547; [17-41]
+      (=ucs@unicode	  . #x6804)	; &GT-18547;
+      (mojikyo		  . 050226)	; &MCS-6000C432;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x69AE)	; 榮
+	(=jis-x0208	    . #x5C46)	; &I-J90-5C46; [60-38]
+	))
+      )
+     ((=cns11643-6	  . #x3172)	; &C6-3172; [17-82]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -4780,12 +4785,6 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (<-wrong
-     ((=cns11643-2	  . #x2B40)	; &M-14584; [11-32]
-      (=daikanwa	  . 14584)	; &I-M-14584;
-      ))
-    (<-wrong*sources
-     daikanwa)
     (=jis-x0208@1983	. #x5B4A)	; &GT-18563; [59-42]
     (=jis-x0208@1990	. #x5B4A)	; &I-J90-5B4A; [59-42]
     (=cns11643-1	. #x5165)	; &I-C1-5165; [49-69]
@@ -4795,6 +4794,12 @@
     (=daikanwa		. 49161)	; &I-M-49161;
     (=jef-china3	. #x70CA)	; &I-JC3-70CA;
     (=ucs@unicode	. #x67B4)	; &GT-18563;
+    (<-wrong
+     ((=cns11643-2	  . #x2B40)	; &M-14584; [11-32]
+      (=daikanwa	  . 14584)	; &I-M-14584;
+      ))
+    (<-wrong*sources
+     daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -4804,16 +4809,16 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=ucs		. #x2F8DF)	; 柺
+    (=jis-x0208@1978	. #x5B4A)	; &I-J78-5B4A; [59-42]
+    (=cns11643-3	. #x2D35)	; &I-C3-2D35; [13-21]
+    (=daikanwa		. 49162)	; &I-M-49162;
     (<-wrong
      ((=cns11643-2	  . #x2B40)	; &M-14584; [11-32]
       (=daikanwa	  . 14584)	; &I-M-14584;
       ))
     (<-wrong*sources
      daikanwa)
-    (=ucs		. #x2F8DF)	; 柺
-    (=jis-x0208@1978	. #x5B4A)	; &I-J78-5B4A; [59-42]
-    (=cns11643-3	. #x2D35)	; &I-C3-2D35; [13-21]
-    (=daikanwa		. 49162)	; &I-M-49162;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -5022,69 +5027,64 @@
     (=hanziku-3		. #xF3F3)	; &I-HZK03-F3F3;
     ))
 (define-char
-  '((=>ucs		. #x6816)	; 栖
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (shinjigen-2	. 3681)
-    (=jis-x0208		. #x4034)	; &GT-18767; [32-20]
-    (=ks-x1001		. #x5F77)	; &I-K0-5F77; [63-87]
-    (=big5		. #xD1E1)	; &I-B-D1E1;
-    (=gt		. 18767)	; &I-GT-18767;
-    (=gt-pj-1		. #x4034)	; &I-GT-18767; [32-20]
-    (=daikanwa		. 14693)	; &I-M-14693;
-    (=ucs@jis		. #x6816)	; &GT-18767;
-    (=ucs@big5		. #x6816)	; &GT-18767;
-    ))
-(define-char
-  '((morohashi-daikanwa	14693 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6816)	; 栖
-    (=gb2312		. #x465C)	; &I-G0-465C; [38-60]
-    (=cns11643-2	. #x2F63)	; &I-C2-2F63; [15-67]
-    (=jef-china3	. #x8FD3)	; &I-JC3-8FD3;
-    (mojikyo		. 014693)	; &MCS-60003965;
-    ))
-(define-char
-  '((=>ucs		. #x23435)	; 𣐵
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=daikanwa		. 14694)	; &M-14694;
-    (mojikyo		. 014694)	; &MCS-60003966;
+    (=big5		. #xD1E1)	; &I-B-D1E1;
+    (->subsumptive
+     ((shinjigen-2	  . 3681)
+      (=jis-x0208	  . #x4034)	; &GT-18767; [32-20]
+      (=ks-x1001	  . #x5F77)	; &I-K0-5F77; [63-87]
+      (=gt		  . 18767)	; &I-GT-18767;
+      (=gt-pj-1		  . #x4034)	; &I-GT-18767; [32-20]
+      (=daikanwa	  . 14693)	; &I-M-14693;
+      (=ucs@jis		  . #x6816)	; &GT-18767;
+      )
+     ((=gb2312		  . #x465C)	; &C2-2F63; [38-60]
+      (=cns11643-2	  . #x2F63)	; &I-C2-2F63; [15-67]
+      (=jef-china3	  . #x8FD3)	; &I-JC3-8FD3;
+      (=ucs@unicode	  . #x6816)	; &C2-2F63;
+      (mojikyo		  . 014693)	; &MCS-60003965;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	14694 0 0)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
+  '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x23435)	; 𣐵
-    (=cns11643-6	. #x405C)	; &I-C6-405C; [32-60]
+    (->subsumptive
+     ((ideographic-strokes . 6)
+      (total-strokes	   . 10)
+      (=daikanwa	  . 14694)	; &M-14694;
+      (mojikyo		  . 014694)	; &MCS-60003966;
+      )
+     ((ideographic-strokes . 7)
+      (total-strokes	   . 11)
+      (=cns11643-6	  . #x405C)	; &C6-405C; [32-60]
+      )
+     ((ideographic-strokes . 7)
+      (total-strokes	   . 11)
+      (=ucs@iso		  . #x23435)	; &U-00023435;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (shinjigen-2	. 3624)
     (=ucs		. #x6817)	; 栗
-    (=jis-x0208		. #x372A)	; &I-J90-372A; [23-10]
-    (=gb2312		. #x4075)	; &I-G0-4075; [32-85]
-    (=ks-x1001		. #x574A)	; &I-K0-574A; [55-42]
-    (=big5		. #xAEDF)	; &I-B-AEDF;
-    (=gt		. 18817)	; &I-GT-18817;
-    (=gt-k		. 06409)	; &I-GT-K06409;
-    (=gt-pj-1		. #x372A)	; &I-GT-18817; [23-10]
-    (=daikanwa		. 14695)	; &I-M-14695;
-    ))
-(define-char
-  '((=>ucs		. #x6817)	; 栗
-    (morohashi-daikanwa	14695 0 1)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=cns11643-1	. #x5623)	; &C1-5623; [54-03]
+    (->subsumptive
+     ((shinjigen-2	  . 3624)
+      (=jis-x0208	  . #x372A)	; &GT-18817; [23-10]
+      (=gb2312		  . #x4075)	; &I-G0-4075; [32-85]
+      (=ks-x1001	  . #x574A)	; &I-K0-574A; [55-42]
+      (=big5		  . #xAEDF)	; &I-B-AEDF;
+      (=gt		  . 18817)	; &I-GT-18817;
+      (=gt-k		  . 06409)	; &I-GT-K06409;
+      (=gt-pj-1		  . #x372A)	; &I-GT-18817; [23-10]
+      (=daikanwa	  . 14695)	; &I-M-14695;
+      (=ucs@unicode	  . #x6817)	; &GT-18817;
+      )
+     ((=cns11643-1	  . #x5623)	; &C1-5623; [54-03]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -5301,17 +5301,17 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
-    (<-vulgar
-     ((=daikanwa	  . 15010)	; &M-15010;
-      ))
-    (<-vulgar*sources
-     zhengzi-tong daikanwa)
     (=jis-x0212		. #x434D)	; &M-14710; [35-45]
     (=iso-ir165		. #x7B6B)	; &I-EGB-7B6B; [91-75]
     (=cns11643-2	. #x2F5B)	; &I-C2-2F5B; [15-59]
     (=jis-x0213-2-2000	. #x2E59)	; &I-JX2-2E59; [14-57]
     (=daikanwa		. 14710)	; &I-M-14710;
     (=ucs@unicode	. #x681F)	; &M-14710;
+    (<-vulgar
+     ((=daikanwa	  . 15010)	; &M-15010;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa)
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -5854,33 +5854,28 @@
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
     (=ucs		. #x6840)	; 桀
-    (=gb2312		. #x686E)	; &I-G0-686E; [72-78]
-    (=big5		. #xAEE5)	; &I-B-AEE5;
-    (=daikanwa		. 14753)	; &I-M-14753;
-    ))
-(define-char
-  '((=>ucs		. #x6840)	; 桀
-    (morohashi-daikanwa	14753 0 1)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=cns11643-1	. #x5629)	; &C1-5629; [54-09]
-    ))
-(define-char
-  '((=>ucs		. #x6840)	; 桀
-    (morohashi-daikanwa	14753 0 2)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=jis-x0208		. #x5B5C)	; &GT-18861; [59-60]
-    (=ks-x1001		. #x4B7A)	; &I-K0-4B7A; [43-90]
-    (=gt		. 18861)	; &I-GT-18861;
-    (=gt-k		. 07943)	; &I-GT-K07943;
-    (=gt-pj-1		. #x5B5C)	; &I-GT-18861; [59-60]
-    (=ucs@jis		. #x6840)	; &GT-18861;
+    (->subsumptive
+     ((ideographic-strokes . 6)
+      (total-strokes	   . 10)
+      (=gb2312		  . #x686E)	; &M-14753; [72-78]
+      (=big5		  . #xAEE5)	; &I-B-AEE5;
+      (=daikanwa	  . 14753)	; &I-M-14753;
+      (=ucs@unicode	  . #x6840)	; &M-14753;
+      )
+     ((ideographic-strokes . 6)
+      (total-strokes	   . 10)
+      (=cns11643-1	  . #x5629)	; &C1-5629; [54-09]
+      )
+     ((ideographic-strokes . 7)
+      (total-strokes	   . 11)
+      (=jis-x0208	  . #x5B5C)	; &GT-18861; [59-60]
+      (=ks-x1001	  . #x4B7A)	; &I-K0-4B7A; [43-90]
+      (=gt		  . 18861)	; &I-GT-18861;
+      (=gt-k		  . 07943)	; &I-GT-K07943;
+      (=gt-pj-1		  . #x5B5C)	; &I-GT-18861; [59-60]
+      (=ucs@jis		  . #x6840)	; &GT-18861;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -6152,24 +6147,22 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (shinjigen-2	. 3616)
     (=ucs		. #x6851)	; 桑
-    (=jis-x0208		. #x372C)	; &I-J90-372C; [23-12]
-    (=gb2312		. #x4923)	; &I-G0-4923; [41-03]
-    (=ks-x1001		. #x5F4D)	; &I-K0-5F4D; [63-45]
-    (=big5		. #xAEE1)	; &I-B-AEE1;
-    (=gt		. 18778)	; &I-GT-18778;
-    (=gt-k		. 06410)	; &I-GT-K06410;
-    (=gt-pj-1		. #x372C)	; &I-GT-18778; [23-12]
-    (=daikanwa		. 14772)	; &I-M-14772;
-    ))
-(define-char
-  '((=>ucs		. #x6851)	; 桑
-    (morohashi-daikanwa	14772 0 1)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=cns11643-1	. #x5625)	; &C1-5625; [54-05]
+    (->subsumptive
+     ((shinjigen-1	  . 3616)
+      (shinjigen-2	  . 3616)
+      (=jis-x0208	  . #x372C)	; &GT-18778; [23-12]
+      (=gb2312		  . #x4923)	; &I-G0-4923; [41-03]
+      (=ks-x1001	  . #x5F4D)	; &I-K0-5F4D; [63-45]
+      (=big5		  . #xAEE1)	; &I-B-AEE1;
+      (=gt		  . 18778)	; &I-GT-18778;
+      (=gt-k		  . 06410)	; &I-GT-K06410;
+      (=gt-pj-1		  . #x372C)	; &I-GT-18778; [23-12]
+      (=daikanwa	  . 14772)	; &I-M-14772;
+      (=ucs@unicode	  . #x6851)	; &GT-18778;
+      )
+     ((=cns11643-1	  . #x5625)	; &C1-5625; [54-05]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -6304,10 +6297,6 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA44)	; 梅
-      (=jis-x0213-1-2000  . #x7565)	; &I-JX1-7565; [85-69]
-      ))
     (=ucs		. #x2F8E2)	; 梅
     (=jis-x0208		. #x475F)	; &I-J90-475F; [39-63]
     (=cns11643-4	. #x2D5C)	; &I-C4-2D5C; [13-60]
@@ -6315,6 +6304,10 @@
     (=gt-pj-1		. #x475F)	; &I-GT-18800; [39-63]
     (=ucs@jis		. #x6885)	; 梅
     (mojikyo		. 050227)	; &MCS-6000C433;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA44)	; 梅
+      (=jis-x0213-1-2000  . #x7565)	; &I-JX1-7565; [85-69]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -6331,15 +6324,15 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6AFB)	; æ«»
-      (=jis-x0208	  . #x5D2F)	; &I-J90-5D2F; [61-15]
-      ))
     (=ucs		. #x685C)	; 桜
     (=jis-x0208		. #x3A79)	; &I-J90-3A79; [26-89]
     (=gt		. 18686)	; &I-GT-18686;
     (=gt-pj-1		. #x3A79)	; &I-GT-18686; [26-89]
     (mojikyo		. 050228)	; &MCS-6000C434;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x6AFB)	; æ«»
+      (=jis-x0208	  . #x5D2F)	; &I-J90-5D2F; [61-15]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -6456,16 +6449,16 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x68E7)	; 棧
-      (=jis-x0208	  . #x5C22)	; &I-J90-5C22; [60-02]
-      ))
     (=ucs		. #x685F)	; 桟
     (=jis-x0208		. #x3B37)	; &I-J90-3B37; [27-23]
     (=gt		. 18745)	; &I-GT-18745;
     (=gt-k		. 06443)	; &I-GT-K06443;
     (=gt-pj-1		. #x3B37)	; &I-GT-18745; [27-23]
     (mojikyo		. 054139)	; &MCS-6000D37B;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x68E7)	; 棧
+      (=jis-x0208	  . #x5C22)	; &I-J90-5C22; [60-02]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -7318,7 +7311,9 @@
     (=jef-china3	. #x70CC)	; &I-JC3-70CC;
     (mojikyo		. 014839)	; &MCS-600039F7;
     (->mistakable
-     ((=daikanwa	  . 14840)	; &I-M-14840;
+     ((=jis-x0208@1978	  . #x5B74)	; &M-14840; [59-84]
+      (=cns11643-3	  . #x3651)	; &I-C3-3651; [22-49]
+      (=daikanwa	  . 14840)	; &I-M-14840;
       ))
     ))
 (define-char
@@ -7648,36 +7643,28 @@
     (=cns11643-4	. #x3834)	; &C4-3834; [24-20]
     ))
 (define-char
-  '((=>ucs		. #x689D)	; 條
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (shinjigen-2	. 3479)
-    (=jis-x0208		. #x5B6A)	; &GT-18893; [59-74]
-    (=ks-x1001		. #x7049)	; &I-K0-7049; [80-41]
-    (=big5		. #xB1F8)	; &I-B-B1F8;
-    (=gt		. 18893)	; &I-GT-18893;
-    (=gt-k		. 07945)	; &I-GT-K07945;
-    (=gt-pj-1		. #x5B6A)	; &I-GT-18893; [59-74]
-    (=daikanwa		. 14859)	; &I-M-14859;
-    (=ucs@jis		. #x689D)	; &GT-18893;
-    (=ucs@big5		. #x689D)	; &GT-18893;
-    ))
-(define-char
-  '((=>ucs		. #x689D)	; 條
-    (morohashi-daikanwa	14859 0 1)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=cns11643-1	. #x5B3E)	; &C1-5B3E; [59-30]
-    ))
-(define-char
-  '((morohashi-daikanwa	14859 0 2)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x689D)	; 條
-    (=gb12345		. #x4C75)	; 條 [44-85]
+    (->subsumptive
+     ((shinjigen-1	  . 3479)
+      (shinjigen-2	  . 3479)
+      (=jis-x0208	  . #x5B6A)	; &GT-18893; [59-74]
+      (=ks-x1001	  . #x7049)	; &I-K0-7049; [80-41]
+      (=big5		  . #xB1F8)	; &I-B-B1F8;
+      (=gt		  . 18893)	; &I-GT-18893;
+      (=gt-k		  . 07945)	; &I-GT-K07945;
+      (=gt-pj-1		  . #x5B6A)	; &I-GT-18893; [59-74]
+      (=daikanwa	  . 14859)	; &I-M-14859;
+      (=ucs@jis		  . #x689D)	; &GT-18893;
+      (=ucs@big5	  . #x689D)	; &GT-18893;
+      )
+     ((=cns11643-1	  . #x5B3E)	; &C1-5B3E; [59-30]
+      )
+     ((=gb12345		  . #x4C75)	; &UU+689D; [44-85]
+      (=ucs@unicode	  . #x689D)	; &UU+689D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -7690,77 +7677,90 @@
     (=hanziku-3		. #xF97E)	; &I-HZK03-F97E;
     ))
 (define-char
-  '((=>ucs		. #x689F)	; 梟
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=ucs		. #x689F)	; 梟
+    (=big5		. #xB1FA)	; &I-B-B1FA;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x689F)	; 梟
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (shinjigen-1	. 3628)
     (shinjigen-2	. 3628)
     (=jis-x0208		. #x5B66)	; &GT-18853; [59-70]
-    (=big5		. #xB1FA)	; &I-B-B1FA;
     (=gt		. 18853)	; &I-GT-18853;
     (=gt-k		. 07944)	; &I-GT-K07944;
     (=gt-pj-1		. #x5B66)	; &I-GT-18853; [59-70]
     (=daikanwa		. 14861)	; &I-M-14861;
     (=ucs@jis		. #x689F)	; &GT-18853;
-    (=ucs@big5		. #x689F)	; &GT-18853;
     ))
 (define-char
-  '((=>ucs		. #x689F)	; 梟
-    (morohashi-daikanwa	14861 0 2)
+  '((<-denotational
+     ((=ucs		  . #x689F)	; 梟
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ks-x1001		. #x7C7C)	; &K0-7C7C; [92-92]
+    (->subsumptive
+     ((=ks-x1001	  . #x7C7C)	; &K0-7C7C; [92-92]
+      )
+     ((=gb12345		  . #x6849)	; &UU+689F; [72-41]
+      (=ucs@unicode	  . #x689F)	; &UU+689F;
+      )
+     ((=cns11643-1	  . #x5B40)	; &C1-5B40; [59-32]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	14861 0 3)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=ucs		. #x689F)	; 梟
-    (=gb12345		. #x6849)	; 梟 [72-41]
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x68A0)	; 梠
     ))
 (define-char
-  '((=>ucs		. #x689F)	; 梟
-    (morohashi-daikanwa	14861 0 4)
+  '((<-denotational
+     ((=ucs		  . #x68A0)	; 梠
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=cns11643-1	. #x5B40)	; &C1-5B40; [59-32]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
+    (shinjigen-1	. 3658)
     (shinjigen-2	. 3658)
-    (=ucs		. #x68A0)	; 梠
-    (=jis-x0208		. #x5B71)	; &I-J90-5B71; [59-81]
-    (=iso-ir165		. #x7B69)	; &I-EGB-7B69; [91-73]
+    (=jis-x0208		. #x5B71)	; &GT-18984; [59-81]
     (=cns11643-2	. #x3631)	; &I-C2-3631; [22-17]
     (=big5		. #xD5CD)	; &I-B-D5CD;
     (=gt		. 18984)	; &I-GT-18984;
     (=gt-pj-1		. #x5B71)	; &I-GT-18984; [59-81]
     (=daikanwa		. 14862)	; &I-M-14862;
+    (=ucs@jis		. #x68A0)	; &GT-18984;
     ))
 (define-char
-  '((=>ucs		. #x68A1)	; 梡
+  '((<-denotational
+     ((=ucs		  . #x68A0)	; 梠
+      ))
     (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=ks-x1001		. #x6849)	; &M-14865; [72-41]
-    (=jis-x0212		. #x4373)	; &I-JSP-4373; [35-83]
-    (=big5		. #xB1FB)	; &I-B-B1FB;
-    (=daikanwa		. 14865)	; &I-M-14865;
-    (=ucs@jis		. #x68A1)	; &M-14865;
-    (=ucs@big5		. #x68A1)	; &M-14865;
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=iso-ir165		. #x7B69)	; &EGB-7B69; [91-73]
+    (=ucs@unicode	. #x68A0)	; &EGB-7B69;
     ))
 (define-char
-  '((morohashi-daikanwa	14865 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x68A1)	; 梡
-    (=cns11643-1	. #x5B41)	; &I-C1-5B41; [59-33]
+    (=big5		. #xB1FB)	; &I-B-B1FB;
+    (->subsumptive
+     ((=ks-x1001	  . #x6849)	; &M-14865; [72-41]
+      (=jis-x0212	  . #x4373)	; &I-JSP-4373; [35-83]
+      (=daikanwa	  . 14865)	; &I-M-14865;
+      (=ucs@jis		  . #x68A1)	; &M-14865;
+      )
+     ((=cns11643-1	  . #x5B41)	; &C1-5B41; [59-33]
+      (=ucs@unicode	  . #x68A1)	; &C1-5B41;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -7887,13 +7887,6 @@
     (ideographic-radical@cns*sources
      daikanwa=05784 cns11643 gt jis)
     (total-strokes	 . 11)
-    (<-vulgar
-     ((shinjigen-1	  . 1550)
-      (=cns11643-1	  . #x6842)	; &M-05802; [72-34]
-      (=daikanwa	  . 05802)	; &I-M-05802;
-      ))
-    (<-vulgar*sources
-     songyuan-yilai-suzipu zihui daikanwa shinjigen-1)
     (hanyu-dazidian	2 863 18)
     (shinjigen-1	. 1552)
     (shinjigen-2	. 1552)
@@ -7906,6 +7899,13 @@
     (=gt-pj-1		. #x546D)	; &I-GT-07313; [52-77]
     (=hanziku-3		. #xADD4)	; &I-HZK03-ADD4;
     (=jef-china3	. #x82A2)	; &I-JC3-82A2;
+    (<-vulgar
+     ((shinjigen-1	  . 1550)
+      (=cns11643-1	  . #x6842)	; &M-05802; [72-34]
+      (=daikanwa	  . 05802)	; &I-M-05802;
+      ))
+    (<-vulgar*sources
+     songyuan-yilai-suzipu zihui daikanwa shinjigen-1)
     (->subsumptive
      ((ideographic-radical . 36)	; â¼£
       (ideographic-strokes . 8)
@@ -9912,88 +9912,86 @@
     (=hanziku-4		. #xA5F6)	; &I-HZK04-A5F6;
     ))
 (define-char
-  '((=>ucs		. #x6900)	; 椀
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6728)	; 木
-      )
-     ((=jis-x0208	  . #x3038)	; &GT-08917; [16-24]
-      (=ks-x1001	  . #x6848)	; &I-K0-6848; [72-40]
-      (=daikanwa	  . 07110)	; &I-M-07110;
-      ))
-    (shinjigen-2	. 3699)
-    (=jis-x0208		. #x4F50)	; &GT-19211; [47-48]
-    (=ks-x1001		. #x684A)	; &I-K0-684A; [72-42]
-    (=gt		. 19211)	; &I-GT-19211;
-    (=gt-pj-1		. #x4F50)	; &I-GT-19211; [47-48]
-    (=daikanwa		. 15001)	; &I-M-15001;
-    (=cbeta		. 00179)	; &I-CB00179;
-    (=ucs@jis		. #x6900)	; &GT-19211;
-    ))
-(define-char
-  '((morohashi-daikanwa	15001 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (hanyu-dazidian	2 1239 2)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6728)	; 木
-      )
-     ((=ucs		  . #x5B9B)	; 宛
-      ))
     (=ucs		. #x6900)	; 椀
-    (=cns11643-3	. #x3C39)	; &I-C3-3C39; [28-25]
-    (=hanziku-4		. #xA753)	; &I-HZK04-A753;
-    ))
-(define-char
-  '((=>ucs		. #x6901)	; 椁
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6728)	; 木
-      )
-     ((=jis-x0208	  . #x357D)	; &GT-00396; [21-93]
-      (=ks-x1001	  . #x7A3D)	; &I-K0-7A3D; [90-29]
-      (=daikanwa	  . 00298)	; &I-M-00298;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=jis-x0208	    . #x3038)	; &GT-08917; [16-24]
+	(=ks-x1001	    . #x6848)	; &I-K0-6848; [72-40]
+	(=daikanwa	    . 07110)	; &I-M-07110;
+	))
+      (shinjigen-1	  . 3699)
+      (shinjigen-2	  . 3699)
+      (=jis-x0208	  . #x4F50)	; &GT-19211; [47-48]
+      (=ks-x1001	  . #x684A)	; &I-K0-684A; [72-42]
+      (=gt		  . 19211)	; &I-GT-19211;
+      (=gt-pj-1		  . #x4F50)	; &I-GT-19211; [47-48]
+      (=daikanwa	  . 15001)	; &I-M-15001;
+      (=cbeta		  . 00179)	; &I-CB00179;
+      (=ucs@jis		  . #x6900)	; &GT-19211;
+      )
+     ((hanyu-dazidian	  2 1239 2)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=gb2312	    . #x4D70)	; &C1-4C7D; [45-80]
+	(=cns11643-1	    . #x4C7D)	; &I-C1-4C7D; [44-93]
+	))
+      (=cns11643-3	  . #x3C39)	; &HZK04-A753; [28-25]
+      (=hanziku-4	  . #xA753)	; &I-HZK04-A753;
+      (=ucs@unicode	  . #x6900)	; &HZK04-A753;
       ))
-    (shinjigen-2	. 3663)
-    (=jis-x0208		. #x5B76)	; &GT-19012; [59-86]
-    (=gt		. 19012)	; &I-GT-19012;
-    (=gt-pj-1		. #x5B76)	; &I-GT-19012; [59-86]
-    (=daikanwa		. 15003)	; &I-M-15003;
-    (=cbeta		. 05956)	; &I-CB05956;
-    (=ucs@jis		. #x6901)	; &GT-19012;
     ))
 (define-char
-  '((morohashi-daikanwa	15003 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (hanyu-dazidian	2 1236 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6728)	; 木
-      )
-     ((=ucs		  . #x4EAB)	; 享
-      ))
     (=ucs		. #x6901)	; 椁
-    (=gb2312		. #x6924)	; &I-G0-6924; [73-04]
-    (=cns11643-3	. #x3C3B)	; &I-C3-3C3B; [28-27]
-    (=hanziku-4		. #xA6BB)	; &I-HZK04-A6BB;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=jis-x0208	    . #x357D)	; &GT-00396; [21-93]
+	(=ks-x1001	    . #x7A3D)	; &I-K0-7A3D; [90-29]
+	(=daikanwa	    . 00298)	; &I-M-00298;
+	))
+      (shinjigen-1	  . 3663)
+      (shinjigen-2	  . 3663)
+      (=jis-x0208	  . #x5B76)	; &GT-19012; [59-86]
+      (=gt		  . 19012)	; &I-GT-19012;
+      (=gt-pj-1		  . #x5B76)	; &I-GT-19012; [59-86]
+      (=daikanwa	  . 15003)	; &I-M-15003;
+      (=cbeta		  . 05956)	; &I-CB05956;
+      (=ucs@jis		  . #x6901)	; &GT-19012;
+      )
+     ((hanyu-dazidian	  2 1236 11)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=gb2312	    . #x4F6D)	; &C1-4B6A; [47-77]
+	(=cns11643-1	    . #x4B6A)	; &I-C1-4B6A; [43-74]
+	))
+      (=gb2312		  . #x6924)	; &HZK04-A6BB; [73-04]
+      (=cns11643-3	  . #x3C3B)	; &I-C3-3C3B; [28-27]
+      (=hanziku-4	  . #xA6BB)	; &I-HZK04-A6BB;
+      (=ucs@unicode	  . #x6901)	; &HZK04-A6BB;
+      ))
     ))
 (define-char
   '((=>ucs		. #x6902)	; 椂
@@ -10671,27 +10669,24 @@
     (mojikyo		. 054056)	; &MCS-6000D328;
     ))
 (define-char
-  '((morohashi-daikanwa	15065 1)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6AA2)	; 檢
-      (=jis-x0208	  . #x5C7D)	; &I-J90-5C7D; [60-93]
-      ))
     (=ucs		. #x691C)	; 検
-    (=jis-x0208		. #x3821)	; &I-J90-3821; [24-01]
-    (=gt		. 19053)	; &I-GT-19053;
-    (=gt-pj-1		. #x3821)	; &I-GT-19053; [24-01]
-    (mojikyo		. 050229)	; &MCS-6000C435;
-    ))
-(define-char
-  '((=>ucs		. #x691C)	; 検
-    (morohashi-daikanwa	15065 1 0)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=cns11643-3	. #x3C44)	; &C3-3C44; [28-36]
+    (->subsumptive
+     ((morohashi-daikanwa	15065 1)
+      (=jis-x0208	  . #x3821)	; &GT-19053; [24-01]
+      (=gt		  . 19053)	; &I-GT-19053;
+      (=gt-pj-1		  . #x3821)	; &I-GT-19053; [24-01]
+      (=ucs@unicode	  . #x691C)	; &GT-19053;
+      (mojikyo		  . 050229)	; &MCS-6000C435;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x6AA2)	; 檢
+	(=jis-x0208	    . #x5C7D)	; &I-J90-5C7D; [60-93]
+	))
+      )
+     ((=cns11643-3	  . #x3C44)	; &C3-3C44; [28-36]
+      ))
     ))
 (define-char
   '((=>ucs		. #x3B87)	; 㮇
@@ -12473,7 +12468,15 @@
     (=daikanwa		. 15152)	; &I-M-15152;
     ))
 (define-char
-  '((=>ucs		. #x6961)	; 楡
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=ucs		. #x6961)	; 楡
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6961)	; 楡
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
@@ -12487,19 +12490,17 @@
     (=ucs@jis		. #x6961)	; &GT-19414;
     ))
 (define-char
-  '((morohashi-daikanwa	15153 0 0)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=ucs		. #x6961)	; 楡
-    ))
-(define-char
-  '((=>ucs		. #x6961)	; 楡
-    (morohashi-daikanwa	15153 0 1)
+  '((<-denotational
+     ((=ucs		  . #x6961)	; 楡
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=cns11643-3	. #x4179)	; &C3-4179; [33-89]
+    (->subsumptive
+     ((=ucs@unicode	  . #x6961)	; &UU+6961;
+      )
+     ((=cns11643-3	  . #x4179)	; &C3-4179; [33-89]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -12534,15 +12535,15 @@
      ((=cns11643-2	  . #x4353)	; &C2-4353; [35-51]
       (=ucs@cns		  . #x6962)	; &C2-4353;
       )
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x466A)	; &J78-466A; [38-74]
-	(=ks-x1001	    . #x6A79)	; &I-K0-6A79; [74-89]
-	))
-      (=jis-x0208@1983	  . #x466A)	; &GT-19314; [38-74]
+     ((=jis-x0208@1983	  . #x466A)	; &GT-19314; [38-74]
       (=jis-x0208@1990	  . #x466A)	; &I-J90-466A; [38-74]
       (=gt		  . 19314)	; &I-GT-19314;
       (=gt-pj-1		  . #x466A)	; &I-GT-19314; [38-74]
       (=ucs@jis		  . #x6962)	; &GT-19314;
+      (<-simplified@JP/misc
+       ((=jis-x0208@1978    . #x466A)	; &J78-466A; [38-74]
+	(=ks-x1001	    . #x6A79)	; &I-K0-6A79; [74-89]
+	))
       )
      ((=iso-ir165	  . #x7C21)	; &EGB-7C21; [92-01]
       (=jef-china3	  . #x70C5)	; &I-JC3-70C5;
@@ -13124,53 +13125,49 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6A13)	; 樓
-      (=jis-x0208	  . #x5C6C)	; &I-J90-5C6C; [60-76]
-      ))
-    (hanyu-dazidian	2 1255 3)
-    (shinjigen-2	. 3739)
     (=ucs		. #x697C)	; 楼
-    (=jis-x0208		. #x4F30)	; &I-J90-4F30; [47-16]
-    (=gb2312		. #x4225)	; &I-G0-4225; [34-05]
-    (=gt		. 19428)	; &I-GT-19428;
-    (=gt-pj-1		. #x4F30)	; &I-GT-19428; [47-16]
-    (=daikanwa		. 15212)	; &I-M-15212;
-    (=hanziku-4		. #xAA7D)	; &I-HZK04-AA7D;
-    ))
-(define-char
-  '((=>ucs		. #x697C)	; 楼
-    (morohashi-daikanwa	15212 0 1)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=cns11643-3	. #x416A)	; &C3-416A; [33-74]
+    (->subsumptive
+     ((hanyu-dazidian	  2 1255 3)
+      (shinjigen-2	  . 3739)
+      (=jis-x0208	  . #x4F30)	; &GT-19428; [47-16]
+      (=gb2312		  . #x4225)	; &I-G0-4225; [34-05]
+      (=gt		  . 19428)	; &I-GT-19428;
+      (=gt-pj-1		  . #x4F30)	; &I-GT-19428; [47-16]
+      (=daikanwa	  . 15212)	; &I-M-15212;
+      (=hanziku-4	  . #xAA7D)	; &I-HZK04-AA7D;
+      (=ucs@unicode	  . #x697C)	; &GT-19428;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5C6C)	; &GT-19836; [60-76]
+	(=ks-x1001	    . #x5727)	; &I-K0-5727; [55-07]
+	(=daikanwa	    . 15430)	; &I-M-15430;
+	))
+      )
+     ((=cns11643-3	  . #x416A)	; &C3-416A; [33-74]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6A02)	; 樂
-      (=jis-x0208	  . #x5C5B)	; &I-J90-5C5B; [60-59]
-      ))
-    (hanyu-dazidian	8 20 14)
-    (shinjigen-2	. 3706)
     (=ucs		. #x697D)	; 楽
-    (=jis-x0208		. #x335A)	; &I-J90-335A; [19-58]
-    (=gt		. 19243)	; &I-GT-19243;
-    (=gt-k		. 10182)	; &I-GT-K10182;
-    (=gt-pj-1		. #x335A)	; &I-GT-19243; [19-58]
-    (=daikanwa		. 15213)	; &I-M-15213;
-    (=hanziku-12	. #xED54)	; &I-HZK12-ED54;
-    ))
-(define-char
-  '((=>ucs		. #x697D)	; 楽
-    (morohashi-daikanwa	15213 0 1)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=cns11643-3	. #x417B)	; &C3-417B; [33-91]
+    (->subsumptive
+     ((hanyu-dazidian	  8 20 14)
+      (shinjigen-2	  . 3706)
+      (=jis-x0208	  . #x335A)	; &GT-19243; [19-58]
+      (=gt		  . 19243)	; &I-GT-19243;
+      (=gt-k		  . 10182)	; &I-GT-K10182;
+      (=gt-pj-1		  . #x335A)	; &I-GT-19243; [19-58]
+      (=daikanwa	  . 15213)	; &I-M-15213;
+      (=hanziku-12	  . #xED54)	; &I-HZK12-ED54;
+      (=ucs@unicode	  . #x697D)	; &GT-19243;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5C5B)	; &GT-19659; [60-59]
+	(=ks-x1001	    . #x6445)	; &I-K0-6445; [68-37]
+	(=daikanwa	    . 15399)	; &I-M-15399;
+	))
+      )
+     ((=cns11643-3	  . #x417B)	; &C3-417B; [33-91]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -13223,22 +13220,19 @@
     (=jef-china3	. #x53EE)	; &I-JC3-53EE;
     ))
 (define-char
-  '((=>ucs		. #x6981)	; 榁
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=jis-x0208		. #x5C43)	; &GT-19410; [60-35]
-    (=gt		. 19410)	; &I-GT-19410;
-    (=gt-pj-1		. #x5C43)	; &I-GT-19410; [60-35]
-    (=daikanwa		. 15217)	; &I-M-15217;
-    (=ucs@jis		. #x6981)	; &GT-19410;
-    ))
-(define-char
-  '((morohashi-daikanwa	15217 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x6981)	; 榁
+    (->subsumptive
+     ((=jis-x0208	  . #x5C43)	; &GT-19410; [60-35]
+      (=gt		  . 19410)	; &I-GT-19410;
+      (=gt-pj-1		  . #x5C43)	; &I-GT-19410; [60-35]
+      (=daikanwa	  . 15217)	; &I-M-15217;
+      (=ucs@jis		  . #x6981)	; &GT-19410;
+      )
+     ((=ucs@unicode	  . #x6981)	; &UU+6981;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -13248,14 +13242,14 @@
      ((morohashi-daikanwa	15217 1)
       (ideographic-strokes . 9)
       (total-strokes	   . 13)
+      (=jis-x0208@1978	  . #x3335)	; &J78-3335; [19-21]
+      (mojikyo		  . 050230)	; &MCS-6000C436;
       (<-simplified
        ((=ucs		    . #x69EA)	; 槪
 	(=daikanwa	    . 15364)	; &I-M-15364;
 	))
       (<-simplified*sources
        daikanwa)
-      (=jis-x0208@1978	  . #x3335)	; &J78-3335; [19-21]
-      (mojikyo		  . 050230)	; &MCS-6000C436;
       )
      ((ideographic-strokes . 9)
       (total-strokes	   . 13)
@@ -13264,15 +13258,15 @@
       )
      ((ideographic-strokes . 9)
       (total-strokes	   . 13)
-      (<-simplified@JP/Jouyou
-       ((=ks-x1001	    . #x4B48)	; &GT-19861; [43-40]
-	(=jis-x0213-1-2000  . #x7624)	; &I-JX1-7624; [86-04]
-	))
       (=jis-x0208@1990	  . #x3335)	; &GT-19449; [19-21]
       (=cns11643-1	  . #x644D)	; &I-C1-644D; [68-45]
       (=gt		  . 19449)	; &I-GT-19449;
       (=gt-pj-1		  . #x3335)	; &I-GT-19449; [19-21]
       (=ucs@jis		  . #x6982)	; &GT-19449;
+      (<-simplified@JP/Jouyou
+       ((=ks-x1001	    . #x4B48)	; &GT-19861; [43-40]
+	(=jis-x0213-1-2000  . #x7624)	; &I-JX1-7624; [86-04]
+	))
       )
      ((ideographic-strokes . 10)
       (total-strokes	   . 14)
@@ -13928,15 +13922,15 @@
     (=big5		. #xB77D)	; &B-B77D;
     (=ucs@big5		. #x6994)	; &B-B77D;
     (->subsumptive
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x4F31)	; &M-15226; [47-17]
-	(=daikanwa	    . 15226)	; &I-M-15226;
-	))
-      (=jis-x0208@1983	  . #x4F31)	; &GT-19429; [47-17]
+     ((=jis-x0208@1983	  . #x4F31)	; &GT-19429; [47-17]
       (=jis-x0208@1990	  . #x4F31)	; &I-J90-4F31; [47-17]
       (=gt		  . 19429)	; &I-GT-19429;
       (=gt-pj-1		  . #x4F31)	; &I-GT-19429; [47-17]
       (=ucs@jis		  . #x6994)	; &GT-19429;
+      (<-simplified@JP/misc
+       ((=jis-x0208@1978    . #x4F31)	; &M-15226; [47-17]
+	(=daikanwa	    . 15226)	; &I-M-15226;
+	))
       )
      ((=gb2312		  . #x4046)	; &C1-6445; [32-38]
       (=cns11643-1	  . #x6445)	; &I-C1-6445; [68-37]
@@ -15064,92 +15058,106 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x69C3)	; 槃
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (shinjigen-2	. 3772)
-    (=jis-x0208		. #x5C51)	; &GT-19601; [60-49]
-    (=ks-x1001		. #x5A69)	; &I-K0-5A69; [58-73]
+    (=ucs		. #x69C3)	; 槃
     (=big5		. #xBA6E)	; &I-B-BA6E;
-    (=gt		. 19601)	; &I-GT-19601;
-    (=gt-k		. 11212)	; &I-GT-K11212;
-    (=gt-pj-1		. #x5C51)	; &I-GT-19601; [60-49]
-    (=daikanwa		. 15303)	; &I-M-15303;
-    (=ucs@jis		. #x69C3)	; &GT-19601;
-    (=ucs@big5		. #x69C3)	; &GT-19601;
+    (->subsumptive
+     ((shinjigen-1	  . 3771)
+      (shinjigen-2	  . 3772)
+      (=jis-x0208	  . #x5C51)	; &GT-19601; [60-49]
+      (=ks-x1001	  . #x5A69)	; &I-K0-5A69; [58-73]
+      (=gt		  . 19601)	; &I-GT-19601;
+      (=gt-k		  . 11212)	; &I-GT-K11212;
+      (=gt-pj-1		  . #x5C51)	; &I-GT-19601; [60-49]
+      (=daikanwa	  . 15303)	; &I-M-15303;
+      (=ucs@jis		  . #x69C3)	; &GT-19601;
+      )
+     ((=ucs@unicode	  . #x69C3)	; &UU+69C3;
+      )
+     ((=cns11643-1	  . #x6937)	; &C1-6937; [73-23]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15303 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x69C3)	; 槃
+    (=ucs		. #x69C4)	; 槄
+    (=big5		. #xE24F)	; &I-B-E24F;
     ))
 (define-char
-  '((=>ucs		. #x69C3)	; 槃
-    (morohashi-daikanwa	15303 0 1)
+  '((<-denotational
+     ((=ucs		  . #x69C4)	; 槄
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=cns11643-1	. #x6937)	; &C1-6937; [73-23]
+    (=daikanwa		. 15305)	; &M-15305;
     ))
 (define-char
-  '((=>ucs		. #x69C4)	; 槄
+  '((<-denotational
+     ((=ucs		  . #x69C4)	; 槄
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=big5		. #xE24F)	; &M-15305;
-    (=daikanwa		. 15305)	; &I-M-15305;
-    (=ucs@big5		. #x69C4)	; &M-15305;
+    (=cns11643-2	. #x4A75)	; &C2-4A75; [42-85]
+    (=ucs@unicode	. #x69C4)	; &C2-4A75;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x69C5)	; 槅
     ))
 (define-char
-  '((morohashi-daikanwa	15305 0 2)
+  '((<-denotational
+     ((=ucs		  . #x69C5)	; 槅
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x69C4)	; 槄
-    (=cns11643-2	. #x4A75)	; &I-C2-4A75; [42-85]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=jis-x0208	  . #x722F)	; &M-45672; [82-15]
+      (=daikanwa	  . 45672)	; &I-M-45672;
+      ))
+    (=jis-x0212		. #x4465)	; &M-15306; [36-69]
+    (=daikanwa		. 15306)	; &I-M-15306;
+    (=cbeta		. 00184)	; &I-CB00184;
+    (=ucs@jis		. #x69C5)	; &M-15306;
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x69C5)	; 槅
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x69C5)	; 槅
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x6728)	; 木
-	)
-       ((=jis-x0208	    . #x722F)	; &M-45672; [82-15]
-	(=daikanwa	    . 45672)	; &I-M-45672;
-	))
-      (=jis-x0212	  . #x4465)	; &M-15306; [36-69]
-      (=daikanwa	  . 15306)	; &I-M-15306;
-      (=cbeta		  . 00184)	; &I-CB00184;
-      (=ucs@jis		  . #x69C5)	; &M-15306;
+    (hanyu-dazidian	2 1262 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((hanyu-dazidian	  2 1262 7)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x6728)	; 木
-	)
-       ((=gb2312	    . #x582A)	; &C1-586F; [56-10]
-	(=cns11643-1	    . #x586F)	; &I-C1-586F; [56-79]
-	))
-      (=iso-ir165	  . #x7C25)	; &HZK04-ABE6; [92-05]
-      (=cns11643-3	  . #x473B)	; &I-C3-473B; [39-27]
-      (=hanziku-4	  . #xABE6)	; &I-HZK04-ABE6;
-      (=ucs@unicode	  . #x69C5)	; &HZK04-ABE6;
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=gb2312		  . #x582A)	; &C1-586F; [56-10]
+      (=cns11643-1	  . #x586F)	; &I-C1-586F; [56-79]
       ))
+    (=iso-ir165		. #x7C25)	; &HZK04-ABE6; [92-05]
+    (=cns11643-3	. #x473B)	; &I-C3-473B; [39-27]
+    (=hanziku-4		. #xABE6)	; &I-HZK04-ABE6;
+    (=ucs@unicode	. #x69C5)	; &HZK04-ABE6;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x69C6)	; 槆
+    (=big5		. #xE262)	; &I-B-E262;
     ))
 (define-char
   '((<-denotational
@@ -15169,8 +15177,7 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=big5		. #xE262)	; &B-E262;
-    (=ucs@unicode	. #x69C6)	; &B-E262;
+    (=ucs@unicode	. #x69C6)	; &UU+69C6;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -15194,25 +15201,94 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((=>daikanwa		. 15310)	; &GT-19542;
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (hanyu-dazidian	2 1263 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
+    (=ucs		. #x69D9)	; 槙
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x69D9)	; 槙
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=jis-x0208@1983	. #x4B6A)	; &GT-19543; [43-74]
+    (=jis-x0208@1990	. #x4B6A)	; &I-J90-4B6A; [43-74]
+    (=gt		. 19543)	; &I-GT-19543;
+    (=gt-pj-1		. #x4B6A)	; &I-GT-19543; [43-74]
+    (=jef-china3	. #x54C4)	; &I-JC3-54C4;
+    (=ucs@jis		. #x69D9)	; &GT-19543;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x4B6A)	; &GT-19542; [43-74]
+      (=jis-x0208@1983	  . #x7422)	; &I-J83-7422; [84-02]
+      (=jis-x0208@1990	  . #x7422)	; &I-J90-7422; [84-02]
+      (=daikanwa	  . 15310)	; &I-M-15310;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x69D9)	; 槙
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=cns11643-2	. #x4B24)	; &C2-4B24; [43-04]
+    (=big5		. #xE25C)	; &I-B-E25C;
+    (=ucs@unicode	. #x69D9)	; &C2-4B24;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x69C8)	; 槈
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x69C8)	; 槈
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (->subsumptive
+     ((hanyu-dazidian	  2 1263 1)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=gb2312	    . #x4868)	; &C1-5849; [40-72]
+	(=cns11643-1	    . #x5849)	; &I-C1-5849; [56-41]
+	))
+      (=jis-x0212	  . #x4466)	; &M-15312; [36-70]
+      (=daikanwa	  . 15312)	; &I-M-15312;
+      (=hanziku-4	  . #xAC41)	; &I-HZK04-AC41;
+      (=cbeta		  . 02533)	; &I-CB02533;
+      (=ucs@unicode	  . #x69C8)	; &M-15312;
+      )
+     ((=cns11643-3	  . #x473C)	; &C3-473C; [39-28]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x69C8)	; 槈
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
      ((=ucs		  . #x6728)	; 木
       )
-     ((=ucs		  . #x8FB1)	; è¾±
+     ((=jis-x0208	  . #x3F2B)	; &GT-51624; [31-11]
+      (=ks-x1001	  . #x6934)	; &I-K0-6934; [73-20]
+      (=daikanwa	  . 38686)	; &I-M-38686;
       ))
-    (=ucs		. #x69C8)	; 槈
-    (=jis-x0212		. #x4466)	; &I-JSP-4466; [36-70]
-    (=cns11643-3	. #x473C)	; &I-C3-473C; [39-28]
-    (=daikanwa		. 15312)	; &I-M-15312;
-    (=hanziku-4		. #xAC41)	; &I-HZK04-AC41;
-    (=cbeta		. 02533)	; &I-CB02533;
-    (=jef-china3	. #x53F6)	; &I-JC3-53F6;
+    (=jef-china3	. #x53F6)	; &JC3-53F6;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -15249,28 +15325,37 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x69CB)	; 構
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x69CB)	; 構
+    (=big5		. #xBA63)	; &I-B-BA63;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x69CB)	; 構
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=big5		. #xBA63)	; &M-15317;
-    (=daikanwa		. 15317)	; &I-M-15317;
+    (=daikanwa		. 15317)	; &M-15317;
     (=jef-china3	. #x53F7)	; &I-JC3-53F7;
-    (=ucs@big5		. #x69CB)	; &M-15317;
     ))
 (define-char
-  '((morohashi-daikanwa	15317 0 1)
+  '((<-denotational
+     ((=ucs		  . #x69CB)	; 構
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x69CB)	; 構
-    (=jis-x0208		. #x393D)	; &I-J90-393D; [25-29]
+    (=jis-x0208		. #x393D)	; &GT-19495; [25-29]
     (=ks-x1001		. #x4F30)	; &I-K0-4F30; [47-16]
     (=cns11643-1	. #x692C)	; &I-C1-692C; [73-12]
-    (=gb12345		. #x3939)	; 構 [25-25]
+    (=gb12345		. #x3939)	; &GT-19495; [25-25]
     (=gt		. 19495)	; &I-GT-19495;
     (=gt-k		. 11119)	; &I-GT-K11119;
     (=gt-pj-1		. #x393D)	; &I-GT-19495; [25-29]
+    (=ucs@unicode	. #x69CB)	; &GT-19495;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -15296,11 +15381,6 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4448)	; &M-15318; [36-40]
-      (=ks-x1001	  . #x7759)	; &I-K0-7759; [87-57]
-      (=daikanwa	  . 15318)	; &I-M-15318;
-      ))
     (=gb2312		. #x6933)	; &GT-19365; [73-19]
     (=jis-x0208@1983	. #x4448)	; &I-J83-4448; [36-40]
     (=jis-x0208@1990	. #x4448)	; &I-J90-4448; [36-40]
@@ -15308,6 +15388,11 @@
     (=gt-pj-1		. #x4448)	; &I-GT-19365; [36-40]
     (=jef-china3	. #x70C4)	; &I-JC3-70C4;
     (=ucs@unicode	. #x69CC)	; &GT-19365;
+    (<-simplified@JP/misc
+     ((=jis-x0208@1978	  . #x4448)	; &M-15318; [36-40]
+      (=ks-x1001	  . #x7759)	; &I-K0-7759; [87-57]
+      (=daikanwa	  . 15318)	; &I-M-15318;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -15319,28 +15404,24 @@
     (=cns11643-1	. #x6935)	; &C1-6935; [73-21]
     ))
 (define-char
-  '((=>ucs		. #x69CD)	; 槍
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (shinjigen-2	. 3768)
-    (=jis-x0208		. #x4164)	; &GT-19558; [33-68]
-    (=ks-x1001		. #x7366)	; &I-K0-7366; [83-70]
-    (=cns11643-1	. #x6933)	; &I-C1-6933; [73-19]
-    (=big5		. #xBA6A)	; &I-B-BA6A;
-    (=gt		. 19558)	; &I-GT-19558;
-    (=gt-pj-1		. #x4164)	; &I-GT-19558; [33-68]
-    (=daikanwa		. 15319)	; &I-M-15319;
-    (=ucs@jis		. #x69CD)	; &GT-19558;
-    (=ucs@big5		. #x69CD)	; &GT-19558;
-    ))
-(define-char
-  '((morohashi-daikanwa	15319 0 1)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x69CD)	; 槍
-    (=gb12345		. #x4739)	; 槍 [39-25]
+    (=big5		. #xBA6A)	; &I-B-BA6A;
+    (->subsumptive
+     ((shinjigen-2	  . 3768)
+      (=jis-x0208	  . #x4164)	; &GT-19558; [33-68]
+      (=ks-x1001	  . #x7366)	; &I-K0-7366; [83-70]
+      (=cns11643-1	  . #x6933)	; &I-C1-6933; [73-19]
+      (=gt		  . 19558)	; &I-GT-19558;
+      (=gt-pj-1		  . #x4164)	; &I-GT-19558; [33-68]
+      (=daikanwa	  . 15319)	; &I-M-15319;
+      (=ucs@jis		  . #x69CD)	; &GT-19558;
+      )
+     ((=gb12345		  . #x4739)	; &UU+69CD; [39-25]
+      (=ucs@unicode	  . #x69CD)	; &UU+69CD;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -15448,6 +15529,37 @@
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x3BB8)	; 㮸
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3BB8)	; 㮸
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=daikanwa		. 15327)	; &M-15327;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3BB8)	; 㮸
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=ucs@unicode	. #x3BB8)	; &UU+3BB8;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3BB8)	; 㮸
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=cns11643-3	. #x4749)	; &C3-4749; [39-41]
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (ideographic-structure
@@ -15464,38 +15576,91 @@
     (=cbeta		. 01270)	; &I-CB01270;
     ))
 (define-char
-  '((=>ucs		. #x69D2)	; 槒
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x69D2)	; 槒
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=jis-x0208	    . #x435C)	; &GT-28000; [35-60]
+	(=ks-x1001	    . #x7565)	; &I-K0-7565; [85-69]
+	(=daikanwa	    . 21814)	; &I-M-21814;
+	))
+      (=daikanwa	  . 15332)	; &M-15332;
+      (=cbeta		  . 00183)	; &I-CB00183;
       )
-     ((=ucs		  . #x6728)	; 木
+     ((hanyu-dazidian	  2 1269 1)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=gb2312	    . #x5073)	; &C1-5665; [48-83]
+	(=cns11643-1	    . #x5665)	; &I-C1-5665; [54-69]
+	))
+      (=cns11643-3	  . #x4748)	; &HZK04-AD64; [39-40]
+      (=hanziku-4	  . #xAD64)	; &I-HZK04-AD64;
+      (=ucs@unicode	  . #x69D2)	; &HZK04-AD64;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x3BBA)	; 㮺
+    (=cns11643-3	. #x4750)	; &I-C3-4750; [39-48]
+    (=daikanwa		. 15333)	; &I-M-15333;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x23612)	; 𣘒
+    (->subsumptive
+     ((=daikanwa	  . 15338)	; &M-15338;
+      )
+     ((=ucs@iso		  . #x23612)	; &U-00023612;
       )
-     ((=ucs		  . #x755C)	; 畜
+     ((=cns11643-6	  . #x5D61)	; &C6-5D61; [61-65]
       ))
-    (=daikanwa		. 15332)	; &M-15332;
-    (=cbeta		. 00183)	; &I-CB00183;
     ))
 (define-char
-  '((morohashi-daikanwa	15332 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (hanyu-dazidian	2 1269 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x235F8)	; 𣗸
+    (->subsumptive
+     ((=daikanwa	  . 15339)	; &M-15339;
+      (=ucs@iso		  . #x235F8)	; &M-15339;
       )
-     ((=ucs		  . #x6728)	; 木
+     ((=cns11643-6	  . #x5D6C)	; &C6-5D6C; [61-76]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x235F5)	; 𣗵
+    (=cns11643-6	. #x5D67)	; &I-C6-5D67; [61-71]
+    (=daikanwa		. 15340)	; &I-M-15340;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x235F4)	; 𣗴
+    (->subsumptive
+     ((=daikanwa	  . 15341)	; &M-15341;
+      (=ucs@iso		  . #x235F4)	; &M-15341;
       )
-     ((=ucs		  . #x755C)	; 畜
+     ((=cns11643-6	  . #x5D6A)	; &C6-5D6A; [61-74]
       ))
-    (=ucs		. #x69D2)	; 槒
-    (=cns11643-3	. #x4748)	; &I-C3-4748; [39-40]
-    (=hanziku-4		. #xAD64)	; &I-HZK04-AD64;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -15559,6 +15724,26 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=ucs		. #x235F7)	; 𣗷
+    (->subsumptive
+     ((=daikanwa	  . 15348)	; &M-15348;
+      )
+     ((=cns11643-6	  . #x5D6B)	; &C6-5D6B; [61-75]
+      (=ucs@iso		  . #x235F7)	; &C6-5D6B;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x235F3)	; 𣗳
+    (=cns11643-3	. #x474B)	; &I-C3-474B; [39-43]
+    (=daikanwa		. 15350)	; &I-M-15350;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
     (hanyu-dazidian	8 20 18)
     (=ucs		. #x69D7)	; 槗
     (=jis-x0212		. #x4469)	; &I-JSP-4469; [36-73]
@@ -15588,50 +15773,59 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (->subsumptive
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x3A67)	; &M-15352; [26-71]
-	(=daikanwa	    . 15352)	; &I-M-15352;
-	))
-      (=jis-x0208@1983	  . #x3A67)	; &GT-19292; [26-71]
+     ((=jis-x0208@1983	  . #x3A67)	; &GT-19292; [26-71]
       (=jis-x0208@1990	  . #x3A67)	; &I-J90-3A67; [26-71]
       (=gt		  . 19292)	; &I-GT-19292;
       (=gt-pj-1		  . #x3A67)	; &I-GT-19292; [26-71]
       (=jef-china3	  . #x54C8)	; &I-JC3-54C8;
       (=ucs@jis		  . #x698A)	; &GT-19292;
+      (<-simplified@JP/misc
+       ((=jis-x0208@1978    . #x3A67)	; &M-15352; [26-71]
+	(=daikanwa	    . 15352)	; &I-M-15352;
+	))
       )
      ((=ucs@unicode	  . #x698A)	; &UU+698A;
       ))
     ))
 (define-char
-  '((=>ucs		. #x69D8)	; 様
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x69D8)	; 様
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x69D8)	; 様
+      ))
     (morohashi-daikanwa	15352 1)
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6A23)	; 樣
-      (=jis-x0208	  . #x5C6B)	; &I-J90-5C6B; [60-75]
-      ))
     (=jis-x0208		. #x4D4D)	; &GT-19625; [45-45]
     (=gt		. 19625)	; &I-GT-19625;
     (=gt-pj-1		. #x4D4D)	; &I-GT-19625; [45-45]
     (=ucs@jis		. #x69D8)	; &GT-19625;
     (mojikyo		. 050231)	; &MCS-6000C437;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x6A23)	; 樣
+      (=jis-x0208	  . #x5C6B)	; &I-J90-5C6B; [60-75]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x69D8)	; 様
-    (morohashi-daikanwa	15352 1 2)
+  '((<-denotational
+     ((=ucs		  . #x69D8)	; 様
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=cns11643-3	. #x4C54)	; &C3-4C54; [44-52]
+    (=ucs@unicode	. #x69D8)	; &UU+69D8;
     ))
 (define-char
-  '((morohashi-daikanwa	15352 1 5)
+  '((<-denotational
+     ((=ucs		  . #x69D8)	; 様
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x69D8)	; 様
+    (=cns11643-3	. #x4C54)	; &C3-4C54; [44-52]
     ))
 (define-char
   '((=>ucs		. #x23605)	; 𣘅
@@ -15794,44 +15988,6 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x3BB8)	; 㮸
-    (=cns11643-3	. #x4749)	; &I-C3-4749; [39-41]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x3BBA)	; 㮺
-    (=cns11643-3	. #x4750)	; &I-C3-4750; [39-48]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x69D9)	; 槙
-    (->subsumptive
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x4B6A)	; &GT-19542; [43-74]
-	(=jis-x0208@1983    . #x7422)	; &I-J83-7422; [84-02]
-	(=jis-x0208@1990    . #x7422)	; &I-J90-7422; [84-02]
-	(=daikanwa	    . 15310)	; &I-M-15310;
-	))
-      (=jis-x0208@1983	  . #x4B6A)	; &GT-19543; [43-74]
-      (=jis-x0208@1990	  . #x4B6A)	; &I-J90-4B6A; [43-74]
-      (=gt		  . 19543)	; &I-GT-19543;
-      (=gt-pj-1		  . #x4B6A)	; &I-GT-19543; [43-74]
-      (=jef-china3	  . #x54C4)	; &I-JC3-54C4;
-      (=ucs@jis		  . #x69D9)	; &GT-19543;
-      )
-     ((=cns11643-2	  . #x4B24)	; &C2-4B24; [43-04]
-      (=big5		  . #xE25C)	; &I-B-E25C;
-      (=ucs@unicode	  . #x69D9)	; &C2-4B24;
-      ))
-    ))
-(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]
@@ -16077,66 +16233,46 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x235F3)	; 𣗳
-    (=cns11643-3	. #x474B)	; &I-C3-474B; [39-43]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x235F4)	; 𣗴
-    (=cns11643-6	. #x5D6A)	; &I-C6-5D6A; [61-74]
+    (=ucs		. #x235FA)	; 𣗺
+    (=cns11643-5	. #x4656)	; &I-C5-4656; [38-54]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x235F5)	; 𣗵
-    (=cns11643-6	. #x5D67)	; &I-C6-5D67; [61-71]
+    (=ucs		. #x235FB)	; 𣗻
+    (=cns11643-5	. #x4657)	; &I-C5-4657; [38-55]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x235F7)	; 𣗷
-    (=cns11643-6	. #x5D6B)	; &I-C6-5D6B; [61-75]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x235F8)	; 𣗸
-    (=cns11643-6	. #x5D6C)	; &I-C6-5D6C; [61-76]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x235FA)	; 𣗺
-    (=cns11643-5	. #x4656)	; &I-C5-4656; [38-54]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x235FB)	; 𣗻
-    (=cns11643-5	. #x4657)	; &I-C5-4657; [38-55]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x23601)	; 𣘁
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=jis-x0208	    . #x5327)	; &GT-04543; [51-07]
+	(=ks-x1001	    . #x4A28)	; &I-K0-4A28; [42-08]
+	(=daikanwa	    . 03641)	; &I-M-03641;
+	))
+      (mojikyo		  . 061353)	; &MCS-6000EFA9;
       )
-     ((=ucs		  . #x6728)	; 木
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=gb2312	    . #x3867)	; &G0-3867; [24-71]
+	))
+      (=ucs@iso		  . #x23601)	; &U-00023601;
       )
-     ((=ucs		  . #x54E5)	; 哥
+     ((=cbeta		  . 04052)	; &CB04052;
       ))
-    (=ucs		. #x23601)	; 𣘁
-    (=cbeta		. 04052)	; &I-CB04052;
-    (mojikyo		. 061353)	; &MCS-6000EFA9;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -16154,16 +16290,16 @@
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x23612)	; 𣘒
-    ))
-(define-char
-  '((=>ucs		. #x23612)	; 𣘒
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=cns11643-6	. #x5D61)	; &C6-5D61; [61-65]
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x235B2)	; 𣖲
+    (->subsumptive
+     ((=daikanwa	  . 15252)	; &M-15252;
+      )
+     ((=ucs@iso		  . #x235B2)	; &U-000235B2;
+      )
+     ((=cns11643-7	  . #x2365)	; &C7-2365; [03-69]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -16337,7 +16473,25 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x3BBF)	; 㮿
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23615)	; 𣘕
+    (->subsumptive
+     ((=daikanwa	  . 15360)	; &M-15360;
+      )
+     ((=cns11643-7	  . #x2368)	; &C7-2368; [03-72]
+      (=ucs@iso		  . #x23615)	; &C7-2368;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x3BBF)	; 㮿
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3BBF)	; 㮿
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
@@ -16351,45 +16505,52 @@
       ))
     (=cns11643-3	. #x4C4E)	; &M-15361; [44-46]
     (=daikanwa		. 15361)	; &I-M-15361;
+    (=cbeta		. 00996)	; &I-CB00996;
     ))
 (define-char
-  '((morohashi-daikanwa	15361 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3BBF)	; 㮿
+      ))
     (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x6728)	; 木
       )
-     ((=ucs		  . #x7562)	; 畢
+     ((=gb12345		  . #x314F)	; &GT-28043; [17-47]
+      (=daikanwa	  . 21829)	; &GT-28043;
       ))
-    (=ucs		. #x3BBF)	; 㮿
-    (=cbeta		. 00996)	; &I-CB00996;
-    ))
-(define-char
-  '((=>ucs		. #x69E8)	; 槨
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (shinjigen-2	. 3664)
-    (=jis-x0208		. #x5C5A)	; &GT-19658; [60-58]
-    (=ks-x1001		. #x4E2A)	; &I-K0-4E2A; [46-10]
-    (=big5		. #xBCCD)	; &I-B-BCCD;
-    (=gt		. 19658)	; &I-GT-19658;
-    (=gt-pj-1		. #x5C5A)	; &I-GT-19658; [60-58]
-    (=daikanwa		. 15362)	; &I-M-15362;
-    (=ucs@jis		. #x69E8)	; &GT-19658;
-    (=ucs@big5		. #x69E8)	; &GT-19658;
+    (=ucs@unicode	. #x3BBF)	; &UU+3BBF;
     ))
 (define-char
-  '((morohashi-daikanwa	15362 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x69E8)	; 槨
-    (=cns11643-1	. #x6D37)	; &I-C1-6D37; [77-23]
+    (=big5		. #xBCCD)	; &I-B-BCCD;
+    (->subsumptive
+     ((shinjigen-1	  . 3664)
+      (shinjigen-2	  . 3664)
+      (=jis-x0208	  . #x5C5A)	; &GT-19658; [60-58]
+      (=ks-x1001	  . #x4E2A)	; &I-K0-4E2A; [46-10]
+      (=gt		  . 19658)	; &I-GT-19658;
+      (=gt-pj-1		  . #x5C5A)	; &I-GT-19658; [60-58]
+      (=daikanwa	  . 15362)	; &I-M-15362;
+      (=ucs@jis		  . #x69E8)	; &GT-19658;
+      (<-formed
+       ((shinjigen-1	    . 3663)
+	(=jis-x0208	    . #x5B76)	; &GT-19012; [59-86]
+	(=daikanwa	    . 15003)	; &I-M-15003;
+	))
+      (<-formed*sources
+       shinjigen-1)
+      )
+     ((=cns11643-1	  . #x6D37)	; &C1-6D37; [77-23]
+      (=ucs@unicode	  . #x69E8)	; &C1-6D37;
+      ))
     ))
 (define-char
   '((=>ucs		. #x69E9)	; 槩
@@ -16592,6 +16753,31 @@
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23617)	; 𣘗
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23617)	; 𣘗
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=daikanwa		. 15372)	; &M-15372;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23617)	; 𣘗
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-5	. #x4D5E)	; &C5-4D5E; [45-62]
+    (=ucs@iso		. #x23617)	; &C5-4D5E;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x69F0)	; 槰
     ))
 (define-char
@@ -16671,16 +16857,19 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (shinjigen-2	. 3789)
-    (=jis-x0208		. #x5C60)	; &GT-19706; [60-64]
-    (=cns11643-2	. #x5123)	; &I-C2-5123; [49-03]
-    (=big5		. #xE5DA)	; &I-B-E5DA;
-    (=gt		. 19706)	; &I-GT-19706;
-    (=gt-pj-1		. #x5C60)	; &I-GT-19706; [60-64]
-    (=daikanwa		. 15375)	; &I-M-15375;
-    (=ucs@cns		. #x69F2)	; &GT-19706;
-    (=ucs@jis		. #x69F2)	; &GT-19706;
-    (=ucs@big5		. #x69F2)	; &GT-19706;
+    (=big5		. #xE5DA)	; &B-E5DA;
+    (=ucs@big5		. #x69F2)	; &B-E5DA;
+    (->subsumptive
+     ((shinjigen-2	  . 3789)
+      (=jis-x0208	  . #x5C60)	; &GT-19706; [60-64]
+      (=gt		  . 19706)	; &I-GT-19706;
+      (=gt-pj-1		  . #x5C60)	; &I-GT-19706; [60-64]
+      (=daikanwa	  . 15375)	; &I-M-15375;
+      (=ucs@jis		  . #x69F2)	; &GT-19706;
+      )
+     ((=cns11643-2	  . #x5123)	; &C2-5123; [49-03]
+      (=ucs@cns		  . #x69F2)	; &C2-5123;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -16696,6 +16885,30 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ucs		. #x3BC0)	; 㯀
+    (->subsumptive
+     ((=daikanwa	  . 15376)	; &M-15376;
+      )
+     ((=cns11643-5	  . #x4D6D)	; &C5-4D6D; [45-77]
+      (=ucs@unicode	  . #x3BC0)	; &C5-4D6D;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23618)	; 𣘘
+    (->subsumptive
+     ((=daikanwa	  . 15377)	; &M-15377;
+      )
+     ((=cns11643-4	  . #x4A3B)	; &C4-4A3B; [42-27]
+      (=ucs@iso		  . #x23618)	; &C4-4A3B;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
     (=ucs		. #x69F3)	; 槳
     (=jis-x0212		. #x446F)	; &I-JSP-446F; [36-79]
     (=jis-x0213-2-2000	. #x2F47)	; &I-JX2-2F47; [15-39]
@@ -16840,43 +17053,74 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x69F9)	; 槹
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=jis-x0208		. #x5C5F)	; &GT-19695; [60-63]
-    (=cns11643-3	. #x4C5F)	; &I-C3-4C5F; [44-63]
-    (=gt		. 19695)	; &I-GT-19695;
-    (=gt-pj-1		. #x5C5F)	; &I-GT-19695; [60-63]
-    (=daikanwa		. 15385)	; &I-M-15385;
-    (=cbeta		. 01648)	; &I-CB01648;
-    (=ucs@jis		. #x69F9)	; &GT-19695;
+    (=ucs		. #x69F9)	; 槹
+    (->subsumptive
+     ((=jis-x0208	  . #x5C5F)	; &GT-19695; [60-63]
+      (=cns11643-3	  . #x4C5F)	; &I-C3-4C5F; [44-63]
+      (=gt		  . 19695)	; &I-GT-19695;
+      (=gt-pj-1		  . #x5C5F)	; &I-GT-19695; [60-63]
+      (=daikanwa	  . 15385)	; &I-M-15385;
+      (=cbeta		  . 01648)	; &I-CB01648;
+      (=ucs@jis		  . #x69F9)	; &GT-19695;
+      )
+     ((hanyu-dazidian	  2 1280 14)
+      (=hanziku-4	  . #xAFB9)	; &HZK04-AFB9;
+      (=ucs@iso		  . #x69F9)	; &HZK04-AFB9;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15385 0 1)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (hanyu-dazidian	2 1280 14)
-    (=ucs		. #x69F9)	; 槹
-    (=hanziku-4		. #xAFB9)	; &I-HZK04-AFB9;
+    (=ucs		. #x3BC1)	; 㯁
+    (->subsumptive
+     ((=daikanwa	  . 15386)	; &M-15386;
+      )
+     ((=cns11643-4	  . #x4A3A)	; &C4-4A3A; [42-26]
+      (=ucs@unicode	  . #x3BC1)	; &C4-4A3A;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x69FA)	; 槺
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 15388)	; &M-15388;
+    (=ucs		. #x23619)	; 𣘙
+    (->subsumptive
+     ((=daikanwa	  . 15387)	; &M-15387;
+      )
+     ((=cns11643-4	  . #x4A47)	; &C4-4A47; [42-39]
+      (=ucs@iso		  . #x23619)	; &C4-4A47;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15388 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (hanyu-dazidian	2 1283 13)
     (=ucs		. #x69FA)	; 槺
-    (=cns11643-3	. #x4C57)	; &I-C3-4C57; [44-55]
-    (=hanziku-4		. #xB059)	; &I-HZK04-B059;
+    (->subsumptive
+     ((=daikanwa	  . 15388)	; &M-15388;
+      )
+     ((hanyu-dazidian	  2 1283 13)
+      (=hanziku-4	  . #xB059)	; &HZK04-B059;
+      (=ucs@unicode	  . #x69FA)	; &HZK04-B059;
+      )
+     ((=cns11643-3	  . #x4C57)	; &C3-4C57; [44-55]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x2361A)	; 𣘚
+    (->subsumptive
+     ((=daikanwa	  . 15389)	; &M-15389;
+      )
+     ((=cns11643-5	  . #x4D5B)	; &C5-4D5B; [45-59]
+      (=ucs@iso		  . #x2361A)	; &C5-4D5B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -16912,6 +17156,14 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ucs		. #x3BC2)	; 㯂
+    (=cns11643-3	. #x4C4C)	; &I-C3-4C4C; [44-44]
+    (=daikanwa		. 15392)	; &I-M-15392;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
     (shinjigen-2	. 3796)
     (=ucs		. #x69FD)	; 槽
     (=jis-x0208		. #x4165)	; &I-J90-4165; [33-69]
@@ -16928,12 +17180,30 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x69FE)	; 槾
-    (=jis-x0212		. #x4471)	; &I-JSP-4471; [36-81]
-    (=iso-ir165		. #x2E4B)	; &I-EGB-2E4B; [14-43]
-    (=cns11643-2	. #x5121)	; &I-C2-5121; [49-01]
-    (=jis-x0213-2-2000	. #x2F4A)	; &I-JX2-2F4A; [15-42]
     (=big5		. #xE5D8)	; &I-B-E5D8;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x69FE)	; 槾
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=jis-x0212		. #x4471)	; &M-15394; [36-81]
+    (=cns11643-2	. #x5121)	; &I-C2-5121; [49-01]
     (=daikanwa		. 15394)	; &I-M-15394;
+    (=ucs@jis/1990	. #x69FE)	; &M-15394;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x69FE)	; 槾
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=iso-ir165		. #x2E4B)	; &JX2-2F4A; [14-43]
+    (=jis-x0213-2-2000	. #x2F4A)	; &I-JX2-2F4A; [15-42]
+    (=ucs@unicode	. #x69FE)	; &JX2-2F4A;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -16951,24 +17221,20 @@
     (=daikanwa		. 15395)	; &I-M-15395;
     ))
 (define-char
-  '((=>ucs		. #x6A00)	; 樀
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=jis-x0212		. #x4472)	; &M-15396; [36-82]
-    (=big5		. #xE5CA)	; &I-B-E5CA;
-    (=daikanwa		. 15396)	; &I-M-15396;
-    (=jef-china3	. #x53FC)	; &I-JC3-53FC;
-    (=ucs@jis		. #x6A00)	; &M-15396;
-    (=ucs@big5		. #x6A00)	; &M-15396;
-    ))
-(define-char
-  '((morohashi-daikanwa	15396 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x6A00)	; 樀
-    (=cns11643-2	. #x5071)	; &I-C2-5071; [48-81]
+    (=big5		. #xE5CA)	; &I-B-E5CA;
+    (->subsumptive
+     ((=jis-x0212	  . #x4472)	; &M-15396; [36-82]
+      (=daikanwa	  . 15396)	; &I-M-15396;
+      (=jef-china3	  . #x53FC)	; &I-JC3-53FC;
+      (=ucs@jis		  . #x6A00)	; &M-15396;
+      )
+     ((=cns11643-2	  . #x5071)	; &C2-5071; [48-81]
+      (=ucs@unicode	  . #x6A00)	; &C2-5071;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -16984,54 +17250,87 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x6A01)	; 樁
-    (=jis-x0212		. #x4473)	; &I-JSP-4473; [36-83]
-    (=cns11643-1	. #x6D38)	; &I-C1-6D38; [77-24]
-    (=gb12345		. #x572E)	; 樁 [55-14]
-    (=big5		. #xBCCE)	; &I-B-BCCE;
-    (=daikanwa		. 15398)	; &I-M-15398;
+    (->subsumptive
+     ((=jis-x0212	  . #x4473)	; &M-15398; [36-83]
+      (=big5		  . #xBCCE)	; &I-B-BCCE;
+      (=daikanwa	  . 15398)	; &I-M-15398;
+      (=ucs@jis		  . #x6A01)	; &M-15398;
+      )
+     ((=cns11643-1	  . #x6D38)	; &C1-6D38; [77-24]
+      (=gb12345		  . #x572E)	; &C1-6D38; [55-14]
+      (=ucs@unicode	  . #x6A01)	; &C1-6D38;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (shinjigen-2	. 3707)
     (=ucs		. #x6A02)	; 樂
-    (=jis-x0208		. #x5C5B)	; &I-J90-5C5B; [60-59]
-    (=ks-x1001		. #x6445)	; &I-K0-6445; [68-37]
-    (=gb12345		. #x4056)	; 樂 [32-54]
-    (=big5		. #xBCD6)	; &I-B-BCD6;
-    (=gt		. 19659)	; &I-GT-19659;
-    (=gt-k		. 11978)	; &I-GT-K11978;
-    (=gt-pj-1		. #x5C5B)	; &I-GT-19659; [60-59]
-    (=daikanwa		. 15399)	; &I-M-15399;
+    (->subsumptive
+     ((shinjigen-1	  . 3707)
+      (shinjigen-2	  . 3707)
+      (=jis-x0208	  . #x5C5B)	; &GT-19659; [60-59]
+      (=ks-x1001	  . #x6445)	; &I-K0-6445; [68-37]
+      (=gb12345		  . #x4056)	; &GT-19659; [32-54]
+      (=big5		  . #xBCD6)	; &I-B-BCD6;
+      (=gt		  . 19659)	; &I-GT-19659;
+      (=gt-k		  . 11978)	; &I-GT-K11978;
+      (=gt-pj-1		  . #x5C5B)	; &I-GT-19659; [60-59]
+      (=daikanwa	  . 15399)	; &I-M-15399;
+      (=ucs@unicode	  . #x6A02)	; &GT-19659;
+      )
+     ((=cns11643-1	  . #x6D40)	; &C1-6D40; [77-32]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6A02)	; 樂
-    (morohashi-daikanwa	15399 0 1)
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x6A03)	; 樃
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6A03)	; 樃
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (shinjigen-2	. 3707)
-    (=cns11643-1	. #x6D40)	; &C1-6D40; [77-32]
+    (->subsumptive
+     ((=jis-x0212	  . #x4474)	; &M-15400; [36-84]
+      (=daikanwa	  . 15400)	; &I-M-15400;
+      (=ucs@jis		  . #x6A03)	; &M-15400;
+      )
+     ((hanyu-dazidian	  2 1284 16)
+      (=cns11643-4	  . #x4A48)	; &HZK04-B07C; [42-40]
+      (=hanziku-4	  . #xB07C)	; &I-HZK04-B07C;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6A03)	; 樃
+  '((<-denotational
+     ((=ucs		  . #x6A03)	; 樃
+      ))
     (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x6A03)	; &UU+6A03;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=jis-x0212		. #x4474)	; &M-15400; [36-84]
-    (=daikanwa		. 15400)	; &I-M-15400;
-    (=ucs@jis		. #x6A03)	; &M-15400;
+    (=ucs		. #x2361B)	; 𣘛
+    (->subsumptive
+     ((=daikanwa	  . 15401)	; &M-15401;
+      (=ucs@iso		  . #x2361B)	; &M-15401;
+      )
+     ((=cns11643-4	  . #x4A40)	; &C4-4A40; [42-32]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15400 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (hanyu-dazidian	2 1284 16)
-    (=ucs		. #x6A03)	; 樃
-    (=cns11643-4	. #x4A48)	; &I-C4-4A48; [42-40]
-    (=hanziku-4		. #xB07C)	; &I-HZK04-B07C;
+    (=ucs		. #x2361C)	; 𣘜
+    (=cns11643-7	. #x2371)	; &I-C7-2371; [03-81]
+    (=daikanwa		. 15402)	; &I-M-15402;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -17060,6 +17359,12 @@
   '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x6A06)	; 樆
     (=big5		. #xE5CB)	; &I-B-E5CB;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6A06)	; 樆
+      ))
+    (ideographic-radical . 75)	; ⽊
     (->subsumptive
      ((ideographic-strokes . 11)
       (total-strokes	   . 15)
@@ -17069,21 +17374,51 @@
      ((ideographic-strokes . 10)
       (total-strokes	   . 14)
       (=ucs@unicode	  . #x6A06)	; &UU+6A06;
-      )
-     ((ideographic-strokes . 11)
-      (total-strokes	   . 15)
-      (=cns11643-2	  . #x5072)	; &C2-5072; [48-82]
-      (=ucs@cns		  . #x6A06)	; &C2-5072;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x6A06)	; 樆
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-2	. #x5072)	; &C2-5072; [48-82]
+    (=ucs@cns		. #x6A06)	; &C2-5072;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x2361D)	; 𣘝
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2361D)	; 𣘝
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-7	. #x236C)	; &M-15406; [03-76]
+    (=daikanwa		. 15406)	; &I-M-15406;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2361D)	; 𣘝
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs@iso		. #x2361D)	; &U-0002361D;
+    ))
+(define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x6A07)	; 樇
+    (=big5		. #xE5ED)	; &I-B-E5ED;
     (->subsumptive
-     ((=big5		  . #xE5ED)	; &M-15407;
-      (=daikanwa	  . 15407)	; &I-M-15407;
+     ((=daikanwa	  . 15407)	; &M-15407;
       (=ucs@unicode	  . #x6A07)	; &M-15407;
       )
      ((=cns11643-2	  . #x5136)	; &C2-5136; [49-22]
@@ -17094,6 +17429,18 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ucs		. #x2361E)	; 𣘞
+    (->subsumptive
+     ((=daikanwa	  . 15408)	; &M-15408;
+      )
+     ((=cns11643-7	  . #x2374)	; &C7-2374; [03-84]
+      (=ucs@iso		  . #x2361E)	; &C7-2374;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
     (=ucs		. #x6A08)	; 樈
     (=big5		. #xE5E0)	; &I-B-E5E0;
     (->subsumptive
@@ -17107,6 +17454,27 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ucs		. #x2361F)	; 𣘟
+    (->subsumptive
+     ((=daikanwa	  . 15410)	; &M-15410;
+      )
+     ((=ucs@iso		  . #x2361F)	; &U-0002361F;
+      )
+     ((=cns11643-5	  . #x4D6B)	; &C5-4D6B; [45-75]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x3BC4)	; 㯄
+    (=cns11643-3	. #x4C53)	; &I-C3-4C53; [44-51]
+    (=daikanwa		. 15411)	; &I-M-15411;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
     (=ucs		. #x6A09)	; 樉
     (=cns11643-2	. #x512F)	; &I-C2-512F; [49-15]
     (=big5		. #xE5E6)	; &I-B-E5E6;
@@ -17116,23 +17484,28 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (shinjigen-2	. 3799)
-    (=ucs		. #x6A0A)	; 樊
-    (=jis-x0208		. #x5C68)	; &I-J90-5C68; [60-72]
-    (=gb2312		. #x372E)	; &I-G0-372E; [23-14]
-    (=ks-x1001		. #x5B60)	; &I-K0-5B60; [59-64]
-    (=big5		. #xBCD4)	; &I-B-BCD4;
-    (=gt		. 19796)	; &I-GT-19796;
-    (=gt-pj-1		. #x5C68)	; &I-GT-19796; [60-72]
-    (=daikanwa		. 15414)	; &I-M-15414;
+    (=ucs		. #x23620)	; 𣘠
+    (=cns11643-5	. #x4D65)	; &I-C5-4D65; [45-69]
+    (=daikanwa		. 15413)	; &I-M-15413;
     ))
 (define-char
-  '((=>ucs		. #x6A0A)	; 樊
-    (morohashi-daikanwa	15414 0 1)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=cns11643-1	. #x6D3E)	; &C1-6D3E; [77-30]
+    (=ucs		. #x6A0A)	; 樊
+    (->subsumptive
+     ((shinjigen-2	  . 3799)
+      (=jis-x0208	  . #x5C68)	; &GT-19796; [60-72]
+      (=gb2312		  . #x372E)	; &I-G0-372E; [23-14]
+      (=ks-x1001	  . #x5B60)	; &I-K0-5B60; [59-64]
+      (=big5		  . #xBCD4)	; &I-B-BCD4;
+      (=gt		  . 19796)	; &I-GT-19796;
+      (=gt-pj-1		  . #x5C68)	; &I-GT-19796; [60-72]
+      (=daikanwa	  . 15414)	; &I-M-15414;
+      (=ucs@unicode	  . #x6A0A)	; &GT-19796;
+      )
+     ((=cns11643-1	  . #x6D3E)	; &C1-6D3E; [77-30]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -17156,10 +17529,6 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4875)	; &M-15415; [40-85]
-      (=daikanwa	  . 15415)	; &I-M-15415;
-      ))
     (hanyu-dazidian	2 1271 11)
     (=jis-x0208@1983	. #x4875)	; &GT-19587; [40-85]
     (=iso-ir165		. #x7C28)	; &I-EGB-7C28; [92-08]
@@ -17169,6 +17538,10 @@
     (=hanziku-4		. #xADD0)	; &I-HZK04-ADD0;
     (=jef-china3	. #x70C6)	; &I-JC3-70C6;
     (=ucs@unicode	. #x6A0B)	; &GT-19587;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x4875)	; &M-15415; [40-85]
+      (=daikanwa	  . 15415)	; &I-M-15415;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -17196,59 +17569,142 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ucs		. #x23621)	; 𣘡
+    (->subsumptive
+     ((=daikanwa	  . 15417)	; &M-15417;
+      )
+     ((=cns11643-7	  . #x2370)	; &C7-2370; [03-80]
+      (=ucs@iso		  . #x23621)	; &C7-2370;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x3BC5)	; 㯅
+    (->subsumptive
+     ((=daikanwa	  . 15418)	; &M-15418;
+      )
+     ((=cns11643-4	  . #x4A37)	; &C4-4A37; [42-23]
+      (=ucs@unicode	  . #x3BC5)	; &C4-4A37;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23622)	; 𣘢
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23622)	; 𣘢
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=daikanwa		. 15419)	; &M-15419;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23622)	; 𣘢
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-4	. #x4A46)	; &C4-4A46; [42-38]
+    (=ucs@iso		. #x23622)	; &C4-4A46;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
     (=ucs		. #x6A0D)	; 樍
     (=cns11643-2	. #x512C)	; &I-C2-512C; [49-12]
     (=big5		. #xE5E3)	; &I-B-E5E3;
     (=daikanwa		. 15420)	; &I-M-15420;
     ))
 (define-char
-  '((=>ucs		. #x6A0E)	; 樎
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 15421)	; &M-15421;
+    (=ucs		. #x6A0E)	; 樎
+    (->subsumptive
+     ((=daikanwa	  . 15421)	; &M-15421;
+      )
+     ((hanyu-dazidian	  2 1284 12)
+      (=cns11643-3	  . #x4C47)	; &HZK04-B078; [44-39]
+      (=hanziku-4	  . #xB078)	; &I-HZK04-B078;
+      (=ucs@unicode	  . #x6A0E)	; &HZK04-B078;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15421 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (hanyu-dazidian	2 1284 12)
-    (=ucs		. #x6A0E)	; 樎
-    (=cns11643-3	. #x4C47)	; &I-C3-4C47; [44-39]
-    (=hanziku-4		. #xB078)	; &I-HZK04-B078;
+    (=ucs		. #x3BC6)	; 㯆
     ))
 (define-char
-  '((=>ucs		. #x23624)	; 𣘤
+  '((<-denotational
+     ((=ucs		  . #x3BC6)	; 㯆
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6728)	; 木
+    (->subsumptive
+     ((=daikanwa	  . 15422)	; &M-15422;
       )
-     ((=ucs		  . #x796D)	; 祭
+     ((=cns11643-4	  . #x4A36)	; &C4-4A36; [42-22]
       ))
-    (=daikanwa		. 15424)	; &M-15424;
-    (=cbeta		. 02608)	; &I-CB02608;
     ))
 (define-char
-  '((morohashi-daikanwa	15424 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3BC6)	; 㯆
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6728)	; 木
+    (=ucs@unicode	. #x3BC6)	; &UU+3BC6;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23623)	; 𣘣
+    (->subsumptive
+     ((=daikanwa	  . 15423)	; &M-15423;
+      (=ucs@iso		  . #x23623)	; &M-15423;
       )
-     ((=cns11643-1	  . #x5C42)	; &C1-5C42; [60-34]
+     ((=cns11643-5	  . #x4D5F)	; &C5-4D5F; [45-63]
       ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
     (=ucs		. #x23624)	; 𣘤
-    (=cns11643-4	. #x4A3F)	; &I-C4-4A3F; [42-31]
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=daikanwa	    . 24700)	; &M-24700;
+	))
+      (=daikanwa	  . 15424)	; &M-15424;
+      (=cbeta		  . 02608)	; &I-CB02608;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=cns11643-1	    . #x5C42)	; &C1-5C42; [60-34]
+	))
+      (=cns11643-4	  . #x4A3F)	; &C4-4A3F; [42-31]
+      (=ucs@iso		  . #x23624)	; &C4-4A3F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -17353,23 +17809,81 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (shinjigen-2	. 3740)
+    (=ucs		. #x23625)	; 𣘥
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23625)	; 𣘥
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=daikanwa		. 15429)	; &M-15429;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23625)	; 𣘥
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-5	. #x4D64)	; &C5-4D64; [45-68]
+    (=ucs@iso		. #x23625)	; &C5-4D64;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
     (=ucs		. #x6A13)	; 樓
-    (=jis-x0208		. #x5C6C)	; &I-J90-5C6C; [60-76]
-    (=ks-x1001		. #x5727)	; &I-K0-5727; [55-07]
-    (=gb12345		. #x4225)	; 樓 [34-05]
-    (=big5		. #xBCD3)	; &I-B-BCD3;
-    (=gt		. 19836)	; &I-GT-19836;
-    (=gt-pj-1		. #x5C6C)	; &I-GT-19836; [60-76]
-    (=daikanwa		. 15430)	; &I-M-15430;
+    (->subsumptive
+     ((shinjigen-2	  . 3740)
+      (=jis-x0208	  . #x5C6C)	; &GT-19836; [60-76]
+      (=ks-x1001	  . #x5727)	; &I-K0-5727; [55-07]
+      (=gb12345		  . #x4225)	; &GT-19836; [34-05]
+      (=big5		  . #xBCD3)	; &I-B-BCD3;
+      (=gt		  . 19836)	; &I-GT-19836;
+      (=gt-pj-1		  . #x5C6C)	; &I-GT-19836; [60-76]
+      (=daikanwa	  . 15430)	; &I-M-15430;
+      (=ucs@unicode	  . #x6A13)	; &GT-19836;
+      )
+     ((=cns11643-1	  . #x6D3D)	; &C1-6D3D; [77-29]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23626)	; 𣘦
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23626)	; 𣘦
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (->subsumptive
+     ((=daikanwa	  . 15431)	; &M-15431;
+      )
+     ((=ucs@iso		  . #x23626)	; &U-00023626;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6A13)	; 樓
-    (morohashi-daikanwa	15430 0 1)
+  '((<-denotational
+     ((=ucs		  . #x23626)	; 𣘦
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=cns11643-1	. #x6D3D)	; &C1-6D3D; [77-29]
+    (=cns11643-4	. #x4A43)	; &C4-4A43; [42-35]
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23627)	; 𣘧
+    (=cns11643-4	. #x4A3E)	; &I-C4-4A3E; [42-30]
+    (=daikanwa		. 15432)	; &I-M-15432;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -17387,12 +17901,61 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ucs		. #x3BC7)	; 㯇
+    (->subsumptive
+     ((=daikanwa	  . 15434)	; &M-15434;
+      )
+     ((=cns11643-3	  . #x4C5D)	; &C3-4C5D; [44-61]
+      )
+     ((=ucs@unicode	  . #x3BC7)	; &UU+3BC7;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
     (=ucs		. #x6A15)	; 樕
-    (=jis-x0212		. #x4477)	; &I-JSP-4477; [36-87]
-    (=cns11643-2	. #x5076)	; &I-C2-5076; [48-86]
-    (=jis-x0213-1-2000	. #x7628)	; &I-JX1-7628; [86-08]
     (=big5		. #xE5CF)	; &I-B-E5CF;
-    (=daikanwa		. 15435)	; &I-M-15435;
+    (->subsumptive
+     ((=jis-x0212	  . #x4477)	; &M-15435; [36-87]
+      (=cns11643-2	  . #x5076)	; &I-C2-5076; [48-86]
+      (=jis-x0213-1-2000  . #x7628)	; &I-JX1-7628; [86-08]
+      (=daikanwa	  . 15435)	; &I-M-15435;
+      (=ucs@jis		  . #x6A15)	; &M-15435;
+      )
+     ((=ucs@unicode	  . #x6A15)	; &UU+6A15;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x3BC8)	; 㯈
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3BC8)	; 㯈
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=daikanwa		. 15436)	; &M-15436;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3BC8)	; 㯈
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x3BC8)	; &UU+3BC8;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3BC8)	; 㯈
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-3	. #x4C58)	; &C3-4C58; [44-56]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -17427,6 +17990,18 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ucs		. #x3BC9)	; 㯉
+    (->subsumptive
+     ((=daikanwa	  . 15439)	; &M-15439;
+      (=ucs@unicode	  . #x3BC9)	; &M-15439;
+      )
+     ((=cns11643-7	  . #x236F)	; &C7-236F; [03-79]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
     (=ucs		. #x6A18)	; 樘
     (=gb2312		. #x694C)	; &I-G0-694C; [73-44]
     (=cns11643-2	. #x5131)	; &I-C2-5131; [49-17]
@@ -17538,7 +18113,6 @@
     (=gt-pj-1		. #x5C5C)	; &I-GT-19671; [60-60]
     (=daikanwa		. 15445)	; &I-M-15445;
     (=ucs@jis		. #x6A1B)	; &GT-19671;
-    (=ucs@big5		. #x6A1B)	; &GT-19671;
     ))
 (define-char
   '((<-denotational
@@ -17554,119 +18128,178 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x6A1C)	; 樜
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 15447)	; &M-15447;
+    (=ucs		. #x2362A)	; 𣘪
+    (=cns11643-5	. #x4D5C)	; &I-C5-4D5C; [45-60]
+    (=daikanwa		. 15446)	; &I-M-15446;
     ))
 (define-char
-  '((morohashi-daikanwa	15447 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (hanyu-dazidian	2 1283 8)
     (=ucs		. #x6A1C)	; 樜
-    (=cns11643-3	. #x4C49)	; &I-C3-4C49; [44-41]
-    (=hanziku-4		. #xB054)	; &I-HZK04-B054;
+    (->subsumptive
+     ((=daikanwa	  . 15447)	; &M-15447;
+      )
+     ((hanyu-dazidian	  2 1283 8)
+      (=cns11643-3	  . #x4C49)	; &HZK04-B054; [44-41]
+      (=hanziku-4	  . #xB054)	; &I-HZK04-B054;
+      (=ucs@unicode	  . #x6A1C)	; &HZK04-B054;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x2362B)	; 𣘫
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2362B)	; 𣘫
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=daikanwa		. 15448)	; &M-15448;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2362B)	; 𣘫
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (->subsumptive
+     ((=ucs@iso		  . #x2362B)	; &U-0002362B;
+      )
+     ((=cns11643-4	  . #x4A4A)	; &C4-4A4A; [42-42]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x6A1D)	; 樝
-    (=jis-x0212		. #x4479)	; &I-JSP-4479; [36-89]
-    (=cns11643-2	. #x507E)	; &I-C2-507E; [48-94]
-    (=jis-x0213-2-2000	. #x2F4D)	; &I-JX2-2F4D; [15-45]
     (=big5		. #xE5D7)	; &I-B-E5D7;
-    (=daikanwa		. 15449)	; &I-M-15449;
+    (->subsumptive
+     ((=jis-x0212	  . #x4479)	; &M-15449; [36-89]
+      (=jis-x0213-2-2000  . #x2F4D)	; &I-JX2-2F4D; [15-45]
+      (=daikanwa	  . 15449)	; &I-M-15449;
+      (=ucs@unicode	  . #x6A1D)	; &M-15449;
+      )
+     ((=cns11643-2	  . #x507E)	; &C2-507E; [48-94]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (shinjigen-2	. 3506)
     (=ucs		. #x6A1E)	; 樞
-    (=jis-x0208		. #x5C64)	; &I-J90-5C64; [60-68]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6A1E)	; 樞
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (shinjigen-2	. 3506)
+    (=jis-x0208		. #x5C64)	; &GT-19746; [60-68]
     (=ks-x1001		. #x7552)	; &I-K0-7552; [85-50]
-    (=gb12345		. #x4A60)	; 樞 [42-64]
+    (=gb12345		. #x4A60)	; &GT-19746; [42-64]
     (=big5		. #xBCCF)	; &I-B-BCCF;
     (=gt		. 19746)	; &I-GT-19746;
     (=gt-k		. 11980)	; &I-GT-K11980;
     (=gt-pj-1		. #x5C64)	; &I-GT-19746; [60-68]
     (=daikanwa		. 15450)	; &I-M-15450;
+    (=ucs@unicode	. #x6A1E)	; &GT-19746;
     ))
 (define-char
-  '((=>ucs		. #x6A1E)	; 樞
-    (morohashi-daikanwa	15450 0 1)
+  '((<-denotational
+     ((=ucs		  . #x6A1E)	; 樞
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=cns11643-1	. #x6D39)	; &C1-6D39; [77-25]
     ))
 (define-char
-  '((=>ucs		. #x6A1F)	; 樟
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (shinjigen-2	. 3792)
-    (=jis-x0208		. #x3E40)	; &GT-19737; [30-32]
-    (=ks-x1001		. #x6D69)	; &I-K0-6D69; [77-73]
-    (=big5		. #xBCCC)	; &I-B-BCCC;
-    (=gt		. 19737)	; &I-GT-19737;
-    (=gt-pj-1		. #x3E40)	; &I-GT-19737; [30-32]
-    (=daikanwa		. 15451)	; &I-M-15451;
-    (=ucs@jis		. #x6A1F)	; &GT-19737;
-    (=ucs@big5		. #x6A1F)	; &GT-19737;
-    ))
-(define-char
-  '((morohashi-daikanwa	15451 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x6A1F)	; 樟
-    (=gb2312		. #x5541)	; &I-G0-5541; [53-33]
-    (=cns11643-1	. #x6D36)	; &I-C1-6D36; [77-22]
+    (=big5		. #xBCCC)	; &I-B-BCCC;
+    (->subsumptive
+     ((shinjigen-2	  . 3792)
+      (=jis-x0208	  . #x3E40)	; &GT-19737; [30-32]
+      (=ks-x1001	  . #x6D69)	; &I-K0-6D69; [77-73]
+      (=gt		  . 19737)	; &I-GT-19737;
+      (=gt-pj-1		  . #x3E40)	; &I-GT-19737; [30-32]
+      (=daikanwa	  . 15451)	; &I-M-15451;
+      (=ucs@jis		  . #x6A1F)	; &GT-19737;
+      )
+     ((=gb2312		  . #x5541)	; &C1-6D36; [53-33]
+      (=cns11643-1	  . #x6D36)	; &I-C1-6D36; [77-22]
+      (=ucs@unicode	  . #x6A1F)	; &C1-6D36;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6A20)	; 樠
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=jis-x0212		. #x447A)	; &M-15452; [36-90]
-    (=big5		. #xE5D2)	; &I-B-E5D2;
-    (=daikanwa		. 15452)	; &I-M-15452;
-    (=ucs@jis		. #x6A20)	; &M-15452;
-    (=ucs@big5		. #x6A20)	; &M-15452;
+    (=ucs		. #x6A20)	; 樠
+    (->subsumptive
+     ((=jis-x0212	  . #x447A)	; &M-15452; [36-90]
+      (=big5		  . #xE5D2)	; &I-B-E5D2;
+      (=daikanwa	  . 15452)	; &I-M-15452;
+      (=ucs@jis		  . #x6A20)	; &M-15452;
+      (=ucs@big5	  . #x6A20)	; &M-15452;
+      )
+     ((=cns11643-2	  . #x5079)	; &C2-5079; [48-89]
+      (=ucs@unicode	  . #x6A20)	; &C2-5079;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15452 0 0)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x6A20)	; 樠
-    (=cns11643-2	. #x5079)	; &I-C2-5079; [48-89]
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x6A21)	; 模
     ))
 (define-char
-  '((=>ucs		. #x6A21)	; 模
+  '((<-denotational
+     ((=ucs		  . #x6A21)	; 模
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=cns11643-1	. #x6D3C)	; &M-15453; [77-28]
-    (=daikanwa		. 15453)	; &I-M-15453;
+    (->subsumptive
+     ((=daikanwa	  . 15453)	; &M-15453;
+      )
+     ((=cns11643-1	  . #x6D3C)	; &C1-6D3C; [77-28]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15453 0 1)
+  '((<-denotational
+     ((=ucs		  . #x6A21)	; 模
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x6A21)	; 模
-    (=jis-x0208		. #x4C4F)	; &I-J90-4C4F; [44-47]
+    (=jis-x0208		. #x4C4F)	; &GT-19619; [44-47]
     (=gb2312		. #x4423)	; &I-G0-4423; [36-03]
     (=ks-x1001		. #x593C)	; &I-K0-593C; [57-28]
     (=big5		. #xBCD2)	; &I-B-BCD2;
     (=gt		. 19619)	; &I-GT-19619;
     (=gt-pj-1		. #x4C4F)	; &I-GT-19619; [44-47]
+    (=ucs@unicode	. #x6A21)	; &GT-19619;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x3BCA)	; 㯊
+    (=cns11643-4	. #x4A38)	; &I-C4-4A38; [42-24]
+    (=daikanwa		. 15454)	; &I-M-15454;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -17694,6 +18327,15 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ucs		. #x4CB7)	; ä²·
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4CB7)	; ä²·
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -17702,20 +18344,13 @@
       )
      ((=ucs		  . #x6728)	; 木
       ))
-    (=ucs		. #x4CB7)	; ä²·
-    (=daikanwa		. 15456)	; &I-M-15456;
-    ))
-(define-char
-  '((=>ucs		. #x4CB7)	; ä²·
-    (morohashi-daikanwa	15456 0 0)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-3	. #x4C63)	; &C3-4C63; [44-67]
+    (=daikanwa		. 15456)	; &M-15456;
+    (=ucs@unicode	. #x4CB7)	; &M-15456;
     ))
 (define-char
-  '((=>ucs		. #x4CB7)	; ä²·
-    (morohashi-daikanwa	15456 0 1)
+  '((<-denotational
+     ((=ucs		  . #x4CB7)	; ä²·
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
@@ -17730,6 +18365,15 @@
     (=cbeta		. 02485)	; &CB02485;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x4CB7)	; ä²·
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-3	. #x4C63)	; &C3-4C63; [44-67]
+    ))
+(define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
@@ -17746,62 +18390,119 @@
     (mojikyo		. 015457)	; &MCS-60003C61;
     ))
 (define-char
-  '((=>ucs		. #x6A24)	; 樤
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x2362C)	; 𣘬
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2362C)	; 𣘬
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6728)	; 木
+    (->subsumptive
+     ((=daikanwa	  . 15458)	; &M-15458;
       )
-     ((=jis-x0208	  . #x5B6A)	; &GT-18893; [59-74]
-      (=ks-x1001	  . #x7049)	; &I-K0-7049; [80-41]
-      (=daikanwa	  . 14859)	; &I-M-14859;
+     ((=ucs@iso		  . #x2362C)	; &U-0002362C;
       ))
-    (=jis-x0212		. #x447B)	; &M-15461; [36-91]
-    (=daikanwa		. 15461)	; &I-M-15461;
-    (=cbeta		. 05007)	; &I-CB05007;
-    (=jef-china3	. #x53FE)	; &I-JC3-53FE;
-    (=ucs@jis		. #x6A24)	; &M-15461;
     ))
 (define-char
-  '((=>ucs		. #x6A24)	; 樤
-    (morohashi-daikanwa	15461 0 1)
+  '((<-denotational
+     ((=ucs		  . #x2362C)	; 𣘬
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=cns11643-5	. #x4D69)	; &C5-4D69; [45-73]
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x3BCB)	; 㯋
+    (->subsumptive
+     ((=daikanwa	  . 15459)	; &M-15459;
+      (=ucs@unicode	  . #x3BCB)	; &M-15459;
       )
-     ((=ucs		  . #x6728)	; 木
+     ((=cns11643-4	  . #x4A42)	; &C4-4A42; [42-34]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23664)	; 𣙤
+    (->subsumptive
+     ((=daikanwa	  . 15460)	; &M-15460;
+      (=ucs@iso		  . #x23664)	; &M-15460;
       )
-     ((=cns11643-1	  . #x5B3E)	; &C1-5B3E; [59-30]
+     ((=cns11643-5	  . #x4D6C)	; &C5-4D6C; [45-76]
       ))
-    (=cns11643-3	. #x4C62)	; &C3-4C62; [44-66]
     ))
 (define-char
-  '((morohashi-daikanwa	15461 0 2)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (hanyu-dazidian	2 1280 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x6A24)	; 樤
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=jis-x0208	    . #x5B6A)	; &GT-18893; [59-74]
+	(=ks-x1001	    . #x7049)	; &I-K0-7049; [80-41]
+	(=daikanwa	    . 14859)	; &I-M-14859;
+	))
+      (=jis-x0212	  . #x447B)	; &M-15461; [36-91]
+      (=daikanwa	  . 15461)	; &I-M-15461;
+      (=cbeta		  . 05007)	; &I-CB05007;
+      (=jef-china3	  . #x53FE)	; &I-JC3-53FE;
+      (=ucs@jis		  . #x6A24)	; &M-15461;
       )
-     ((=ucs		  . #x6728)	; 木
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=cns11643-1	    . #x5B3E)	; &C1-5B3E; [59-30]
+	))
+      (=cns11643-3	  . #x4C62)	; &C3-4C62; [44-66]
       )
-     ((=ucs		  . #x689D)	; 條
+     ((hanyu-dazidian	  2 1280 12)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=gb12345	    . #x4C75)	; &UU+689D; [44-85]
+	))
+      (=hanziku-4	  . #xAFB7)	; &HZK04-AFB7;
+      (=ucs@unicode	  . #x6A24)	; &HZK04-AFB7;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x2362D)	; 𣘭
+    (->subsumptive
+     ((=daikanwa	  . 15462)	; &M-15462;
+      )
+     ((=ucs@iso		  . #x2362D)	; &U-0002362D;
+      )
+     ((=cns11643-7	  . #x236E)	; &C7-236E; [03-78]
       ))
-    (=ucs		. #x6A24)	; 樤
-    (=hanziku-4		. #xAFB7)	; &I-HZK04-AFB7;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x6A25)	; 樥
+    (=big5		. #xE5E9)	; &I-B-E5E9;
     ))
 (define-char
   '((<-denotational
@@ -17821,282 +18522,366 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=big5		. #xE5E9)	; &B-E5E9;
-    (=ucs@unicode	. #x6A25)	; &B-E5E9;
+    (=ucs@unicode	. #x6A25)	; &UU+6A25;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x6A26)	; 樦
     ))
 (define-char
-  '((=>ucs		. #x6A26)	; 樦
+  '((<-denotational
+     ((=ucs		  . #x6A26)	; 樦
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=daikanwa		. 15464)	; &M-15464;
     ))
 (define-char
-  '((morohashi-daikanwa	15464 0 0)
+  '((<-denotational
+     ((=ucs		  . #x6A26)	; 樦
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x6A26)	; 樦
-    (=cns11643-2	. #x5135)	; &I-C2-5135; [49-21]
+    (=cns11643-2	. #x5135)	; &C2-5135; [49-21]
     (=big5		. #xE5EC)	; &I-B-E5EC;
+    (=ucs@unicode	. #x6A26)	; &C2-5135;
     ))
 (define-char
-  '((=>ucs		. #x6A28)	; 樨
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
-    (total-strokes	 . 16)
-    (=jis-x0212		. #x447C)	; &M-15472; [36-92]
-    (=big5		. #xE9CA)	; &I-B-E9CA;
-    (=daikanwa		. 15472)	; &I-M-15472;
-    (=ucs@jis		. #x6A28)	; &M-15472;
-    (=ucs@big5		. #x6A28)	; &M-15472;
+    (total-strokes	 . 15)
+    (=ucs		. #x2362E)	; 𣘮
     ))
 (define-char
-  '((morohashi-daikanwa	15472 0 1)
+  '((<-denotational
+     ((=ucs		  . #x2362E)	; 𣘮
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
-    (total-strokes	 . 16)
-    (=ucs		. #x6A28)	; 樨
-    (=gb2312		. #x6958)	; &I-G0-6958; [73-56]
-    (=cns11643-2	. #x5755)	; &I-C2-5755; [55-53]
+    (total-strokes	 . 15)
+    (=daikanwa		. 15465)	; &M-15465;
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x2362E)	; 𣘮
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 15475)	; &M-15475;
-    (=cbeta		. 00871)	; &I-CB00871;
+    (=cns11643-5	. #x4D63)	; &C5-4D63; [45-67]
+    (=ucs@iso		. #x2362E)	; &C5-4D63;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
-    (total-strokes	 . 16)
-    (=daikanwa		. 15483)	; &M-15483;
+    (total-strokes	 . 15)
+    (=ucs		. #x2362F)	; 𣘯
     ))
 (define-char
-  '((=>ucs		. #x6A29)	; 権
+  '((<-denotational
+     ((=ucs		  . #x2362F)	; 𣘯
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5C5E)	; &GT-20434; [60-62]
-      (=ks-x1001	  . #x4F6D)	; &I-K0-4F6D; [47-77]
-      ))
-    (shinjigen-2	. 3787)
-    (=jis-x0208		. #x3822)	; &GT-19688; [24-02]
-    (=gt		. 19688)	; &I-GT-19688;
-    (=gt-pj-1		. #x3822)	; &I-GT-19688; [24-02]
-    (=daikanwa		. 15484)	; &I-M-15484;
-    (=ucs@jis		. #x6A29)	; &GT-19688;
+    (=daikanwa		. 15466)	; &M-15466;
+    (=ucs@iso		. #x2362F)	; &M-15466;
     ))
 (define-char
-  '((morohashi-daikanwa	15484 0 1)
+  '((<-denotational
+     ((=ucs		  . #x2362F)	; 𣘯
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (hanyu-dazidian	8 20 26)
-    (=ucs		. #x6A29)	; 権
-    (=cns11643-3	. #x4C5E)	; &I-C3-4C5E; [44-62]
-    (=hanziku-12	. #xED60)	; &I-HZK12-ED60;
+    (=cns11643-5	. #x4D6A)	; &C5-4D6A; [45-74]
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x3BCC)	; 㯌
     ))
 (define-char
-  '((morohashi-daikanwa	15484 1)
+  '((<-denotational
+     ((=ucs		  . #x3BCC)	; 㯌
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x7C74)	; &M-15594; [92-84]
-      (=jis-x0213-1-2000  . #x7630)	; &I-JX1-7630; [86-16]
-      (=daikanwa	  . 15594)	; &I-M-15594;
+    (=daikanwa		. 15470)	; &M-15470;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3BCC)	; 㯌
       ))
-    (=ucs		. #x6A2A)	; 横
-    (=jis-x0208		. #x3223)	; &I-J90-3223; [18-03]
-    (=gb2312		. #x3A61)	; &I-G0-3A61; [26-65]
-    (=gt		. 19647)	; &I-GT-19647;
-    (=gt-pj-1		. #x3223)	; &I-GT-19647; [18-03]
-    (mojikyo		. 050233)	; &MCS-6000C439;
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x3BCC)	; &UU+3BCC;
     ))
 (define-char
-  '((=>ucs		. #x6A2A)	; 横
-    (morohashi-daikanwa	15484 1 1)
+  '((<-denotational
+     ((=ucs		  . #x3BCC)	; 㯌
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=cns11643-3	. #x4C59)	; &C3-4C59; [44-57]
+    (=cns11643-3	. #x4C5A)	; &C3-4C5A; [44-58]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (hanyu-dazidian	2 1276 5)
-    (shinjigen-2	. 3804)
-    (=ucs		. #x6A2B)	; 樫
-    (=jis-x0208		. #x335F)	; &I-J90-335F; [19-63]
-    (=gt		. 19660)	; &I-GT-19660;
-    (=gt-pj-1		. #x335F)	; &I-GT-19660; [19-63]
-    (=daikanwa		. 15485)	; &I-M-15485;
-    (=hanziku-4		. #xAECD)	; &I-HZK04-AECD;
+    (=ucs		. #x23633)	; 𣘳
     ))
 (define-char
-  '((=>ucs		. #x6A2C)	; 樬
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=daikanwa		. 49179)	; &M-49179;
-    ))
-(define-char
-  '((morohashi-daikanwa	49179 0 0)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (hanyu-dazidian	2 1281 2)
-    (=ucs		. #x6A2C)	; 樬
-    (=hanziku-4		. #xAFCD)	; &I-HZK04-AFCD;
-    (=cbeta		. 05569)	; &I-CB05569;
-    ))
-(define-char
-  '((=>ucs		. #x6A2C)	; 樬
-    (morohashi-daikanwa	49179 0 1)
+  '((<-denotational
+     ((=ucs		  . #x23633)	; 𣘳
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=cns11643-3	. #x4C61)	; &C3-4C61; [44-65]
+    (=daikanwa		. 15471)	; &M-15471;
     ))
 (define-char
-  '((=>ucs		. #x23642)	; 𣙂
+  '((<-denotational
+     ((=ucs		  . #x23633)	; 𣘳
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 49180)	; &M-49180;
-    (mojikyo		. 049180)	; &MCS-6000C01C;
+    (->subsumptive
+     ((=ucs@iso		  . #x23633)	; &U-00023633;
+      )
+     ((=cns11643-7	  . #x2375)	; &C7-2375; [03-85]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	49180 0 2)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23642)	; 𣙂
-    (=cns11643-7	. #x2366)	; &I-C7-2366; [03-70]
+    (total-strokes	 . 16)
+    (=ucs		. #x6A28)	; 樨
+    (=big5		. #xE9CA)	; &I-B-E9CA;
+    (->subsumptive
+     ((=jis-x0212	  . #x447C)	; &M-15472; [36-92]
+      (=daikanwa	  . 15472)	; &I-M-15472;
+      (=ucs@jis		  . #x6A28)	; &M-15472;
+      )
+     ((=gb2312		  . #x6958)	; &C2-5755; [73-56]
+      (=cns11643-2	  . #x5755)	; &I-C2-5755; [55-53]
+      (=ucs@unicode	  . #x6A28)	; &C2-5755;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3BC0)	; 㯀
-    (=cns11643-5	. #x4D6D)	; &I-C5-4D6D; [45-77]
+    (=ucs		. #x3BCE)	; 㯎
+    (->subsumptive
+     ((=daikanwa	  . 15474)	; &M-15474;
+      )
+     ((=cns11643-3	  . #x4C48)	; &C3-4C48; [44-40]
+      (=ucs@unicode	  . #x3BCE)	; &C3-4C48;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3BC1)	; 㯁
-    (=cns11643-4	. #x4A3A)	; &I-C4-4A3A; [42-26]
+    (=ucs		. #x3BCF)	; 㯏
+    (->subsumptive
+     ((=daikanwa	  . 15475)	; &M-15475;
+      (=cbeta		  . 00871)	; &I-CB00871;
+      )
+     ((=ucs@unicode	  . #x3BCF)	; &UU+3BCF;
+      )
+     ((=cns11643-3	  . #x4C55)	; &C3-4C55; [44-53]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3BC2)	; 㯂
-    (=cns11643-3	. #x4C4C)	; &I-C3-4C4C; [44-44]
+    (=ucs		. #x23672)	; 𣙲
+    (->subsumptive
+     ((=daikanwa	  . 15477)	; &M-15477;
+      (=ucs@iso		  . #x23672)	; &M-15477;
+      )
+     ((=cns11643-7	  . #x2367)	; &C7-2367; [03-71]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3BC4)	; 㯄
-    (=cns11643-3	. #x4C53)	; &I-C3-4C53; [44-51]
+    (=ucs		. #x2365B)	; 𣙛
+    (->subsumptive
+     ((=daikanwa	  . 15482)	; &M-15482;
+      )
+     ((=ucs@iso		  . #x2365B)	; &U-0002365B;
+      )
+     ((=cns11643-7	  . #x236B)	; &C7-236B; [03-75]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x3BC5)	; 㯅
-    (=cns11643-4	. #x4A37)	; &I-C4-4A37; [42-23]
+    (total-strokes	 . 16)
+    (=ucs		. #x2365A)	; 𣙚
+    (->subsumptive
+     ((=daikanwa	  . 15483)	; &M-15483;
+      )
+     ((=hanziku-4	  . #xAFEF)	; &HZK04-AFEF;
+      (=ucs@iso		  . #x2365A)	; &HZK04-AFEF;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3BC6)	; 㯆
-    (=cns11643-4	. #x4A36)	; &I-C4-4A36; [42-22]
+    (=ucs		. #x6A29)	; 権
+    (->subsumptive
+     ((shinjigen-1	  . 3786)
+      (shinjigen-2	  . 3787)
+      (=jis-x0208	  . #x3822)	; &GT-19688; [24-02]
+      (=gt		  . 19688)	; &I-GT-19688;
+      (=gt-pj-1		  . #x3822)	; &I-GT-19688; [24-02]
+      (=daikanwa	  . 15484)	; &I-M-15484;
+      (=ucs@jis		  . #x6A29)	; &GT-19688;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5C5E)	; &GT-20434; [60-62]
+	(=ks-x1001	    . #x4F6D)	; &I-K0-4F6D; [47-77]
+	))
+      )
+     ((hanyu-dazidian	  8 20 26)
+      (=cns11643-3	  . #x4C5E)	; &HZK12-ED60; [44-62]
+      (=hanziku-12	  . #xED60)	; &I-HZK12-ED60;
+      (=ucs@unicode	  . #x6A29)	; &HZK12-ED60;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3BC7)	; 㯇
-    (=cns11643-3	. #x4C5D)	; &I-C3-4C5D; [44-61]
+    (=ucs		. #x6A2A)	; 横
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x6A2A)	; 横
+      ))
+    (morohashi-daikanwa	15484 1)
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3BC8)	; 㯈
-    (=cns11643-3	. #x4C58)	; &I-C3-4C58; [44-56]
+    (=jis-x0208		. #x3223)	; &GT-19647; [18-03]
+    (=gb2312		. #x3A61)	; &I-G0-3A61; [26-65]
+    (=gt		. 19647)	; &I-GT-19647;
+    (=gt-pj-1		. #x3223)	; &I-GT-19647; [18-03]
+    (=ucs@unicode	. #x6A2A)	; &GT-19647;
+    (mojikyo		. 050233)	; &MCS-6000C439;
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x7C74)	; &M-15594; [92-84]
+      (=jis-x0213-1-2000  . #x7630)	; &I-JX1-7630; [86-16]
+      (=daikanwa	  . 15594)	; &I-M-15594;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x6A2A)	; 横
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3BC9)	; 㯉
-    (=cns11643-7	. #x236F)	; &I-C7-236F; [03-79]
+    (=cns11643-3	. #x4C59)	; &C3-4C59; [44-57]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3BCA)	; 㯊
-    (=cns11643-4	. #x4A38)	; &I-C4-4A38; [42-24]
+    (hanyu-dazidian	2 1276 5)
+    (shinjigen-2	. 3804)
+    (=ucs		. #x6A2B)	; 樫
+    (=jis-x0208		. #x335F)	; &I-J90-335F; [19-63]
+    (=gt		. 19660)	; &I-GT-19660;
+    (=gt-pj-1		. #x335F)	; &I-GT-19660; [19-63]
+    (=daikanwa		. 15485)	; &I-M-15485;
+    (=hanziku-4		. #xAECD)	; &I-HZK04-AECD;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3BCB)	; 㯋
-    (=cns11643-4	. #x4A42)	; &I-C4-4A42; [42-34]
+    (=ucs		. #x3BE0)	; 㯠
+    (->subsumptive
+     ((morohashi-daikanwa	15485 1)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=jis-x0208	    . #x3823)	; &GT-25686; [24-03]
+	(=ks-x1001	    . #x4C32)	; &I-K0-4C32; [44-18]
+	(=daikanwa	    . 20025)	; &I-M-20025;
+	))
+      (=gt		  . 19689)	; &GT-19689;
+      (=gt-pj-4		  . #x394A)	; &GT-19689; [25-42]
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=cns11643-1	    . #x5B74)	; &C1-5B74; [59-84]
+	))
+      (=cns11643-3	  . #x4C4B)	; &C3-4C4B; [44-43]
+      (=ucs@unicode	  . #x3BE0)	; &C3-4C4B;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((=>ucs		. #x6A2C)	; 樬
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3BCC)	; 㯌
-    (=cns11643-3	. #x4C5A)	; &I-C3-4C5A; [44-58]
+    (=daikanwa		. 49179)	; &M-49179;
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((morohashi-daikanwa	49179 0 0)
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3BCE)	; 㯎
-    (=cns11643-3	. #x4C48)	; &I-C3-4C48; [44-40]
+    (hanyu-dazidian	2 1281 2)
+    (=ucs		. #x6A2C)	; 樬
+    (=hanziku-4		. #xAFCD)	; &I-HZK04-AFCD;
+    (=cbeta		. 05569)	; &I-CB05569;
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((=>ucs		. #x6A2C)	; 樬
+    (morohashi-daikanwa	49179 0 1)
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3BCF)	; 㯏
-    (=cns11643-3	. #x4C55)	; &I-C3-4C55; [44-53]
+    (=cns11643-3	. #x4C61)	; &C3-4C61; [44-65]
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((=>ucs		. #x23642)	; 𣙂
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3BD9)	; 㯙
-    (=cns11643-4	. #x4A39)	; &I-C4-4A39; [42-25]
+    (=daikanwa		. 49180)	; &M-49180;
+    (mojikyo		. 049180)	; &MCS-6000C01C;
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((morohashi-daikanwa	49180 0 2)
+    (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)	; 㯠
-    (=cns11643-3	. #x4C4B)	; &I-C3-4C4B; [44-43]
+    (=ucs		. #x23642)	; 𣙂
+    (=cns11643-7	. #x2366)	; &I-C7-2366; [03-70]
     ))
 (define-char
   '((=>ucs		. #x3BE0)	; 㯠
@@ -18144,7 +18929,18 @@
     (=ucs		. #x6A30)	; 樰
     ))
 (define-char
-  '((=>ucs		. #x6A30)	; 樰
+  '((<-denotational
+     ((=ucs		  . #x6A30)	; 樰
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x6A30)	; &UU+6A30;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6A30)	; 樰
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
@@ -18173,319 +18969,123 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x235B2)	; 𣖲
-    (=cns11643-7	. #x2365)	; &I-C7-2365; [03-69]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23615)	; 𣘕
-    (=cns11643-7	. #x2368)	; &I-C7-2368; [03-72]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23617)	; 𣘗
-    (=cns11643-5	. #x4D5E)	; &I-C5-4D5E; [45-62]
+    (=ucs		. #x23629)	; 𣘩
+    (=cns11643-7	. #x2373)	; &I-C7-2373; [03-83]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23618)	; 𣘘
-    (=cns11643-4	. #x4A3B)	; &I-C4-4A3B; [42-27]
+    (=ucs		. #x23630)	; 𣘰
+    (=cns11643-7	. #x2369)	; &I-C7-2369; [03-73]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23619)	; 𣘙
-    (=cns11643-4	. #x4A47)	; &I-C4-4A47; [42-39]
+    (=ucs		. #x23631)	; 𣘱
+    (=cns11643-4	. #x4A41)	; &I-C4-4A41; [42-33]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x2361A)	; 𣘚
-    (=cns11643-5	. #x4D5B)	; &I-C5-4D5B; [45-59]
+    (=ucs		. #x23632)	; 𣘲
+    (=cns11643-5	. #x4D5D)	; &I-C5-4D5D; [45-61]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x2361B)	; 𣘛
-    (=cns11643-4	. #x4A40)	; &I-C4-4A40; [42-32]
+    (=ucs		. #x2363F)	; 𣘿
+    (=cns11643-4	. #x4A45)	; &I-C4-4A45; [42-37]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x2361C)	; 𣘜
-    (=cns11643-7	. #x2371)	; &I-C7-2371; [03-81]
+    (=ucs		. #x23641)	; 𣙁
+    (=cns11643-4	. #x4A49)	; &I-C4-4A49; [42-41]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x2361D)	; 𣘝
-    (=cns11643-7	. #x236C)	; &I-C7-236C; [03-76]
+    (=ucs		. #x23643)	; 𣙃
+    (=cns11643-7	. #x236A)	; &I-C7-236A; [03-74]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x2361E)	; 𣘞
-    (=cns11643-7	. #x2374)	; &I-C7-2374; [03-84]
+    (=ucs		. #x23670)	; 𣙰
+    (=cns11643-5	. #x4D68)	; &I-C5-4D68; [45-72]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x2361F)	; 𣘟
-    (=cns11643-5	. #x4D6B)	; &I-C5-4D6B; [45-75]
+    (=ucs		. #x23671)	; 𣙱
+    (=cns11643-5	. #x4D66)	; &I-C5-4D66; [45-70]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23620)	; 𣘠
-    (=cns11643-5	. #x4D65)	; &I-C5-4D65; [45-69]
+    (=ucs		. #x23673)	; 𣙳
+    (=cns11643-7	. #x236D)	; &I-C7-236D; [03-77]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23621)	; 𣘡
-    (=cns11643-7	. #x2370)	; &I-C7-2370; [03-80]
+    (=ucs		. #x23674)	; 𣙴
+    (=cns11643-5	. #x4D60)	; &I-C5-4D60; [45-64]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23622)	; 𣘢
-    (=cns11643-4	. #x4A46)	; &I-C4-4A46; [42-38]
+    (=ucs		. #x23675)	; 𣙵
+    (=cns11643-5	. #x4D5A)	; &I-C5-4D5A; [45-58]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23623)	; 𣘣
-    (=cns11643-5	. #x4D5F)	; &I-C5-4D5F; [45-63]
+    (=ucs		. #x23676)	; 𣙶
+    (=cns11643-5	. #x4D62)	; &I-C5-4D62; [45-66]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23625)	; 𣘥
-    (=cns11643-5	. #x4D64)	; &I-C5-4D64; [45-68]
+    (=ucs		. #x236A3)	; 𣚣
+    (=cns11643-4	. #x4A44)	; &I-C4-4A44; [42-36]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23626)	; 𣘦
-    (=cns11643-4	. #x4A43)	; &I-C4-4A43; [42-35]
+    (=cns11643-7	. #x2372)	; &C7-2372; [03-82]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23627)	; 𣘧
-    (=cns11643-4	. #x4A3E)	; &I-C4-4A3E; [42-30]
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (=ucs		. #x6A32)	; 樲
+    (=jis-x0212		. #x447E)	; &I-JSP-447E; [36-94]
+    (=cns11643-2	. #x574D)	; &I-C2-574D; [55-45]
+    (=jis-x0213-2-2000	. #x2F4F)	; &I-JX2-2F4F; [15-47]
+    (=big5		. #xE9C2)	; &I-B-E9C2;
+    (=daikanwa		. 15486)	; &I-M-15486;
+    (=jef-china3	. #x54A1)	; &I-JC3-54A1;
     ))
 (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		. #x2362A)	; 𣘪
-    (=cns11643-5	. #x4D5C)	; &I-C5-4D5C; [45-60]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x2362B)	; 𣘫
-    (=cns11643-4	. #x4A4A)	; &I-C4-4A4A; [42-42]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x2362C)	; 𣘬
-    (=cns11643-5	. #x4D69)	; &I-C5-4D69; [45-73]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x2362D)	; 𣘭
-    (=cns11643-7	. #x236E)	; &I-C7-236E; [03-78]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x2362E)	; 𣘮
-    (=cns11643-5	. #x4D63)	; &I-C5-4D63; [45-67]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x2362F)	; 𣘯
-    (=cns11643-5	. #x4D6A)	; &I-C5-4D6A; [45-74]
-    ))
-(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		. #x23633)	; 𣘳
-    (=cns11643-7	. #x2375)	; &I-C7-2375; [03-85]
-    ))
-(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		. #x2365B)	; 𣙛
-    (=cns11643-7	. #x236B)	; &I-C7-236B; [03-75]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23664)	; 𣙤
-    (=cns11643-5	. #x4D6C)	; &I-C5-4D6C; [45-76]
-    ))
-(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]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23672)	; 𣙲
-    (=cns11643-7	. #x2367)	; &I-C7-2367; [03-71]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23673)	; 𣙳
-    (=cns11643-7	. #x236D)	; &I-C7-236D; [03-77]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23674)	; 𣙴
-    (=cns11643-5	. #x4D60)	; &I-C5-4D60; [45-64]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23675)	; 𣙵
-    (=cns11643-5	. #x4D5A)	; &I-C5-4D5A; [45-58]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23676)	; 𣙶
-    (=cns11643-5	. #x4D62)	; &I-C5-4D62; [45-66]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x236A3)	; 𣚣
-    (=cns11643-4	. #x4A44)	; &I-C4-4A44; [42-36]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-7	. #x2372)	; &C7-2372; [03-82]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=ucs		. #x6A32)	; 樲
-    (=jis-x0212		. #x447E)	; &I-JSP-447E; [36-94]
-    (=cns11643-2	. #x574D)	; &I-C2-574D; [55-45]
-    (=jis-x0213-2-2000	. #x2F4F)	; &I-JX2-2F4F; [15-47]
-    (=big5		. #xE9C2)	; &I-B-E9C2;
-    (=daikanwa		. 15486)	; &I-M-15486;
-    (=jef-china3	. #x54A1)	; &I-JC3-54A1;
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=ucs		. #x6A33)	; 樳
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (=ucs		. #x6A33)	; 樳
     ))
 (define-char
   '((<-denotational
@@ -18589,7 +19189,12 @@
     (total-strokes	 . 16)
     (=ucs		. #x6A37)	; 樷
     (->subsumptive
-     ((<-vulgar
+     ((shinjigen-1	  . 933)
+      (=jis-x0212	  . #x4522)	; &M-15492; [37-02]
+      (=cns11643-3	  . #x5138)	; &I-C3-5138; [49-24]
+      (=daikanwa	  . 15492)	; &I-M-15492;
+      (=ucs@jis		  . #x6A37)	; &M-15492;
+      (<-vulgar
        ((shinjigen-1	    . 932)
 	(=jis-x0208	    . #x4151)	; &GT-04083; [33-49]
 	(=ks-x1001	    . #x753F)	; &I-K0-753F; [85-31]
@@ -18598,24 +19203,20 @@
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 933)
-      (=jis-x0212	  . #x4522)	; &M-15492; [37-02]
-      (=cns11643-3	  . #x5138)	; &I-C3-5138; [49-24]
-      (=daikanwa	  . 15492)	; &I-M-15492;
-      (=ucs@jis		  . #x6A37)	; &M-15492;
       (->synonyms@jiyun
-       ((=daikanwa	    . 32547)	; &I-M-32547;
+       ((=cns11643-7	    . #x5872)	; &M-32547; [56-82]
+	(=daikanwa	    . 32547)	; &I-M-32547;
 	))
       (->synonyms@jiyun*sources
        jiyun daikanwa)
-      (->synonyms@zhengzi-tong
+      (->synonyms@zhengzitong
        ((=jis-x0208	    . #x4151)	; &GT-04083; [33-49]
 	(=ks-x1001	    . #x753F)	; &I-K0-753F; [85-31]
 	(=cns11643-1	    . #x763B)	; &I-C1-763B; [86-27]
 	(=daikanwa	    . 03220)	; &I-M-03220;
 	))
-      (->synonyms@zhengzi-tong*sources
-       zhengzi-tong jiyun daikanwa)
+      (->synonyms@zhengzitong*sources
+       zhengzitong jiyun daikanwa)
       )
      ((hanyu-dazidian	  2 1288 18)
       (=hanziku-4	  . #xB161)	; &HZK04-B161;
@@ -18729,22 +19330,30 @@
     (->subsumptive
      ((=cns11643-1	  . #x7073)	; &C1-7073; [80-83]
       )
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x432E)	; &J78-432E; [35-14]
-	(=ks-x1001	    . #x715C)	; &I-K0-715C; [81-60]
-	))
-      (=jis-x0208@1983	  . #x432E)	; &GT-19953; [35-14]
+     ((=jis-x0208@1983	  . #x432E)	; &GT-19953; [35-14]
       (=jis-x0208@1990	  . #x432E)	; &I-J90-432E; [35-14]
       (=gt		  . 19953)	; &I-GT-19953;
       (=gt-pj-1		  . #x432E)	; &I-GT-19953; [35-14]
       (=ucs@jis		  . #x6A3D)	; &GT-19953;
+      (<-simplified@JP
+       ((=jis-x0208@1978    . #x432E)	; &J78-432E; [35-14]
+	(=ks-x1001	    . #x715C)	; &I-K0-715C; [81-60]
+	))
       )
      ((=gb2312		  . #x6957)	; &G0-6957; [73-55]
       (=ucs@unicode	  . #x6A3D)	; &G0-6957;
       ))
     ))
 (define-char
-  '((=>ucs		. #x3BD3)	; 㯓
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (=ucs		. #x3BD3)	; 㯓
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3BD3)	; 㯓
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
@@ -18762,7 +19371,9 @@
     (=cbeta		. 00186)	; &I-CB00186;
     ))
 (define-char
-  '((morohashi-daikanwa	15501 0 2)
+  '((<-denotational
+     ((=ucs		  . #x3BD3)	; 㯓
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
@@ -18772,10 +19383,11 @@
       )
      ((=ucs		  . #x6728)	; 木
       )
-     ((=ucs		  . #x7FD5)	; 翕
+     ((=gb2312		  . #x7462)	; &C1-6145; [84-66]
+      (=cns11643-1	  . #x6145)	; &I-C1-6145; [65-37]
       ))
-    (=ucs		. #x3BD3)	; 㯓
-    (=cns11643-3	. #x5142)	; &I-C3-5142; [49-34]
+    (=cns11643-3	. #x5142)	; &C3-5142; [49-34]
+    (=ucs@unicode	. #x3BD3)	; &C3-5142;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -19186,58 +19798,70 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (hanyu-dazidian	2 1290 5)
     (=ucs		. #x6A52)	; 橒
-    (=ks-x1001		. #x6978)	; &I-K0-6978; [73-88]
-    (=jis-x0212		. #x452D)	; &I-JSP-452D; [37-13]
-    (=jis-x0213-2-2000	. #x2F57)	; &I-JX2-2F57; [15-55]
-    (=daikanwa		. 15537)	; &I-M-15537;
-    (=hanziku-4		. #xB1B6)	; &I-HZK04-B1B6;
-    (=jef-china3	. #x54A7)	; &I-JC3-54A7;
+    (->subsumptive
+     ((hanyu-dazidian	  2 1290 5)
+      (=ks-x1001	  . #x6978)	; &M-15537; [73-88]
+      (=jis-x0212	  . #x452D)	; &I-JSP-452D; [37-13]
+      (=jis-x0213-2-2000  . #x2F57)	; &I-JX2-2F57; [15-55]
+      (=daikanwa	  . 15537)	; &I-M-15537;
+      (=hanziku-4	  . #xB1B6)	; &I-HZK04-B1B6;
+      (=jef-china3	  . #x54A7)	; &I-JC3-54A7;
+      (=ucs@unicode	  . #x6A52)	; &M-15537;
+      )
+     ((=cns11643-3	  . #x5129)	; &C3-5129; [49-09]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6A52)	; 橒
-    (morohashi-daikanwa	15537 0 2)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=cns11643-3	. #x5129)	; &C3-5129; [49-09]
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x3BD9)	; 㯙
+    (->subsumptive
+     ((ideographic-strokes . 12)
+      (total-strokes	   . 16)
+      (=daikanwa	  . 15538)	; &M-15538;
+      )
+     ((ideographic-strokes . 12)
+      (total-strokes	   . 16)
+      (=ucs@unicode	  . #x3BD9)	; &UU+3BD9;
+      )
+     ((ideographic-strokes . 11)
+      (total-strokes	   . 15)
+      (=cns11643-4	  . #x4A39)	; &C4-4A39; [42-25]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (hanyu-dazidian	2 1294 5)
     (=ucs		. #x6A53)	; 橓
-    (=cns11643-3	. #x513E)	; &I-C3-513E; [49-30]
-    (=daikanwa		. 15540)	; &I-M-15540;
-    (=hanziku-4		. #xB277)	; &I-HZK04-B277;
-    ))
-(define-char
-  '((=>ucs		. #x6A53)	; 橓
-    (morohashi-daikanwa	15540 0 2)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 13)
-    (total-strokes	 . 17)
-    (=ks-x1001		. #x6265)	; &K0-6265; [66-69]
-    ))
-(define-char
-  '((=>ucs		. #x6A54)	; 橔
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=big5		. #xE9D3)	; &M-15541;
-    (=daikanwa		. 15541)	; &I-M-15541;
-    (=jef-china3	. #x54A8)	; &I-JC3-54A8;
-    (=ucs@big5		. #x6A54)	; &M-15541;
+    (->subsumptive
+     ((ideographic-strokes . 12)
+      (total-strokes	   . 16)
+      (hanyu-dazidian	  2 1294 5)
+      (=daikanwa	  . 15540)	; &M-15540;
+      (=hanziku-4	  . #xB277)	; &I-HZK04-B277;
+      (=ucs@unicode	  . #x6A53)	; &M-15540;
+      )
+     ((ideographic-strokes . 12)
+      (total-strokes	   . 16)
+      (=cns11643-3	  . #x513E)	; &C3-513E; [49-30]
+      )
+     ((ideographic-strokes . 13)
+      (total-strokes	   . 17)
+      (=ks-x1001	  . #x6265)	; &K0-6265; [66-69]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15541 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x6A54)	; 橔
-    (=cns11643-2	. #x575E)	; &I-C2-575E; [55-62]
+    (=big5		. #xE9D3)	; &I-B-E9D3;
+    (->subsumptive
+     ((=daikanwa	  . 15541)	; &M-15541;
+      (=jef-china3	  . #x54A8)	; &I-JC3-54A8;
+      )
+     ((=cns11643-2	  . #x575E)	; &C2-575E; [55-62]
+      (=ucs@unicode	  . #x6A54)	; &C2-575E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -23140,40 +23764,44 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (hanyu-dazidian	2 1313 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6728)	; 木
-      )
-     ((=ucs		  . #x616E)	; 慮
-      ))
     (=ucs		. #x6AD6)	; 櫖
-    (=jis-x0212		. #x4552)	; &I-JSP-4552; [37-50]
-    (=daikanwa		. 15805)	; &I-M-15805;
-    (=hanziku-4		. #xB667)	; &I-HZK04-B667;
-    (=cbeta		. 06256)	; &I-CB06256;
-    ))
-(define-char
-  '((=>ucs		. #x6AD6)	; 櫖
-    (morohashi-daikanwa	15805 0 0)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 15)
-    (total-strokes	 . 19)
-    (hanyu-dazidian	2 1313 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6728)	; 木
+    (->subsumptive
+     ((hanyu-dazidian	  2 1313 9)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=jis-x0208	    . #x4E38)	; &GT-14186; [46-24]
+	(=ks-x1001	    . #x5567)	; &I-K0-5567; [53-71]
+	(=daikanwa	    . 11132)	; &I-M-11132;
+	))
+      (=jis-x0212	  . #x4552)	; &M-15805; [37-50]
+      (=daikanwa	  . 15805)	; &I-M-15805;
+      (=hanziku-4	  . #xB667)	; &I-HZK04-B667;
+      (=cbeta		  . 06256)	; &I-CB06256;
+      (=ucs@unicode	  . #x6AD6)	; &M-15805;
       )
-     ((=cns11643-1	  . #x6C65)	; &C1-6C65; [76-69]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=cns11643-1	    . #x6C65)	; &C1-6C65; [76-69]
+	))
+      (=cns11643-4	  . #x5F71)	; &C4-5F71; [63-81]
       ))
-    (=cns11643-4	. #x5F71)	; &C4-5F71; [63-81]
     ))
 (define-char
-  '((=>ucs		. #x6AD7)	; 櫗
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x6AD7)	; 櫗
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6AD7)	; 櫗
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
@@ -23183,25 +23811,99 @@
     (=hanziku-4		. #xB642)	; &I-HZK04-B642;
     ))
 (define-char
-  '((morohashi-daikanwa	15806 0 2)
+  '((<-denotational
+     ((=ucs		  . #x6AD7)	; 櫗
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 14)
+    (total-strokes	 . 18)
+    (=ucs@unicode	. #x6AD7)	; &UU+6AD7;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (=ucs		. #x6AD8)	; 櫘
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6AD8)	; 櫘
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x6AD7)	; 櫗
+    (->subsumptive
+     ((=cns11643-3	  . #x5A4D)	; &M-15807; [58-45]
+      (=daikanwa	  . 15807)	; &I-M-15807;
+      )
+     ((hanyu-dazidian	  2 1311 14)
+      (=hanziku-4	  . #xB5EB)	; &HZK04-B5EB;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6AD8)	; 櫘
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (=ucs@unicode	. #x6AD8)	; &UU+6AD8;
+    ))
+(define-char
+  '((=>ucs		. #x3C08)	; 㰈
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (=daikanwa		. 15808)	; &M-15808;
+    ))
+(define-char
+  '((=>daikanwa		. 15808)	; &M-15808;
+    (ideographic-radical . 75)	; ⽊
+    (=ucs		. #x3C08)	; 㰈
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3C08)	; 㰈
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 14)
+    (total-strokes	 . 18)
+    (=ucs@unicode	. #x3C08)	; &UU+3C08;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3C08)	; 㰈
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (=cns11643-3	. #x5A4A)	; &C3-5A4A; [58-42]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (hanyu-dazidian	2 1311 14)
-    (=ucs		. #x6AD8)	; 櫘
-    (=cns11643-3	. #x5A4D)	; &I-C3-5A4D; [58-45]
-    (=daikanwa		. 15807)	; &I-M-15807;
-    (=hanziku-4		. #xB5EB)	; &I-HZK04-B5EB;
+    (=ucs		. #x3C01)	; 㰁
+    (=cns11643-4	. #x5F70)	; &I-C4-5F70; [63-80]
+    (=daikanwa		. 15809)	; &I-M-15809;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (=ucs		. #x23796)	; 𣞖
+    (->subsumptive
+     ((=daikanwa	  . 15810)	; &M-15810;
+      )
+     ((=ucs@iso		  . #x23796)	; &U-00023796;
+      )
+     ((=cns11643-7	  . #x4740)	; &C7-4740; [39-32]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x6AD9)	; 櫙
+    (=big5		. #xF250)	; &I-B-F250;
     ))
 (define-char
   '((<-denotational
@@ -23221,40 +23923,82 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (=big5		. #xF250)	; &B-F250;
-    (=ucs@unicode	. #x6AD9)	; &B-F250;
+    (=ucs@unicode	. #x6AD9)	; &UU+6AD9;
     ))
 (define-char
-  '((=>ucs		. #x6ADA)	; 櫚
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (=ucs		. #x3C02)	; 㰂
+    (->subsumptive
+     ((=daikanwa	  . 15812)	; &M-15812;
+      )
+     ((=ucs@unicode	  . #x3C02)	; &UU+3C02;
+      )
+     ((=cns11643-4	  . #x5F6E)	; &C4-5F6E; [63-78]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=daikanwa		. 15815)	; &M-15815;
+    (=ucs		. #x3C03)	; 㰃
+    (->subsumptive
+     ((=daikanwa	  . 15813)	; &M-15813;
+      )
+     ((=ucs@unicode	  . #x3C03)	; &UU+3C03;
+      )
+     ((=cns11643-4	  . #x5F72)	; &C4-5F72; [63-82]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x6ADA)	; 櫚
     ))
 (define-char
-  '((=>ucs		. #x6ADA)	; 櫚
-    (morohashi-daikanwa	15815 0 0)
+  '((<-denotational
+     ((=ucs		  . #x6ADA)	; 櫚
+      ))
     (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 14)
-    (total-strokes	 . 18)
-    (shinjigen-2	. 3873)
-    (=jis-x0208		. #x5D2D)	; &GT-20353; [61-13]
-    (=ks-x1001		. #x556A)	; &I-K0-556A; [53-74]
-    (=cns11643-1	. #x783E)	; &I-C1-783E; [88-30]
-    (=big5		. #xC371)	; &I-B-C371;
-    (=gt		. 20353)	; &I-GT-20353;
-    (=gt-pj-1		. #x5D2D)	; &I-GT-20353; [61-13]
-    (=ucs@jis		. #x6ADA)	; &GT-20353;
-    (=ucs@big5		. #x6ADA)	; &GT-20353;
-    (mojikyo		. 015815)	; &MCS-60003DC7;
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (->subsumptive
+     ((=daikanwa	  . 15815)	; &M-15815;
+      )
+     ((shinjigen-1	  . 3873)
+      (shinjigen-2	  . 3873)
+      (=jis-x0208	  . #x5D2D)	; &GT-20353; [61-13]
+      (=ks-x1001	  . #x556A)	; &I-K0-556A; [53-74]
+      (=cns11643-1	  . #x783E)	; &I-C1-783E; [88-30]
+      (=big5		  . #xC371)	; &I-B-C371;
+      (=gt		  . 20353)	; &I-GT-20353;
+      (=gt-pj-1		  . #x5D2D)	; &I-GT-20353; [61-13]
+      (=ucs@jis		  . #x6ADA)	; &GT-20353;
+      (=ucs@big5	  . #x6ADA)	; &GT-20353;
+      (mojikyo		  . 015815)	; &MCS-60003DC7;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15815 0 5)
+  '((<-denotational
+     ((=ucs		  . #x6ADA)	; 櫚
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (=ucs		. #x6ADA)	; 櫚
-    (=gb12345		. #x6935)	; 櫚 [73-21]
+    (=gb12345		. #x6935)	; &UU+6ADA; [73-21]
+    (=ucs@unicode	. #x6ADA)	; &UU+6ADA;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (=ucs		. #x3C04)	; 㰄
+    (->subsumptive
+     ((=cns11643-4	  . #x5F75)	; &M-15816; [63-85]
+      (=daikanwa	  . 15816)	; &I-M-15816;
+      )
+     ((=ucs@unicode	  . #x3C04)	; &UU+3C04;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -23306,10 +24050,6 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x367B)	; &J78-367B; [22-91]
-      (=ks-x1001	  . #x716E)	; &I-K0-716E; [81-78]
-      ))
     (=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]
@@ -23317,6 +24057,10 @@
     (=gt		. 20091)	; &I-GT-20091;
     (=gt-pj-1		. #x367B)	; &I-GT-20091; [22-91]
     (=ucs@unicode	. #x6ADB)	; &GT-20091;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x367B)	; &J78-367B; [22-91]
+      (=ks-x1001	  . #x716E)	; &I-K0-716E; [81-78]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -23499,160 +24243,234 @@
     (=ucs		. #x3C05)	; 㰅
     ))
 (define-char
-  '((=>ucs		. #x6AE1)	; æ«¡
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x6AE1)	; æ«¡
+    (=big5		. #xEFE0)	; &I-B-EFE0;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6AE1)	; æ«¡
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=big5		. #xEFE0)	; &M-15826;
-    (=daikanwa		. 15826)	; &I-M-15826;
-    (=ucs@big5		. #x6AE1)	; &M-15826;
+    (=daikanwa		. 15826)	; &M-15826;
     ))
 (define-char
-  '((morohashi-daikanwa	15826 0 2)
+  '((<-denotational
+     ((=ucs		  . #x6AE1)	; æ«¡
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (=ucs		. #x6AE1)	; æ«¡
-    (=cns11643-2	. #x616C)	; &I-C2-616C; [65-76]
+    (=cns11643-2	. #x616C)	; &C2-616C; [65-76]
+    (=ucs@unicode	. #x6AE1)	; &C2-616C;
     ))
 (define-char
-  '((=>ucs		. #x3C06)	; 㰆
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=daikanwa		. 15827)	; &M-15827;
-    (=cbeta		. 02240)	; &I-CB02240;
+    (=ucs		. #x3C06)	; 㰆
+    (->subsumptive
+     ((=daikanwa	  . 15827)	; &M-15827;
+      (=cbeta		  . 02240)	; &I-CB02240;
+      )
+     ((=ucs@unicode	  . #x3C06)	; &UU+3C06;
+      )
+     ((=cns11643-3	  . #x5A4B)	; &C3-5A4B; [58-43]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15827 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x3C06)	; 㰆
+    (=ucs		. #x2379B)	; 𣞛
     ))
 (define-char
-  '((=>ucs		. #x3C06)	; 㰆
-    (morohashi-daikanwa	15827 0 1)
+  '((<-denotational
+     ((=ucs		  . #x2379B)	; 𣞛
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=cns11643-3	. #x5A4B)	; &C3-5A4B; [58-43]
+    (->subsumptive
+     ((=daikanwa	  . 15830)	; &M-15830;
+      )
+     ((=cns11643-7	  . #x4749)	; &C7-4749; [39-41]
+      ))
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x2379B)	; 𣞛
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (hanyu-dazidian	2 1313 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6728)	; 木
-      )
-     ((=ucs		  . #x6578)	; 數
-      ))
-    (=ucs		. #x6AE2)	; æ«¢
-    (=daikanwa		. 15833)	; &I-M-15833;
-    (=hanziku-4		. #xB66A)	; &I-HZK04-B66A;
-    (=cbeta		. 04859)	; &I-CB04859;
-    (=jef-china3	. #x54BC)	; &I-JC3-54BC;
+    (=ucs@iso		. #x2379B)	; &U-0002379B;
     ))
 (define-char
-  '((=>ucs		. #x6AE2)	; æ«¢
-    (morohashi-daikanwa	15833 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x6AE2)	; æ«¢
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=jis-x0208	    . #x5A4B)	; &M-13363; [58-43]
+	(=daikanwa	    . 13363)	; &I-M-13363;
+	))
+      (=daikanwa	  . 15833)	; &M-15833;
       )
-     ((=ucs		  . #x6728)	; 木
+     ((hanyu-dazidian	  2 1313 12)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=ks-x1001	    . #x6226)	; &GT-16891; [66-06]
+	))
+      (=hanziku-4	  . #xB66A)	; &CB04859;
+      (=cbeta		  . 04859)	; &I-CB04859;
+      (=jef-china3	  . #x54BC)	; &I-JC3-54BC;
+      (=ucs@unicode	  . #x6AE2)	; &CB04859;
       )
-     ((=cns11643-1	  . #x6D30)	; &C1-6D30; [77-16]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=cns11643-1	    . #x6D30)	; &C1-6D30; [77-16]
+	))
+      (=cns11643-3	  . #x5A48)	; &C3-5A48; [58-40]
       ))
-    (=cns11643-3	. #x5A48)	; &C3-5A48; [58-40]
     ))
 (define-char
-  '((=>ucs		. #x6AE3)	; æ«£
+  '((=>ucs		. #x2379F)	; 𣞟
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=daikanwa		. 15841)	; &M-15841;
+    (=daikanwa		. 15835)	; &M-15835;
     ))
 (define-char
-  '((=>ucs		. #x6AE3)	; æ«£
-    (morohashi-daikanwa	15841 0 2)
+  '((=>daikanwa		. 15835)	; &M-15835;
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=cns11643-3	. #x5A46)	; &C3-5A46; [58-38]
+    (=ucs		. #x2379F)	; 𣞟
+    (->subsumptive
+     ((=ucs@iso		  . #x2379F)	; &U-0002379F;
+      )
+     ((=cns11643-5	  . #x682F)	; &C5-682F; [72-15]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15841 0 3)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x6AE3)	; æ«£
+    (=ucs		. #x237B5)	; 𣞵
     ))
 (define-char
-  '((=>ucs		. #x237A3)	; 𣞣
+  '((<-denotational
+     ((=ucs		  . #x237B5)	; 𣞵
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=daikanwa		. 49185)	; &M-49185;
+    (->subsumptive
+     ((=daikanwa	  . 15836)	; &M-15836;
+      )
+     ((=cns11643-7	  . #x473F)	; &C7-473F; [39-31]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	49185 0 0)
+  '((<-denotational
+     ((=ucs		  . #x237B5)	; 𣞵
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x237A3)	; 𣞣
-    (=cns11643-7	. #x4747)	; &I-C7-4747; [39-39]
+    (=ucs@iso		. #x237B5)	; &U-000237B5;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x3C01)	; 㰁
-    (=cns11643-4	. #x5F70)	; &I-C4-5F70; [63-80]
+    (=ucs		. #x237D1)	; 𣟑
+    (->subsumptive
+     ((=daikanwa	  . 15840)	; &M-15840;
+      )
+     ((=cns11643-5	  . #x682A)	; &C5-682A; [72-10]
+      )
+     ((=ucs@iso		  . #x237D1)	; &U-000237D1;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x6AE3)	; æ«£
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6AE3)	; æ«£
+      ))
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x3C02)	; 㰂
-    (=cns11643-4	. #x5F6E)	; &I-C4-5F6E; [63-78]
+    (=daikanwa		. 15841)	; &M-15841;
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x6AE3)	; æ«£
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 13)
+    (total-strokes	 . 17)
+    (=ucs@unicode	. #x6AE3)	; &UU+6AE3;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6AE3)	; æ«£
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x3C03)	; 㰃
-    (=cns11643-4	. #x5F72)	; &I-C4-5F72; [63-82]
+    (=cns11643-3	. #x5A46)	; &C3-5A46; [58-38]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x3C04)	; 㰄
-    (=cns11643-4	. #x5F75)	; &I-C4-5F75; [63-85]
+    (=ucs		. #x237A3)	; 𣞣
+    (->subsumptive
+     ((=daikanwa	  . 49185)	; &M-49185;
+      )
+     ((=cns11643-7	  . #x4747)	; &C7-4747; [39-39]
+      (=ucs@iso		  . #x237A3)	; &C7-4747;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x3C08)	; 㰈
-    (=cns11643-3	. #x5A4A)	; &I-C3-5A4A; [58-42]
+    (=ucs		. #x6AE4)	; 櫤
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x6AE4)	; 櫤
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x6AE4)	; 櫤
+    (=ucs@unicode	. #x6AE4)	; &UU+6AE4;
     ))
 (define-char
-  '((=>ucs		. #x6AE4)	; 櫤
+  '((<-denotational
+     ((=ucs		  . #x6AE4)	; 櫤
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
@@ -23666,15 +24484,11 @@
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
     (=ucs		. #x6AE5)	; æ«¥
-    (=cns11643-1	. #x783C)	; &I-C1-783C; [88-28]
-    ))
-(define-char
-  '((=>ucs		. #x6AE5)	; æ«¥
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 15)
-    (total-strokes	 . 19)
-    (=big5		. #xC36F)	; &B-C36F;
-    (=ucs@big5		. #x6AE5)	; &B-C36F;
+    (=big5		. #xC36F)	; &I-B-C36F;
+    (->subsumptive
+     ((=cns11643-1	  . #x783C)	; &C1-783C; [88-28]
+      (=ucs@unicode	  . #x6AE5)	; &C1-783C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -23693,13 +24507,6 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x23796)	; 𣞖
-    (=cns11643-7	. #x4740)	; &I-C7-4740; [39-32]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 15)
-    (total-strokes	 . 19)
     (=ucs		. #x23797)	; 𣞗
     (=cns11643-5	. #x682D)	; &I-C5-682D; [72-13]
     ))
@@ -23721,13 +24528,6 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x2379B)	; 𣞛
-    (=cns11643-7	. #x4749)	; &I-C7-4749; [39-41]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 15)
-    (total-strokes	 . 19)
     (=ucs		. #x2379C)	; 𣞜
     (=cns11643-5	. #x6827)	; &I-C5-6827; [72-07]
     ))
@@ -23749,15 +24549,12 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x2379F)	; 𣞟
-    (=cns11643-5	. #x682F)	; &I-C5-682F; [72-15]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 15)
-    (total-strokes	 . 19)
     (=ucs		. #x237B0)	; 𣞰
-    (=cns11643-5	. #x682E)	; &I-C5-682E; [72-14]
+    (->subsumptive
+     ((=ucs@iso		  . #x237B0)	; &U-000237B0;
+      )
+     ((=cns11643-5	  . #x682E)	; &C5-682E; [72-14]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -23770,13 +24567,6 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x237B5)	; 𣞵
-    (=cns11643-7	. #x473F)	; &I-C7-473F; [39-31]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 15)
-    (total-strokes	 . 19)
     (=ucs		. #x237B7)	; 𣞷
     (=cns11643-5	. #x682C)	; &I-C5-682C; [72-12]
     ))
@@ -23798,45 +24588,45 @@
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 15)
-    (total-strokes	 . 19)
-    (=ucs		. #x237C9)	; 𣟉
-    ))
-(define-char
-  '((=>ucs		. #x237C9)	; 𣟉
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 15)
-    (total-strokes	 . 19)
-    (=cns11643-5	. #x6830)	; &C5-6830; [72-16]
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=ucs		. #x3C09)	; 㰉
+    (->subsumptive
+     ((=daikanwa	  . 15842)	; &M-15842;
+      )
+     ((=ucs@unicode	  . #x3C09)	; &UU+3C09;
+      )
+     ((=cns11643-3	  . #x5C4C)	; &C3-5C4C; [60-44]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 15)
-    (total-strokes	 . 19)
-    (=ucs		. #x237D1)	; 𣟑
-    (=cns11643-5	. #x682A)	; &I-C5-682A; [72-10]
+    (=ucs		. #x6AE7)	; 櫧
+    (=big5		. #xF24C)	; &I-B-F24C;
     ))
 (define-char
-  '((=>ucs		. #x6AE7)	; 櫧
+  '((<-denotational
+     ((=ucs		  . #x6AE7)	; 櫧
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
     (=jis-x0212		. #x4556)	; &M-15843; [37-54]
     (=jis-x0213-1-2000	. #x7639)	; &I-JX1-7639; [86-25]
-    (=big5		. #xF24C)	; &I-B-F24C;
     (=daikanwa		. 15843)	; &I-M-15843;
     (=jef-china3	. #x54BE)	; &I-JC3-54BE;
     (=ucs@jis		. #x6AE7)	; &M-15843;
-    (=ucs@big5		. #x6AE7)	; &M-15843;
     ))
 (define-char
-  '((morohashi-daikanwa	15843 0 2)
+  '((<-denotational
+     ((=ucs		  . #x6AE7)	; 櫧
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs		. #x6AE7)	; 櫧
-    (=cns11643-2	. #x6557)	; &I-C2-6557; [69-55]
-    (=gb12345		. #x6946)	; 櫧 [73-38]
+    (=cns11643-2	. #x6557)	; &C2-6557; [69-55]
+    (=gb12345		. #x6946)	; &C2-6557; [73-38]
+    (=ucs@unicode	. #x6AE7)	; &C2-6557;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -23858,51 +24648,43 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x6AE9)	; æ«©
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 16)
-    (total-strokes	 . 20)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6728)	; 木
-      )
-     ((=daikanwa	  . 41379)	; &M-41379;
-      ))
-    (=daikanwa		. 15845)	; &M-15845;
-    ))
-(define-char
-  '((=>ucs		. #x6AE9)	; æ«©
-    (morohashi-daikanwa	15845 0 0)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 16)
-    (total-strokes	 . 20)
-    (mojikyo		. 015845)	; &MCS-60003DE5;
-    ))
-(define-char
-  '((morohashi-daikanwa	15845 0 1)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (hanyu-dazidian	2 1318 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x6AE9)	; æ«©
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=daikanwa	    . 41379)	; &M-41379;
+	))
+      (=daikanwa	  . 15845)	; &M-15845;
       )
-     ((=ucs		  . #x6728)	; 木
+     ((mojikyo		  . 015845)	; &MCS-60003DE5;
       )
-     ((=ucs		  . #x95BB)	; 閻
+     ((hanyu-dazidian	  2 1318 10)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=cns11643-1	    . #x726F)	; &C1-726F; [82-79]
+	))
+      (=cns11643-3	  . #x5C49)	; &CB01761; [60-41]
+      (=hanziku-4	  . #xB76B)	; &I-HZK04-B76B;
+      (=cbeta		  . 01761)	; &I-CB01761;
+      (=ucs@unicode	  . #x6AE9)	; &CB01761;
       ))
-    (=ucs		. #x6AE9)	; æ«©
-    (=cns11643-3	. #x5C49)	; &I-C3-5C49; [60-41]
-    (=hanziku-4		. #xB76B)	; &I-HZK04-B76B;
-    (=cbeta		. 01761)	; &I-CB01761;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
+    (shinjigen-1	. 3884)
     (shinjigen-2	. 3884)
     (=ucs		. #x6AEA)	; 櫪
     (=jis-x0208		. #x5D2E)	; &I-J90-5D2E; [61-14]
@@ -23915,6 +24697,18 @@
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=ucs		. #x237C4)	; 𣟄
+    (->subsumptive
+     ((=daikanwa	  . 15847)	; &M-15847;
+      (=ucs@iso		  . #x237C4)	; &M-15847;
+      )
+     ((=cns11643-4	  . #x6353)	; &C4-6353; [67-51]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x6AEB)	; æ««
     (=big5		. #xF255)	; &I-B-F255;
     (=jef-china3	. #x8DFA)	; &I-JC3-8DFA;
@@ -23944,419 +24738,622 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x6AEC)	; 櫬
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=jis-x0212		. #x4557)	; &M-15851; [37-55]
-    (=jis-x0213-2-2000	. #x2F6B)	; &I-JX2-2F6B; [15-75]
-    (=big5		. #xC468)	; &I-B-C468;
-    (=daikanwa		. 15851)	; &I-M-15851;
-    (=jef-china3	. #x54BF)	; &I-JC3-54BF;
-    (=ucs@jis		. #x6AEC)	; &M-15851;
-    (=ucs@big5		. #x6AEC)	; &M-15851;
+    (=ucs		. #x237C5)	; 𣟅
     ))
 (define-char
-  '((morohashi-daikanwa	15851 0 0)
+  '((<-denotational
+     ((=ucs		  . #x237C5)	; 𣟅
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x6AEC)	; 櫬
-    (=cns11643-1	. #x7973)	; &I-C1-7973; [89-83]
-    (=gb12345		. #x6934)	; 櫬 [73-20]
+    (->subsumptive
+     ((=daikanwa	  . 15849)	; &M-15849;
+      )
+     ((=cns11643-7	  . #x4D7C)	; &C7-4D7C; [45-92]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6AED)	; æ«­
+  '((<-denotational
+     ((=ucs		  . #x237C5)	; 𣟅
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=daikanwa		. 15853)	; &M-15853;
+    (=ucs@iso		. #x237C5)	; &U-000237C5;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x237C6)	; 𣟆
     ))
 (define-char
-  '((=>ucs		. #x6AED)	; æ«­
-    (morohashi-daikanwa	15853 0 0)
+  '((<-denotational
+     ((=ucs		  . #x237C6)	; 𣟆
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (hanyu-dazidian	2 1317 5)
-    (=hanziku-4		. #xB746)	; &HZK04-B746;
+    (=daikanwa		. 15850)	; &M-15850;
     ))
 (define-char
-  '((morohashi-daikanwa	15853 0 4)
+  '((<-denotational
+     ((=ucs		  . #x237C6)	; 𣟆
+      ))
     (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 14)
-    (total-strokes	 . 18)
-    (=ucs		. #x6AED)	; æ«­
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (=ucs@iso		. #x237C6)	; &U-000237C6;
     ))
 (define-char
-  '((=>ucs		. #x6AED)	; æ«­
-    (morohashi-daikanwa	15853 0 5)
+  '((<-denotational
+     ((=ucs		  . #x237C6)	; 𣟆
+      ))
     (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 14)
-    (total-strokes	 . 18)
-    (=cns11643-3	. #x5775)	; &C3-5775; [55-85]
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=cns11643-5	. #x6C3F)	; &C5-6C3F; [76-31]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x6AEE)	; æ«®
-    (=cns11643-2	. #x6927)	; &I-C2-6927; [73-07]
-    (=big5		. #xF459)	; &I-B-F459;
-    (=daikanwa		. 15854)	; &I-M-15854;
+    (=ucs		. #x6AEC)	; 櫬
+    (=big5		. #xC468)	; &I-B-C468;
+    (->subsumptive
+     ((=jis-x0212	  . #x4557)	; &M-15851; [37-55]
+      (=jis-x0213-2-2000  . #x2F6B)	; &I-JX2-2F6B; [15-75]
+      (=daikanwa	  . 15851)	; &I-M-15851;
+      (=jef-china3	  . #x54BF)	; &I-JC3-54BF;
+      (=ucs@jis		  . #x6AEC)	; &M-15851;
+      )
+     ((=cns11643-1	  . #x7973)	; &C1-7973; [89-83]
+      )
+     ((=gb12345		  . #x6934)	; &UU+6AEC; [73-20]
+      (=ucs@unicode	  . #x6AEC)	; &UU+6AEC;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x6AEF)	; 櫯
-    (=cns11643-2	. #x6928)	; &I-C2-6928; [73-08]
-    (=big5		. #xF45A)	; &I-B-F45A;
-    (=daikanwa		. 15859)	; &I-M-15859;
+    (=ucs		. #x237C7)	; 𣟇
     ))
 (define-char
-  '((=>ucs		. #x6AF0)	; æ«°
+  '((<-denotational
+     ((=ucs		  . #x237C7)	; 𣟇
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=jis-x0212		. #x4558)	; &M-15862; [37-56]
-    (=big5		. #xF454)	; &I-B-F454;
-    (=daikanwa		. 15862)	; &I-M-15862;
-    (=ucs@jis		. #x6AF0)	; &M-15862;
-    (=ucs@big5		. #x6AF0)	; &M-15862;
+    (=daikanwa		. 15852)	; &M-15852;
     ))
 (define-char
-  '((morohashi-daikanwa	15862 0 0)
+  '((<-denotational
+     ((=ucs		  . #x237C7)	; 𣟇
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x6AF0)	; æ«°
-    (=cns11643-2	. #x6922)	; &I-C2-6922; [73-02]
+    (=cns11643-7	. #x4D7E)	; &C7-4D7E; [45-94]
+    (=ucs@iso		. #x237C7)	; &C7-4D7E;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x6AED)	; æ«­
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6AED)	; æ«­
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x6AF1)	; 櫱
-    (=big5		. #xF458)	; &I-B-F458;
     (->subsumptive
-     ((=jis-x0212	  . #x4559)	; &M-15863; [37-57]
-      (=jis-x0213-2-2000  . #x2F6C)	; &I-JX2-2F6C; [15-76]
-      (=daikanwa	  . 15863)	; &I-M-15863;
-      (=ucs@jis		  . #x6AF1)	; &M-15863;
+     ((=daikanwa	  . 15853)	; &M-15853;
       )
-     ((=ucs@unicode	  . #x6AF1)	; &UU+6AF1;
+     ((hanyu-dazidian	  2 1317 5)
+      (=hanziku-4	  . #xB746)	; &HZK04-B746;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6AED)	; æ«­
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 14)
+    (total-strokes	 . 18)
+    (->subsumptive
+     ((=ucs@unicode	  . #x6AED)	; &UU+6AED;
       )
-     ((=cns11643-2	  . #x6926)	; &C2-6926; [73-06]
-      (=ucs@cns		  . #x6AF1)	; &C2-6926;
+     ((=cns11643-3	  . #x5775)	; &C3-5775; [55-85]
       ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (hanyu-dazidian	2 1319 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6728)	; 木
-      )
-     ((=ucs		  . #x8C6B)	; 豫
-      ))
-    (=ucs		. #x6AF2)	; 櫲
-    (=jis-x0212		. #x455A)	; &I-JSP-455A; [37-58]
-    (=cns11643-4	. #x6350)	; &I-C4-6350; [67-48]
-    (=jis-x0213-2-2000	. #x2F6D)	; &I-JX2-2F6D; [15-77]
-    (=daikanwa		. 15864)	; &I-M-15864;
-    (=hanziku-4		. #xB7A6)	; &I-HZK04-B7A6;
-    (=cbeta		. 04400)	; &I-CB04400;
+    (=ucs		. #x6AEE)	; æ«®
+    (=cns11643-2	. #x6927)	; &I-C2-6927; [73-07]
+    (=big5		. #xF459)	; &I-B-F459;
+    (=daikanwa		. 15854)	; &I-M-15854;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x6AF3)	; 櫳
-    (=big5		. #xF453)	; &I-B-F453;
+    (=ucs		. #x237C8)	; 𣟈
     (->subsumptive
-     ((=jis-x0213-2-2000  . #x2F6E)	; &M-15868; [15-78]
-      (=daikanwa	  . 15868)	; &I-M-15868;
-      (=ucs@jis		  . #x6AF3)	; &M-15868;
+     ((=daikanwa	  . 15855)	; &M-15855;
+      (=ucs@iso		  . #x237C8)	; &M-15855;
       )
-     ((=gb12345		  . #x6850)	; &UU+6AF3; [72-48]
-      (=ucs@unicode	  . #x6AF3)	; &UU+6AF3;
-      )
-     ((=cns11643-2	  . #x6921)	; &C2-6921; [73-01]
-      (=ucs@cns		  . #x6AF3)	; &C2-6921;
+     ((=cns11643-5	  . #x6C42)	; &C5-6C42; [76-34]
       ))
     ))
 (define-char
-  '((=>ucs		. #x3C0F)	; 㰏
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 16)
-    (total-strokes	 . 20)
-    (=jis-x0213-1-2000	. #x763A)	; &M-15871; [86-26]
-    (=daikanwa		. 15871)	; &I-M-15871;
-    (=ucs@jis		. #x3C0F)	; &M-15871;
-    ))
-(define-char
-  '((morohashi-daikanwa	15871 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x3C0F)	; 㰏
-    (=cns11643-4	. #x6354)	; &I-C4-6354; [67-52]
+    (=ucs		. #x3C0A)	; 㰊
     ))
 (define-char
-  '((=>ucs		. #x6AF4)	; æ«´
+  '((<-denotational
+     ((=ucs		  . #x3C0A)	; 㰊
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (hanyu-dazidian	2 1316 7)
-    (=cns11643-3	. #x5C47)	; &M-15873; [60-39]
-    (=daikanwa		. 15873)	; &I-M-15873;
-    (=hanziku-4		. #xB6E7)	; &I-HZK04-B6E7;
+    (->subsumptive
+     ((=daikanwa	  . 15856)	; &M-15856;
+      )
+     ((=cns11643-3	  . #x5C46)	; &C3-5C46; [60-38]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15873 0 4)
+  '((<-denotational
+     ((=ucs		  . #x3C0A)	; 㰊
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x6AF4)	; æ«´
+    (=ucs@unicode	. #x3C0A)	; &UU+3C0A;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (=ucs		. #x6B04)	; 欄
+    (=ucs		. #x237C9)	; 𣟉
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x6B04)	; 欄
+     ((=ucs		  . #x237C9)	; 𣟉
       ))
-    (morohashi-daikanwa	15880 1)
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xF91D)	; 欄
-      (=jis-x0213-1-2000  . #x763B)	; &I-JX1-763B; [86-27]
-      ))
-    (<-simplified@JP/Jouyou*sources
-     JP/Jouyou daikanwa)
-    (=jis-x0208		. #x4D73)	; &GT-20415; [45-83]
-    (=gt		. 20415)	; &I-GT-20415;
-    (=gt-pj-1		. #x4D73)	; &I-GT-20415; [45-83]
-    (=ucs@jis		. #x6B04)	; &GT-20415;
-    (mojikyo		. 050235)	; &MCS-6000C43B;
+    (=daikanwa		. 15857)	; &M-15857;
+    (=ucs@iso		. #x237C9)	; &M-15857;
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 16)
-    (total-strokes	 . 20)
-    (=ucs		. #x237E8)	; 𣟨
-    (=cns11643-7	. #x4E21)	; &I-C7-4E21; [46-01]
-    (=daikanwa		. 49186)	; &I-M-49186;
+  '((<-denotational
+     ((=ucs		  . #x237C9)	; 𣟉
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (=cns11643-5	. #x6830)	; &C5-6830; [72-16]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x3C09)	; 㰉
-    (=cns11643-3	. #x5C4C)	; &I-C3-5C4C; [60-44]
+    (=ucs		. #x237CA)	; 𣟊
+    (->subsumptive
+     ((=daikanwa	  . 15858)	; &M-15858;
+      )
+     ((=cns11643-5	  . #x6C3A)	; &C5-6C3A; [76-26]
+      )
+     ((=ucs@iso		  . #x237CA)	; &U-000237CA;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x3C0A)	; 㰊
-    (=cns11643-3	. #x5C46)	; &I-C3-5C46; [60-38]
+    (=ucs		. #x6AEF)	; 櫯
+    (=cns11643-2	. #x6928)	; &I-C2-6928; [73-08]
+    (=big5		. #xF45A)	; &I-B-F45A;
+    (=daikanwa		. 15859)	; &I-M-15859;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x3C0B)	; 㰋
-    (=cns11643-4	. #x6351)	; &I-C4-6351; [67-49]
+    (=ucs		. #x237CB)	; 𣟋
+    (->subsumptive
+     ((=daikanwa	  . 15861)	; &M-15861;
+      )
+     ((=cns11643-5	  . #x6C39)	; &C5-6C39; [76-25]
+      (=ucs@iso		  . #x237CB)	; &C5-6C39;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x3C0C)	; 㰌
-    (=cns11643-4	. #x634F)	; &I-C4-634F; [67-47]
+    (=ucs		. #x6AF0)	; æ«°
+    (=big5		. #xF454)	; &I-B-F454;
+    (->subsumptive
+     ((=jis-x0212	  . #x4558)	; &M-15862; [37-56]
+      (=daikanwa	  . 15862)	; &I-M-15862;
+      (=ucs@jis		  . #x6AF0)	; &M-15862;
+      )
+     ((=cns11643-2	  . #x6922)	; &C2-6922; [73-02]
+      (=ucs@unicode	  . #x6AF0)	; &C2-6922;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x3C0D)	; 㰍
-    (=cns11643-3	. #x5C48)	; &I-C3-5C48; [60-40]
+    (=ucs		. #x6AF1)	; 櫱
+    (=big5		. #xF458)	; &I-B-F458;
+    (->subsumptive
+     ((=jis-x0212	  . #x4559)	; &M-15863; [37-57]
+      (=jis-x0213-2-2000  . #x2F6C)	; &I-JX2-2F6C; [15-76]
+      (=daikanwa	  . 15863)	; &I-M-15863;
+      (=ucs@jis		  . #x6AF1)	; &M-15863;
+      )
+     ((=ucs@unicode	  . #x6AF1)	; &UU+6AF1;
+      )
+     ((=cns11643-2	  . #x6926)	; &C2-6926; [73-06]
+      (=ucs@cns		  . #x6AF1)	; &C2-6926;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x3C0E)	; 㰎
-    (=cns11643-3	. #x5C4D)	; &I-C3-5C4D; [60-45]
+    (=ucs		. #x6AF2)	; 櫲
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=jis-x0208	    . #x502E)	; &GT-48859; [48-14]
+	(=ks-x1001	    . #x6763)	; &I-K0-6763; [71-67]
+	(=daikanwa	    . 36425)	; &I-M-36425;
+	))
+      (=jis-x0212	  . #x455A)	; &M-15864; [37-58]
+      (=jis-x0213-2-2000  . #x2F6D)	; &I-JX2-2F6D; [15-77]
+      (=daikanwa	  . 15864)	; &I-M-15864;
+      (=ucs@jis		  . #x6AF2)	; &M-15864;
+      )
+     ((hanyu-dazidian	  2 1319 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=gb2312	    . #x5425)	; &G0-5425; [52-05]
+	))
+      (=hanziku-4	  . #xB7A6)	; &HZK04-B7A6;
+      (=ucs@unicode	  . #x6AF2)	; &HZK04-B7A6;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=cns11643-1	    . #x7247)	; &C1-7247; [82-39]
+	))
+      (=cns11643-4	  . #x6350)	; &CB04400; [67-48]
+      (=cbeta		  . 04400)	; &I-CB04400;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x3C10)	; 㰐
-    (=cns11643-3	. #x5C4B)	; &I-C3-5C4B; [60-43]
+    (=ucs		. #x237CC)	; 𣟌
+    (->subsumptive
+     ((=daikanwa	  . 15865)	; &M-15865;
+      )
+     ((=ucs@iso		  . #x237CC)	; &U-000237CC;
+      )
+     ((=cns11643-5	  . #x6C3D)	; &C5-6C3D; [76-29]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x3C11)	; 㰑
-    (=cns11643-3	. #x5C45)	; &I-C3-5C45; [60-37]
+    (=ucs		. #x237CD)	; 𣟍
+    (->subsumptive
+     ((=daikanwa	  . 15866)	; &M-15866;
+      )
+     ((=ucs@iso		  . #x237CD)	; &U-000237CD;
+      )
+     ((=cns11643-7	  . #x4D7D)	; &C7-4D7D; [45-93]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x3C16)	; 㰖
+    (=ucs		. #x3C0C)	; 㰌
+    (->subsumptive
+     ((=daikanwa	  . 15867)	; &M-15867;
+      )
+     ((=ucs@unicode	  . #x3C0C)	; &UU+3C0C;
+      )
+     ((=cns11643-4	  . #x634F)	; &C4-634F; [67-47]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x3C16)	; 㰖
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=cns11643-3	. #x5C4A)	; &C3-5C4A; [60-42]
+    (=ucs		. #x6AF3)	; 櫳
+    (=big5		. #xF453)	; &I-B-F453;
+    (->subsumptive
+     ((=jis-x0213-2-2000  . #x2F6E)	; &M-15868; [15-78]
+      (=daikanwa	  . 15868)	; &I-M-15868;
+      (=ucs@jis		  . #x6AF3)	; &M-15868;
+      )
+     ((=gb12345		  . #x6850)	; &UU+6AF3; [72-48]
+      (=ucs@unicode	  . #x6AF3)	; &UU+6AF3;
+      )
+     ((=cns11643-2	  . #x6921)	; &C2-6921; [73-01]
+      (=ucs@cns		  . #x6AF3)	; &C2-6921;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x6AF5)	; 櫵
+    (=ucs		. #x3C0D)	; 㰍
+    (->subsumptive
+     ((=daikanwa	  . 15869)	; &M-15869;
+      )
+     ((=ucs@unicode	  . #x3C0D)	; &UU+3C0D;
+      )
+     ((=cns11643-3	  . #x5C48)	; &C3-5C48; [60-40]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x6AF6)	; 櫶
+    (=ucs		. #x3C0E)	; 㰎
+    (->subsumptive
+     ((=daikanwa	  . 15870)	; &M-15870;
+      )
+     ((=cns11643-3	  . #x5C4D)	; &C3-5C4D; [60-45]
+      (=ucs@unicode	  . #x3C0E)	; &C3-5C4D;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6AF6)	; 櫶
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=ucs		. #x3C0F)	; 㰏
+    (->subsumptive
+     ((=jis-x0213-1-2000  . #x763A)	; &M-15871; [86-26]
+      (=daikanwa	  . 15871)	; &I-M-15871;
+      (=ucs@jis		  . #x3C0F)	; &M-15871;
+      )
+     ((=cns11643-4	  . #x6354)	; &C4-6354; [67-52]
+      (=ucs@unicode	  . #x3C0F)	; &C4-6354;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=ucs		. #x237CE)	; 𣟎
+    (->subsumptive
+     ((=daikanwa	  . 15872)	; &M-15872;
+      )
+     ((=ucs@iso		  . #x237CE)	; &U-000237CE;
+      )
+     ((=cns11643-5	  . #x6C3C)	; &C5-6C3C; [76-28]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=ucs		. #x6AF4)	; æ«´
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6AF4)	; æ«´
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ks-x1001		. #x7A4B)	; &K0-7A4B; [90-43]
+    (hanyu-dazidian	2 1316 7)
+    (=cns11643-3	. #x5C47)	; &M-15873; [60-39]
+    (=daikanwa		. 15873)	; &I-M-15873;
+    (=hanziku-4		. #xB6E7)	; &I-HZK04-B6E7;
     ))
 (define-char
-  '((=>ucs		. #x6AF6)	; 櫶
+  '((<-denotational
+     ((=ucs		  . #x6AF4)	; æ«´
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (hanyu-dazidian	2 1318 8)
-    (=cns11643-4	. #x634E)	; &HZK04-B769; [67-46]
-    (=hanziku-4		. #xB769)	; &I-HZK04-B769;
+    (=ucs@unicode	. #x6AF4)	; &UU+6AF4;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x3C10)	; 㰐
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3C10)	; 㰐
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237C4)	; 𣟄
-    (=cns11643-4	. #x6353)	; &I-C4-6353; [67-51]
+    (=daikanwa		. 15874)	; &M-15874;
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x3C10)	; 㰐
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (=ucs@unicode	. #x3C10)	; &UU+3C10;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3C10)	; 㰐
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237C5)	; 𣟅
-    (=cns11643-7	. #x4D7C)	; &I-C7-4D7C; [45-92]
+    (=cns11643-3	. #x5C4B)	; &C3-5C4B; [60-43]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237C6)	; 𣟆
-    (=cns11643-5	. #x6C3F)	; &I-C5-6C3F; [76-31]
+    (=ucs		. #x3C11)	; 㰑
+    (->subsumptive
+     ((=daikanwa	  . 15875)	; &M-15875;
+      (=ucs@unicode	  . #x3C11)	; &M-15875;
+      )
+     ((=cns11643-3	  . #x5C45)	; &C3-5C45; [60-37]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237C7)	; 𣟇
-    (=cns11643-7	. #x4D7E)	; &I-C7-4D7E; [45-94]
+    (=ucs		. #x237CF)	; 𣟏
+    (->subsumptive
+     ((=daikanwa	  . 15876)	; &M-15876;
+      (=ucs@iso		  . #x237CF)	; &M-15876;
+      )
+     ((=cns11643-5	  . #x6C41)	; &C5-6C41; [76-33]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237C8)	; 𣟈
-    (=cns11643-5	. #x6C42)	; &I-C5-6C42; [76-34]
+    (=ucs		. #x237D0)	; 𣟐
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x237D0)	; 𣟐
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237CA)	; 𣟊
-    (=cns11643-5	. #x6C3A)	; &I-C5-6C3A; [76-26]
+    (=daikanwa		. 15877)	; &M-15877;
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x237D0)	; 𣟐
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237CB)	; 𣟋
-    (=cns11643-5	. #x6C39)	; &I-C5-6C39; [76-25]
+    (=cns11643-5	. #x6C3B)	; &C5-6C3B; [76-27]
+    (=ucs@iso		. #x237D0)	; &C5-6C3B;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237CC)	; 𣟌
-    (=cns11643-5	. #x6C3D)	; &I-C5-6C3D; [76-29]
+    (=ucs		. #x237D2)	; 𣟒
+    (=cns11643-5	. #x6C40)	; &I-C5-6C40; [76-32]
+    (=daikanwa		. 15879)	; &I-M-15879;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x6B04)	; 欄
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6B04)	; 欄
+      ))
+    (morohashi-daikanwa	15880 1)
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237CD)	; 𣟍
-    (=cns11643-7	. #x4D7D)	; &I-C7-4D7D; [45-93]
+    (=ucs		. #x237EC)	; 𣟬
+    (=jis-x0208		. #x4D73)	; &I-J90-4D73; [45-83]
+    (=cns11643-4	. #x6352)	; &I-C4-6352; [67-50]
+    (=gt		. 20415)	; &I-GT-20415;
+    (=gt-pj-1		. #x4D73)	; &I-GT-20415; [45-83]
+    (=ucs@jis		. #x6B04)	; 𣟬
+    (mojikyo		. 050235)	; &MCS-6000C43B;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xF91D)	; 欄
+      (=jis-x0213-1-2000  . #x763B)	; &I-JX1-763B; [86-27]
+      ))
+    (<-simplified@JP/Jouyou*sources
+     JP/Jouyou daikanwa)
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237CE)	; 𣟎
-    (=cns11643-5	. #x6C3C)	; &I-C5-6C3C; [76-28]
+    (=ucs		. #x237E8)	; 𣟨
+    (=cns11643-7	. #x4E21)	; &I-C7-4E21; [46-01]
+    (=daikanwa		. 49186)	; &I-M-49186;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237CF)	; 𣟏
-    (=cns11643-5	. #x6C41)	; &I-C5-6C41; [76-33]
+    (=ucs		. #x3C0B)	; 㰋
+    (=cns11643-4	. #x6351)	; &I-C4-6351; [67-49]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237D0)	; 𣟐
-    (=cns11643-5	. #x6C3B)	; &I-C5-6C3B; [76-27]
+    (=ucs		. #x6AF5)	; 櫵
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237D2)	; 𣟒
-    (=cns11643-5	. #x6C40)	; &I-C5-6C40; [76-32]
+    (=ucs		. #x6AF6)	; 櫶
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((=>ucs		. #x6AF6)	; 櫶
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237D8)	; 𣟘
-    (=cns11643-5	. #x6C3E)	; &I-C5-6C3E; [76-30]
+    (=ks-x1001		. #x7A4B)	; &K0-7A4B; [90-43]
+    ))
+(define-char
+  '((=>ucs		. #x6AF6)	; 櫶
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (hanyu-dazidian	2 1318 8)
+    (=cns11643-4	. #x634E)	; &HZK04-B769; [67-46]
+    (=hanziku-4		. #xB769)	; &I-HZK04-B769;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x237EC)	; 𣟬
-    (=cns11643-4	. #x6352)	; &I-C4-6352; [67-50]
+    (=ucs		. #x237D8)	; 𣟘
+    (=cns11643-5	. #x6C3E)	; &I-C5-6C3E; [76-30]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -24378,17 +25375,60 @@
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=ucs		. #x237EF)	; 𣟯
+    (->subsumptive
+     ((=daikanwa	  . 15881)	; &M-15881;
+      )
+     ((=cns11643-7	  . #x5349)	; &C7-5349; [51-41]
+      (=ucs@iso		  . #x237EF)	; &C7-5349;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=ucs		. #x237F0)	; 𣟰
+    (->subsumptive
+     ((=daikanwa	  . 15882)	; &M-15882;
+      )
+     ((=ucs@iso		  . #x237F0)	; &U-000237F0;
+      )
+     ((=cns11643-7	  . #x5348)	; &C7-5348; [51-40]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 17)
     (total-strokes	 . 14)
-    (shinjigen-2	. 3888)
     (=ucs		. #x6B05)	; 欅
-    (=jis-x0208		. #x5D30)	; &I-J90-5D30; [61-16]
-    (=gt		. 20431)	; &I-GT-20431;
-    (=gt-pj-1		. #x5D30)	; &I-GT-20431; [61-16]
-    (=daikanwa		. 15883)	; &I-M-15883;
+    (->subsumptive
+     ((shinjigen-2	  . 3888)
+      (=jis-x0208	  . #x5D30)	; &GT-20431; [61-16]
+      (=gt		  . 20431)	; &I-GT-20431;
+      (=gt-pj-1		  . #x5D30)	; &I-GT-20431; [61-16]
+      (=daikanwa	  . 15883)	; &I-M-15883;
+      (=ucs@unicode	  . #x6B05)	; &GT-20431;
+      )
+     ((shinjigen-1	  . 3888)
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=ucs		. #x237F2)	; 𣟲
+    (->subsumptive
+     ((=daikanwa	  . 15884)	; &M-15884;
+      )
+     ((=cns11643-5	  . #x702B)	; &C5-702B; [80-11]
+      (=ucs@iso		  . #x237F2)	; &C5-702B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x6AF9)	; 櫹
+    (=big5		. #xF457)	; &I-B-F457;
     ))
 (define-char
   '((<-denotational
@@ -24409,10 +25449,40 @@
      ((=ucs		  . #x6AF9)	; 櫹
       ))
     (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 16)
-    (total-strokes	 . 20)
-    (=big5		. #xF457)	; &B-F457;
-    (=ucs@unicode	. #x6AF9)	; &B-F457;
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=ucs@unicode	. #x6AF9)	; &UU+6AF9;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x237F3)	; 𣟳
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x237F3)	; 𣟳
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=daikanwa		. 15886)	; &M-15886;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x237F3)	; 𣟳
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=ucs@iso		. #x237F3)	; &U-000237F3;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x237F3)	; 𣟳
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=cns11643-5	. #x702D)	; &C5-702D; [80-13]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -24467,7 +25537,36 @@
     (=daikanwa		. 15889)	; &I-M-15889;
     ))
 (define-char
-  '((=>ucs		. #x6AFD)	; 櫽
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=ucs		. #x3C14)	; 㰔
+    (->subsumptive
+     ((=daikanwa	  . 15890)	; &M-15890;
+      )
+     ((=ucs@unicode	  . #x3C14)	; &UU+3C14;
+      )
+     ((=cns11643-5	  . #x7027)	; &C5-7027; [80-07]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=ucs		. #x237F4)	; 𣟴
+    (=cns11643-4	. #x6646)	; &I-C4-6646; [70-38]
+    (=daikanwa		. 15891)	; &I-M-15891;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=ucs		. #x6AFD)	; 櫽
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6AFD)	; 櫽
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
@@ -24488,7 +25587,18 @@
     (=ucs@jis		. #x6AFD)	; &M-15892;
     ))
 (define-char
-  '((morohashi-daikanwa	15892 0 2)
+  '((<-denotational
+     ((=ucs		  . #x6AFD)	; 櫽
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=cns11643-3	. #x5E35)	; &C3-5E35; [62-21]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6AFD)	; 櫽
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
@@ -24497,100 +25607,191 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs		  . #x96B1)	; 隱
+     ((=gb12345		  . #x527E)	; &UU+96B1; [50-94]
       )
      ((=ucs		  . #x6728)	; 木
       ))
-    (=ucs		. #x6AFD)	; 櫽
-    (=hanziku-4		. #xB7A4)	; &I-HZK04-B7A4;
+    (=hanziku-4		. #xB7A4)	; &HZK04-B7A4;
+    (=ucs@unicode	. #x6AFD)	; &HZK04-B7A4;
     ))
 (define-char
-  '((=>ucs		. #x6AFD)	; 櫽
-    (morohashi-daikanwa	15892 0 3)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=cns11643-3	. #x5E35)	; &C3-5E35; [62-21]
+    (=ucs		. #x6AFE)	; 櫾
     ))
 (define-char
-  '((=>ucs		. #x6AFE)	; 櫾
+  '((<-denotational
+     ((=ucs		  . #x6AFE)	; 櫾
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (hanyu-dazidian	2 1321 12)
-    (=daikanwa		. 15893)	; &M-15893;
-    (=hanziku-4		. #xB7EF)	; &I-HZK04-B7EF;
+    (->subsumptive
+     ((hanyu-dazidian	  2 1321 12)
+      (=daikanwa	  . 15893)	; &M-15893;
+      (=hanziku-4	  . #xB7EF)	; &I-HZK04-B7EF;
+      )
+     ((=cns11643-3	  . #x5E34)	; &C3-5E34; [62-20]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6AFE)	; 櫾
-    (morohashi-daikanwa	15893 0 0)
+  '((<-denotational
+     ((=ucs		  . #x6AFE)	; 櫾
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=cns11643-3	. #x5E34)	; &C3-5E34; [62-20]
+    (=ucs@unicode	. #x6AFE)	; &UU+6AFE;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=ucs		. #x237F5)	; 𣟵
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=jis-x0208	    . #x5926)	; &GT-14715; [57-06]
+	(=daikanwa	    . 11681)	; &I-M-11681;
+	))
+      (=daikanwa	  . 15894)	; &M-15894;
+      (=cbeta		  . 02106)	; &I-CB02106;
+      )
+     ((=ucs@iso		  . #x237F5)	; &U-000237F5;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6728)	; 木
+	)
+       ((=cns11643-1	    . #x7361)	; &C1-7361; [83-65]
+	))
+      (=cns11643-5	  . #x7029)	; &C5-7029; [80-09]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x3C15)	; 㰕
     ))
 (define-char
-  '((morohashi-daikanwa	15893 0 5)
+  '((<-denotational
+     ((=ucs		  . #x3C15)	; 㰕
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x6AFE)	; 櫾
+    (=daikanwa		. 15895)	; &M-15895;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3C15)	; 㰕
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (total-strokes@cns	     . 21)
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=cns11643-3	. #x5E36)	; &C3-5E36; [62-22]
+    (=ucs@unicode	. #x3C15)	; &C3-5E36;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x6AFF)	; æ«¿
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6AFF)	; æ«¿
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (->subsumptive
+     ((hanyu-dazidian	  2 1322 6)
+      (=daikanwa	  . 15896)	; &M-15896;
+      (=hanziku-4	  . #xB84A)	; &I-HZK04-B84A;
       )
-     ((=ucs		  . #x6728)	; 木
+     ((=cns11643-3	  . #x5E33)	; &C3-5E33; [62-19]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6AFF)	; æ«¿
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=ucs@unicode	. #x6AFF)	; &UU+6AFF;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=ucs		. #x237F6)	; 𣟶
+    (->subsumptive
+     ((=daikanwa	  . 15897)	; &M-15897;
       )
-     ((=ucs		  . #x6232)	; 戲
+     ((=cns11643-7	  . #x534D)	; &C7-534D; [51-45]
+      (=ucs@iso		  . #x237F6)	; &C7-534D;
       ))
-    (=daikanwa		. 15894)	; &M-15894;
-    (=cbeta		. 02106)	; &I-CB02106;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (hanyu-dazidian	2 1322 6)
-    (=ucs		. #x6AFF)	; æ«¿
-    (=cns11643-3	. #x5E33)	; &I-C3-5E33; [62-19]
-    (=daikanwa		. 15896)	; &I-M-15896;
-    (=hanziku-4		. #xB84A)	; &I-HZK04-B84A;
+    (=ucs		. #x6B00)	; 欀
+    (=big5		. #xF5D2)	; &I-B-F5D2;
+    (->subsumptive
+     ((=daikanwa	  . 15898)	; &M-15898;
+      )
+     ((=cns11643-2	  . #x6B60)	; &C2-6B60; [75-64]
+      (=ucs@unicode	  . #x6B00)	; &C2-6B60;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6B00)	; 欀
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=big5		. #xF5D2)	; &M-15898;
-    (=daikanwa		. 15898)	; &I-M-15898;
-    (=ucs@big5		. #x6B00)	; &M-15898;
+    (=ucs		. #x237F8)	; 𣟸
+    (->subsumptive
+     ((=daikanwa	  . 15899)	; &M-15899;
+      )
+     ((=ucs@iso		  . #x237F8)	; &U-000237F8;
+      )
+     ((=cns11643-5	  . #x7028)	; &C5-7028; [80-08]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15898 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x6B00)	; 欀
-    (=cns11643-2	. #x6B60)	; &I-C2-6B60; [75-64]
+    (=ucs		. #x237F9)	; 𣟹
+    (=cns11643-5	. #x702A)	; &I-C5-702A; [80-10]
+    (=daikanwa		. 15900)	; &I-M-15900;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (hanyu-dazidian	2 1321 2)
     (=ucs		. #x6B01)	; 欁
-    (=cns11643-3	. #x5E37)	; &I-C3-5E37; [62-23]
-    (=daikanwa		. 15901)	; &I-M-15901;
-    (=hanziku-4		. #xB7E5)	; &I-HZK04-B7E5;
+    (->subsumptive
+     ((=daikanwa	  . 15901)	; &M-15901;
+      )
+     ((=cns11643-3	  . #x5E37)	; &C3-5E37; [62-23]
+      )
+     ((hanyu-dazidian	  2 1321 2)
+      (=hanziku-4	  . #xB7E5)	; &HZK04-B7E5;
+      (=ucs@unicode	  . #x6B01)	; &HZK04-B7E5;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x6B02)	; 欂
+    (=big5		. #xF5CE)	; &I-B-F5CE;
     ))
 (define-char
   '((<-denotational
@@ -24611,7 +25812,6 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
     (=jis-x0212		. #x455D)	; &JSP-455D; [37-61]
-    (=big5		. #xF5CE)	; &I-B-F5CE;
     (=ucs@unicode	. #x6B02)	; &JSP-455D;
     ))
 (define-char
@@ -24654,218 +25854,337 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x23810)	; 𣠐
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes@ucs . 17)
+    (total-strokes@ucs	     . 21)
+    (ideographic-strokes@ucs*sources
+     daikanwa ucs)
+    (ideographic-strokes@cns . 16)
+    (total-strokes@cns	     . 20)
+    (=ucs		. #x3C16)	; 㰖
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3C16)	; 㰖
+      ))
     (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 17)
-    (total-strokes	 . 21)
-    (=daikanwa		. 49187)	; &M-49187;
+    (ideographic-strokes@ucs . 17)
+    (total-strokes@ucs	     . 21)
+    (ideographic-strokes@ucs*sources
+     daikanwa ucs)
+    (ideographic-strokes@cns . 16)
+    (total-strokes@cns	     . 20)
+    (=cns11643-3	. #x5C4A)	; &M-15905; [60-42]
+    (=daikanwa		. 15905)	; &I-M-15905;
     ))
 (define-char
-  '((morohashi-daikanwa	49187 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3C16)	; 㰖
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x23810)	; 𣠐
-    (=cns11643-7	. #x534B)	; &I-C7-534B; [51-43]
+    (=ucs@unicode	. #x3C16)	; &UU+3C16;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x3C14)	; 㰔
-    (=cns11643-5	. #x7027)	; &I-C5-7027; [80-07]
+    (=ucs		. #x237FA)	; 𣟺
+    (=cns11643-5	. #x702C)	; &I-C5-702C; [80-12]
+    (=daikanwa		. 15906)	; &I-M-15906;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x3C15)	; 㰕
-    (=cns11643-3	. #x5E36)	; &I-C3-5E36; [62-22]
+    (=ucs		. #x237FB)	; 𣟻
+    (->subsumptive
+     ((=daikanwa	  . 15907)	; &M-15907;
+      )
+     ((=cns11643-7	  . #x534A)	; &C7-534A; [51-42]
+      (=ucs@iso		  . #x237FB)	; &C7-534A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x6AF8)	; 櫸
-    (=cns11643-2	. #x6B5F)	; &I-C2-6B5F; [75-63]
-    (=gb12345		. #x6937)	; 櫸 [73-23]
-    (=big5		. #xF5D1)	; &I-B-F5D1;
+    (=ucs		. #x237FC)	; 𣟼
+    (->subsumptive
+     ((=daikanwa	  . 15908)	; &M-15908;
+      )
+     ((=ucs@iso		  . #x237FC)	; &U-000237FC;
+      )
+     ((=cns11643-4	  . #x6645)	; &C4-6645; [70-37]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x6B0C)	; 欌
-    (=ks-x1001		. #x6D6B)	; &I-K0-6D6B; [77-75]
-    (=gb12345		. #x7D56)	; 欌 [93-54]
+    (=ucs		. #x237FD)	; 𣟽
+    (->subsumptive
+     ((=daikanwa	  . 15909)	; &M-15909;
+      (=ucs@iso		  . #x237FD)	; &M-15909;
+      )
+     ((=cns11643-5	  . #x702F)	; &C5-702F; [80-15]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x237EF)	; 𣟯
-    (=cns11643-7	. #x5349)	; &I-C7-5349; [51-41]
+    (=ucs		. #x237FE)	; 𣟾
+    (->subsumptive
+     ((=daikanwa	  . 15910)	; &M-15910;
+      )
+     ((=cns11643-7	  . #x534E)	; &C7-534E; [51-46]
+      )
+     ((=ucs@iso		  . #x237FE)	; &U-000237FE;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x237F0)	; 𣟰
-    (=cns11643-7	. #x5348)	; &I-C7-5348; [51-40]
+    (=ucs		. #x23814)	; 𣠔
+    (->subsumptive
+     ((=daikanwa	  . 15911)	; &M-15911;
+      )
+     ((=ucs@iso		  . #x23814)	; &U-00023814;
+      )
+     ((=cns11643-5	  . #x702E)	; &C5-702E; [80-14]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x237F2)	; 𣟲
-    (=cns11643-5	. #x702B)	; &I-C5-702B; [80-11]
+    (=ucs		. #x2380C)	; 𣠌
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x2380C)	; 𣠌
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x237F3)	; 𣟳
-    (=cns11643-5	. #x702D)	; &I-C5-702D; [80-13]
+    (=daikanwa		. 15913)	; &M-15913;
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x2380C)	; 𣠌
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x237F4)	; 𣟴
-    (=cns11643-4	. #x6646)	; &I-C4-6646; [70-38]
+    (->subsumptive
+     ((=ucs@iso		  . #x2380C)	; &U-0002380C;
+      )
+     ((=cns11643-7	  . #x534C)	; &C7-534C; [51-44]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x237F5)	; 𣟵
-    (=cns11643-5	. #x7029)	; &I-C5-7029; [80-09]
+    (=ucs		. #x23810)	; 𣠐
+    (->subsumptive
+     ((=daikanwa	  . 49187)	; &M-49187;
+      )
+     ((=cns11643-7	  . #x534B)	; &C7-534B; [51-43]
+      (=ucs@iso		  . #x23810)	; &C7-534B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x237F6)	; 𣟶
-    (=cns11643-7	. #x534D)	; &I-C7-534D; [51-45]
+    (=ucs		. #x6AF8)	; 櫸
+    (=big5		. #xF5D1)	; &I-B-F5D1;
+    (->subsumptive
+     ((=gb12345		  . #x6937)	; &UU+6AF8; [73-23]
+      (=ucs@unicode	  . #x6AF8)	; &UU+6AF8;
+      )
+     ((=cns11643-2	  . #x6B5F)	; &C2-6B5F; [75-63]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x237F8)	; 𣟸
-    (=cns11643-5	. #x7028)	; &I-C5-7028; [80-08]
+    (=ucs		. #x6B0C)	; 欌
+    (=ks-x1001		. #x6D6B)	; &I-K0-6D6B; [77-75]
+    (=gb12345		. #x7D56)	; 欌 [93-54]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x237F9)	; 𣟹
-    (=cns11643-5	. #x702A)	; &I-C5-702A; [80-10]
+    (=ucs		. #x23801)	; 𣠁
+    (=cns11643-5	. #x7032)	; &I-C5-7032; [80-18]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x237FA)	; 𣟺
-    (=cns11643-5	. #x702C)	; &I-C5-702C; [80-12]
+    (=ucs		. #x2380E)	; 𣠎
+    (->subsumptive
+     ((=ucs@iso		  . #x2380E)	; &U-0002380E;
+      )
+     ((=cns11643-5	  . #x7031)	; &C5-7031; [80-17]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x237FB)	; 𣟻
-    (=cns11643-7	. #x534A)	; &I-C7-534A; [51-42]
+    (=ucs		. #x2380F)	; 𣠏
+    (->subsumptive
+     ((=ucs@iso		  . #x2380F)	; &U-0002380F;
+      )
+     ((=cns11643-5	  . #x7030)	; &C5-7030; [80-16]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=ucs		. #x237FC)	; 𣟼
-    (=cns11643-4	. #x6645)	; &I-C4-6645; [70-37]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=ucs		  . #x971C)	; 霜
+      ))
+    (=cbeta		. 01273)	; &CB01273;
+    (mojikyo		. 065345)	; &MCS-6000FF41;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 17)
-    (total-strokes	 . 21)
-    (=ucs		. #x237FD)	; 𣟽
-    (=cns11643-5	. #x702F)	; &I-C5-702F; [80-15]
+    (ideographic-strokes . 18)
+    (total-strokes	 . 22)
+    (=ucs		. #x2382D)	; 𣠭
+    (=cns11643-7	. #x5824)	; &I-C7-5824; [56-04]
+    (=daikanwa		. 15912)	; &I-M-15912;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 18)
+    (total-strokes	 . 22)
+    (=ucs		. #x23819)	; 𣠙
+    (->subsumptive
+     ((=daikanwa	  . 15914)	; &M-15914;
+      )
+     ((=ucs@iso		  . #x23819)	; &U-00023819;
+      )
+     ((=cns11643-7	  . #x5826)	; &C7-5826; [56-06]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 17)
-    (total-strokes	 . 21)
-    (=ucs		. #x237FE)	; 𣟾
-    (=cns11643-7	. #x534E)	; &I-C7-534E; [51-46]
+    (ideographic-strokes . 18)
+    (total-strokes	 . 22)
+    (=ucs		. #x3C17)	; 㰗
+    (=cns11643-3	. #x5F50)	; &I-C3-5F50; [63-48]
+    (=daikanwa		. 15915)	; &I-M-15915;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 17)
-    (total-strokes	 . 21)
-    (=ucs		. #x23801)	; 𣠁
-    (=cns11643-5	. #x7032)	; &I-C5-7032; [80-18]
+    (ideographic-strokes . 18)
+    (total-strokes	 . 22)
+    (=ucs		. #x2381A)	; 𣠚
+    (->subsumptive
+     ((=daikanwa	  . 15916)	; &M-15916;
+      )
+     ((=ucs@iso		  . #x2381A)	; &U-0002381A;
+      )
+     ((=cns11643-5	  . #x734E)	; &C5-734E; [83-46]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 17)
-    (total-strokes	 . 21)
-    (=ucs		. #x2380C)	; 𣠌
-    (=cns11643-7	. #x534C)	; &I-C7-534C; [51-44]
+    (ideographic-strokes . 18)
+    (total-strokes	 . 22)
+    (=ucs		. #x2381B)	; 𣠛
+    (->subsumptive
+     ((=daikanwa	  . 15917)	; &M-15917;
+      )
+     ((=ucs@iso		  . #x2381B)	; &U-0002381B;
+      )
+     ((=cns11643-5	  . #x734F)	; &C5-734F; [83-47]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 17)
-    (total-strokes	 . 21)
-    (=ucs		. #x2380E)	; 𣠎
-    (=cns11643-5	. #x7031)	; &I-C5-7031; [80-17]
+    (ideographic-strokes . 18)
+    (total-strokes	 . 22)
+    (=ucs		. #x2381C)	; 𣠜
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 17)
-    (total-strokes	 . 21)
-    (=ucs		. #x2380F)	; 𣠏
-    (=cns11643-5	. #x7030)	; &I-C5-7030; [80-16]
+  '((<-denotational
+     ((=ucs		  . #x2381C)	; 𣠜
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 18)
+    (total-strokes	 . 22)
+    (=daikanwa		. 15918)	; &M-15918;
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 17)
-    (total-strokes	 . 21)
-    (=ucs		. #x23814)	; 𣠔
-    (=cns11643-5	. #x702E)	; &I-C5-702E; [80-14]
+  '((<-denotational
+     ((=ucs		  . #x2381C)	; 𣠜
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 18)
+    (total-strokes	 . 22)
+    (->subsumptive
+     ((=ucs@iso		  . #x2381C)	; &U-0002381C;
+      )
+     ((=cns11643-5	  . #x734C)	; &C5-734C; [83-44]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 17)
-    (total-strokes	 . 21)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (ideographic-strokes . 18)
+    (total-strokes	 . 22)
+    (=ucs		. #x6B06)	; 欆
+    (->subsumptive
+     ((=daikanwa	  . 15919)	; &M-15919;
       )
-     ((=ucs		  . #x6728)	; 木
+     ((=jis-x0212	  . #x455F)	; &JSP-455F; [37-63]
+      (=jef-china3	  . #x54C1)	; &I-JC3-54C1;
+      (=ucs@jis		  . #x6B06)	; &JSP-455F;
       )
-     ((=ucs		  . #x971C)	; 霜
+     ((hanyu-dazidian	  2 1323 14)
+      (=cns11643-3	  . #x5F4F)	; &HZK04-B872; [63-47]
+      (=hanziku-4	  . #xB872)	; &I-HZK04-B872;
+      (=ucs@unicode	  . #x6B06)	; &HZK04-B872;
       ))
-    (=cbeta		. 01273)	; &CB01273;
-    (mojikyo		. 065345)	; &MCS-6000FF41;
     ))
 (define-char
-  '((=>ucs		. #x6B06)	; 欆
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x2381D)	; 𣠝
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2381D)	; 𣠝
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=jis-x0212		. #x455F)	; &M-15919; [37-63]
-    (=daikanwa		. 15919)	; &I-M-15919;
-    (=jef-china3	. #x54C1)	; &I-JC3-54C1;
-    (=ucs@jis		. #x6B06)	; &M-15919;
+    (=cns11643-5	. #x734A)	; &M-15920; [83-42]
+    (=daikanwa		. 15920)	; &I-M-15920;
     ))
 (define-char
-  '((morohashi-daikanwa	15919 0 1)
+  '((<-denotational
+     ((=ucs		  . #x2381D)	; 𣠝
+      ))
     (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 18)
-    (total-strokes	 . 22)
-    (hanyu-dazidian	2 1323 14)
-    (=ucs		. #x6B06)	; 欆
-    (=cns11643-3	. #x5F4F)	; &I-C3-5F4F; [63-47]
-    (=hanziku-4		. #xB872)	; &I-HZK04-B872;
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=ucs@iso		. #x2381D)	; &U-0002381D;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -24923,262 +26242,287 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x6B08)	; 欈
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 18)
-    (total-strokes	 . 22)
-    (=big5		. #xF6E5)	; &M-15924;
-    (=daikanwa		. 15924)	; &I-M-15924;
-    (=ucs@big5		. #x6B08)	; &M-15924;
-    ))
-(define-char
-  '((morohashi-daikanwa	15924 0 1)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 18)
-    (total-strokes	 . 22)
-    (=ucs		. #x6B08)	; 欈
-    (=cns11643-2	. #x6D53)	; &I-C2-6D53; [77-51]
-    ))
-(define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x6B09)	; 欉
-    (=jis-x0212		. #x4561)	; &I-JSP-4561; [37-65]
-    (=cns11643-2	. #x6D54)	; &I-C2-6D54; [77-52]
-    (=big5		. #xF6E6)	; &I-B-F6E6;
-    (=daikanwa		. 15925)	; &I-M-15925;
-    (=jef-china3	. #x54C2)	; &I-JC3-54C2;
+    (=ucs		. #x2381E)	; 𣠞
+    (->subsumptive
+     ((=daikanwa	  . 15922)	; &M-15922;
+      )
+     ((=ucs@iso		  . #x2381E)	; &U-0002381E;
+      )
+     ((=cns11643-4	  . #x686F)	; &C4-686F; [72-79]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6B0A)	; 權
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=daikanwa		. 15926)	; &M-15926;
+    (=ucs		. #x2381F)	; 𣠟
     ))
 (define-char
-  '((=>ucs		. #x6B0A)	; 權
-    (morohashi-daikanwa	15926 0 1)
+  '((<-denotational
+     ((=ucs		  . #x2381F)	; 𣠟
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=cns11643-1	. #x7B62)	; &C1-7B62; [91-66]
-    ))
-(define-char
-  '((=>ucs		. #x6B0A)	; 權
-    (morohashi-daikanwa	15926 0 2)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 17)
-    (total-strokes	 . 21)
-    (=jis-x0208		. #x5C5E)	; &GT-20434; [60-62]
-    (=ks-x1001		. #x4F6D)	; &I-K0-4F6D; [47-77]
-    (=big5		. #xC576)	; &I-B-C576;
-    (=gt		. 20434)	; &I-GT-20434;
-    (=gt-pj-1		. #x5C5E)	; &I-GT-20434; [60-62]
-    (=ucs@jis		. #x6B0A)	; &GT-20434;
-    (=ucs@big5		. #x6B0A)	; &GT-20434;
-    ))
-(define-char
-  '((morohashi-daikanwa	15926 0 3)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 17)
-    (total-strokes	 . 21)
-    (=ucs		. #x6B0A)	; 權
-    (=gb12345		. #x4828)	; 權 [40-08]
+    (=daikanwa		. 15923)	; &M-15923;
     ))
 (define-char
-  '((=>ucs		. #x6B0B)	; 欋
+  '((<-denotational
+     ((=ucs		  . #x2381F)	; 𣠟
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=jis-x0213-2-2000	. #x2F71)	; &M-15929; [15-81]
-    (=big5		. #xF6E4)	; &I-B-F6E4;
-    (=daikanwa		. 15929)	; &I-M-15929;
-    (=ucs@jis		. #x6B0B)	; &M-15929;
-    (=ucs@big5		. #x6B0B)	; &M-15929;
+    (->subsumptive
+     ((=ucs@iso		  . #x2381F)	; &U-0002381F;
+      )
+     ((=cns11643-5	  . #x734B)	; &C5-734B; [83-43]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15929 0 1)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x6B0B)	; 欋
-    (=cns11643-2	. #x6D52)	; &I-C2-6D52; [77-50]
+    (=ucs		. #x6B08)	; 欈
     ))
 (define-char
-  '((=>ucs		. #x2382E)	; 𣠮
+  '((<-denotational
+     ((=ucs		  . #x6B08)	; 欈
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=daikanwa		. 49188)	; &M-49188;
+    (=big5		. #xF6E5)	; &B-F6E5;
+    (=ucs@big5		. #x6B08)	; &B-F6E5;
+    (->subsumptive
+     ((=daikanwa	  . 15924)	; &M-15924;
+      )
+     ((=cns11643-2	  . #x6D53)	; &C2-6D53; [77-51]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	49188 0 0)
+  '((<-denotational
+     ((=ucs		  . #x6B08)	; 欈
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x2382E)	; 𣠮
-    (=cns11643-7	. #x5822)	; &I-C7-5822; [56-02]
+    (=ucs@unicode	. #x6B08)	; &UU+6B08;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x3C17)	; 㰗
-    (=cns11643-3	. #x5F50)	; &I-C3-5F50; [63-48]
+    (=ucs		. #x6B09)	; 欉
+    (->subsumptive
+     ((=jis-x0212	  . #x4561)	; &M-15925; [37-65]
+      (=cns11643-2	  . #x6D54)	; &I-C2-6D54; [77-52]
+      (=big5		  . #xF6E6)	; &I-B-F6E6;
+      (=daikanwa	  . 15925)	; &I-M-15925;
+      (=jef-china3	  . #x54C2)	; &I-JC3-54C2;
+      (=ucs@jis		  . #x6B09)	; &M-15925;
+      )
+     ((=ucs@unicode	  . #x6B09)	; &UU+6B09;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 18)
-    (total-strokes	 . 22)
-    (=ucs		. #x3C18)	; 㰘
-    (=cns11643-4	. #x686E)	; &I-C4-686E; [72-78]
+    (=ucs		. #x6B0A)	; 權
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x6B0A)	; 權
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x6AF7)	; æ«·
-    (=gb12345		. #x7D2B)	; æ«· [93-11]
+    (->subsumptive
+     ((shinjigen-1	  . 3787)
+      (=daikanwa	  . 15926)	; &M-15926;
+      )
+     ((=cns11643-1	  . #x7B62)	; &C1-7B62; [91-66]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6B0C)	; 欌
+  '((<-denotational
+     ((=ucs		  . #x6B0A)	; 權
+      ))
     (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 18)
-    (total-strokes	 . 22)
-    (mojikyo		. 059705)	; &MCS-6000E939;
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=big5		. #xC576)	; &B-C576;
+    (=ucs@big5		. #x6B0A)	; &B-C576;
+    (->subsumptive
+     ((=jis-x0208	  . #x5C5E)	; &GT-20434; [60-62]
+      (=ks-x1001	  . #x4F6D)	; &I-K0-4F6D; [47-77]
+      (=gt		  . 20434)	; &I-GT-20434;
+      (=gt-pj-1		  . #x5C5E)	; &I-GT-20434; [60-62]
+      (=ucs@jis		  . #x6B0A)	; &GT-20434;
+      )
+     ((=gb12345		  . #x4828)	; &UU+6B0A; [40-08]
+      (=ucs@unicode	  . #x6B0A)	; &UU+6B0A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x6B0D)	; 欍
-    (mojikyo		. 059706)	; &MCS-6000E93A;
+    (=ucs		. #x23820)	; 𣠠
+    (=cns11643-5	. #x734D)	; &I-C5-734D; [83-45]
+    (=daikanwa		. 15927)	; &I-M-15927;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x6B0E)	; 欎
-    (mojikyo		. 059707)	; &MCS-6000E93B;
+    (=ucs		. #x2F8EE)	; 㰘
+    (->subsumptive
+     ((=daikanwa	  . 15928)	; &M-15928;
+      )
+     ((=cns11643-7	  . #x5823)	; &C7-5823; [56-03]
+      (=ucs@iso		  . #x2F8EE)	; &C7-5823;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x23819)	; 𣠙
-    (=cns11643-7	. #x5826)	; &I-C7-5826; [56-06]
+    (=ucs		. #x6B0B)	; 欋
+    (=big5		. #xF6E4)	; &I-B-F6E4;
+    (->subsumptive
+     ((=jis-x0213-2-2000  . #x2F71)	; &M-15929; [15-81]
+      (=daikanwa	  . 15929)	; &I-M-15929;
+      (=ucs@jis		  . #x6B0B)	; &M-15929;
+      )
+     ((=cns11643-2	  . #x6D52)	; &C2-6D52; [77-50]
+      (=ucs@unicode	  . #x6B0B)	; &C2-6D52;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x2381A)	; 𣠚
-    (=cns11643-5	. #x734E)	; &I-C5-734E; [83-46]
+    (=ucs		. #x23821)	; 𣠡
+    (->subsumptive
+     ((=daikanwa	  . 15930)	; &M-15930;
+      )
+     ((=cns11643-7	  . #x5825)	; &C7-5825; [56-05]
+      (=ucs@iso		  . #x23821)	; &C7-5825;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x2381B)	; 𣠛
-    (=cns11643-5	. #x734F)	; &I-C5-734F; [83-47]
+    (=ucs		. #x2382E)	; 𣠮
+    (->subsumptive
+     ((=daikanwa	  . 49188)	; &M-49188;
+      )
+     ((=cns11643-7	  . #x5822)	; &C7-5822; [56-02]
+      )
+     ((=ucs@iso		  . #x2382E)	; &U-0002382E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x2381C)	; 𣠜
-    (=cns11643-5	. #x734C)	; &I-C5-734C; [83-44]
+    (=ucs		. #x3C18)	; 㰘
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x3C18)	; 㰘
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x2381D)	; 𣠝
-    (=cns11643-5	. #x734A)	; &I-C5-734A; [83-42]
+    (=ucs@unicode	. #x3C18)	; &UU+3C18;
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x3C18)	; 㰘
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x2381E)	; 𣠞
-    (=cns11643-4	. #x686F)	; &I-C4-686F; [72-79]
+    (=cns11643-4	. #x686E)	; &C4-686E; [72-78]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x2381F)	; 𣠟
-    (=cns11643-5	. #x734B)	; &I-C5-734B; [83-43]
+    (=ucs		. #x6AF7)	; æ«·
+    (=gb12345		. #x7D2B)	; æ«· [93-11]
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((=>ucs		. #x6B0C)	; 欌
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x23820)	; 𣠠
-    (=cns11643-5	. #x734D)	; &I-C5-734D; [83-45]
+    (mojikyo		. 059705)	; &MCS-6000E939;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x23821)	; 𣠡
-    (=cns11643-7	. #x5825)	; &I-C7-5825; [56-05]
+    (=ucs		. #x6B0D)	; 欍
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((=>ucs		. #x6B0D)	; 欍
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=ucs		. #x2382D)	; 𣠭
-    (=cns11643-7	. #x5824)	; &I-C7-5824; [56-04]
+    (mojikyo		. 059706)	; &MCS-6000E93A;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
-    (=cns11643-7	. #x5823)	; &C7-5823; [56-03]
+    (=ucs		. #x6B0E)	; 欎
     ))
 (define-char
-  '((=>ucs		. #x6B0F)	; 欏
+  '((=>ucs		. #x6B0E)	; 欎
     (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 19)
-    (total-strokes	 . 23)
-    (=jis-x0212		. #x4562)	; &M-15933; [37-66]
-    (=jis-x0213-2-2000	. #x2F72)	; &I-JX2-2F72; [15-82]
-    (=big5		. #xF7E2)	; &I-B-F7E2;
-    (=daikanwa		. 15933)	; &I-M-15933;
-    (=ucs@jis		. #x6B0F)	; &M-15933;
-    (=ucs@big5		. #x6B0F)	; &M-15933;
+    (ideographic-strokes . 18)
+    (total-strokes	 . 22)
+    (mojikyo		. 059707)	; &MCS-6000E93B;
     ))
 (define-char
-  '((morohashi-daikanwa	15933 0 1)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 19)
     (total-strokes	 . 23)
     (=ucs		. #x6B0F)	; 欏
-    (=cns11643-2	. #x6F31)	; &I-C2-6F31; [79-17]
-    (=gb12345		. #x6921)	; 欏 [73-01]
-    ))
-(define-char
-  '((=>ucs		. #x6B10)	; 欐
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 19)
-    (total-strokes	 . 23)
-    (=jis-x0212		. #x4563)	; &M-15942; [37-67]
-    (=jis-x0213-2-2000	. #x2F73)	; &I-JX2-2F73; [15-83]
-    (=big5		. #xC5CF)	; &I-B-C5CF;
-    (=daikanwa		. 15942)	; &I-M-15942;
-    (=ucs@jis		. #x6B10)	; &M-15942;
-    (=ucs@big5		. #x6B10)	; &M-15942;
+    (=big5		. #xF7E2)	; &I-B-F7E2;
+    (->subsumptive
+     ((=jis-x0212	  . #x4562)	; &M-15933; [37-66]
+      (=jis-x0213-2-2000  . #x2F72)	; &I-JX2-2F72; [15-82]
+      (=daikanwa	  . 15933)	; &I-M-15933;
+      (=ucs@jis		  . #x6B0F)	; &M-15933;
+      )
+     ((=cns11643-2	  . #x6F31)	; &C2-6F31; [79-17]
+      (=gb12345		  . #x6921)	; &C2-6F31; [73-01]
+      (=ucs@unicode	  . #x6B0F)	; &C2-6F31;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15942 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 19)
     (total-strokes	 . 23)
     (=ucs		. #x6B10)	; 欐
-    (=cns11643-1	. #x7C3B)	; &I-C1-7C3B; [92-27]
+    (=big5		. #xC5CF)	; &I-B-C5CF;
+    (->subsumptive
+     ((=jis-x0212	  . #x4563)	; &M-15942; [37-67]
+      (=jis-x0213-2-2000  . #x2F73)	; &I-JX2-2F73; [15-83]
+      (=daikanwa	  . 15942)	; &I-M-15942;
+      (=ucs@jis		  . #x6B10)	; &M-15942;
+      )
+     ((=ucs@unicode	  . #x6B10)	; &UU+6B10;
+      )
+     ((=cns11643-1	  . #x7C3B)	; &C1-7C3B; [92-27]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -25715,10 +27059,6 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 21)
     (total-strokes	 . 25)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x3135)	; &M-15978; [17-21]
-      (=daikanwa	  . 15978)	; &I-M-15978;
-      ))
     (hanyu-dazidian	2 1326 11)
     (=jis-x0208@1983	. #x3135)	; &GT-20537; [17-21]
     (=jis-x0208@1990	. #x3135)	; &I-J90-3135; [17-21]
@@ -25728,6 +27068,10 @@
     (=hanziku-4		. #xB8F1)	; &I-HZK04-B8F1;
     (=jef-china3	. #x54C5)	; &I-JC3-54C5;
     (=ucs@unicode	. #x6B1D)	; &GT-20537;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x3135)	; &M-15978; [17-21]
+      (=daikanwa	  . 15978)	; &I-M-15978;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
diff --git a/lisp/utf-2000/Ideograph-R076-Lack.el b/lisp/utf-2000/Ideograph-R076-Lack.el
index 376c7bb..23ff06d 100644
--- a/lisp/utf-2000/Ideograph-R076-Lack.el
+++ b/lisp/utf-2000/Ideograph-R076-Lack.el
@@ -5,12 +5,7 @@
     (total-strokes	 . 4)
     (=ucs		. #x6B20)	; 欠
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x657E)	; &M-28122; [69-94]
-	(=ks-x1001	    . #x4C40)	; &I-K0-4C40; [44-32]
-	(=daikanwa	    . 28122)	; &I-M-28122;
-	))
-      (shinjigen-1	  . 3905)
+     ((shinjigen-1	  . 3905)
       (shinjigen-2	  . 3905)
       (=jis-x0208	  . #x3767)	; &GT-20571; [23-71]
       (=ks-x1001	  . #x7D62)	; &I-K0-7D62; [93-66]
@@ -20,6 +15,11 @@
       (=gt-pj-1		  . #x3767)	; &I-GT-20571; [23-71]
       (=daikanwa	  . 15991)	; &I-M-15991;
       (=ucs@jis		  . #x6B20)	; &GT-20571;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x657E)	; &M-28122; [69-94]
+	(=ks-x1001	    . #x4C40)	; &I-K0-4C40; [44-32]
+	(=daikanwa	    . 28122)	; &I-M-28122;
+	))
       )
      ((=gb2312		  . #x4737)	; &G0-4737; [39-23]
       (=big5		  . #xA4ED)	; &I-B-A4ED;
@@ -236,96 +236,130 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x3C1F)	; 㰟
-    (=cns11643-4	. #x266D)	; &I-C4-266D; [06-77]
-    (=daikanwa		. 16004)	; &I-M-16004;
     ))
 (define-char
-  '((=>ucs		. #x23889)	; 𣢉
+  '((<-denotational
+     ((=ucs		  . #x3C1F)	; 㰟
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=daikanwa		. 16005)	; &M-16005;
+    (=cns11643-4	. #x266D)	; &M-16004; [06-77]
+    (=daikanwa		. 16004)	; &I-M-16004;
     ))
 (define-char
-  '((morohashi-daikanwa	16005 0 1)
+  '((<-denotational
+     ((=ucs		  . #x3C1F)	; 㰟
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x23889)	; 𣢉
-    (=cns11643-5	. #x265C)	; &I-C5-265C; [06-60]
+    (=ucs@unicode	. #x3C1F)	; &UU+3C1F;
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x2388A)	; 𣢊
-    (=cns11643-5	. #x265B)	; &I-C5-265B; [06-59]
-    (=daikanwa		. 16006)	; &I-M-16006;
+    (=ucs		. #x23889)	; 𣢉
+    (->subsumptive
+     ((=daikanwa	  . 16005)	; &M-16005;
+      )
+     ((=cns11643-5	  . #x265C)	; &C5-265C; [06-60]
+      )
+     ((=ucs@iso		  . #x23889)	; &U-00023889;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x2388B)	; 𣢋
-    (ideographic-radical . 76)	; ⽋
+  '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=daikanwa		. 16007)	; &M-16007;
+    (=ucs		. #x2388A)	; 𣢊
+    (->subsumptive
+     ((=cns11643-5	  . #x265B)	; &M-16006; [06-59]
+      (=daikanwa	  . 16006)	; &I-M-16006;
+      )
+     ((=ucs@iso		  . #x2388A)	; &U-0002388A;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	16007 0 0)
-    (ideographic-radical . 76)	; ⽋
+  '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x2388B)	; 𣢋
-    (=cns11643-5	. #x2658)	; &I-C5-2658; [06-56]
+    (->subsumptive
+     ((=daikanwa	  . 16007)	; &M-16007;
+      )
+     ((=cns11643-5	  . #x2658)	; &C5-2658; [06-56]
+      )
+     ((=ucs@iso		  . #x2388B)	; &U-0002388B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (shinjigen-2	. 3911)
     (=ucs		. #x6B23)	; 欣
-    (=jis-x0208		. #x3655)	; &I-J90-3655; [22-53]
-    (=gb2312		. #x5040)	; &I-G0-5040; [48-32]
-    (=ks-x1001		. #x7D5B)	; &I-K0-7D5B; [93-59]
-    (=cns11643-1	. #x4E3C)	; &I-C1-4E3C; [46-28]
-    (=big5		. #xAA59)	; &I-B-AA59;
-    (=gt		. 20593)	; &I-GT-20593;
-    (=gt-k		. 03675)	; &I-GT-K03675;
-    (=gt-pj-1		. #x3655)	; &I-GT-20593; [22-53]
-    (=daikanwa		. 16008)	; &I-M-16008;
+    (->subsumptive
+     ((shinjigen-2	  . 3911)
+      (=jis-x0208	  . #x3655)	; &GT-20593; [22-53]
+      (=ks-x1001	  . #x7D5B)	; &I-K0-7D5B; [93-59]
+      (=cns11643-1	  . #x4E3C)	; &I-C1-4E3C; [46-28]
+      (=gt		  . 20593)	; &I-GT-20593;
+      (=gt-k		  . 03675)	; &I-GT-K03675;
+      (=gt-pj-1		  . #x3655)	; &I-GT-20593; [22-53]
+      (=daikanwa	  . 16008)	; &I-M-16008;
+      (=ucs@jis		  . #x6B23)	; &GT-20593;
+      )
+     ((=gb2312		  . #x5040)	; &G0-5040; [48-32]
+      (=big5		  . #xAA59)	; &I-B-AA59;
+      (=ucs@unicode	  . #x6B23)	; &G0-5040;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x2388C)	; 𣢌
-    (=cns11643-6	. #x2C2F)	; &I-C6-2C2F; [12-15]
-    (=daikanwa		. 16009)	; &I-M-16009;
-    ))
-(define-char
-  '((=>ucs		. #x2388D)	; 𣢍
-    (ideographic-radical . 76)	; ⽋
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (=daikanwa		. 16010)	; &M-16010;
+    (->subsumptive
+     ((=cns11643-6	  . #x2C2F)	; &M-16009; [12-15]
+      (=daikanwa	  . 16009)	; &I-M-16009;
+      )
+     ((=ucs@iso		  . #x2388C)	; &U-0002388C;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	16010 0 0)
-    (ideographic-radical . 76)	; ⽋
+  '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x2388D)	; 𣢍
-    (=cns11643-4	. #x266F)	; &I-C4-266F; [06-79]
+    (->subsumptive
+     ((=daikanwa	  . 16010)	; &M-16010;
+      )
+     ((=cns11643-4	  . #x266F)	; &C4-266F; [06-79]
+      )
+     ((=ucs@iso		  . #x2388D)	; &U-0002388D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x2388E)	; 𣢎
-    (=cns11643-6	. #x2C30)	; &I-C6-2C30; [12-16]
-    (=daikanwa		. 16011)	; &I-M-16011;
+    (->subsumptive
+     ((=cns11643-6	  . #x2C30)	; &M-16011; [12-16]
+      (=daikanwa	  . 16011)	; &I-M-16011;
+      )
+     ((=ucs@iso		  . #x2388E)	; &U-0002388E;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 76)	; ⽋
+    (=ucs		. #x6B24)	; 欤
     ))
 (define-char
-  '((=>ucs		. #x6B24)	; 欤
+  '((<-denotational
+     ((=ucs		  . #x6B24)	; 欤
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
@@ -335,146 +369,214 @@
     (=ucs@jis		. #x6B24)	; &M-16012;
     ))
 (define-char
-  '((morohashi-daikanwa	16012 0 4)
+  '((<-denotational
+     ((=ucs		  . #x6B24)	; 欤
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
-    (=ucs		. #x6B24)	; 欤
-    (=gb2312		. #x6C23)	; &I-G0-6C23; [76-03]
+    (=gb2312		. #x6C23)	; &G0-6C23; [76-03]
+    (=ucs@unicode	. #x6B24)	; &G0-6C23;
     ))
 (define-char
-  '((=>ucs		. #x3C20)	; ã° 
-    (ideographic-radical . 76)	; ⽋
+  '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x2388F)	; 𣢏
+    (->subsumptive
+     ((=daikanwa	  . 16013)	; &M-16013;
       )
-     ((=jis-x0208	  . #x5036)	; &GT-00379; [48-22]
-      (=ks-x1001	  . #x7971)	; &I-K0-7971; [89-81]
-      (=daikanwa	  . 00288)	; &I-M-00288;
+     ((=cns11643-5	  . #x265D)	; &C5-265D; [06-61]
       )
-     ((=ucs		  . #x6B20)	; 欠
+     ((=ucs@iso		  . #x2388F)	; &U-0002388F;
       ))
-    (=daikanwa		. 16014)	; &M-16014;
-    (=cbeta		. 00780)	; &I-CB00780;
     ))
 (define-char
-  '((morohashi-daikanwa	16014 0 0)
-    (ideographic-radical . 76)	; ⽋
+  '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x3C20)	; ã° 
-    (=cns11643-5	. #x2656)	; &I-C5-2656; [06-54]
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x5036)	; &GT-00379; [48-22]
+	(=ks-x1001	    . #x7971)	; &I-K0-7971; [89-81]
+	(=daikanwa	    . 00288)	; &I-M-00288;
+	)
+       ((=jis-x0208	    . #x3767)	; &GT-20571; [23-71]
+	(=ks-x1001	    . #x7D62)	; &I-K0-7D62; [93-66]
+	(=cns11643-1	    . #x454E)	; &I-C1-454E; [37-46]
+	(=daikanwa	    . 15991)	; &I-M-15991;
+	))
+      (=daikanwa	  . 16014)	; &M-16014;
+      (=cbeta		  . 00780)	; &I-CB00780;
+      )
+     ((=cns11643-5	  . #x2656)	; &C5-2656; [06-54]
+      )
+     ((=ucs@unicode	  . #x3C20)	; &UU+3C20;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x6B25)	; 欥
-    (=cns11643-2	. #x274A)	; &I-C2-274A; [07-42]
-    (=big5		. #xCCE9)	; &I-B-CCE9;
-    (=daikanwa		. 16017)	; &I-M-16017;
-    ))
-(define-char
-  '((=>ucs		. #x6B26)	; 欦
-    (ideographic-radical . 76)	; ⽋
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (=cns11643-3	. #x2953)	; &M-16019; [09-51]
-    (=daikanwa		. 16019)	; &I-M-16019;
+    (=ucs		. #x23890)	; 𣢐
+    (->subsumptive
+     ((=daikanwa	  . 16015)	; &M-16015;
+      )
+     ((=cns11643-4	  . #x266E)	; &C4-266E; [06-78]
+      )
+     ((=ucs@iso		  . #x23890)	; &U-00023890;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	16019 0 1)
-    (ideographic-radical . 76)	; ⽋
+  '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x6B26)	; 欦
+    (=ucs		. #x3C21)	; ã°¡
+    (->subsumptive
+     ((=cns11643-4	  . #x2670)	; &M-16016; [06-80]
+      (=daikanwa	  . 16016)	; &I-M-16016;
+      )
+     ((=ucs@unicode	  . #x3C21)	; &UU+3C21;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	16024 1)
-    (ideographic-radical . 76)	; ⽋
+  '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6B50)	; 歐
-      (=jis-x0208	  . #x5D3F)	; &I-J90-5D3F; [61-31]
+    (=ucs		. #x6B25)	; 欥
+    (=big5		. #xCCE9)	; &I-B-CCE9;
+    (->subsumptive
+     ((=cns11643-2	  . #x274A)	; &M-16017; [07-42]
+      (=daikanwa	  . 16017)	; &I-M-16017;
+      )
+     ((=ucs@unicode	  . #x6B25)	; &UU+6B25;
       ))
-    (=ucs		. #x6B27)	; 欧
-    (=jis-x0208		. #x3224)	; &I-J90-3224; [18-04]
-    (=gb2312		. #x4537)	; &I-G0-4537; [37-23]
-    (=gt		. 20586)	; &I-GT-20586;
-    (=gt-k		. 03644)	; &I-GT-K03644;
-    (=gt-pj-1		. #x3224)	; &I-GT-20586; [18-04]
-    (mojikyo		. 050237)	; &MCS-6000C43D;
     ))
 (define-char
-  '((=>ucs		. #x6B27)	; 欧
-    (morohashi-daikanwa	16024 1 1)
-    (ideographic-radical . 76)	; ⽋
+  '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=cns11643-3	. #x2954)	; &C3-2954; [09-52]
+    (=ucs		. #x23891)	; 𣢑
+    (->subsumptive
+     ((=cns11643-5	  . #x2659)	; &M-16018; [06-57]
+      (=daikanwa	  . 16018)	; &I-M-16018;
+      )
+     ((=ucs@iso		  . #x23891)	; &U-00023891;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x3C21)	; ã°¡
-    (=cns11643-4	. #x2670)	; &I-C4-2670; [06-80]
+    (=ucs		. #x6B26)	; 欦
+    (->subsumptive
+     ((=cns11643-3	  . #x2953)	; &M-16019; [09-51]
+      (=daikanwa	  . 16019)	; &I-M-16019;
+      )
+     ((=ucs@unicode	  . #x6B26)	; &UU+6B26;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x3C22)	; ã°¢
-    (=cns11643-4	. #x266C)	; &I-C4-266C; [06-76]
+    (=ucs		. #x23892)	; 𣢒
+    (->subsumptive
+     ((=daikanwa	  . 16020)	; &M-16020;
+      )
+     ((=cns11643-5	  . #x265A)	; &C5-265A; [06-58]
+      )
+     ((=ucs@iso		  . #x23892)	; &U-00023892;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x2388F)	; 𣢏
-    (=cns11643-5	. #x265D)	; &I-C5-265D; [06-61]
+    (=ucs		. #x3C22)	; ã°¢
+    (->subsumptive
+     ((=cns11643-4	  . #x266C)	; &M-16021; [06-76]
+      (=daikanwa	  . 16021)	; &I-M-16021;
+      )
+     ((=ucs@unicode	  . #x3C22)	; &UU+3C22;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x23890)	; 𣢐
-    (=cns11643-4	. #x266E)	; &I-C4-266E; [06-78]
+    (=ucs		. #x23893)	; 𣢓
+    (->subsumptive
+     ((=cns11643-5	  . #x2657)	; &M-16022; [06-55]
+      (=daikanwa	  . 16022)	; &I-M-16022;
+      )
+     ((=ucs@iso		  . #x23893)	; &U-00023893;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x23891)	; 𣢑
-    (=cns11643-5	. #x2659)	; &I-C5-2659; [06-57]
+    (=ucs		. #x6B27)	; 欧
+    (<-simplified@ucs
+     ((=ucs		  . #x6B50)	; 歐
+      ))
     ))
 (define-char
-  '((ideographic-radical . 76)	; ⽋
+  '((<-denotational
+     ((=ucs		  . #x6B27)	; 欧
+      ))
+    (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x23892)	; 𣢒
-    (=cns11643-5	. #x265A)	; &I-C5-265A; [06-58]
+    (->subsumptive
+     ((morohashi-daikanwa	16024 1)
+      (=jis-x0208	  . #x3224)	; &GT-20586; [18-04]
+      (=gt		  . 20586)	; &I-GT-20586;
+      (=gt-k		  . 03644)	; &I-GT-K03644;
+      (=gt-pj-1		  . #x3224)	; &I-GT-20586; [18-04]
+      (=ucs@jis		  . #x6B27)	; &GT-20586;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5D3F)	; &GT-20792; [61-31]
+	(=ks-x1001	    . #x4F31)	; &I-K0-4F31; [47-17]
+	(=daikanwa	    . 16185)	; &I-M-16185;
+	))
+      )
+     ((=gb2312		  . #x4537)	; &G0-4537; [37-23]
+      (=ucs@unicode	  . #x6B27)	; &G0-4537;
+      (mojikyo		  . 050237)	; &MCS-6000C43D;
+      (<-simplified@CN
+       ((=gb12345	    . #x4537)	; &UU+6B50; [37-23]
+	))
+      ))
     ))
 (define-char
-  '((ideographic-radical . 76)	; ⽋
+  '((<-denotational
+     ((=ucs		  . #x6B27)	; 欧
+      ))
+    (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x23893)	; 𣢓
-    (=cns11643-5	. #x2657)	; &I-C5-2657; [06-55]
+    (=cns11643-3	. #x2954)	; &C3-2954; [09-52]
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x6B28)	; 欨
-    (=jis-x0212		. #x4569)	; &I-JSP-4569; [37-73]
-    (=cns11643-2	. #x2B46)	; &I-C2-2B46; [11-38]
     (=big5		. #xCF64)	; &I-B-CF64;
-    (=daikanwa		. 16028)	; &I-M-16028;
+    (->subsumptive
+     ((=jis-x0212	  . #x4569)	; &M-16028; [37-73]
+      (=cns11643-2	  . #x2B46)	; &I-C2-2B46; [11-38]
+      (=daikanwa	  . 16028)	; &I-M-16028;
+      (=ucs@jis		  . #x6B28)	; &M-16028;
+      )
+     ((=ucs@unicode	  . #x6B28)	; &UU+6B28;
+      ))
     ))
 (define-char
   '((=>ucs		. #x3C24)	; ã°¤
@@ -1372,6 +1474,31 @@
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=ucs		. #x238CA)	; 𣣊
+    (->subsumptive
+     ((=daikanwa	  . 16101)	; &M-16101;
+      )
+     ((=ucs@iso		  . #x238CA)	; &U-000238CA;
+      )
+     ((=cns11643-5	  . #x3F77)	; &C5-3F77; [31-87]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=ucs		. #x3C39)	; ã°¹
+    (->subsumptive
+     ((=cns11643-4	  . #x3E21)	; &M-16120; [30-01]
+      (=daikanwa	  . 16120)	; &I-M-16120;
+      )
+     ((=ucs@unicode	  . #x3C39)	; &UU+3C39;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
     (=ucs		. #x6B40)	; 歀
     (->subsumptive
      ((=cns11643-3	  . #x417D)	; &M-16125; [33-93]
@@ -1416,172 +1543,297 @@
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (shinjigen-2	. 3934)
     (=ucs		. #x6B43)	; 歃
-    (=jis-x0208		. #x5D3D)	; &I-J90-5D3D; [61-29]
-    (=gb2312		. #x6C26)	; &I-G0-6C26; [76-06]
-    (=cns11643-2	. #x437D)	; &I-C2-437D; [35-93]
-    (=big5		. #xDDF7)	; &I-B-DDF7;
-    (=gt		. 20745)	; &I-GT-20745;
-    (=gt-pj-1		. #x5D3D)	; &I-GT-20745; [61-29]
-    (=daikanwa		. 16131)	; &I-M-16131;
     ))
 (define-char
-  '((ideographic-radical . 76)	; ⽋
+  '((<-denotational
+     ((=ucs		  . #x6B43)	; 歃
+      ))
+    (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs		. #x6B44)	; 歄
-    (=cns11643-3	. #x417C)	; &I-C3-417C; [33-92]
-    (=daikanwa		. 16135)	; &I-M-16135;
+    (->subsumptive
+     ((shinjigen-2	  . 3934)
+      (=jis-x0208	  . #x5D3D)	; &GT-20745; [61-29]
+      (=gt		  . 20745)	; &I-GT-20745;
+      (=gt-pj-1		  . #x5D3D)	; &I-GT-20745; [61-29]
+      (=daikanwa	  . 16131)	; &I-M-16131;
+      (=ucs@jis		  . #x6B43)	; &GT-20745;
+      )
+     ((=gb2312		  . #x6C26)	; &G0-6C26; [76-06]
+      (=big5		  . #xDDF7)	; &I-B-DDF7;
+      (=ucs@unicode	  . #x6B43)	; &G0-6C26;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 76)	; ⽋
+  '((<-denotational
+     ((=ucs		  . #x6B43)	; 歃
+      ))
+    (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs		. #x6B45)	; 歅
-    (=cns11643-2	. #x437C)	; &I-C2-437C; [35-92]
-    (=big5		. #xDDF6)	; &I-B-DDF6;
-    (=daikanwa		. 16138)	; &I-M-16138;
+    (=cns11643-2	. #x437D)	; &C2-437D; [35-93]
+    ))
+(define-char
+  '((ideographic-radical . 76)	; ⽋
+    (=ucs		. #x6B44)	; 歄
     ))
 (define-char
-  '((=>ucs		. #x6B46)	; 歆
+  '((<-denotational
+     ((=ucs		  . #x6B44)	; 歄
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ks-x1001		. #x7D64)	; &M-16139; [93-68]
-    (=jis-x0212		. #x4571)	; &I-JSP-4571; [37-81]
-    (=jis-x0213-1-2000	. #x7640)	; &I-JX1-7640; [86-32]
-    (=big5		. #xDDF5)	; &I-B-DDF5;
-    (=daikanwa		. 16139)	; &I-M-16139;
-    (=jef-china3	. #x54D1)	; &I-JC3-54D1;
-    (=ucs@jis		. #x6B46)	; &M-16139;
+    (=cns11643-3	. #x417C)	; &M-16135; [33-92]
+    (=daikanwa		. 16135)	; &I-M-16135;
     ))
 (define-char
-  '((morohashi-daikanwa	16139 0 0)
+  '((<-denotational
+     ((=ucs		  . #x6B44)	; 歄
+      ))
     (ideographic-radical . 76)	; ⽋
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=ucs		. #x6B46)	; 歆
-    (=gb2312		. #x6C27)	; &I-G0-6C27; [76-07]
-    (=cns11643-2	. #x437B)	; &I-C2-437B; [35-91]
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=ucs@unicode	. #x6B44)	; &UU+6B44;
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (shinjigen-2	. 3932)
-    (=ucs		. #x6B47)	; 歇
-    (=jis-x0208		. #x5D3C)	; &I-J90-5D3C; [61-28]
-    (=gb2312		. #x502A)	; &I-G0-502A; [48-10]
-    (=ks-x1001		. #x7A4E)	; &I-K0-7A4E; [90-46]
-    (=big5		. #xB7B2)	; &I-B-B7B2;
-    (=gt		. 20735)	; &I-GT-20735;
-    (=gt-k		. 10315)	; &I-GT-K10315;
-    (=gt-pj-1		. #x5D3C)	; &I-GT-20735; [61-28]
-    (=daikanwa		. 16141)	; &I-M-16141;
+    (=ucs		. #x3C3D)	; ã°½
     ))
 (define-char
-  '((=>ucs		. #x6B47)	; 歇
-    (morohashi-daikanwa	16141 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3C3D)	; ã°½
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=cns11643-1	. #x6458)	; &C1-6458; [68-56]
-    (mojikyo		. 016141)	; &MCS-60003F0D;
+    (->subsumptive
+     ((=daikanwa	  . 16136)	; &M-16136;
+      )
+     ((=ucs@unicode	  . #x3C3D)	; &UU+3C3D;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x238E5)	; 𣣥
+  '((<-denotational
+     ((=ucs		  . #x3C3D)	; ã°½
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=daikanwa		. 16142)	; &M-16142;
+    (=cns11643-4	. #x3D7E)	; &C4-3D7E; [29-94]
     ))
 (define-char
-  '((morohashi-daikanwa	16142 0 0)
-    (ideographic-radical . 76)	; ⽋
+  '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs		. #x238E5)	; 𣣥
-    (=cns11643-6	. #x5368)	; &I-C6-5368; [51-72]
+    (=ucs		. #x3C3E)	; ã°¾
+    (->subsumptive
+     ((=daikanwa	  . 16137)	; &M-16137;
+      )
+     ((=cns11643-4	  . #x3E22)	; &C4-3E22; [30-02]
+      )
+     ((=ucs@unicode	  . #x3C3E)	; &UU+3C3E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs		. #x6B48)	; 歈
+    (=ucs		. #x6B45)	; 歅
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x6B48)	; 歈
+     ((=ucs		  . #x6B45)	; 歅
       ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=daikanwa		. 16143)	; &M-16143;
+    (=big5		. #xDDF6)	; &B-DDF6;
+    (->subsumptive
+     ((=daikanwa	  . 16138)	; &M-16138;
+      )
+     ((=cns11643-2	  . #x437C)	; &C2-437C; [35-92]
+      ))
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x6B48)	; 歈
+     ((=ucs		  . #x6B45)	; 歅
       ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=big5		. #xDDF9)	; &B-DDF9;
+    (=ucs@unicode	. #x6B45)	; &UU+6B45;
+    ))
+(define-char
+  '((ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=ucs		. #x6B46)	; 歆
+    (=big5		. #xDDF5)	; &I-B-DDF5;
     (->subsumptive
-     ((=ucs@unicode	  . #x6B48)	; &UU+6B48;
+     ((=ks-x1001	  . #x7D64)	; &M-16139; [93-68]
+      (=jis-x0212	  . #x4571)	; &I-JSP-4571; [37-81]
+      (=jis-x0213-1-2000  . #x7640)	; &I-JX1-7640; [86-32]
+      (=daikanwa	  . 16139)	; &I-M-16139;
+      (=jef-china3	  . #x54D1)	; &I-JC3-54D1;
+      (=ucs@jis		  . #x6B46)	; &M-16139;
       )
-     ((=cns11643-2	  . #x4421)	; &C2-4421; [36-01]
-      (=ucs@cns		  . #x6B48)	; &C2-4421;
+     ((=cns11643-2	  . #x437B)	; &C2-437B; [35-91]
+      )
+     ((=gb2312		  . #x6C27)	; &G0-6C27; [76-07]
+      (=ucs@unicode	  . #x6B46)	; &G0-6C27;
       ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs		. #x3C39)	; ã°¹
-    (=cns11643-4	. #x3E21)	; &I-C4-3E21; [30-01]
+    (=ucs		. #x6B47)	; 歇
+    (->subsumptive
+     ((shinjigen-2	  . 3932)
+      (=jis-x0208	  . #x5D3C)	; &GT-20735; [61-28]
+      (=ks-x1001	  . #x7A4E)	; &I-K0-7A4E; [90-46]
+      (=cns11643-1	  . #x6458)	; &I-C1-6458; [68-56]
+      (=gt		  . 20735)	; &I-GT-20735;
+      (=gt-k		  . 10315)	; &I-GT-K10315;
+      (=gt-pj-1		  . #x5D3C)	; &I-GT-20735; [61-28]
+      (=daikanwa	  . 16141)	; &I-M-16141;
+      (=ucs@jis		  . #x6B47)	; &GT-20735;
+      )
+     ((=gb2312		  . #x502A)	; &G0-502A; [48-10]
+      (=big5		  . #xB7B2)	; &I-B-B7B2;
+      (=ucs@unicode	  . #x6B47)	; &G0-502A;
+      (mojikyo		  . 016141)	; &MCS-60003F0D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs		. #x3C3A)	; ã°º
-    (=cns11643-4	. #x3D7C)	; &I-C4-3D7C; [29-92]
+    (=ucs		. #x238E5)	; 𣣥
+    (->subsumptive
+     ((=daikanwa	  . 16142)	; &M-16142;
+      )
+     ((=cns11643-6	  . #x5368)	; &C6-5368; [51-72]
+      )
+     ((=ucs@iso		  . #x238E5)	; &U-000238E5;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs		. #x3C3B)	; ã°»
-    (=cns11643-4	. #x3D7B)	; &I-C4-3D7B; [29-91]
+    (=ucs		. #x6B48)	; 歈
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6B48)	; 歈
+      ))
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=daikanwa		. 16143)	; &M-16143;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6B48)	; 歈
+      ))
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=big5		. #xDDF9)	; &B-DDF9;
+    (->subsumptive
+     ((=ucs@unicode	  . #x6B48)	; &UU+6B48;
+      )
+     ((=cns11643-2	  . #x4421)	; &C2-4421; [36-01]
+      (=ucs@cns		  . #x6B48)	; &C2-4421;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs		. #x3C3C)	; ã°¼
-    (=cns11643-4	. #x3D7D)	; &I-C4-3D7D; [29-93]
+    (=ucs		. #x238E8)	; 𣣨
+    (->subsumptive
+     ((=cns11643-6	  . #x536D)	; &M-16146; [51-77]
+      (=daikanwa	  . 16146)	; &I-M-16146;
+      )
+     ((=ucs@iso		  . #x238E8)	; &U-000238E8;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs		. #x3C3D)	; ã°½
-    (=cns11643-4	. #x3D7E)	; &I-C4-3D7E; [29-94]
+    (=ucs		. #x238E9)	; 𣣩
+    (->subsumptive
+     ((=daikanwa	  . 16147)	; &M-16147;
+      )
+     ((=cns11643-5	  . #x3F78)	; &C5-3F78; [31-88]
+      )
+     ((=ucs@iso		  . #x238E9)	; &U-000238E9;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs		. #x3C3E)	; ã°¾
-    (=cns11643-4	. #x3E22)	; &I-C4-3E22; [30-02]
+    (=ucs		. #x238F0)	; 𣣰
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x238F0)	; 𣣰
+      ))
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=daikanwa		. 16148)	; &M-16148;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x238F0)	; 𣣰
+      ))
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=cns11643-6	. #x5365)	; &C6-5365; [51-69]
+    (=ucs@iso		. #x238F0)	; &C6-5365;
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs		. #x238CA)	; 𣣊
-    (=cns11643-5	. #x3F77)	; &I-C5-3F77; [31-87]
+    (=ucs		. #x238EF)	; 𣣯
+    (->subsumptive
+     ((=cns11643-6	  . #x536C)	; &M-16151; [51-76]
+      (=daikanwa	  . 16151)	; &I-M-16151;
+      )
+     ((=ucs@iso		  . #x238EF)	; &U-000238EF;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=ucs		. #x3C3A)	; ã°º
+    (=cns11643-4	. #x3D7C)	; &I-C4-3D7C; [29-92]
+    ))
+(define-char
+  '((ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=ucs		. #x3C3B)	; ã°»
+    (=cns11643-4	. #x3D7B)	; &I-C4-3D7B; [29-91]
+    ))
+(define-char
+  '((ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=ucs		. #x3C3C)	; ã°¼
+    (=cns11643-4	. #x3D7D)	; &I-C4-3D7D; [29-93]
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
@@ -1655,500 +1907,862 @@
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=ucs		. #x238E8)	; 𣣨
-    (=cns11643-6	. #x536D)	; &I-C6-536D; [51-77]
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x238F2)	; 𣣲
+    (->subsumptive
+     ((=daikanwa	  . 16152)	; &M-16152;
+      )
+     ((=ucs@iso		  . #x238F2)	; &U-000238F2;
+      )
+     ((=cns11643-5	  . #x465C)	; &C5-465C; [38-60]
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=ucs		. #x238E9)	; 𣣩
-    (=cns11643-5	. #x3F78)	; &I-C5-3F78; [31-88]
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x238F3)	; 𣣳
+    (->subsumptive
+     ((=daikanwa	  . 16153)	; &M-16153;
+      )
+     ((=cns11643-4	  . #x442B)	; &C4-442B; [36-11]
+      )
+     ((=ucs@iso		  . #x238F3)	; &U-000238F3;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=ucs		. #x238EF)	; 𣣯
-    (=cns11643-6	. #x536C)	; &I-C6-536C; [51-76]
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x238F4)	; 𣣴
     ))
 (define-char
-  '((ideographic-radical . 76)	; ⽋
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=ucs		. #x238F0)	; 𣣰
-    (=cns11643-6	. #x5365)	; &I-C6-5365; [51-69]
+  '((<-denotational
+     ((=ucs		  . #x238F4)	; 𣣴
+      ))
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (->subsumptive
+     ((=daikanwa	  . 16154)	; &M-16154;
+      )
+     ((=ucs@iso		  . #x238F4)	; &U-000238F4;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x238F4)	; 𣣴
+      ))
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=cns11643-5	. #x465E)	; &C5-465E; [38-62]
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=ucs		. #x23903)	; 𣤃
-    (=cns11643-6	. #x536F)	; &I-C6-536F; [51-79]
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x238F5)	; 𣣵
+    (->subsumptive
+     ((=cns11643-6	  . #x5D6F)	; &M-16155; [61-79]
+      (=daikanwa	  . 16155)	; &I-M-16155;
+      )
+     ((=ucs@iso		  . #x238F5)	; &U-000238F5;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6B49)	; 歉
-    (ideographic-radical . 76)	; ⽋
+  '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (shinjigen-2	. 3937)
-    (=jis-x0208		. #x5D3E)	; &GT-20772; [61-30]
-    (=big5		. #xBA70)	; &I-B-BA70;
-    (=gt		. 20772)	; &I-GT-20772;
-    (=gt-pj-1		. #x5D3E)	; &I-GT-20772; [61-30]
-    (=daikanwa		. 16159)	; &I-M-16159;
-    (=ucs@jis		. #x6B49)	; &GT-20772;
+    (=ucs		. #x3C3F)	; ã°¿
     ))
 (define-char
-  '((morohashi-daikanwa	16159 0 2)
+  '((<-denotational
+     ((=ucs		  . #x3C3F)	; ã°¿
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x6B49)	; 歉
-    (=gb2312		. #x4738)	; &I-G0-4738; [39-24]
-    (=cns11643-1	. #x6939)	; &I-C1-6939; [73-25]
+    (=daikanwa		. 16156)	; &M-16156;
     ))
 (define-char
-  '((=>ucs		. #x6B4A)	; 歊
+  '((<-denotational
+     ((=ucs		  . #x3C3F)	; ã°¿
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=jis-x0212		. #x4572)	; &M-16161; [37-82]
-    (=jis-x0213-2-2000	. #x2F79)	; &I-JX2-2F79; [15-89]
-    (=big5		. #xE263)	; &I-B-E263;
-    (=daikanwa		. 16161)	; &I-M-16161;
-    (=jef-china3	. #x54D2)	; &I-JC3-54D2;
-    (=ucs@jis		. #x6B4A)	; &M-16161;
+    (->subsumptive
+     ((=cns11643-3	  . #x4752)	; &C3-4752; [39-50]
+      )
+     ((=ucs@unicode	  . #x3C3F)	; &UU+3C3F;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	16161 0 0)
-    (ideographic-radical . 76)	; ⽋
+  '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x6B4A)	; 歊
-    (=cns11643-2	. #x4B2B)	; &I-C2-4B2B; [43-11]
+    (=ucs		. #x238F6)	; 𣣶
     ))
 (define-char
-  '((=>ucs		. #x238F9)	; 𣣹
+  '((<-denotational
+     ((=ucs		  . #x238F6)	; 𣣶
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=cns11643-4	. #x4429)	; &M-16162; [36-09]
-    (=daikanwa		. 16162)	; &I-M-16162;
+    (->subsumptive
+     ((=daikanwa	  . 16157)	; &M-16157;
+      )
+     ((=ucs@iso		  . #x238F6)	; &U-000238F6;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	16162 0 0)
+  '((<-denotational
+     ((=ucs		  . #x238F6)	; 𣣶
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x238F9)	; 𣣹
-    (=cbeta		. 03413)	; &I-CB03413;
+    (=cns11643-6	. #x5D6E)	; &C6-5D6E; [61-78]
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x6B4B)	; 歋
+    (=ucs		. #x238F7)	; 𣣷
     (->subsumptive
-     ((=big5		  . #xE265)	; &B-E265;
-      (->subsumptive
-       ((=daikanwa	    . 16166)	; &M-16166;
-	)
-       ((=cns11643-2	    . #x4B2D)	; &C2-4B2D; [43-13]
-	(=ucs@cns	    . #x6B4B)	; &C2-4B2D;
-	)
-       ((mojikyo	    . 016166)	; &MCS-60003F26;
-	))
+     ((=cns11643-4	  . #x442C)	; &M-16158; [36-12]
+      (=daikanwa	  . 16158)	; &I-M-16158;
       )
-     ((=ucs@unicode	  . #x6B4B)	; &UU+6B4B;
+     ((=ucs@iso		  . #x238F7)	; &U-000238F7;
       ))
     ))
 (define-char
-  '((=>ucs		. #x6B4C)	; 歌
-    (ideographic-radical . 76)	; ⽋
+  '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (shinjigen-2	. 3936)
-    (=jis-x0208		. #x324E)	; &GT-20760; [18-46]
-    (=ks-x1001		. #x4A30)	; &I-K0-4A30; [42-16]
-    (=big5		. #xBA71)	; &I-B-BA71;
-    (=gt		. 20760)	; &I-GT-20760;
-    (=gt-pj-1		. #x324E)	; &I-GT-20760; [18-46]
-    (=daikanwa		. 16167)	; &I-M-16167;
-    (=ucs@jis		. #x6B4C)	; &GT-20760;
+    (=ucs		. #x6B49)	; 歉
+    (=big5		. #xBA70)	; &I-B-BA70;
     ))
 (define-char
-  '((morohashi-daikanwa	16167 0 0)
+  '((<-denotational
+     ((=ucs		  . #x6B49)	; 歉
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x6B4C)	; 歌
-    (=gb2312		. #x3868)	; &I-G0-3868; [24-72]
-    (=cns11643-1	. #x693A)	; &I-C1-693A; [73-26]
+    (->subsumptive
+     ((shinjigen-2	  . 3937)
+      (=jis-x0208	  . #x5D3E)	; &GT-20772; [61-30]
+      (=gt		  . 20772)	; &I-GT-20772;
+      (=gt-pj-1		  . #x5D3E)	; &I-GT-20772; [61-30]
+      (=daikanwa	  . 16159)	; &I-M-16159;
+      (=ucs@jis		  . #x6B49)	; &GT-20772;
+      )
+     ((shinjigen-1	  . 3937)
+      ))
     ))
 (define-char
-  '((ideographic-radical . 76)	; ⽋
+  '((<-denotational
+     ((=ucs		  . #x6B49)	; 歉
+      ))
+    (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x6B4D)	; 歍
-    (=jis-x0212		. #x4573)	; &I-JSP-4573; [37-83]
-    (=cns11643-2	. #x4B2C)	; &I-C2-4B2C; [43-12]
-    (=big5		. #xE264)	; &I-B-E264;
-    (=daikanwa		. 16168)	; &I-M-16168;
+    (->subsumptive
+     ((=cns11643-1	  . #x6939)	; &C1-6939; [73-25]
+      )
+     ((=gb2312		  . #x4738)	; &G0-4738; [39-24]
+      (=ucs@unicode	  . #x6B49)	; &G0-4738;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x3C3F)	; ã°¿
-    (=cns11643-3	. #x4752)	; &I-C3-4752; [39-50]
+    (=ucs		. #x238F8)	; 𣣸
+    (->subsumptive
+     ((=cns11643-5	  . #x465D)	; &M-16160; [38-61]
+      (=daikanwa	  . 16160)	; &I-M-16160;
+      )
+     ((=ucs@iso		  . #x238F8)	; &U-000238F8;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x3C40)	; 㱀
-    (=cns11643-6	. #x5D77)	; &I-C6-5D77; [61-87]
+    (=ucs		. #x6B4A)	; 歊
+    (=big5		. #xE263)	; &I-B-E263;
+    (->subsumptive
+     ((=jis-x0212	  . #x4572)	; &M-16161; [37-82]
+      (=jis-x0213-2-2000  . #x2F79)	; &I-JX2-2F79; [15-89]
+      (=daikanwa	  . 16161)	; &I-M-16161;
+      (=jef-china3	  . #x54D2)	; &I-JC3-54D2;
+      (=ucs@jis		  . #x6B4A)	; &M-16161;
+      )
+     ((=cns11643-2	  . #x4B2B)	; &C2-4B2B; [43-11]
+      )
+     ((=ucs@unicode	  . #x6B4A)	; &UU+6B4A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x3C41)	; 㱁
-    (=cns11643-4	. #x442A)	; &I-C4-442A; [36-10]
+    (=ucs		. #x238F9)	; 𣣹
+    (->subsumptive
+     ((=cns11643-4	  . #x4429)	; &M-16162; [36-09]
+      (=daikanwa	  . 16162)	; &I-M-16162;
+      )
+     ((=cbeta		  . 03413)	; &CB03413;
+      )
+     ((=ucs@iso		  . #x238F9)	; &U-000238F9;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x238F2)	; 𣣲
-    (=cns11643-5	. #x465C)	; &I-C5-465C; [38-60]
+    (=ucs		. #x3C40)	; 㱀
+    (->subsumptive
+     ((=cns11643-6	  . #x5D77)	; &M-16163; [61-87]
+      (=daikanwa	  . 16163)	; &I-M-16163;
+      )
+     ((=ucs@unicode	  . #x3C40)	; &UU+3C40;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x238F3)	; 𣣳
-    (=cns11643-4	. #x442B)	; &I-C4-442B; [36-11]
+    (=ucs		. #x3C41)	; 㱁
+    (->subsumptive
+     ((=cns11643-4	  . #x442A)	; &M-16164; [36-10]
+      (=daikanwa	  . 16164)	; &I-M-16164;
+      )
+     ((=ucs@unicode	  . #x3C41)	; &UU+3C41;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x238F4)	; 𣣴
-    (=cns11643-5	. #x465E)	; &I-C5-465E; [38-62]
+    (=ucs		. #x238FA)	; 𣣺
+    (->subsumptive
+     ((=daikanwa	  . 16165)	; &M-16165;
+      )
+     ((=cns11643-6	  . #x5D75)	; &C6-5D75; [61-85]
+      )
+     ((=ucs@iso		  . #x238FA)	; &U-000238FA;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x238F5)	; 𣣵
-    (=cns11643-6	. #x5D6F)	; &I-C6-5D6F; [61-79]
+    (=ucs		. #x6B4B)	; 歋
     ))
 (define-char
-  '((ideographic-radical . 76)	; ⽋
+  '((<-denotational
+     ((=ucs		  . #x6B4B)	; 歋
+      ))
+    (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x238F6)	; 𣣶
-    (=cns11643-6	. #x5D6E)	; &I-C6-5D6E; [61-78]
+    (=big5		. #xE265)	; &B-E265;
+    (->subsumptive
+     ((=daikanwa	  . 16166)	; &M-16166;
+      )
+     ((mojikyo		  . 016166)	; &MCS-60003F26;
+      )
+     ((=cns11643-2	  . #x4B2D)	; &C2-4B2D; [43-13]
+      (=ucs@cns		  . #x6B4B)	; &C2-4B2D;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 76)	; ⽋
+  '((<-denotational
+     ((=ucs		  . #x6B4B)	; 歋
+      ))
+    (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x238F7)	; 𣣷
-    (=cns11643-4	. #x442C)	; &I-C4-442C; [36-12]
+    (=ucs@unicode	. #x6B4B)	; &UU+6B4B;
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x238F8)	; 𣣸
-    (=cns11643-5	. #x465D)	; &I-C5-465D; [38-61]
+    (=ucs		. #x6B4C)	; 歌
+    (=big5		. #xBA71)	; &I-B-BA71;
+    (->subsumptive
+     ((shinjigen-2	  . 3936)
+      (=jis-x0208	  . #x324E)	; &GT-20760; [18-46]
+      (=ks-x1001	  . #x4A30)	; &I-K0-4A30; [42-16]
+      (=gt		  . 20760)	; &I-GT-20760;
+      (=gt-pj-1		  . #x324E)	; &I-GT-20760; [18-46]
+      (=daikanwa	  . 16167)	; &I-M-16167;
+      (=ucs@jis		  . #x6B4C)	; &GT-20760;
+      )
+     ((=cns11643-1	  . #x693A)	; &C1-693A; [73-26]
+      )
+     ((=gb2312		  . #x3868)	; &G0-3868; [24-72]
+      (=ucs@unicode	  . #x6B4C)	; &G0-3868;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x238FA)	; 𣣺
-    (=cns11643-6	. #x5D75)	; &I-C6-5D75; [61-85]
+    (=ucs		. #x6B4D)	; 歍
+    (=big5		. #xE264)	; &I-B-E264;
+    (->subsumptive
+     ((=jis-x0212	  . #x4573)	; &M-16168; [37-83]
+      (=cns11643-2	  . #x4B2C)	; &I-C2-4B2C; [43-12]
+      (=daikanwa	  . 16168)	; &I-M-16168;
+      (=ucs@jis		  . #x6B4D)	; &M-16168;
+      )
+     ((=ucs@unicode	  . #x6B4D)	; &UU+6B4D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x238FB)	; 𣣻
-    (=cns11643-6	. #x5D70)	; &I-C6-5D70; [61-80]
+    (->subsumptive
+     ((=cns11643-6	  . #x5D70)	; &M-16169; [61-80]
+      (=daikanwa	  . 16169)	; &I-M-16169;
+      )
+     ((=ucs@iso		  . #x238FB)	; &U-000238FB;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 76)	; ⽋
+  '((=>ucs		. #x238FC)	; 𣣼
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=daikanwa		. 16170)	; &M-16170;
+    ))
+(define-char
+  '((=>daikanwa		. 16170)	; &M-16170;
+    (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x238FC)	; 𣣼
-    (=cns11643-5	. #x465A)	; &I-C5-465A; [38-58]
+    (->subsumptive
+     ((=cns11643-5	  . #x465A)	; &C5-465A; [38-58]
+      )
+     ((=ucs@iso		  . #x238FC)	; &U-000238FC;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x238FD)	; 𣣽
-    (=cns11643-6	. #x5D76)	; &I-C6-5D76; [61-86]
+    (->subsumptive
+     ((=cns11643-6	  . #x5D76)	; &M-16171; [61-86]
+      (=daikanwa	  . 16171)	; &I-M-16171;
+      )
+     ((=ucs@iso		  . #x238FD)	; &U-000238FD;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x238FE)	; 𣣾
-    (=cns11643-6	. #x5D74)	; &I-C6-5D74; [61-84]
+    (->subsumptive
+     ((=cns11643-6	  . #x5D74)	; &M-16172; [61-84]
+      (=daikanwa	  . 16172)	; &I-M-16172;
+      )
+     ((=ucs@iso		  . #x238FE)	; &U-000238FE;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x238FF)	; 𣣿
-    (=cns11643-5	. #x465B)	; &I-C5-465B; [38-59]
+    (->subsumptive
+     ((=cns11643-5	  . #x465B)	; &M-16173; [38-59]
+      (=daikanwa	  . 16173)	; &I-M-16173;
+      )
+     ((=ucs@iso		  . #x238FF)	; &U-000238FF;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x23900)	; 𣤀
-    (=cns11643-6	. #x5D72)	; &I-C6-5D72; [61-82]
+    (->subsumptive
+     ((=cns11643-6	  . #x5D72)	; &M-16174; [61-82]
+      (=daikanwa	  . 16174)	; &I-M-16174;
+      )
+     ((=ucs@iso		  . #x23900)	; &U-00023900;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x23901)	; 𣤁
-    (=cns11643-6	. #x5D71)	; &I-C6-5D71; [61-81]
+    (->subsumptive
+     ((=daikanwa	  . 16175)	; &M-16175;
+      )
+     ((=cns11643-6	  . #x5D71)	; &C6-5D71; [61-81]
+      )
+     ((=ucs@iso		  . #x23901)	; &U-00023901;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x23902)	; 𣤂
-    (=cns11643-6	. #x5D73)	; &I-C6-5D73; [61-83]
+    (->subsumptive
+     ((=daikanwa	  . 16176)	; &M-16176;
+      )
+     ((=ucs@iso		  . #x23902)	; &U-00023902;
+      )
+     ((=cns11643-6	  . #x5D73)	; &C6-5D73; [61-83]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 76)	; ⽋
+    (=ucs		. #x23903)	; 𣤃
+    (->subsumptive
+     ((ideographic-strokes . 10)
+      (total-strokes	   . 14)
+      (=daikanwa	  . 16177)	; &M-16177;
+      )
+     ((ideographic-strokes . 9)
+      (total-strokes	   . 13)
+      (=cns11643-6	  . #x536F)	; &C6-536F; [51-79]
+      )
+     ((ideographic-strokes . 10)
+      (total-strokes	   . 14)
+      (=ucs@iso		  . #x23903)	; &U-00023903;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x23907)	; 𣤇
-    (=cns11643-5	. #x4659)	; &I-C5-4659; [38-57]
+    (->subsumptive
+     ((=cns11643-5	  . #x4659)	; &C5-4659; [38-57]
+      )
+     ((=ucs@iso		  . #x23907)	; &U-00023907;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x6B4E)	; 歎
-    (=ks-x1001		. #x7727)	; &I-K0-7727; [87-07]
-    (=cns11643-1	. #x6D45)	; &I-C1-6D45; [77-37]
-    (=big5		. #xBCDB)	; &I-B-BCDB;
-    (=daikanwa		. 16182)	; &I-M-16182;
-    (=jef-china3	. #x54D3)	; &I-JC3-54D3;
-    ))
-(define-char
-  '((=>ucs		. #x6B4E)	; 歎
-    (morohashi-daikanwa	16182 0 2)
-    (ideographic-radical . 76)	; ⽋
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=jis-x0208		. #x4337)	; &GT-20780; [35-23]
-    (=gt		. 20780)	; &I-GT-20780;
-    (=gt-k		. 11150)	; &I-GT-K11150;
-    (=gt-pj-1		. #x4337)	; &I-GT-20780; [35-23]
-    (=ucs@jis		. #x6B4E)	; &GT-20780;
+    (=ucs		. #x23908)	; 𣤈
+    (->subsumptive
+     ((=cns11643-5	  . #x4D6E)	; &M-16178; [45-78]
+      (=daikanwa	  . 16178)	; &I-M-16178;
+      )
+     ((=ucs@iso		  . #x23908)	; &U-00023908;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x6B4F)	; 歏
-    (=cns11643-3	. #x4C66)	; &I-C3-4C66; [44-70]
-    (=daikanwa		. 16183)	; &I-M-16183;
-    (=jef-china3	. #x54D4)	; &I-JC3-54D4;
+    (=ucs		. #x23909)	; 𣤉
+    (->subsumptive
+     ((=cns11643-7	  . #x237D)	; &M-16179; [03-93]
+      (=daikanwa	  . 16179)	; &I-M-16179;
+      )
+     ((=ucs@iso		  . #x23909)	; &U-00023909;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (shinjigen-2	. 3910)
-    (=ucs		. #x6B50)	; 歐
-    (=jis-x0208		. #x5D3F)	; &I-J90-5D3F; [61-31]
-    (=ks-x1001		. #x4F31)	; &I-K0-4F31; [47-17]
-    (=gb12345		. #x4537)	; 歐 [37-23]
-    (=big5		. #xBCDA)	; &I-B-BCDA;
-    (=gt		. 20792)	; &I-GT-20792;
-    (=gt-k		. 11981)	; &I-GT-K11981;
-    (=gt-pj-1		. #x5D3F)	; &I-GT-20792; [61-31]
-    (=daikanwa		. 16185)	; &I-M-16185;
+    (=ucs		. #x2390A)	; 𣤊
     ))
 (define-char
-  '((=>ucs		. #x6B50)	; 歐
-    (morohashi-daikanwa	16185 0 1)
+  '((<-denotational
+     ((=ucs		  . #x2390A)	; 𣤊
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=cns11643-1	. #x6D44)	; &C1-6D44; [77-36]
+    (=daikanwa		. 16180)	; &M-16180;
     ))
 (define-char
-  '((ideographic-radical . 76)	; ⽋
+  '((<-denotational
+     ((=ucs		  . #x2390A)	; 𣤊
+      ))
+    (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x6B51)	; 歑
-    (=cns11643-2	. #x5139)	; &I-C2-5139; [49-25]
-    (=big5		. #xE5F0)	; &I-B-E5F0;
-    (=daikanwa		. 16186)	; &I-M-16186;
+    (=ucs@iso		. #x2390A)	; &U-0002390A;
     ))
 (define-char
-  '((=>ucs		. #x6B52)	; 歒
+  '((<-denotational
+     ((=ucs		  . #x2390A)	; 𣤊
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=jis-x0212		. #x4574)	; &M-16190; [37-84]
-    (=daikanwa		. 16190)	; &I-M-16190;
-    (=cbeta		. 02584)	; &I-CB02584;
-    (=jef-china3	. #x54D5)	; &I-JC3-54D5;
-    (=ucs@jis		. #x6B52)	; &M-16190;
+    (=cns11643-5	. #x4D70)	; &C5-4D70; [45-80]
     ))
 (define-char
-  '((morohashi-daikanwa	16190 0 0)
-    (ideographic-radical . 76)	; ⽋
+  '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x6B52)	; 歒
-    (=cns11643-3	. #x4C65)	; &I-C3-4C65; [44-69]
+    (=ucs		. #x3C42)	; 㱂
+    (->subsumptive
+     ((=daikanwa	  . 16181)	; &M-16181;
+      )
+     ((=cns11643-4	  . #x4A4C)	; &C4-4A4C; [42-44]
+      )
+     ((=ucs@unicode	  . #x3C42)	; &UU+3C42;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 76)	; ⽋
+    (=ucs		. #x6B4E)	; 歎
+    (=jis-x0208@1997	. #x4337)	; 歎 [35-23]
     ))
 (define-char
-  '((=>ucs		. #x6B53)	; 歓
+  '((<-denotational
+     ((=ucs		  . #x6B4E)	; 歎
+      ))
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5D44)	; &GT-20862; [61-36]
-      (=ks-x1001	  . #x7C36)	; &I-K0-7C36; [92-22]
+    (=big5		. #xBCDB)	; &B-BCDB;
+    (->subsumptive
+     ((=ks-x1001	  . #x7727)	; &M-16182; [87-07]
+      (=cns11643-1	  . #x6D45)	; &I-C1-6D45; [77-37]
+      (=daikanwa	  . 16182)	; &I-M-16182;
+      (=jef-china3	  . #x54D3)	; &I-JC3-54D3;
+      )
+     ((=ucs@unicode	  . #x6B4E)	; &UU+6B4E;
       ))
-    (shinjigen-2	. 3938)
-    (=jis-x0208		. #x343F)	; &GT-20795; [20-31]
-    (=gt		. 20795)	; &I-GT-20795;
-    (=gt-pj-1		. #x343F)	; &I-GT-20795; [20-31]
-    (=daikanwa		. 16197)	; &I-M-16197;
-    (=ucs@jis		. #x6B53)	; &GT-20795;
     ))
 (define-char
-  '((morohashi-daikanwa	16197 0 1)
+  '((<-denotational
+     ((=ucs		  . #x6B4E)	; 歎
+      ))
     (ideographic-radical . 76)	; ⽋
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x6B53)	; 歓
-    (=cns11643-3	. #x4C67)	; &I-C3-4C67; [44-71]
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (->subsumptive
+     ((=gt		  . 20780)	; &GT-20780;
+      (=gt-k		  . 11150)	; &I-GT-K11150;
+      (=gt-pj-1		  . #x4337)	; &GT-20780; [35-23]
+      )
+     ((=jis-x0208	  . #x4337)	; &J90-4337; [35-23]
+      (=ucs@jis		  . #x6B4E)	; &J90-4337;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x3C42)	; 㱂
-    (=cns11643-4	. #x4A4C)	; &I-C4-4A4C; [42-44]
+    (=ucs		. #x6B4F)	; 歏
+    (->subsumptive
+     ((=cns11643-3	  . #x4C66)	; &M-16183; [44-70]
+      (=daikanwa	  . 16183)	; &I-M-16183;
+      (=jef-china3	  . #x54D4)	; &I-JC3-54D4;
+      )
+     ((=ucs@unicode	  . #x6B4F)	; &UU+6B4F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x3C43)	; 㱃
-    (=cns11643-3	. #x4C68)	; &I-C3-4C68; [44-72]
+    (->subsumptive
+     ((=daikanwa	  . 16184)	; &M-16184;
+      )
+     ((=cns11643-3	  . #x4C68)	; &C3-4C68; [44-72]
+      )
+     ((=ucs@unicode	  . #x3C43)	; &UU+3C43;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23908)	; 𣤈
-    (=cns11643-5	. #x4D6E)	; &I-C5-4D6E; [45-78]
+    (=ucs		. #x6B50)	; 歐
+    (=big5		. #xBCDA)	; &I-B-BCDA;
     ))
 (define-char
-  '((ideographic-radical . 76)	; ⽋
+  '((<-denotational
+     ((=ucs		  . #x6B50)	; 歐
+      ))
+    (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23909)	; 𣤉
-    (=cns11643-7	. #x237D)	; &I-C7-237D; [03-93]
+    (->subsumptive
+     ((shinjigen-1	  . 3910)
+      (shinjigen-2	  . 3910)
+      (=jis-x0208	  . #x5D3F)	; &GT-20792; [61-31]
+      (=ks-x1001	  . #x4F31)	; &I-K0-4F31; [47-17]
+      (=gt		  . 20792)	; &I-GT-20792;
+      (=gt-k		  . 11981)	; &I-GT-K11981;
+      (=gt-pj-1		  . #x5D3F)	; &I-GT-20792; [61-31]
+      (=daikanwa	  . 16185)	; &I-M-16185;
+      (=ucs@jis		  . #x6B50)	; &GT-20792;
+      )
+     ((=gb12345		  . #x4537)	; &UU+6B50; [37-23]
+      (=ucs@unicode	  . #x6B50)	; &UU+6B50;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6B50)	; 歐
+      ))
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-1	. #x6D44)	; &C1-6D44; [77-36]
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x2390A)	; 𣤊
-    (=cns11643-5	. #x4D70)	; &I-C5-4D70; [45-80]
+    (=ucs		. #x6B51)	; 歑
+    (=big5		. #xE5F0)	; &I-B-E5F0;
+    (->subsumptive
+     ((=daikanwa	  . 16186)	; &M-16186;
+      )
+     ((=cns11643-2	  . #x5139)	; &C2-5139; [49-25]
+      )
+     ((=ucs@unicode	  . #x6B51)	; &UU+6B51;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x2390B)	; 𣤋
-    (=cns11643-5	. #x4D71)	; &I-C5-4D71; [45-81]
+    (->subsumptive
+     ((=daikanwa	  . 16187)	; &M-16187;
+      )
+     ((=ucs@iso		  . #x2390B)	; &U-0002390B;
+      )
+     ((=cns11643-5	  . #x4D71)	; &C5-4D71; [45-81]
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x2390C)	; 𣤌
-    (=cns11643-4	. #x4A4D)	; &I-C4-4A4D; [42-45]
+    (->subsumptive
+     ((=cns11643-4	  . #x4A4D)	; &M-16188; [42-45]
+      (=daikanwa	  . 16188)	; &I-M-16188;
+      )
+     ((=ucs@iso		  . #x2390C)	; &U-0002390C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x2390D)	; 𣤍
-    (=cns11643-7	. #x2379)	; &I-C7-2379; [03-89]
+    (->subsumptive
+     ((=daikanwa	  . 16189)	; &M-16189;
+      )
+     ((=ucs@iso		  . #x2390D)	; &U-0002390D;
+      )
+     ((=cns11643-7	  . #x2379)	; &C7-2379; [03-89]
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ucs		. #x6B52)	; 歒
+    (->subsumptive
+     ((=jis-x0212	  . #x4574)	; &M-16190; [37-84]
+      (=daikanwa	  . 16190)	; &I-M-16190;
+      (=cbeta		  . 02584)	; &I-CB02584;
+      (=jef-china3	  . #x54D5)	; &I-JC3-54D5;
+      (=ucs@jis		  . #x6B52)	; &M-16190;
+      )
+     ((=cns11643-3	  . #x4C65)	; &C3-4C65; [44-69]
+      )
+     ((=ucs@unicode	  . #x6B52)	; &UU+6B52;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 76)	; ⽋
     (=ucs		. #x2390E)	; 𣤎
-    (=cns11643-7	. #x2377)	; &I-C7-2377; [03-87]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2390E)	; 𣤎
+      ))
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=daikanwa		. 16191)	; &M-16191;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2390E)	; 𣤎
+      ))
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x2390E)	; &U-0002390E;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2390E)	; 𣤎
+      ))
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-7	. #x2377)	; &C7-2377; [03-87]
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x2390F)	; 𣤏
-    (=cns11643-7	. #x237E)	; &I-C7-237E; [03-94]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2390F)	; 𣤏
+      ))
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (->subsumptive
+     ((=daikanwa	  . 16192)	; &M-16192;
+      )
+     ((=ucs@iso		  . #x2390F)	; &U-0002390F;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2390F)	; 𣤏
+      ))
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-7	. #x237E)	; &C7-237E; [03-94]
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x23910)	; 𣤐
-    (=cns11643-7	. #x2376)	; &I-C7-2376; [03-86]
+    (->subsumptive
+     ((=cns11643-7	  . #x2376)	; &M-16193; [03-86]
+      (=daikanwa	  . 16193)	; &I-M-16193;
+      )
+     ((=ucs@iso		  . #x23910)	; &U-00023910;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x23911)	; 𣤑
-    (=cns11643-7	. #x237A)	; &I-C7-237A; [03-90]
+    (->subsumptive
+     ((=cns11643-7	  . #x237A)	; &M-16194; [03-90]
+      (=daikanwa	  . 16194)	; &I-M-16194;
+      )
+     ((=ucs@iso		  . #x23911)	; &U-00023911;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x23912)	; 𣤒
-    (=cns11643-7	. #x237B)	; &I-C7-237B; [03-91]
+    (->subsumptive
+     ((=cns11643-7	  . #x237B)	; &M-16195; [03-91]
+      (=daikanwa	  . 16195)	; &I-M-16195;
+      )
+     ((=ucs@iso		  . #x23912)	; &U-00023912;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23914)	; 𣤔
-    (=cns11643-5	. #x4D6F)	; &I-C5-4D6F; [45-79]
+    (=ucs		. #x23917)	; 𣤗
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23917)	; 𣤗
+      ))
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (->subsumptive
+     ((=daikanwa	  . 16196)	; &M-16196;
+      )
+     ((=gt		  . 20791)	; &GT-20791;
+      (=gt-pj-4		  . #x4052)	; &GT-20791; [32-50]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23917)	; 𣤗
+      ))
+    (ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (->subsumptive
+     ((=ucs@iso		  . #x23917)	; &U-00023917;
+      )
+     ((=cns11643-7	  . #x237C)	; &C7-237C; [03-92]
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23917)	; 𣤗
-    (=cns11643-7	. #x237C)	; &I-C7-237C; [03-92]
+    (=ucs		. #x6B53)	; 歓
+    (->subsumptive
+     ((shinjigen-1	  . 3938)
+      (shinjigen-2	  . 3938)
+      (=jis-x0208	  . #x343F)	; &M-16197; [20-31]
+      (=daikanwa	  . 16197)	; &I-M-16197;
+      (=ucs@jis		  . #x6B53)	; &M-16197;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5D44)	; &GT-20862; [61-36]
+	(=ks-x1001	    . #x7C36)	; &I-K0-7C36; [92-22]
+	))
+      )
+     ((=gt		  . 20795)	; &GT-20795;
+      (=gt-pj-1		  . #x343F)	; &GT-20795; [20-31]
+      )
+     ((=ucs@unicode	  . #x6B53)	; &UU+6B53;
+      )
+     ((=cns11643-3	  . #x4C67)	; &C3-4C67; [44-71]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 76)	; ⽋
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23914)	; 𣤔
+    (->subsumptive
+     ((=cns11643-5	  . #x4D6F)	; &C5-4D6F; [45-79]
+      )
+     ((=ucs@iso		  . #x23914)	; &U-00023914;
+      ))
     ))
 (define-char
   '((ideographic-radical . 76)	; ⽋
@@ -2161,6 +2775,7 @@
     (ideographic-radical . 76)	; ⽋
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=big5		. #xE9DF)	; &B-E9DF;
     (->subsumptive
      ((shinjigen-1	  . 3943)
       (shinjigen-2	  . 3943)
@@ -2170,8 +2785,6 @@
       (=daikanwa	  . 16198)	; &I-M-16198;
       (=ucs@jis		  . #x6B54)	; &GT-20820;
       )
-     ((=big5		  . #xE9DF)	; &B-E9DF;
-      )
      ((=cns11643-2	  . #x576A)	; &C2-576A; [55-74]
       (=ucs@cns		  . #x6B54)	; &C2-576A;
       ))
@@ -2188,16 +2801,16 @@
     (total-strokes	 . 15)
     (=ucs		. #x2F8F1)	; 歔
     (->subsumptive
-     ((<-wrong
+     ((shinjigen-1	  . 3944)
+      (=iso-ir165	  . #x2E55)	; &EGB-2E55; [14-53]
+      (=ucs@unicode	  . #x6B54)	; &EGB-2E55;
+      (<-wrong
        ((shinjigen-1	    . 3943)
 	(=jis-x0208	    . #x5D41)	; &GT-20820; [61-33]
 	(=daikanwa	    . 16198)	; &I-M-16198;
 	))
       (<-wrong*sources
        shinjigen-1)
-      (shinjigen-1	  . 3944)
-      (=iso-ir165	  . #x2E55)	; &EGB-2E55; [14-53]
-      (=ucs@unicode	  . #x6B54)	; &EGB-2E55;
       )
      ((=cns11643-7	  . #x2378)	; &C7-2378; [03-88]
       (=ucs@iso		  . #x2F8F1)	; &C7-2378;
diff --git a/lisp/utf-2000/Ideograph-R077-Stop.el b/lisp/utf-2000/Ideograph-R077-Stop.el
index 9dc540c..fef240e 100644
--- a/lisp/utf-2000/Ideograph-R077-Stop.el
+++ b/lisp/utf-2000/Ideograph-R077-Stop.el
@@ -22,11 +22,11 @@
     (ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x6B62)	; æ­¢
-      ))
     (=gt-k		. 00439)	; &GT-K00439;
     (=gt-pj-k1		. #x347D)	; &GT-K00439; [20-93]
+    (<-formed@component/connect-right
+     ((=ucs		  . #x6B62)	; æ­¢
+      ))
     ))
 (define-char
   '((=>ucs		. #x6B62)	; æ­¢
@@ -34,22 +34,22 @@
     (ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x6B62)	; æ­¢
-      ))
     (=big5-cdp		. #x8960)	; &CDP-8960;
     (=gt-k		. 00182)	; &I-GT-K00182;
     (=gt-pj-k1		. #x3A42)	; &CDP-8960; [26-34]
+    (<-formed@component
+     ((=ucs		  . #x6B62)	; æ­¢
+      ))
     ))
 (define-char
   '((=>daikanwa		. 16253)	; æ­¢
     (ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-ideographic-component-forms
+    (=ucs		. #x9FB0)	; é¾°
+    (<-formed@component/connect-above
      ((=ucs		  . #x6B62)	; æ­¢
       ))
-    (=ucs		. #x9FB0)	; é¾°
     (->subsumptive
      ((=big5-cdp	  . #x8B68)	; &CDP-8B68;
       )
@@ -59,30 +59,28 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x23942)	; 𣥂
-    (ideographic-radical . 77)	; ⽌
-    (ideographic-strokes . 0)
-    (total-strokes	 . 3)
-    (=gt		. 20883)	; &GT-20883;
-    (=gt-k		. 00187)	; &I-GT-K00187;
-    (=gt-pj-4		. #x4128)	; &GT-20883; [33-08]
-    (=daikanwa		. 16254)	; &I-M-16254;
-    ))
-(define-char
-  '((morohashi-daikanwa	16254 0 0)
-    (ideographic-radical . 77)	; ⽌
+  '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
-    (hanyu-dazidian	1 28 5)
     (=ucs		. #x23942)	; 𣥂
-    (=cns11643-5	. #x2132)	; &I-C5-2132; [01-18]
-    (=big5-cdp		. #x8BDB)	; &I-CDP-8BDB;
-    (mojikyo		. 016254)	; &MCS-60003F7E;
+    (->subsumptive
+     ((=gt		  . 20883)	; &GT-20883;
+      (=gt-k		  . 00187)	; &I-GT-K00187;
+      (=gt-pj-4		  . #x4128)	; &GT-20883; [33-08]
+      (=daikanwa	  . 16254)	; &I-M-16254;
+      )
+     ((hanyu-dazidian	  1 28 5)
+      (=cns11643-5	  . #x2132)	; &CDP-8BDB; [01-18]
+      (=big5-cdp	  . #x8BDB)	; &I-CDP-8BDB;
+      (=ucs@iso		  . #x23942)	; &CDP-8BDB;
+      (mojikyo		  . 016254)	; &MCS-60003F7E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 1)
     (total-strokes	 . 5)
+    (shinjigen-1	. 3948)
     (shinjigen-2	. 3948)
     (=ucs		. #x6B63)	; æ­£
     (=jis-x0208		. #x4035)	; &I-J90-4035; [32-21]
@@ -197,49 +195,38 @@
     (=hanziku-4		. #xD2AD)	; &I-HZK04-D2AD;
     ))
 (define-char
-  '((=>ucs		. #x6B65)	; æ­¥
-    (ideographic-radical . 77)	; ⽌
-    (ideographic-strokes . 3)
-    (total-strokes	 . 7)
-    (=ks-x1001		. #x5C46)	; &M-16264; [60-38]
-    (=jis-x0213-1-2000	. #x7643)	; &I-JX1-7643; [86-35]
-    (=big5		. #xA842)	; &I-B-A842;
-    (=daikanwa		. 16264)	; &I-M-16264;
-    (=jef-china3	. #x54DC)	; &I-JC3-54DC;
-    (=ucs@jis		. #x6B65)	; &M-16264;
-    ))
-(define-char
-  '((morohashi-daikanwa	16264 0 0)
-    (ideographic-radical . 77)	; ⽌
+  '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x6B65)	; æ­¥
-    (=gb2312		. #x323D)	; &I-G0-323D; [18-29]
-    (=cns11643-1	. #x4A63)	; &I-C1-4A63; [42-67]
-    ))
-(define-char
-  '((=>ucs		. #x2394A)	; 𣥊
-    (ideographic-radical . 77)	; ⽌
-    (ideographic-strokes . 3)
-    (total-strokes	 . 7)
-    (=daikanwa		. 16265)	; &M-16265;
-    ))
-(define-char
-  '((=>ucs		. #x2394A)	; 𣥊
-    (morohashi-daikanwa	16265 0 0)
-    (ideographic-radical . 77)	; ⽌
-    (ideographic-strokes . 3)
-    (total-strokes	 . 7)
-    (=cns11643-5	. #x2449)	; &C5-2449; [04-41]
+    (->subsumptive
+     ((shinjigen-1	  . 3953)
+      (=ks-x1001	  . #x5C46)	; &M-16264; [60-38]
+      (=jis-x0213-1-2000  . #x7643)	; &I-JX1-7643; [86-35]
+      (=big5		  . #xA842)	; &I-B-A842;
+      (=daikanwa	  . 16264)	; &I-M-16264;
+      (=jef-china3	  . #x54DC)	; &I-JC3-54DC;
+      (=ucs@jis		  . #x6B65)	; &M-16264;
+      )
+     ((=gb2312		  . #x323D)	; &C1-4A63; [18-29]
+      (=cns11643-1	  . #x4A63)	; &I-C1-4A63; [42-67]
+      (=ucs@unicode	  . #x6B65)	; &C1-4A63;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	16265 0 1)
-    (ideographic-radical . 77)	; ⽌
+  '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
-    (hanyu-dazidian	2 1439 2)
     (=ucs		. #x2394A)	; 𣥊
-    (=hanziku-4		. #xD2AE)	; &I-HZK04-D2AE;
+    (->subsumptive
+     ((=daikanwa	  . 16265)	; &M-16265;
+      )
+     ((=cns11643-5	  . #x2449)	; &C5-2449; [04-41]
+      )
+     ((hanyu-dazidian	  2 1439 2)
+      (=hanziku-4	  . #xD2AE)	; &HZK04-D2AE;
+      (=ucs@iso		  . #x2394A)	; &HZK04-D2AE;
+      ))
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
@@ -275,17 +262,17 @@
   '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (hanyu-dazidian	2 1441 6)
+    (=ucs		. #x2394D)	; 𣥍
+    (=cns11643-6	. #x2C3C)	; &I-C6-2C3C; [12-28]
+    (=daikanwa		. 16268)	; &I-M-16268;
+    (=hanziku-4		. #xD2F2)	; &I-HZK04-D2F2;
     (<-ancient
      ((=ks-x1001	  . #x504E)	; &M-38752; [48-46]
       (=daikanwa	  . 38752)	; &I-M-38752;
       ))
     (<-ancient*sources
      shuowen daikanwa)
-    (hanyu-dazidian	2 1441 6)
-    (=ucs		. #x2394D)	; 𣥍
-    (=cns11643-6	. #x2C3C)	; &I-C6-2C3C; [12-28]
-    (=daikanwa		. 16268)	; &I-M-16268;
-    (=hanziku-4		. #xD2F2)	; &I-HZK04-D2F2;
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
@@ -469,57 +456,55 @@
     (=hanziku-4		. #xD2EF)	; &I-HZK04-D2EF;
     ))
 (define-char
-  '((=>ucs		. #x6B69)	; æ­©
+  '((morohashi-daikanwa	16283 1)
     (ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x5C46)	; &M-16264; [60-38]
-      (=jis-x0213-1-2000  . #x7643)	; &I-JX1-7643; [86-35]
-      (=daikanwa	  . 16264)	; &I-M-16264;
-      ))
-    (shinjigen-2	. 3952)
-    (=jis-x0208		. #x4A62)	; &GT-20914; [42-66]
-    (=gt		. 20914)	; &I-GT-20914;
-    (=gt-k		. 03986)	; &I-GT-K03986;
-    (=gt-pj-1		. #x4A62)	; &I-GT-20914; [42-66]
-    (=daikanwa		. 16284)	; &I-M-16284;
-    (=ucs@jis		. #x6B69)	; &GT-20914;
+    (hanyu-dazidian	2 1441 11)
+    (=ucs		. #x23949)	; 𣥉
+    (=cns11643-6	. #x2C31)	; &I-C6-2C31; [12-17]
+    (=hanziku-4		. #xD2F7)	; &I-HZK04-D2F7;
     ))
 (define-char
-  '((morohashi-daikanwa	16284 0 1)
-    (ideographic-radical . 77)	; ⽌
+  '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x6B69)	; æ­©
-    (=cns11643-3	. #x2956)	; &I-C3-2956; [09-54]
-    ))
-(define-char
-  '((=>ucs		. #x23960)	; 𣥠
-    (ideographic-radical . 77)	; ⽌
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (=daikanwa		. 49194)	; &M-49194;
-    (mojikyo		. 049194)	; &MCS-6000C02A;
-    ))
-(define-char
-  '((morohashi-daikanwa	49194 0 0)
-    (ideographic-radical . 77)	; ⽌
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (hanyu-dazidian	2 1440 8)
-    (=ucs		. #x23960)	; 𣥠
-    (=cns11643-4	. #x2672)	; &I-C4-2672; [06-82]
-    (=hanziku-4		. #xD2D4)	; &I-HZK04-D2D4;
+    (->subsumptive
+     ((shinjigen-1	  . 3952)
+      (shinjigen-2	  . 3952)
+      (=jis-x0208	  . #x4A62)	; &GT-20914; [42-66]
+      (=gt		  . 20914)	; &I-GT-20914;
+      (=gt-k		  . 03986)	; &I-GT-K03986;
+      (=gt-pj-1		  . #x4A62)	; &I-GT-20914; [42-66]
+      (=daikanwa	  . 16284)	; &I-M-16284;
+      (=ucs@jis		  . #x6B69)	; &GT-20914;
+      (<-simplified@JP/Jouyou
+       ((=ks-x1001	    . #x5C46)	; &M-16264; [60-38]
+	(=jis-x0213-1-2000  . #x7643)	; &I-JX1-7643; [86-35]
+	(=daikanwa	    . 16264)	; &I-M-16264;
+	))
+      )
+     ((=ucs@unicode	  . #x6B69)	; &UU+6B69;
+      )
+     ((=cns11643-3	  . #x2956)	; &C3-2956; [09-54]
+      ))
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (hanyu-dazidian	2 1441 11)
-    (=ucs		. #x23949)	; 𣥉
-    (=cns11643-6	. #x2C31)	; &I-C6-2C31; [12-17]
-    (=hanziku-4		. #xD2F7)	; &I-HZK04-D2F7;
+    (=ucs		. #x23960)	; 𣥠
+    (->subsumptive
+     ((=daikanwa	  . 49194)	; &M-49194;
+      (mojikyo		  . 049194)	; &MCS-6000C02A;
+      )
+     ((=cns11643-4	  . #x2672)	; &C4-2672; [06-82]
+      )
+     ((hanyu-dazidian	  2 1440 8)
+      (=hanziku-4	  . #xD2D4)	; &HZK04-D2D4;
+      (=ucs@iso		  . #x23960)	; &HZK04-D2D4;
+      ))
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
@@ -780,7 +765,10 @@
   '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=daikanwa		. 16306)	; &M-16306;
+    (hanyu-dazidian	2 1442 19)
+    (=ucs		. #x23977)	; 𣥷
+    (=daikanwa		. 16306)	; &I-M-16306;
+    (=hanziku-4		. #xD360)	; &I-HZK04-D360;
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
@@ -792,59 +780,62 @@
     (=hanziku-4		. #xD361)	; &I-HZK04-D361;
     ))
 (define-char
-  '((=>ucs		. #x23979)	; 𣥹
-    (ideographic-radical . 77)	; ⽌
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=daikanwa		. 16307)	; &M-16307;
-    (mojikyo		. 016307)	; &MCS-60003FB3;
-    ))
-(define-char
-  '((morohashi-daikanwa	16307 0 0)
-    (ideographic-radical . 77)	; ⽌
+  '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (hanyu-dazidian	2 1443 5)
     (=ucs		. #x23979)	; 𣥹
     (=cns11643-4	. #x3840)	; &I-C4-3840; [24-32]
+    (=daikanwa		. 16307)	; &I-M-16307;
     (=hanziku-4		. #xD372)	; &I-HZK04-D372;
+    (mojikyo		. 016307)	; &MCS-60003FB3;
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x3C55)	; 㱕
-    (->subsumptive
-     ((<-original
-       ((shinjigen-1	    . 3960)
-	(=jis-x0208	    . #x5D45)	; &GT-20995; [61-37]
-	(=ks-x1001	    . #x4F7D)	; &I-K0-4F7D; [47-93]
-	(=cns11643-1	    . #x7657)	; &I-C1-7657; [86-55]
-	(=daikanwa	    . 16349)	; &I-M-16349;
-	))
-      (<-original*sources
-       shinjigen-1)
-      (shinjigen-1	  . 3961)
-      (=cns11643-3	  . #x3C48)	; &M-16308; [28-40]
-      (=daikanwa	  . 16308)	; &I-M-16308;
-      )
-     ((=ucs@unicode	  . #x3C55)	; &UU+3C55;
-      ))
     ))
 (define-char
-  '((=>ucs		. #x3C56)	; 㱖
+  '((<-denotational
+     ((=ucs		  . #x3C55)	; 㱕
+      ))
     (ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=daikanwa		. 16309)	; &M-16309;
+    (shinjigen-1	. 3961)
+    (=cns11643-3	. #x3C48)	; &M-16308; [28-40]
+    (=daikanwa		. 16308)	; &I-M-16308;
+    (<-original
+     ((shinjigen-1	  . 3960)
+      (=jis-x0208	  . #x5D45)	; &GT-20995; [61-37]
+      (=ks-x1001	  . #x4F7D)	; &I-K0-4F7D; [47-93]
+      (=cns11643-1	  . #x7657)	; &I-C1-7657; [86-55]
+      (=daikanwa	  . 16349)	; &I-M-16349;
+      ))
+    (<-original*sources
+     shinjigen-1)
     ))
 (define-char
-  '((morohashi-daikanwa	16309 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3C55)	; 㱕
+      ))
     (ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=ucs@unicode	. #x3C55)	; &UU+3C55;
+    ))
+(define-char
+  '((ideographic-radical . 77)	; ⽌
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
     (=ucs		. #x3C56)	; 㱖
-    (=cns11643-4	. #x383F)	; &I-C4-383F; [24-31]
+    (->subsumptive
+     ((=daikanwa	  . 16309)	; &M-16309;
+      )
+     ((=cns11643-4	  . #x383F)	; &C4-383F; [24-31]
+      (=ucs@unicode	  . #x3C56)	; &C4-383F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
@@ -1035,28 +1026,19 @@
     (=hanziku-4		. #xD37A)	; &I-HZK04-D37A;
     ))
 (define-char
-  '((=>ucs		. #x23985)	; 𣦅
-    (ideographic-radical . 77)	; ⽌
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=daikanwa		. 16322)	; &M-16322;
-    ))
-(define-char
-  '((morohashi-daikanwa	16322 0 0)
-    (ideographic-radical . 77)	; ⽌
+  '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x23985)	; 𣦅
-    (=cns11643-6	. #x4A41)	; &I-C6-4A41; [42-33]
-    ))
-(define-char
-  '((=>ucs		. #x23985)	; 𣦅
-    (morohashi-daikanwa	16322 0 1)
-    (ideographic-radical . 77)	; ⽌
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (hanyu-dazidian	2 1443 17)
-    (=hanziku-4		. #xD37E)	; &HZK04-D37E;
+    (->subsumptive
+     ((=daikanwa	  . 16322)	; &M-16322;
+      )
+     ((=cns11643-6	  . #x4A41)	; &C6-4A41; [42-33]
+      (=ucs@iso		  . #x23985)	; &C6-4A41;
+      )
+     ((hanyu-dazidian	  2 1443 17)
+      (=hanziku-4	  . #xD37E)	; &HZK04-D37E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
@@ -1064,7 +1046,13 @@
     (total-strokes	 . 12)
     (=ucs		. #x6B6F)	; æ­¯
     (->subsumptive
-     ((<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x3B75)	; &GT-66384; [27-85]
+      (=gt		  . 66384)	; &I-GT-66384;
+      (=gt-k		  . 09061)	; &I-GT-K09061;
+      (=gt-pj-1		  . #x3B75)	; &I-GT-66384; [27-85]
+      (=daikanwa	  . 16323)	; &I-M-16323;
+      (=ucs@unicode	  . #x6B6F)	; &GT-66384;
+      (<-simplified@JP/Jouyou
        ((=ucs		    . #x9F52)	; 齒
 	(=jis-x0208	    . #x736F)	; &I-J90-736F; [83-79]
 	))
@@ -1074,12 +1062,6 @@
 	))
       (<-vulgar*sources
        songyuan-yilai-suzipu daikanwa)
-      (=jis-x0208	  . #x3B75)	; &GT-66384; [27-85]
-      (=gt		  . 66384)	; &I-GT-66384;
-      (=gt-k		  . 09061)	; &I-GT-K09061;
-      (=gt-pj-1		  . #x3B75)	; &I-GT-66384; [27-85]
-      (=daikanwa	  . 16323)	; &I-M-16323;
-      (=ucs@unicode	  . #x6B6F)	; &GT-66384;
       )
      ((shinjigen-1	  . 9882)
       (shinjigen-2	  . 9882)
@@ -1095,10 +1077,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EED)	; â»­
     (<-identical@component
      ((=ucs		  . #x6B6F)	; æ­¯
       ))
-    (=ucs		. #x2EED)	; â»­
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
@@ -1129,6 +1111,17 @@
       ))
     ))
 (define-char
+  '((ideographic-radical@ucs . 77)	; ⽌
+    (ideographic-strokes@ucs . 9)
+    (ideographic-radical@daikanwa . 56)	; â¼·
+    (ideographic-strokes@daikanwa . 10)
+    (total-strokes	 . 13)
+    (hanyu-dazidian	1 560 3)
+    (=ucs		. #x2398F)	; 𣦏
+    (=daikanwa		. 09684)	; &I-M-09684;
+    (=hanziku-2		. #xC342)	; &I-HZK02-C342;
+    ))
+(define-char
   '((ideographic-radical . 77)	; ⽌
     (=ucs		. #x6B70)	; æ­°
     (->subsumptive
@@ -1191,12 +1184,6 @@
     (ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (<-simplified@JP
-     ((=cns11643-1	  . #x6459)	; &M-16326; [68-57]
-      (=daikanwa	  . 16326)	; &I-M-16326;
-      ))
-    (<-simplified@JP*sources
-     daikanwa)
     (shinjigen-1	. 3955)
     (shinjigen-2	. 3955)
     (=ucs		. #x6B73)	; æ­³
@@ -1206,77 +1193,91 @@
     (=gt-k		. 10209)	; &I-GT-K10209;
     (=gt-pj-1		. #x3A50)	; &I-GT-20964; [26-48]
     (mojikyo		. 050239)	; &MCS-6000C43F;
+    (<-simplified@JP
+     ((=cns11643-1	  . #x6459)	; &M-16326; [68-57]
+      (=daikanwa	  . 16326)	; &I-M-16326;
+      ))
+    (<-simplified@JP*sources
+     daikanwa)
     ))
 (define-char
-  '((=>ucs		. #x23987)	; 𣦇
-    (ideographic-radical . 77)	; ⽌
+  '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=daikanwa		. 16327)	; &M-16327;
+    (=ucs		. #x23987)	; 𣦇
     ))
 (define-char
-  '((=>ucs		. #x23987)	; 𣦇
-    (morohashi-daikanwa	16327 0 0)
+  '((<-denotational
+     ((=ucs		  . #x23987)	; 𣦇
+      ))
     (ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=cns11643-5	. #x3F7C)	; &C5-3F7C; [31-92]
+    (->subsumptive
+     ((=daikanwa	  . 16327)	; &M-16327;
+      )
+     ((=cns11643-5	  . #x3F7C)	; &C5-3F7C; [31-92]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	16327 0 1)
+  '((<-denotational
+     ((=ucs		  . #x23987)	; 𣦇
+      ))
     (ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (hanyu-dazidian	2 1444 3)
-    (=ucs		. #x23987)	; 𣦇
-    (=hanziku-4		. #xD3B2)	; &I-HZK04-D3B2;
-    ))
-(define-char
-  '((=>ucs		. #x23988)	; 𣦈
-    (ideographic-radical . 77)	; ⽌
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (hanyu-dazidian	2 1443 19)
-    (=daikanwa		. 16328)	; &M-16328;
-    (=hanziku-4		. #xD3A2)	; &I-HZK04-D3A2;
+    (=hanziku-4		. #xD3B2)	; &HZK04-D3B2;
+    (=ucs@iso		. #x23987)	; &HZK04-D3B2;
     ))
 (define-char
-  '((morohashi-daikanwa	16328 0 0)
-    (ideographic-radical . 77)	; ⽌
+  '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x23988)	; 𣦈
-    (=cns11643-6	. #x5370)	; &I-C6-5370; [51-80]
-    ))
-(define-char
-  '((=>ucs		. #x23989)	; 𣦉
-    (ideographic-radical . 77)	; ⽌
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=daikanwa		. 16329)	; &M-16329;
-    (mojikyo		. 016329)	; &MCS-60003FC9;
+    (->subsumptive
+     ((hanyu-dazidian	  2 1443 19)
+      (=daikanwa	  . 16328)	; &M-16328;
+      (=hanziku-4	  . #xD3A2)	; &I-HZK04-D3A2;
+      )
+     ((=cns11643-6	  . #x5370)	; &C6-5370; [51-80]
+      (=ucs@iso		  . #x23988)	; &C6-5370;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	16329 0 1)
-    (ideographic-radical . 77)	; ⽌
+  '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (hanyu-dazidian	2 1444 1)
     (=ucs		. #x23989)	; 𣦉
-    (=cns11643-5	. #x3F7B)	; &I-C5-3F7B; [31-91]
-    (=hanziku-4		. #xD3B0)	; &I-HZK04-D3B0;
+    (->subsumptive
+     ((=daikanwa	  . 16329)	; &M-16329;
+      (mojikyo		  . 016329)	; &MCS-60003FC9;
+      )
+     ((hanyu-dazidian	  2 1444 1)
+      (=cns11643-5	  . #x3F7B)	; &HZK04-D3B0; [31-91]
+      (=hanziku-4	  . #xD3B0)	; &I-HZK04-D3B0;
+      (=ucs@iso		  . #x23989)	; &HZK04-D3B0;
+      ))
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=daikanwa		. 16330)	; &M-16330;
+    (=ucs		. #x2469C)	; 𤚜
+    (=daikanwa		. 16330)	; &I-M-16330;
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=daikanwa		. 16331)	; &M-16331;
+    (=ucs		. #x2398C)	; 𣦌
+    (->subsumptive
+     ((=daikanwa	  . 16331)	; &M-16331;
+      )
+     ((hanyu-dazidian	  2 1444 6)
+      (=hanziku-4	  . #xD3B5)	; &HZK04-D3B5;
+      (=ucs@iso		  . #x2398C)	; &HZK04-D3B5;
+      ))
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
@@ -1305,37 +1306,42 @@
   '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=daikanwa		. 16333)	; &M-16333;
+    (hanyu-dazidian	2 1444 8)
+    (=ucs		. #x23990)	; 𣦐
+    (=daikanwa		. 16333)	; &I-M-16333;
+    (=hanziku-4		. #xD3B7)	; &I-HZK04-D3B7;
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=daikanwa		. 16334)	; &M-16334;
+    (hanyu-dazidian	2 1444 10)
+    (=ucs		. #x23991)	; 𣦑
+    (=daikanwa		. 16334)	; &I-M-16334;
+    (=hanziku-4		. #xD3B9)	; &I-HZK04-D3B9;
     ))
 (define-char
-  '((morohashi-daikanwa	16334 1)
-    (ideographic-radical . 77)	; ⽌
+  '((ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6B77)	; æ­·
-      (=jis-x0213-1-2000  . #x7645)	; &I-JX1-7645; [86-37]
-      ))
     (=ucs		. #x6B74)	; æ­´
-    (=jis-x0208		. #x4E72)	; &I-J90-4E72; [46-82]
-    (=gt		. 20973)	; &I-GT-20973;
-    (=gt-k		. 11191)	; &I-GT-K11191;
-    (=gt-pj-1		. #x4E72)	; &I-GT-20973; [46-82]
-    (mojikyo		. 050240)	; &MCS-6000C440;
-    ))
-(define-char
-  '((=>ucs		. #x6B74)	; æ­´
-    (morohashi-daikanwa	16334 1 0)
-    (ideographic-radical . 77)	; ⽌
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=cns11643-3	. #x4753)	; &C3-4753; [39-51]
+    (->subsumptive
+     ((morohashi-daikanwa	16334 1)
+      (shinjigen-1	  . 3957)
+      (=jis-x0208	  . #x4E72)	; &GT-20973; [46-82]
+      (=gt		  . 20973)	; &I-GT-20973;
+      (=gt-k		  . 11191)	; &I-GT-K11191;
+      (=gt-pj-1		  . #x4E72)	; &I-GT-20973; [46-82]
+      (=ucs@unicode	  . #x6B74)	; &GT-20973;
+      (mojikyo		  . 050240)	; &MCS-6000C440;
+      (<-simplified@JP/Jouyou
+       ((=ks-x1001	    . #x5576)	; &M-16340; [53-86]
+	(=jis-x0213-1-2000  . #x7645)	; &I-JX1-7645; [86-37]
+	(=daikanwa	    . 16340)	; &I-M-16340;
+	))
+      )
+     ((=cns11643-3	  . #x4753)	; &C3-4753; [39-51]
+      ))
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
@@ -1429,13 +1435,18 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x6B77)	; æ­·
-    (=ks-x1001		. #x5576)	; &I-K0-5576; [53-86]
-    (=cns11643-1	. #x7125)	; &I-C1-7125; [81-05]
-    (=jis-x0213-1-2000	. #x7645)	; &I-JX1-7645; [86-37]
-    (=gb12345		. #x407A)	; æ­· [32-90]
-    (=big5		. #xBEFA)	; &I-B-BEFA;
-    (=daikanwa		. 16340)	; &I-M-16340;
-    (=jef-china3	. #x54DF)	; &I-JC3-54DF;
+    (->subsumptive
+     ((shinjigen-1	  . 3958)
+      (=ks-x1001	  . #x5576)	; &M-16340; [53-86]
+      (=jis-x0213-1-2000  . #x7645)	; &I-JX1-7645; [86-37]
+      (=gb12345		  . #x407A)	; &M-16340; [32-90]
+      (=big5		  . #xBEFA)	; &I-B-BEFA;
+      (=daikanwa	  . 16340)	; &I-M-16340;
+      (=jef-china3	  . #x54DF)	; &I-JC3-54DF;
+      (=ucs@unicode	  . #x6B77)	; &M-16340;
+      )
+     ((=cns11643-1	  . #x7125)	; &C1-7125; [81-05]
+      ))
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
@@ -1746,36 +1757,6 @@
     ))
 (define-char
   '((ideographic-radical . 77)	; ⽌
-    (hanyu-dazidian	2 1442 19)
-    (=ucs		. #x23977)	; 𣥷
-    (=hanziku-4		. #xD360)	; &I-HZK04-D360;
-    ))
-(define-char
-  '((ideographic-radical . 77)	; ⽌
-    (hanyu-dazidian	2 1444 6)
-    (=ucs		. #x2398C)	; 𣦌
-    (=hanziku-4		. #xD3B5)	; &I-HZK04-D3B5;
-    ))
-(define-char
-  '((ideographic-radical . 77)	; ⽌
-    (hanyu-dazidian	1 560 3)
-    (=ucs		. #x2398F)	; 𣦏
-    (=hanziku-2		. #xC342)	; &I-HZK02-C342;
-    ))
-(define-char
-  '((ideographic-radical . 77)	; ⽌
-    (hanyu-dazidian	2 1444 8)
-    (=ucs		. #x23990)	; 𣦐
-    (=hanziku-4		. #xD3B7)	; &I-HZK04-D3B7;
-    ))
-(define-char
-  '((ideographic-radical . 77)	; ⽌
-    (hanyu-dazidian	2 1444 10)
-    (=ucs		. #x23991)	; 𣦑
-    (=hanziku-4		. #xD3B9)	; &I-HZK04-D3B9;
-    ))
-(define-char
-  '((ideographic-radical . 77)	; ⽌
     (hanyu-dazidian	8 22 16)
     (=ucs		. #x23992)	; 𣦒
     (=hanziku-12	. #xEDAF)	; &I-HZK12-EDAF;
diff --git a/lisp/utf-2000/Ideograph-R078-Death.el b/lisp/utf-2000/Ideograph-R078-Death.el
index 3e0606c..9d8b749 100644
--- a/lisp/utf-2000/Ideograph-R078-Death.el
+++ b/lisp/utf-2000/Ideograph-R078-Death.el
@@ -44,16 +44,16 @@
   '((ideographic-radical . 78)	; ⽍
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
+    (=ucs		. #x6B7A)	; æ­º
+    (=cns11643-3	. #x2253)	; &I-C3-2253; [02-51]
+    (=jis-x0213-2-2000	. #x2F7D)	; &I-JX2-2F7D; [15-93]
+    (=daikanwa		. 16362)	; &I-M-16362;
     (<-same
      ((=ucs		  . #x6B79)	; æ­¹
       (=daikanwa	  . 16359)	; &I-M-16359;
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=ucs		. #x6B7A)	; æ­º
-    (=cns11643-3	. #x2253)	; &I-C3-2253; [02-51]
-    (=jis-x0213-2-2000	. #x2F7D)	; &I-JX2-2F7D; [15-93]
-    (=daikanwa		. 16362)	; &I-M-16362;
     ))
 (define-char
   '((<-denotational
@@ -63,10 +63,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E9E)	; ⺞
     (<-identical@component
      ((=ucs		  . #x6B7A)	; æ­º
       ))
-    (=ucs		. #x2E9E)	; ⺞
     ))
 (define-char
   '((ideographic-radical . 78)	; ⽍
@@ -1204,6 +1204,7 @@
   '((ideographic-radical . 78)	; ⽍
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (shinjigen-1	. 3974)
     (shinjigen-2	. 3974)
     (=ucs		. #x6B8A)	; 殊
     (=jis-x0208		. #x3C6C)	; &I-J90-3C6C; [28-76]
@@ -1218,6 +1219,9 @@
 (define-char
   '((ideographic-radical . 78)	; ⽍
     (=ucs		. #x6B8B)	; 残
+    (<-simplified@ucs
+     ((=ucs		  . #x6B98)	; 殘
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1227,10 +1231,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=ucs		    . #x6B98)	; 殘
-	(=jis-x0208	    . #x5D4C)	; &I-J90-5D4C; [61-44]
-	))
+     ((shinjigen-1	  . 3972)
       (shinjigen-2	  . 3972)
       (=jis-x0208	  . #x3B44)	; &GT-21090; [27-36]
       (=gt		  . 21090)	; &I-GT-21090;
@@ -1239,6 +1240,10 @@
       (=daikanwa	  . 16459)	; &I-M-16459;
       (=ucs@jis		  . #x6B8B)	; &GT-21090;
       (mojikyo		  . 016459)	; &MCS-6000404B;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x6B98)	; 殘
+	(=jis-x0208	    . #x5D4C)	; &I-J90-5D4C; [61-44]
+	))
       )
      ((=cns11643-3	  . #x316A)	; &C3-316A; [17-74]
       (=ucs@cns		  . #x6B8B)	; &C3-316A;
@@ -1255,6 +1260,10 @@
     (=gb2312		. #x3250)	; &G0-3250; [18-48]
     (=ucs@unicode	. #x6B8B)	; &G0-3250;
     (mojikyo		. 051660)	; &MCS-6000C9CC;
+    (<-simplified@CN
+     ((=ucs		  . #x6B98)	; 殘
+      (=gb12345		  . #x3250)	; 殘 [18-48]
+      ))
     ))
 (define-char
   '((ideographic-radical@ucs . 129)	; ⾀
@@ -1998,6 +2007,7 @@
   '((ideographic-radical . 78)	; ⽍
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (shinjigen-1	. 3973)
     (shinjigen-2	. 3973)
     (=ucs		. #x6B98)	; 殘
     (=jis-x0208		. #x5D4C)	; &I-J90-5D4C; [61-44]
diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el
index d18c655..27e3d35 100644
--- a/lisp/utf-2000/Ideograph-R079-Weapon.el
+++ b/lisp/utf-2000/Ideograph-R079-Weapon.el
@@ -18,215 +18,218 @@
      ((=gb2312		  . #x6C2F)	; &C2-213F; [76-15]
       (=cns11643-2	  . #x213F)	; &I-C2-213F; [01-31]
       (=ucs@unicode	  . #x6BB3)	; &C2-213F;
+      )
+     ((mojikyo		  . 016613)	; &MCS-600040E5;
       ))
     ))
 (define-char
-  '((=>ucs		. #x6BB3)	; 殳
-    (morohashi-daikanwa	16613 0 1)
-    (ideographic-radical . 79)	; ⽎
-    (ideographic-strokes . 0)
-    (total-strokes	 . 4)
-    (mojikyo		. 016613)	; &MCS-600040E5;
-    ))
-(define-char
-  '((=>ucs		. #x3C7C)	; ã±¼
-    (ideographic-radical . 79)	; ⽎
-    (ideographic-strokes . 3)
-    (total-strokes	 . 7)
-    (=daikanwa		. 16614)	; &M-16614;
-    ))
-(define-char
-  '((morohashi-daikanwa	16614 0 0)
-    (ideographic-radical . 79)	; ⽎
+  '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x3C7C)	; ã±¼
-    (=cns11643-5	. #x244E)	; &I-C5-244E; [04-46]
-    ))
-(define-char
-  '((=>ucs		. #x3C7D)	; ã±½
-    (ideographic-radical . 79)	; ⽎
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (=daikanwa		. 16615)	; &M-16615;
+    (->subsumptive
+     ((=daikanwa	  . 16614)	; &M-16614;
+      )
+     ((=cns11643-5	  . #x244E)	; &C5-244E; [04-46]
+      )
+     ((=ucs@unicode	  . #x3C7C)	; &UU+3C7C;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	16615 0 0)
-    (ideographic-radical . 79)	; ⽎
+  '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x3C7D)	; ã±½
-    (=cns11643-4	. #x2678)	; &I-C4-2678; [06-88]
+    (->subsumptive
+     ((=daikanwa	  . 16615)	; &M-16615;
+      )
+     ((=cns11643-4	  . #x2678)	; &C4-2678; [06-88]
+      (=ucs@unicode	  . #x3C7D)	; &C4-2678;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x23A82)	; 𣪂
-    (ideographic-radical . 79)	; ⽎
+  '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=daikanwa		. 16616)	; &M-16616;
+    (=ucs		. #x23A82)	; 𣪂
     ))
 (define-char
-  '((=>ucs		. #x23A82)	; 𣪂
-    (morohashi-daikanwa	16616 0 0)
+  '((<-denotational
+     ((=ucs		  . #x23A82)	; 𣪂
+      ))
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (mojikyo		. 016616)	; &MCS-600040E8;
+    (->subsumptive
+     ((=gt		  . 21306)	; &GT-21306;
+      (=gt-pj-4		  . #x4460)	; &GT-21306; [36-64]
+      (=daikanwa	  . 16616)	; &I-M-16616;
+      )
+     ((mojikyo		  . 016616)	; &MCS-600040E8;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	16616 0 1)
+  '((<-denotational
+     ((=ucs		  . #x23A82)	; 𣪂
+      ))
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x23A82)	; 𣪂
-    (=cns11643-5	. #x2668)	; &I-C5-2668; [06-72]
+    (=cns11643-5	. #x2668)	; &C5-2668; [06-72]
+    (=ucs@iso		. #x23A82)	; &C5-2668;
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=daikanwa		. 16617)	; &M-16617;
-    ))
-(define-char
-  '((=>ucs		. #x23A83)	; 𣪃
-    (ideographic-radical . 79)	; ⽎
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (=daikanwa		. 16618)	; &M-16618;
+    (=ucs		. #x23A84)	; 𣪄
+    (->subsumptive
+     ((=daikanwa	  . 16617)	; &M-16617;
+      )
+     ((=hanziku-6	  . #xBBB9)	; &HZK06-BBB9;
+      (=ucs@iso		  . #x23A84)	; &HZK06-BBB9;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	16618 0 0)
-    (ideographic-radical . 79)	; ⽎
+  '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x23A83)	; 𣪃
-    (=cns11643-5	. #x2667)	; &I-C5-2667; [06-71]
-    ))
-(define-char
-  '((=>ucs		. #x23A83)	; 𣪃
-    (morohashi-daikanwa	16618 0 0)
-    (ideographic-radical . 79)	; ⽎
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (mojikyo		. 016618)	; &MCS-600040EA;
-    ))
-(define-char
-  '((=>ucs		. #x6BB4)	; æ®´
-    (morohashi-daikanwa	16618 1)
-    (ideographic-radical . 79)	; ⽎
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5D58)	; &GT-21376; [61-56]
-      (=ks-x1001	  . #x4F32)	; &I-K0-4F32; [47-18]
-      (=daikanwa	  . 16674)	; &I-M-16674;
+    (->subsumptive
+     ((=daikanwa	  . 16618)	; &M-16618;
+      )
+     ((=cns11643-5	  . #x2667)	; &C5-2667; [06-71]
+      (=ucs@iso		  . #x23A83)	; &C5-2667;
+      )
+     ((mojikyo		  . 016618)	; &MCS-600040EA;
       ))
-    (=jis-x0208		. #x3225)	; &GT-21302; [18-05]
-    (=gt		. 21302)	; &I-GT-21302;
-    (=gt-pj-1		. #x3225)	; &I-GT-21302; [18-05]
-    (=ucs@jis		. #x6BB4)	; &GT-21302;
     ))
 (define-char
-  '((morohashi-daikanwa	16618 1 0)
-    (ideographic-radical . 79)	; ⽎
+  '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x6BB4)	; æ®´
-    (=gb2312		. #x4539)	; &I-G0-4539; [37-25]
     ))
 (define-char
-  '((=>ucs		. #x6BB4)	; æ®´
-    (morohashi-daikanwa	16618 1 1)
+  '((<-denotational
+     ((=ucs		  . #x6BB4)	; æ®´
+      ))
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (mojikyo		. 050242)	; &MCS-6000C442;
+    (->subsumptive
+     ((morohashi-daikanwa	16618 1)
+      (=jis-x0208	  . #x3225)	; &GT-21302; [18-05]
+      (=gt		  . 21302)	; &I-GT-21302;
+      (=gt-pj-1		  . #x3225)	; &I-GT-21302; [18-05]
+      (=ucs@jis		  . #x6BB4)	; &GT-21302;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5D58)	; &GT-21376; [61-56]
+	(=ks-x1001	    . #x4F32)	; &I-K0-4F32; [47-18]
+	(=daikanwa	    . 16674)	; &I-M-16674;
+	))
+      )
+     ((mojikyo		  . 050242)	; &MCS-6000C442;
+      )
+     ((=gb2312		  . #x4539)	; &G0-4539; [37-25]
+      (=ucs@unicode	  . #x6BB4)	; &G0-4539;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6BB4)	; æ®´
-    (morohashi-daikanwa	16618 1 2)
+  '((<-denotational
+     ((=ucs		  . #x6BB4)	; æ®´
+      ))
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=cns11643-3	. #x2959)	; &C3-2959; [09-57]
     ))
 (define-char
-  '((=>ucs		. #x6BB5)	; 段
-    (ideographic-radical . 79)	; ⽎
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (shinjigen-2	. 3994)
-    (=jis-x0208		. #x434A)	; &GT-21312; [35-42]
-    (=ks-x1001		. #x532B)	; &I-K0-532B; [51-11]
-    (=big5		. #xAC71)	; &I-B-AC71;
-    (=gt		. 21312)	; &I-GT-21312;
-    (=gt-k		. 05140)	; &I-GT-K05140;
-    (=gt-pj-1		. #x434A)	; &I-GT-21312; [35-42]
-    (=daikanwa		. 16619)	; &I-M-16619;
-    (=ucs@jis		. #x6BB5)	; &GT-21312;
-    ))
-(define-char
-  '((morohashi-daikanwa	16619 0 0)
-    (ideographic-radical . 79)	; ⽎
+  '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x6BB5)	; 段
-    (=gb2312		. #x364E)	; &I-G0-364E; [22-46]
-    (=cns11643-1	. #x5174)	; &I-C1-5174; [49-84]
+    (=big5		. #xAC71)	; &I-B-AC71;
+    (->subsumptive
+     ((shinjigen-2	  . 3994)
+      (=jis-x0208	  . #x434A)	; &GT-21312; [35-42]
+      (=ks-x1001	  . #x532B)	; &I-K0-532B; [51-11]
+      (=gt		  . 21312)	; &I-GT-21312;
+      (=gt-k		  . 05140)	; &I-GT-K05140;
+      (=gt-pj-1		  . #x434A)	; &I-GT-21312; [35-42]
+      (=daikanwa	  . 16619)	; &I-M-16619;
+      (=ucs@jis		  . #x6BB5)	; &GT-21312;
+      )
+     ((=gb2312		  . #x364E)	; &C1-5174; [22-46]
+      (=cns11643-1	  . #x5174)	; &I-C1-5174; [49-84]
+      (=ucs@unicode	  . #x6BB5)	; &C1-5174;
+      ))
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x23A85)	; 𣪅
-    (=cns11643-6	. #x3227)	; &I-C6-3227; [18-07]
-    (=daikanwa		. 16620)	; &I-M-16620;
-    ))
-(define-char
-  '((=>ucs		. #x23A85)	; 𣪅
-    (morohashi-daikanwa	16620 0 0)
-    (ideographic-radical . 79)	; ⽎
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (mojikyo		. 016620)	; &MCS-600040EC;
+    (->subsumptive
+     ((=daikanwa	  . 16620)	; &M-16620;
+      )
+     ((=cns11643-6	  . #x3227)	; &C6-3227; [18-07]
+      (=ucs@iso		  . #x23A85)	; &C6-3227;
+      )
+     ((mojikyo		  . 016620)	; &MCS-600040EC;
+      ))
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x23A86)	; 𣪆
-    (=cns11643-6	. #x3228)	; &I-C6-3228; [18-08]
-    (=daikanwa		. 16621)	; &I-M-16621;
+    (->subsumptive
+     ((=daikanwa	  . 16621)	; &M-16621;
+      )
+     ((=cns11643-6	  . #x3228)	; &C6-3228; [18-08]
+      (=ucs@iso		  . #x23A86)	; &C6-3228;
+      )
+     ((mojikyo		  . 016621)	; &MCS-600040ED;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x23A86)	; 𣪆
-    (morohashi-daikanwa	16621 0 0)
-    (ideographic-radical . 79)	; ⽎
+  '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (mojikyo		. 016621)	; &MCS-600040ED;
+    (=ucs		. #x6BB6)	; 殶
     ))
 (define-char
-  '((=>ucs		. #x6BB6)	; 殶
+  '((<-denotational
+     ((=ucs		  . #x6BB6)	; 殶
+      ))
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=daikanwa		. 16622)	; &M-16622;
     ))
 (define-char
-  '((morohashi-daikanwa	16622 0 0)
+  '((<-denotational
+     ((=ucs		  . #x6BB6)	; 殶
+      ))
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x6BB6)	; 殶
-    (=cns11643-2	. #x2B49)	; &I-C2-2B49; [11-41]
+    (=cns11643-2	. #x2B49)	; &C2-2B49; [11-41]
     (=big5		. #xCF67)	; &I-B-CF67;
+    (=ucs@unicode	. #x6BB6)	; &C2-2B49;
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=daikanwa		. 16623)	; &M-16623;
+    (=ucs		. #x23A87)	; 𣪇
+    (->subsumptive
+     ((=daikanwa	  . 16623)	; &M-16623;
+      )
+     ((=hanziku-6	  . #xBBBD)	; &HZK06-BBBD;
+      (=ucs@iso		  . #x23A87)	; &HZK06-BBBD;
+      ))
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎
@@ -240,8 +243,12 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x23A88)	; 𣪈
-    (=cns11643-5	. #x2E3F)	; &I-C5-2E3F; [14-31]
-    (=daikanwa		. 16624)	; &I-M-16624;
+    (->subsumptive
+     ((=daikanwa	  . 16624)	; &M-16624;
+      )
+     ((=cns11643-5	  . #x2E3F)	; &C5-2E3F; [14-31]
+      (=ucs@iso		  . #x23A88)	; &C5-2E3F;
+      ))
     ))
 (define-char
   '((=>ucs		. #x23A88)	; 𣪈
@@ -323,7 +330,15 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (->subsumptive
-     ((<-simplified@JP/Jouyou
+     ((shinjigen-1	  . 3996)
+      (shinjigen-2	  . 3996)
+      (=jis-x0208	  . #x3B26)	; &GT-21319; [27-06]
+      (=gt		  . 21319)	; &I-GT-21319;
+      (=gt-k		  . 06440)	; &I-GT-K06440;
+      (=gt-pj-1		  . #x3B26)	; &I-GT-21319; [27-06]
+      (=daikanwa	  . 16629)	; &I-M-16629;
+      (=ucs@jis		  . #x6BBA)	; &GT-21319;
+      (<-simplified@JP/Jouyou
        ((=ucs		    . #xF970)	; 殺
 	(=jis-x0213-1-2000  . #x7649)	; &I-JX1-7649; [86-41]
 	))
@@ -333,14 +348,6 @@
 	))
       (<-vulgar*sources
        daikanwa)
-      (shinjigen-1	  . 3996)
-      (shinjigen-2	  . 3996)
-      (=jis-x0208	  . #x3B26)	; &GT-21319; [27-06]
-      (=gt		  . 21319)	; &I-GT-21319;
-      (=gt-k		  . 06440)	; &I-GT-K06440;
-      (=gt-pj-1		  . #x3B26)	; &I-GT-21319; [27-06]
-      (=daikanwa	  . 16629)	; &I-M-16629;
-      (=ucs@jis		  . #x6BBA)	; &GT-21319;
       )
      ((mojikyo		  . 016629)	; &MCS-600040F5;
       ))
@@ -533,12 +540,12 @@
     (total-strokes	 . 11)
     (=ucs		. #x23A8E)	; 𣪎
     (->subsumptive
-     ((<-wrong
+     ((=daikanwa	  . 16636)	; &M-16636;
+      (<-wrong
        ((=daikanwa	    . 04033)	; &M-04033;
 	))
       (<-wrong*sources
        daikanwa)
-      (=daikanwa	  . 16636)	; &M-16636;
       )
      ((=cns11643-6	  . #x4079)	; &C6-4079; [32-89]
       (=ucs@iso		  . #x23A8E)	; &C6-4079;
@@ -812,13 +819,13 @@
       (=gb12345		  . #x3F47)	; &C3-3665; [31-39]
       (=ucs@unicode	  . #x6BBB)	; &C3-3665;
       )
-     ((<-simplified@JP/Jouyou
+     ((=jis-x0208@1990	  . #x334C)	; &J90-334C; [19-44]
+      (=ucs@jis		  . #x6BBB)	; &J90-334C;
+      (<-simplified@JP/Jouyou
        ((=jis-x0208	    . #x5D57)	; &GT-21339; [61-55]
 	(=ks-x1001	    . #x4A43)	; &I-K0-4A43; [42-35]
 	(=daikanwa	    . 16646)	; &I-M-16646;
 	))
-      (=jis-x0208@1990	  . #x334C)	; &J90-334C; [19-44]
-      (=ucs@jis		  . #x6BBB)	; &J90-334C;
       ))
     ))
 (define-char
@@ -826,17 +833,15 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x6BBD)	; 殽
+    (=big5		. #xD9E2)	; &I-B-D9E2;
     (->subsumptive
-     ((=big5		  . #xD9E2)	; &B-D9E2;
-      (->subsumptive
-       ((=jis-x0212	    . #x4632)	; &M-16647; [38-18]
-	(=jis-x0213-2-2000  . #x6E24)	; &I-JX2-6E24; [78-04]
-	(=daikanwa	    . 16647)	; &I-M-16647;
-	(=jef-china3	    . #x54EE)	; &I-JC3-54EE;
-	(=ucs@jis	    . #x6BBD)	; &M-16647;
-	)
-       ((=ucs@unicode	    . #x6BBD)	; &UU+6BBD;
-	))
+     ((=jis-x0212	  . #x4632)	; &M-16647; [38-18]
+      (=jis-x0213-2-2000  . #x6E24)	; &I-JX2-6E24; [78-04]
+      (=daikanwa	  . 16647)	; &I-M-16647;
+      (=jef-china3	  . #x54EE)	; &I-JC3-54EE;
+      (=ucs@jis		  . #x6BBD)	; &M-16647;
+      )
+     ((=ucs@unicode	  . #x6BBD)	; &UU+6BBD;
       )
      ((=cns11643-2	  . #x3D27)	; &C2-3D27; [29-07]
       (=ucs@cns		  . #x6BBD)	; &C2-3D27;
@@ -890,7 +895,35 @@
     (=daikanwa		. 49199)	; &I-M-49199;
     ))
 (define-char
-  '((=>ucs		. #x6BBE)	; 殾
+  '((ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x81FC)	; 臼
+	)
+       ((=ucs		    . #x6BB3)	; 殳
+	))
+      )
+     ((=ucs		  . #x53B6)	; 厶
+      ))
+    (sources		bos=A2003-10440-00005)
+    (=ruimoku-v6	. #xE01E)	; &RUI6-E01E;
+    ))
+(define-char
+  '((ideographic-radical . 79)	; ⽎
+    (=ucs		. #x6BBE)	; 殾
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6BBE)	; 殾
+      ))
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
@@ -901,12 +934,14 @@
     (=ucs@jis		. #x6BBE)	; &M-16650;
     ))
 (define-char
-  '((morohashi-daikanwa	16650 0 2)
+  '((<-denotational
+     ((=ucs		  . #x6BBE)	; 殾
+      ))
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=ucs		. #x6BBE)	; 殾
-    (=cns11643-3	. #x3C4B)	; &I-C3-3C4B; [28-43]
+    (=cns11643-3	. #x3C4B)	; &C3-3C4B; [28-43]
+    (=ucs@unicode	. #x6BBE)	; &C3-3C4B;
     ))
 (define-char
   '((=>ucs		. #x6BBF)	; 殿
diff --git a/lisp/utf-2000/Ideograph-R080-Do-Not.el b/lisp/utf-2000/Ideograph-R080-Do-Not.el
index 98703bc..d6dfb49 100644
--- a/lisp/utf-2000/Ideograph-R080-Do-Not.el
+++ b/lisp/utf-2000/Ideograph-R080-Do-Not.el
@@ -92,13 +92,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E9F)	; ⺟
     (<-compat
      ((=ucs		  . #x6BCD)	; 母
       ))
     (<-identical@component
      ((=ucs		  . #x6BCD)	; 母
       ))
-    (=ucs		. #x2E9F)	; ⺟
     ))
 (define-char
   '((ideographic-radical . 80)	; ⽏
@@ -116,10 +116,6 @@
     (ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6BCF)	; 每
-      (=jis-x0213-1-2000  . #x764A)	; &I-JX1-764A; [86-42]
-      ))
     (=ucs		. #x6BCE)	; 毎
     (=jis-x0208		. #x4B68)	; &I-J90-4B68; [43-72]
     (=cns11643-3	. #x237A)	; &I-C3-237A; [03-90]
@@ -127,6 +123,10 @@
     (=gt-k		. 01689)	; &I-GT-K01689;
     (=gt-pj-1		. #x4B68)	; &I-GT-21440; [43-72]
     (mojikyo		. 050244)	; &MCS-6000C444;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x6BCF)	; 每
+      (=jis-x0213-1-2000  . #x764A)	; &I-JX1-764A; [86-42]
+      ))
     ))
 (define-char
   '((ideographic-radical . 80)	; ⽏
@@ -154,13 +154,13 @@
     (total-strokes	 . 7)
     (=ucs		. #x23AED)	; 𣫭
     (->subsumptive
-     ((<-vulgar
+     ((=daikanwa	  . 16726)	; &M-16726;
+      (<-vulgar
        ((=ucs		    . #x6BCF)	; 每
 	(=daikanwa	    . 16725)	; &I-M-16725;
 	))
       (<-vulgar*sources
        zhengzitong daikanwa)
-      (=daikanwa	  . 16726)	; &M-16726;
       )
      ((=cns11643-6	  . #x283D)	; &C6-283D; [08-29]
       (=ucs@iso		  . #x23AED)	; &C6-283D;
@@ -218,11 +218,22 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x6BD1)	; 毑
-    (=cns11643-3	. #x295A)	; &I-C3-295A; [09-58]
-    (=daikanwa		. 16729)	; &I-M-16729;
+    (->subsumptive
+     ((=daikanwa	  . 16729)	; &M-16729;
+      (=ucs@unicode	  . #x6BD1)	; &M-16729;
+      )
+     ((=cns11643-3	  . #x295A)	; &C3-295A; [09-58]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 80)	; ⽏
+    (ideographic-strokes . 4)
+    (=ucs		. #x6BD2)	; 毒
     ))
 (define-char
-  '((=>ucs		. #x6BD2)	; 毒
+  '((<-denotational
+     ((=ucs		  . #x6BD2)	; 毒
+      ))
     (ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
@@ -236,32 +247,51 @@
     (=ucs@jis		. #x6BD2)	; &GT-21446;
     ))
 (define-char
-  '((morohashi-daikanwa	16730 0 2)
+  '((<-denotational
+     ((=ucs		  . #x6BD2)	; 毒
+      ))
     (ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (=ucs		. #x6BD2)	; 毒
-    (=gb2312		. #x363E)	; &I-G0-363E; [22-30]
+    (=gb2312		. #x363E)	; &C1-5175; [22-30]
     (=ks-x1001		. #x5438)	; &I-K0-5438; [52-24]
     (=cns11643-1	. #x5175)	; &I-C1-5175; [49-85]
+    (=ucs@unicode	. #x6BD2)	; &C1-5175;
     ))
 (define-char
   '((ideographic-radical . 80)	; ⽏
+    (=ucs		. #x23AEF)	; 𣫯
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23AEF)	; 𣫯
+      ))
+    (ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x23AEF)	; 𣫯
-    (=cns11643-6	. #x2C41)	; &I-C6-2C41; [12-33]
+    (=cns11643-6	. #x2C41)	; &M-16731; [12-33]
     (=daikanwa		. 16731)	; &I-M-16731;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x23AEF)	; 𣫯
+      ))
+    (ideographic-radical . 80)	; ⽏
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=ucs@iso		. #x23AEF)	; &U-00023AEF;
+    ))
+(define-char
   '((ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=daikanwa		. 16732)	; &M-16732;
+    (=ucs		. #x23AF1)	; 𣫱
+    (=daikanwa		. 16732)	; &I-M-16732;
+    (=hanziku-6		. #xECC1)	; &I-HZK06-ECC1;
     ))
 (define-char
   '((ideographic-radical . 80)	; ⽏
-    (ideographic-strokes . 4)
+    (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x23AF0)	; 𣫰
     (=cns11643-6	. #x3229)	; &I-C6-3229; [18-09]
@@ -269,103 +299,179 @@
     ))
 (define-char
   '((ideographic-radical . 80)	; ⽏
+    (=ucs		. #x21E46)	; 𡹆
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21E46)	; 𡹆
+      ))
+    (ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x21E46)	; 𡹆
-    (=cns11643-6	. #x322A)	; &I-C6-322A; [18-10]
+    (=cns11643-6	. #x322A)	; &M-16734; [18-10]
     (=daikanwa		. 16734)	; &I-M-16734;
     (mojikyo		. 016734)	; &MCS-6000415E;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x21E46)	; 𡹆
+      ))
+    (ideographic-radical . 80)	; ⽏
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=ucs@iso		. #x21E46)	; &U-00021E46;
+    ))
+(define-char
   '((ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=daikanwa		. 16735)	; &M-16735;
+    (=ucs		. #x23AF3)	; 𣫳
+    (=daikanwa		. 16735)	; &I-M-16735;
+    (=hanziku-6		. #xECC3)	; &I-HZK06-ECC3;
     ))
 (define-char
   '((ideographic-radical . 80)	; ⽏
+    (=ucs		. #x23AF4)	; 𣫴
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23AF4)	; 𣫴
+      ))
+    (ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=ucs		. #x23AF4)	; 𣫴
-    (=cns11643-6	. #x3867)	; &I-C6-3867; [24-71]
+    (=cns11643-6	. #x3867)	; &M-16736; [24-71]
     (=daikanwa		. 16736)	; &I-M-16736;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x23AF4)	; 𣫴
+      ))
+    (ideographic-radical . 80)	; ⽏
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=ucs@iso		. #x23AF4)	; &U-00023AF4;
+    ))
+(define-char
   '((ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=daikanwa		. 16737)	; &M-16737;
+    (=ucs		. #x23AF5)	; 𣫵
+    (=daikanwa		. 16737)	; &I-M-16737;
+    (=hanziku-6		. #xECE1)	; &I-HZK06-ECE1;
     ))
 (define-char
   '((ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=daikanwa		. 16738)	; &M-16738;
+    (=ucs		. #x23AF6)	; 𣫶
+    (->subsumptive
+     ((=daikanwa	  . 16738)	; &M-16738;
+      )
+     ((=hanziku-6	  . #xECE2)	; &HZK06-ECE2;
+      (=ucs@iso		  . #x23AF6)	; &HZK06-ECE2;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x23AF9)	; 𣫹
+  '((ideographic-radical . 80)	; ⽏
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=ucs		. #x23AF9)	; 𣫹
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23AF9)	; 𣫹
+      ))
     (ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=daikanwa		. 16739)	; &M-16739;
     ))
 (define-char
-  '((morohashi-daikanwa	16739 0 2)
+  '((<-denotational
+     ((=ucs		  . #x23AF9)	; 𣫹
+      ))
     (ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs		. #x23AF9)	; 𣫹
-    (=cns11643-5	. #x4022)	; &I-C5-4022; [32-02]
+    (=cns11643-5	. #x4022)	; &C5-4022; [32-02]
+    (=ucs@iso		. #x23AF9)	; &C5-4022;
     ))
 (define-char
-  '((=>ucs		. #x6BD3)	; 毓
-    (ideographic-radical . 80)	; ⽏
+  '((ideographic-radical . 80)	; ⽏
+    (=ucs		. #x6BD3)	; 毓
+    (=big5		. #xB7B6)	; &I-B-B7B6;
+    (->subsumptive
+     ((ideographic-strokes . 10)
+      (total-strokes	   . 14)
+      (=jis-x0208	  . #x5D5A)	; &GT-21457; [61-58]
+      (=ks-x1001	  . #x6B3E)	; &I-K0-6B3E; [75-30]
+      (=gt		  . 21457)	; &I-GT-21457;
+      (=gt-pj-1		  . #x5D5A)	; &I-GT-21457; [61-58]
+      (=daikanwa	  . 16740)	; &I-M-16740;
+      (=ucs@jis		  . #x6BD3)	; &GT-21457;
+      (mojikyo		  . 016740)	; &MCS-60004164;
+      )
+     ((ideographic-strokes . 10)
+      (total-strokes	   . 14)
+      (=gb2312		  . #x5839)	; &G0-5839; [56-25]
+      (=ucs@unicode	  . #x6BD3)	; &G0-5839;
+      )
+     ((ideographic-strokes . 9)
+      (total-strokes	   . 13)
+      (=cns11643-1	  . #x645C)	; &C1-645C; [68-60]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=jis-x0208		. #x5D5A)	; &GT-21457; [61-58]
-    (=ks-x1001		. #x6B3E)	; &I-K0-6B3E; [75-30]
-    (=big5		. #xB7B6)	; &I-B-B7B6;
-    (=gt		. 21457)	; &I-GT-21457;
-    (=gt-pj-1		. #x5D5A)	; &I-GT-21457; [61-58]
-    (=daikanwa		. 16740)	; &I-M-16740;
-    (=ucs@jis		. #x6BD3)	; &GT-21457;
-    (mojikyo		. 016740)	; &MCS-60004164;
+    (=ucs		. #x23AFB)	; 𣫻
     ))
 (define-char
-  '((morohashi-daikanwa	16740 0 0)
+  '((<-denotational
+     ((=ucs		  . #x23AFB)	; 𣫻
+      ))
     (ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x6BD3)	; 毓
-    (=gb2312		. #x5839)	; &I-G0-5839; [56-25]
+    (=daikanwa		. 16741)	; &M-16741;
     ))
 (define-char
-  '((=>ucs		. #x6BD3)	; 毓
-    (morohashi-daikanwa	16740 0 1)
+  '((<-denotational
+     ((=ucs		  . #x23AFB)	; 𣫻
+      ))
     (ideographic-radical . 80)	; ⽏
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=cns11643-1	. #x645C)	; &C1-645C; [68-60]
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x23AFB)	; &U-00023AFB;
     ))
 (define-char
   '((ideographic-radical . 80)	; ⽏
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=daikanwa		. 16741)	; &M-16741;
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23AFA)	; 𣫺
     ))
 (define-char
-  '((=>ucs		. #x23AFA)	; 𣫺
+  '((<-denotational
+     ((=ucs		  . #x23AFA)	; 𣫺
+      ))
     (ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 16742)	; &M-16742;
-    (mojikyo		. 016742)	; &MCS-60004166;
+    (->subsumptive
+     ((=daikanwa	  . 16742)	; &M-16742;
+      (mojikyo		  . 016742)	; &MCS-60004166;
+      )
+     ((=cns11643-4	  . #x4A53)	; &C4-4A53; [42-51]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	16742 0 0)
+  '((<-denotational
+     ((=ucs		  . #x23AFA)	; 𣫺
+      ))
     (ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23AFA)	; 𣫺
-    (=cns11643-4	. #x4A53)	; &I-C4-4A53; [42-51]
+    (=ucs@iso		. #x23AFA)	; &U-00023AFA;
     ))
diff --git a/lisp/utf-2000/Ideograph-R081-Compare.el b/lisp/utf-2000/Ideograph-R081-Compare.el
index 38e204f..34aa199 100644
--- a/lisp/utf-2000/Ideograph-R081-Compare.el
+++ b/lisp/utf-2000/Ideograph-R081-Compare.el
@@ -3,24 +3,22 @@
   '((ideographic-radical . 81)	; ⽐
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (shinjigen-2	. 4012)
     (=ucs		. #x6BD4)	; 比
-    (=jis-x0208		. #x4866)	; &I-J90-4866; [40-70]
-    (=gb2312		. #x3148)	; &I-G0-3148; [17-40]
-    (=ks-x1001		. #x5D6F)	; &I-K0-5D6F; [61-79]
-    (=gt		. 21460)	; &I-GT-21460;
-    (=gt-k		. 00477)	; &I-GT-K00477;
-    (=gt-pj-1		. #x4866)	; &I-GT-21460; [40-70]
-    (=daikanwa		. 16743)	; &I-M-16743;
-    ))
-(define-char
-  '((=>ucs		. #x6BD4)	; 比
-    (morohashi-daikanwa	16743 0 1)
-    (ideographic-radical . 81)	; ⽐
-    (ideographic-strokes . 0)
-    (total-strokes	 . 4)
-    (=cns11643-1	. #x4552)	; &C1-4552; [37-50]
     (=big5		. #xA4F1)	; &I-B-A4F1;
+    (->subsumptive
+     ((shinjigen-1	  . 4012)
+      (shinjigen-2	  . 4012)
+      (=jis-x0208	  . #x4866)	; &GT-21460; [40-70]
+      (=gb2312		  . #x3148)	; &I-G0-3148; [17-40]
+      (=ks-x1001	  . #x5D6F)	; &I-K0-5D6F; [61-79]
+      (=gt		  . 21460)	; &I-GT-21460;
+      (=gt-k		  . 00477)	; &I-GT-K00477;
+      (=gt-pj-1		  . #x4866)	; &I-GT-21460; [40-70]
+      (=daikanwa	  . 16743)	; &I-M-16743;
+      (=ucs@unicode	  . #x6BD4)	; &GT-21460;
+      )
+     ((=cns11643-1	  . #x4552)	; &C1-4552; [37-50]
+      ))
     ))
 (define-char
   '((ideographic-radical . 81)	; ⽐
@@ -30,11 +28,12 @@
     (=gb2312		. #x314F)	; &I-G0-314F; [17-47]
     ))
 (define-char
-  '((=>daikanwa		. 16744)	; &M-16744;
-    (ideographic-radical@ucs . 4)	; ⼃
+  '((ideographic-radical@ucs . 4)	; ⼃
     (ideographic-strokes@ucs . 7)
-    (ideographic-radical@daikanwa . 81)	; ⽐
-    (ideographic-strokes@daikanwa . 3)
+    (ideographic-radical@cns . 81)	; ⽐
+    (ideographic-strokes@cns . 3)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 8)
     (=ucs		. #x200B1)	; 𠂱
     (->subsumptive
@@ -51,16 +50,24 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x23B03)	; 𣬃
-    (=cns11643-6	. #x283E)	; &I-C6-283E; [08-30]
-    (=daikanwa		. 16745)	; &I-M-16745;
+    (->subsumptive
+     ((=daikanwa	  . 16745)	; &M-16745;
+      )
+     ((=cns11643-6	  . #x283E)	; &C6-283E; [08-30]
+      (=ucs@iso		  . #x23B03)	; &C6-283E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 81)	; ⽐
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x23B02)	; 𣬂
-    (=cns11643-5	. #x244F)	; &I-C5-244F; [04-47]
-    (=daikanwa		. 16746)	; &I-M-16746;
+    (->subsumptive
+     ((=daikanwa	  . 16746)	; &M-16746;
+      )
+     ((=cns11643-5	  . #x244F)	; &C5-244F; [04-47]
+      (=ucs@iso		  . #x23B02)	; &C5-244F;
+      ))
     ))
 (define-char
   '((=>ucs		. #x23B04)	; 𣬄
@@ -333,16 +340,25 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x23B10)	; 𣬐
-    (=cns11643-5	. #x4663)	; &I-C5-4663; [38-67]
-    (=daikanwa		. 16762)	; &I-M-16762;
+    (->subsumptive
+     ((=daikanwa	  . 16762)	; &M-16762;
+      )
+     ((=ucs@iso		  . #x23B10)	; &U-00023B10;
+      )
+     ((=cns11643-5	  . #x4663)	; &C5-4663; [38-67]
+      ))
     ))
 (define-char
   '((ideographic-radical . 81)	; ⽐
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x23B11)	; 𣬑
-    (=cns11643-6	. #x5E23)	; &I-C6-5E23; [62-03]
-    (=daikanwa		. 16763)	; &I-M-16763;
+    (->subsumptive
+     ((=daikanwa	  . 16763)	; &M-16763;
+      (=ucs@iso		  . #x23B11)	; &M-16763;
+      )
+     ((=cns11643-6	  . #x5E23)	; &C6-5E23; [62-03]
+      ))
     ))
 (define-char
   '((ideographic-radical . 81)	; ⽐
@@ -355,73 +371,68 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x23B12)	; 𣬒
-    (=cns11643-7	. #x242E)	; &I-C7-242E; [04-14]
-    (=daikanwa		. 16764)	; &I-M-16764;
-    ))
-(define-char
-  '((=>ucs		. #x23B13)	; 𣬓
-    (ideographic-radical . 81)	; ⽐
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=daikanwa		. 16765)	; &M-16765;
+    (->subsumptive
+     ((=daikanwa	  . 16764)	; &M-16764;
+      )
+     ((=ucs@iso		  . #x23B12)	; &U-00023B12;
+      )
+     ((=cns11643-7	  . #x242E)	; &C7-242E; [04-14]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	16765 0 0)
-    (ideographic-radical . 81)	; ⽐
+  '((ideographic-radical . 81)	; ⽐
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x23B13)	; 𣬓
-    (=cns11643-7	. #x2F27)	; &I-C7-2F27; [15-07]
+    (->subsumptive
+     ((=daikanwa	  . 16765)	; &M-16765;
+      )
+     ((=cns11643-7	  . #x2F27)	; &C7-2F27; [15-07]
+      (=ucs@iso		  . #x23B13)	; &C7-2F27;
+      ))
     ))
 (define-char
   '((ideographic-radical . 81)	; ⽐
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x23B15)	; 𣬕
-    (=cns11643-5	. #x5525)	; &I-C5-5525; [53-05]
-    (=daikanwa		. 16766)	; &I-M-16766;
-    ))
-(define-char
-  '((=>ucs		. #x23B14)	; 𣬔
-    (ideographic-radical . 81)	; ⽐
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=daikanwa		. 49202)	; &M-49202;
+    (->subsumptive
+     ((=daikanwa	  . 16766)	; &M-16766;
+      (=ucs@iso		  . #x23B15)	; &M-16766;
+      )
+     ((=cns11643-5	  . #x5525)	; &C5-5525; [53-05]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	49202 0 0)
-    (ideographic-radical . 81)	; ⽐
+  '((ideographic-radical . 81)	; ⽐
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x23B14)	; 𣬔
-    (mojikyo		. 049202)	; &MCS-6000C032;
-    ))
-(define-char
-  '((=>ucs		. #x23B14)	; 𣬔
-    (morohashi-daikanwa	49202 0 1)
-    (ideographic-radical . 81)	; ⽐
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=cns11643-7	. #x2F28)	; &C7-2F28; [15-08]
+    (->subsumptive
+     ((=daikanwa	  . 49202)	; &M-49202;
+      )
+     ((mojikyo		  . 049202)	; &MCS-6000C032;
+      )
+     ((=ucs@iso		  . #x23B14)	; &U-00023B14;
+      )
+     ((=cns11643-7	  . #x2F28)	; &C7-2F28; [15-08]
+      ))
     ))
 (define-char
   '((ideographic-radical . 81)	; ⽐
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (=ucs		. #x6BDA)	; 毚
-    (=jis-x0212		. #x4639)	; &I-JSP-4639; [38-25]
-    (=iso-ir165		. #x7A3B)	; &I-EGB-7A3B; [90-27]
-    (=jis-x0213-2-2000	. #x6E29)	; &I-JX2-6E29; [78-09]
     (=big5		. #xC0D5)	; &I-B-C0D5;
-    (=daikanwa		. 16767)	; &I-M-16767;
-    ))
-(define-char
-  '((=>ucs		. #x6BDA)	; 毚
-    (morohashi-daikanwa	16767 0 1)
-    (ideographic-radical . 81)	; ⽐
-    (ideographic-strokes . 13)
-    (total-strokes	 . 17)
-    (=cns11643-1	. #x737E)	; &C1-737E; [83-94]
+    (->subsumptive
+     ((=jis-x0212	  . #x4639)	; &M-16767; [38-25]
+      (=iso-ir165	  . #x7A3B)	; &I-EGB-7A3B; [90-27]
+      (=jis-x0213-2-2000  . #x6E29)	; &I-JX2-6E29; [78-09]
+      (=daikanwa	  . 16767)	; &I-M-16767;
+      (=ucs@unicode	  . #x6BDA)	; &M-16767;
+      )
+     ((=cns11643-1	  . #x737E)	; &C1-737E; [83-94]
+      ))
     ))
 (define-char
   '((ideographic-radical . 81)	; ⽐
diff --git a/lisp/utf-2000/Ideograph-R083-Clan.el b/lisp/utf-2000/Ideograph-R083-Clan.el
index 9b42764..496095b 100644
--- a/lisp/utf-2000/Ideograph-R083-Clan.el
+++ b/lisp/utf-2000/Ideograph-R083-Clan.el
@@ -58,10 +58,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA0)	; ⺠
     (<-identical@component
      ((=ucs		  . #x6C11)	; 民
       ))
-    (=ucs		. #x2EA0)	; ⺠
     ))
 (define-char
   '((ideographic-radical . 83)	; ⽒
diff --git a/lisp/utf-2000/Ideograph-R084-Steam.el b/lisp/utf-2000/Ideograph-R084-Steam.el
index 7e0253c..ec7da64 100644
--- a/lisp/utf-2000/Ideograph-R084-Steam.el
+++ b/lisp/utf-2000/Ideograph-R084-Steam.el
@@ -75,17 +75,17 @@
     (ideographic-radical . 84)	; ⽓
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5D66)	; &GT-21850; [61-70]
-      (=ks-x1001	  . #x5128)	; &I-K0-5128; [49-08]
-      (=daikanwa	  . 17059)	; &I-M-17059;
-      ))
     (=ucs		. #x6C17)	; 気
     (=jis-x0208		. #x3524)	; &I-J90-3524; [21-04]
     (=gt		. 21830)	; &I-GT-21830;
     (=gt-k		. 01586)	; &I-GT-K01586;
     (=gt-pj-1		. #x3524)	; &I-GT-21830; [21-04]
     (mojikyo		. 050245)	; &MCS-6000C445;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5D66)	; &GT-21850; [61-70]
+      (=ks-x1001	  . #x5128)	; &I-K0-5128; [49-08]
+      (=daikanwa	  . 17059)	; &I-M-17059;
+      ))
     ))
 (define-char
   '((ideographic-radical . 84)	; ⽓
diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el
index 34217a1..da128d7 100644
--- a/lisp/utf-2000/Ideograph-R085-Water.el
+++ b/lisp/utf-2000/Ideograph-R085-Water.el
@@ -26,12 +26,6 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
-    (<-formed@component/connect-right
-     ((=ucs		  . #x6C34)	; æ°´
-      (=daikanwa	  . 17083)	; &I-M-17083;
-      ))
-    (<-formed@component/connect-right*sources
-     zihui/char-index daikanwa)
     (=ucs		. #x6C35)	; æ°µ
     (=gb2312		. #x635F)	; &I-G0-635F; [67-63]
     (=jis-x0212		. #x4653)	; &I-JSP-4653; [38-51]
@@ -40,6 +34,12 @@
     (=daikanwa		. 17085)	; &I-M-17085;
     (=cbeta		. 01416)	; &I-CB01416;
     (=jef-china3	. #x55B0)	; &I-JC3-55B0;
+    (<-formed@component/connect-right
+     ((=ucs		  . #x6C34)	; æ°´
+      (=daikanwa	  . 17083)	; &I-M-17083;
+      ))
+    (<-formed@component/connect-right*sources
+     zihui/char-index daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -49,10 +49,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA1)	; ⺡
     (<-identical@component/connect-right
      ((=ucs		  . #x6C35)	; æ°µ
       ))
-    (=ucs		. #x2EA1)	; ⺡
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -69,9 +69,6 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 1)
     (total-strokes	 . 5)
-    (<-vulgar
-     ((=ucs		  . #x51B0)	; 冰
-      ))
     (shinjigen-1	. 4051)
     (shinjigen-2	. 4051)
     (=ucs		. #x6C37)	; æ°·
@@ -83,6 +80,9 @@
     (=gt-pj-1		. #x4939)	; &I-GT-21901; [41-25]
     (=daikanwa		. 17087)	; &I-M-17087;
     (=cbeta		. 00457)	; &I-CB00457;
+    (<-vulgar
+     ((=ucs		  . #x51B0)	; 冰
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -119,16 +119,16 @@
     (total-strokes	 . 5)
     (=ucs		. #x6C3A)	; æ°º
     (->subsumptive
-     ((<-formed@component/connect-above
+     ((=jis-x0212	  . #x4655)	; &M-17092; [38-53]
+      (=jis-x0213-2-2000  . #x6E33)	; &I-JX2-6E33; [78-19]
+      (=daikanwa	  . 17092)	; &I-M-17092;
+      (=ucs@unicode	  . #x6C3A)	; &M-17092;
+      (<-formed@component/connect-above
        ((=ucs		    . #x6C34)	; æ°´
 	(=daikanwa	    . 17083)	; &I-M-17083;
 	))
       (<-formed@component/connect-above*sources
        zihui/char-index daikanwa)
-      (=jis-x0212	  . #x4655)	; &M-17092; [38-53]
-      (=jis-x0213-2-2000  . #x6E33)	; &I-JX2-6E33; [78-19]
-      (=daikanwa	  . 17092)	; &I-M-17092;
-      (=ucs@unicode	  . #x6C3A)	; &M-17092;
       )
      ((=cbeta		  . 06162)	; &CB06162;
       ))
@@ -141,11 +141,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA2)	; ⺢
+    (=big5-cdp		. #x8C43)	; &I-CDP-8C43;
     (<-identical@component
      ((=ucs		  . #x6C3A)	; æ°º
       ))
-    (=ucs		. #x2EA2)	; ⺢
-    (=big5-cdp		. #x8C43)	; &I-CDP-8C43;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -305,11 +305,11 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 2)
     (total-strokes	 . 7)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x6C42)	; 求
-      ))
     (=gt-k		. 02519)	; &GT-K02519;
     (=gt-pj-k1		. #x345C)	; &GT-K02519; [20-60]
+    (<-formed@component/connect-right
+     ((=ucs		  . #x6C42)	; 求
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -1704,21 +1704,32 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x6C97)	; 沗
-    (=jis-x0212		. #x466F)	; &I-JSP-466F; [38-79]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6C97)	; 沗
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 4)
+    (total-strokes	 . 8)
+    (=jis-x0212		. #x466F)	; &M-17210; [38-79]
     (=jis-x0213-2-2000	. #x6E3E)	; &I-JX2-6E3E; [78-30]
     (=daikanwa		. 17210)	; &I-M-17210;
+    (=ucs@unicode	. #x6C97)	; &M-17210;
     ))
 (define-char
-  '((=>ucs		. #x6C97)	; 沗
-    (morohashi-daikanwa	17210 0 1)
+  '((<-denotational
+     ((=ucs		  . #x6C97)	; 沗
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=jef-china3	. #x55B3)	; &JC3-55B3;
     ))
 (define-char
-  '((=>ucs		. #x6C97)	; 沗
-    (morohashi-daikanwa	17210 0 3)
+  '((<-denotational
+     ((=ucs		  . #x6C97)	; 沗
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
@@ -1729,45 +1740,39 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x6C98)	; 沘
-    (=jis-x0212		. #x4670)	; &I-JSP-4670; [38-80]
-    (=iso-ir165		. #x2C27)	; &I-EGB-2C27; [12-07]
-    (=jis-x0213-1-2000	. #x7658)	; &I-JX1-7658; [86-56]
-    (=daikanwa		. 17211)	; &I-M-17211;
-    (=jef-china3	. #x98A8)	; &I-JC3-98A8;
-    ))
-(define-char
-  '((=>ucs		. #x6C98)	; 沘
-    (morohashi-daikanwa	17211 0 0)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=cns11643-1	. #x4A7E)	; &C1-4A7E; [42-94]
     (=big5		. #xA85D)	; &I-B-A85D;
+    (->subsumptive
+     ((=jis-x0212	  . #x4670)	; &M-17211; [38-80]
+      (=iso-ir165	  . #x2C27)	; &I-EGB-2C27; [12-07]
+      (=jis-x0213-1-2000  . #x7658)	; &I-JX1-7658; [86-56]
+      (=daikanwa	  . 17211)	; &I-M-17211;
+      (=jef-china3	  . #x98A8)	; &I-JC3-98A8;
+      (=ucs@unicode	  . #x6C98)	; &M-17211;
+      )
+     ((=cns11643-1	  . #x4A7E)	; &C1-4A7E; [42-94]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6C99)	; 沙
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (shinjigen-2	. 4085)
-    (=jis-x0208		. #x3A3B)	; &GT-21980; [26-27]
-    (=ks-x1001		. #x5E5E)	; &I-K0-5E5E; [62-62]
-    (=big5		. #xA846)	; &I-B-A846;
-    (=gt		. 21980)	; &I-GT-21980;
-    (=gt-k		. 02553)	; &I-GT-K02553;
-    (=gt-pj-1		. #x3A3B)	; &I-GT-21980; [26-27]
-    (=daikanwa		. 17212)	; &I-M-17212;
-    (=ucs@jis		. #x6C99)	; &GT-21980;
-    (mojikyo		. 017212)	; &MCS-6000433C;
-    ))
-(define-char
-  '((morohashi-daikanwa	17212 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x6C99)	; 沙
-    (=gb2312		. #x4933)	; &I-G0-4933; [41-19]
-    (=cns11643-1	. #x4A67)	; &I-C1-4A67; [42-71]
+    (->subsumptive
+     ((shinjigen-2	  . 4085)
+      (=jis-x0208	  . #x3A3B)	; &GT-21980; [26-27]
+      (=ks-x1001	  . #x5E5E)	; &I-K0-5E5E; [62-62]
+      (=big5		  . #xA846)	; &I-B-A846;
+      (=gt		  . 21980)	; &I-GT-21980;
+      (=gt-k		  . 02553)	; &I-GT-K02553;
+      (=gt-pj-1		  . #x3A3B)	; &I-GT-21980; [26-27]
+      (=daikanwa	  . 17212)	; &I-M-17212;
+      (=ucs@jis		  . #x6C99)	; &GT-21980;
+      (mojikyo		  . 017212)	; &MCS-6000433C;
+      )
+     ((=gb2312		  . #x4933)	; &C1-4A67; [41-19]
+      (=cns11643-1	  . #x4A67)	; &I-C1-4A67; [42-71]
+      (=ucs@unicode	  . #x6C99)	; &C1-4A67;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -1965,36 +1970,28 @@
     (=daikanwa		. 17230)	; &I-M-17230;
     ))
 (define-char
-  '((=>ucs		. #x6CA1)	; 没
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (shinjigen-2	. 4106)
-    (=jis-x0208		. #x4B57)	; &GT-22026; [43-55]
-    (=gt		. 22026)	; &I-GT-22026;
-    (=gt-k		. 02653)	; &I-GT-K02653;
-    (=gt-pj-1		. #x4B57)	; &I-GT-22026; [43-55]
-    (=daikanwa		. 17233)	; &I-M-17233;
-    (=ucs@jis		. #x6CA1)	; &GT-22026;
-    ))
-(define-char
-  '((morohashi-daikanwa	17233 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x6CA1)	; 没
-    (=gb2312		. #x433B)	; &I-G0-433B; [35-27]
-    (=cns11643-3	. #x2659)	; &I-C3-2659; [06-57]
+    (->subsumptive
+     ((shinjigen-2	  . 4106)
+      (=jis-x0208	  . #x4B57)	; &GT-22026; [43-55]
+      (=gt		  . 22026)	; &I-GT-22026;
+      (=gt-k		  . 02653)	; &I-GT-K02653;
+      (=gt-pj-1		  . #x4B57)	; &I-GT-22026; [43-55]
+      (=daikanwa	  . 17233)	; &I-M-17233;
+      (=ucs@jis		  . #x6CA1)	; &GT-22026;
+      )
+     ((=gb2312		  . #x433B)	; &C3-2659; [35-27]
+      (=cns11643-3	  . #x2659)	; &I-C3-2659; [06-57]
+      (=ucs@unicode	  . #x6CA1)	; &C3-2659;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5F37)	; &GT-23588; [63-23]
-      (=ks-x1001	  . #x774A)	; &I-K0-774A; [87-42]
-      (=daikanwa	  . 18383)	; &I-M-18383;
-      ))
     (shinjigen-2	. 4090)
     (=ucs		. #x6CA2)	; æ²¢
     (=jis-x0208		. #x4274)	; &I-J90-4274; [34-84]
@@ -2002,6 +1999,11 @@
     (=gt		. 22002)	; &I-GT-22002;
     (=gt-pj-1		. #x4274)	; &I-GT-22002; [34-84]
     (=daikanwa		. 17234)	; &I-M-17234;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5F37)	; &GT-23588; [63-23]
+      (=ks-x1001	  . #x774A)	; &I-K0-774A; [87-42]
+      (=daikanwa	  . 18383)	; &I-M-18383;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -3028,32 +3030,23 @@
     (=daikanwa		. 17305)	; &I-M-17305;
     ))
 (define-char
-  '((=>ucs		. #x6CE0)	; æ³ 
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=jis-x0212		. #x4723)	; &M-17306; [39-03]
-    (=jis-x0213-1-2000	. #x765D)	; &I-JX1-765D; [86-61]
-    (=big5		. #xAA7E)	; &I-B-AA7E;
-    (=daikanwa		. 17306)	; &I-M-17306;
-    (=jef-china3	. #x55D6)	; &I-JC3-55D6;
-    (=ucs@jis		. #x6CE0)	; &M-17306;
-    ))
-(define-char
-  '((=>ucs		. #x6CE0)	; æ³ 
-    (morohashi-daikanwa	17306 0 1)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=cns11643-1	. #x4E61)	; &C1-4E61; [46-65]
-    ))
-(define-char
-  '((morohashi-daikanwa	17306 0 2)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x6CE0)	; æ³ 
-    (=gb2312		. #x6376)	; &I-G0-6376; [67-86]
+    (=big5		. #xAA7E)	; &I-B-AA7E;
+    (->subsumptive
+     ((=jis-x0212	  . #x4723)	; &M-17306; [39-03]
+      (=jis-x0213-1-2000  . #x765D)	; &I-JX1-765D; [86-61]
+      (=daikanwa	  . 17306)	; &I-M-17306;
+      (=jef-china3	  . #x55D6)	; &I-JC3-55D6;
+      (=ucs@jis		  . #x6CE0)	; &M-17306;
+      )
+     ((=cns11643-1	  . #x4E61)	; &C1-4E61; [46-65]
+      )
+     ((=gb2312		  . #x6376)	; &G0-6376; [67-86]
+      (=ucs@unicode	  . #x6CE0)	; &G0-6376;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -3086,13 +3079,6 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4B22)	; &GT-22146; [43-02]
-      (=gb2312		  . #x455D)	; &I-G0-455D; [37-61]
-      (=ks-x1001	  . #x785C)	; &I-K0-785C; [88-60]
-      (=cns11643-1	  . #x4E5A)	; &I-C1-4E5A; [46-58]
-      (=daikanwa	  . 17307)	; &I-M-17307;
-      ))
     (=jis-x0208@1983	. #x4B22)	; &GT-22147; [43-02]
     (=jis-x0208@1990	. #x4B22)	; &I-J90-4B22; [43-02]
     (=gt		. 22147)	; &I-GT-22147;
@@ -3100,6 +3086,13 @@
     (=gt-pj-1		. #x4B22)	; &I-GT-22147; [43-02]
     (=jef-china3	. #x55AE)	; &I-JC3-55AE;
     (=ucs@jis		. #x6CE1)	; &GT-22147;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x4B22)	; &GT-22146; [43-02]
+      (=gb2312		  . #x455D)	; &I-G0-455D; [37-61]
+      (=ks-x1001	  . #x785C)	; &I-K0-785C; [88-60]
+      (=cns11643-1	  . #x4E5A)	; &I-C1-4E5A; [46-58]
+      (=daikanwa	  . 17307)	; &I-M-17307;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -4688,6 +4681,18 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (=ucs		. #x23D15)	; 𣴕
+    (->subsumptive
+     ((=daikanwa	  . 17420)	; &M-17420;
+      (=ucs@iso		  . #x23D15)	; &M-17420;
+      )
+     ((=cns11643-6	  . #x3237)	; &C6-3237; [18-23]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
     (=ucs		. #x6D39)	; æ´¹
     (=gb2312		. #x6421)	; &I-G0-6421; [68-01]
     (=ks-x1001		. #x6A37)	; &I-K0-6A37; [74-23]
@@ -4768,18 +4773,18 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (->subsumptive
-     ((<-vulgar
-       ((=jis-x0208@1978    . #x4749)	; &M-17428; [39-41]
-	(=jis-x0208@1983    . #x4749)	; &I-J83-4749; [39-41]
-	(=daikanwa	    . 17428)	; &I-M-17428;
-	))
-      (shinjigen-1	  . 4198)
+     ((shinjigen-1	  . 4198)
       (=gb2312		  . #x4549)	; &M-17427; [37-41]
       (=cns11643-1	  . #x5226)	; &I-C1-5226; [50-06]
       (=big5		  . #xACA3)	; &I-B-ACA3;
       (=daikanwa	  . 17427)	; &I-M-17427;
       (=jef-china3	  . #x55EF)	; &I-JC3-55EF;
       (=ucs@unicode	  . #x6D3E)	; &M-17427;
+      (<-vulgar
+       ((=jis-x0208@1978    . #x4749)	; &M-17428; [39-41]
+	(=jis-x0208@1983    . #x4749)	; &I-J83-4749; [39-41]
+	(=daikanwa	    . 17428)	; &I-M-17428;
+	))
       )
      ((=ks-x1001	  . #x776F)	; &K0-776F; [87-79]
       ))
@@ -4792,25 +4797,25 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (->subsumptive
-     ((<-same
+     ((shinjigen-1	  . 4197)
+      (shinjigen-2	  . 4197)
+      (=jis-x0208@1978	  . #x4749)	; &M-17428; [39-41]
+      (=jis-x0208@1983	  . #x4749)	; &I-J83-4749; [39-41]
+      (=daikanwa	  . 17428)	; &I-M-17428;
+      (<-same
        ((=gb2312	    . #x4549)	; &M-17427; [37-41]
 	(=cns11643-1	    . #x5226)	; &I-C1-5226; [50-06]
 	(=daikanwa	    . 17427)	; &I-M-17427;
 	))
       (<-same*sources
        daikanwa)
-      (shinjigen-1	  . 4197)
-      (shinjigen-2	  . 4197)
-      (=jis-x0208@1978	  . #x4749)	; &M-17428; [39-41]
-      (=jis-x0208@1983	  . #x4749)	; &I-J83-4749; [39-41]
-      (=daikanwa	  . 17428)	; &I-M-17428;
       (->vulgar
        ((=gb2312	    . #x4549)	; &M-17427; [37-41]
 	(=cns11643-1	    . #x5226)	; &I-C1-5226; [50-06]
 	(=daikanwa	    . 17427)	; &I-M-17427;
 	))
       (->vulgar*sources
-       zhengzi-tong)
+       zhengzitong)
       )
      ((=jis-x0208@1990	  . #x4749)	; &GT-22264; [39-41]
       (=gt		  . 22264)	; &I-GT-22264;
@@ -5045,13 +5050,6 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA45)	; 海
-      (=jis-x0213-1-2000  . #x7669)	; &I-JX1-7669; [86-73]
-      (=daikanwa	  . 17503)	; &I-M-17503;
-      ))
-    (<-simplified@JP/Jouyou*sources
-     daikanwa JP/Jouyou)
     (shinjigen-2	. 4166)
     (=ucs		. #x2F901)	; 海
     (=jis-x0208		. #x3324)	; &I-J90-3324; [19-04]
@@ -5061,16 +5059,18 @@
     (=gt-pj-1		. #x3324)	; &I-GT-22177; [19-04]
     (=daikanwa		. 17450)	; &I-M-17450;
     (=ucs@jis		. #x6D77)	; 海
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA45)	; 海
+      (=jis-x0213-1-2000  . #x7669)	; &I-JX1-7669; [86-73]
+      (=daikanwa	  . 17503)	; &I-M-17503;
+      ))
+    (<-simplified@JP/Jouyou*sources
+     daikanwa JP/Jouyou)
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5E46)	; &GT-22572; [62-38]
-      (=ks-x1001	  . #x6F64)	; &I-K0-6F64; [79-68]
-      (=daikanwa	  . 17669)	; &I-M-17669;
-      ))
     (shinjigen-2	. 4183)
     (=ucs		. #x6D44)	; 浄
     (=jis-x0208		. #x3E74)	; &I-J90-3E74; [30-84]
@@ -5079,6 +5079,11 @@
     (=gt		. 22237)	; &I-GT-22237;
     (=gt-pj-1		. #x3E74)	; &I-GT-22237; [30-84]
     (=daikanwa		. 17451)	; &I-M-17451;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5E46)	; &GT-22572; [62-38]
+      (=ks-x1001	  . #x6F64)	; &I-K0-6F64; [79-68]
+      (=daikanwa	  . 17669)	; &I-M-17669;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -5092,17 +5097,17 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=ucs		    . #x6DFA)	; æ·º
-	(=jis-x0208	    . #x5E49)	; &I-J90-5E49; [62-41]
-	))
-      (shinjigen-2	  . 4190)
+     ((shinjigen-2	  . 4190)
       (=jis-x0208	  . #x4075)	; &GT-22248; [32-85]
       (=gt		  . 22248)	; &I-GT-22248;
       (=gt-k		  . 05121)	; &I-GT-K05121;
       (=gt-pj-1		  . #x4075)	; &I-GT-22248; [32-85]
       (=daikanwa	  . 17452)	; &I-M-17452;
       (=ucs@jis		  . #x6D45)	; &GT-22248;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x6DFA)	; æ·º
+	(=jis-x0208	    . #x5E49)	; &I-J90-5E49; [62-41]
+	))
       )
      ((=cns11643-3	  . #x2D51)	; &C3-2D51; [13-49]
       (=ucs@cns		  . #x6D45)	; &C3-2D51;
@@ -5327,11 +5332,19 @@
     (=cns11643-5	. #x297E)	; &I-C5-297E; [09-94]
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=ucs		. #x23D15)	; 𣴕
-    (=cns11643-6	. #x3237)	; &I-C6-3237; [18-23]
+  '((ideographic-radical@ucs . 85)	; ⽔
+    (ideographic-strokes@ucs . 6)
+    (ideographic-radical@ucs*sources
+     jis/x0213@2000 ucs)
+    (ideographic-radical@misc . 123)	; ⽺
+    (ideographic-strokes@misc . 4)
+    (ideographic-radical@misc*sources
+     jis/x0213@2000)
+    (total-strokes	 . 10)
+    (sound@ja/kun/name	"suke" "tugu" "yosi")
+    (sound@ja/on/name	"syAu" "yAu")
+    (=ucs		. #x23D0E)	; 𣴎
+    (=jis-x0213-2-2000	. #x7475)	; &I-JX2-7475; [84-85]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -5485,11 +5498,6 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5F40)	; &GT-23739; [63-32]
-      (=ks-x1001	  . #x5E34)	; &I-K0-5E34; [62-20]
-      (=daikanwa	  . 18537)	; &I-M-18537;
-      ))
     (shinjigen-2	. 4234)
     (=ucs		. #x6D5C)	; 浜
     (=jis-x0208		. #x494D)	; &I-J90-494D; [41-45]
@@ -5499,14 +5507,39 @@
     (=gt		. 22412)	; &I-GT-22412;
     (=gt-pj-1		. #x494D)	; &I-GT-22412; [41-45]
     (=daikanwa		. 17462)	; &I-M-17462;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5F40)	; &GT-23739; [63-32]
+      (=ks-x1001	  . #x5E34)	; &I-K0-5E34; [62-20]
+      (=daikanwa	  . 18537)	; &I-M-18537;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x6D5D)	; 浝
-    (=cns11643-3	. #x3176)	; &I-C3-3176; [17-86]
-    (=daikanwa		. 17463)	; &I-M-17463;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6D5D)	; 浝
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (->subsumptive
+     ((=daikanwa	  . 17463)	; &M-17463;
+      )
+     ((=ucs@unicode	  . #x6D5D)	; &UU+6D5D;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6D5D)	; 浝
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=cns11643-3	. #x3176)	; &C3-3176; [17-86]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -6766,11 +6799,25 @@
     (=daikanwa		. 17573)	; &I-M-17573;
     ))
 (define-char
-  '((=>ucs		. #x6D99)	; 涙
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=ucs		. #x6D99)	; 涙
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6D99)	; 涙
+      ))
     (morohashi-daikanwa	17573 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (=jis-x0208		. #x4E5E)	; &GT-22448; [46-62]
+    (=cns11643-3	. #x317D)	; &I-C3-317D; [17-93]
+    (=gt		. 22448)	; &I-GT-22448;
+    (=gt-pj-1		. #x4E5E)	; &I-GT-22448; [46-62]
+    (=ucs@jis		. #x6D99)	; &GT-22448;
+    (mojikyo		. 050251)	; &MCS-6000C44B;
     (<-simplified@JP/Jouyou
      ((=ks-x1001	  . #x5728)	; &M-17644; [55-08]
       (=cns11643-1	  . #x5B61)	; &I-C1-5B61; [59-65]
@@ -6779,19 +6826,15 @@
       ))
     (<-simplified@JP/Jouyou*sources
      daikanwa JP/Jouyou)
-    (=jis-x0208		. #x4E5E)	; &GT-22448; [46-62]
-    (=cns11643-3	. #x317D)	; &I-C3-317D; [17-93]
-    (=gt		. 22448)	; &I-GT-22448;
-    (=gt-pj-1		. #x4E5E)	; &I-GT-22448; [46-62]
-    (=ucs@jis		. #x6D99)	; &GT-22448;
-    (mojikyo		. 050251)	; &MCS-6000C44B;
     ))
 (define-char
-  '((morohashi-daikanwa	17573 1 1)
+  '((<-denotational
+     ((=ucs		  . #x6D99)	; 涙
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=ucs		. #x6D99)	; 涙
+    (=ucs@unicode	. #x6D99)	; &UU+6D99;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -6807,16 +6850,25 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x23D69)	; 𣵩
-    (=cns11643-6	. #x387D)	; &I-C6-387D; [24-93]
-    (=daikanwa		. 49213)	; &I-M-49213;
+    (->subsumptive
+     ((=daikanwa	  . 49213)	; &M-49213;
+      )
+     ((=ucs@iso		  . #x23D69)	; &U-00023D69;
+      )
+     ((=cns11643-6	  . #x387D)	; &C6-387D; [24-93]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x23D68)	; 𣵨
-    (=cns11643-6	. #x3927)	; &I-C6-3927; [25-07]
-    (=daikanwa		. 49214)	; &I-M-49214;
+    (->subsumptive
+     ((=daikanwa	  . 49214)	; &M-49214;
+      )
+     ((=cns11643-6	  . #x3927)	; &C6-3927; [25-07]
+      (=ucs@iso		  . #x23D68)	; &C6-3927;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -6903,18 +6955,18 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-simplified@JP
-     ((=ucs		  . #x6FE4)	; 濤
-      (=jis-x0208@1978	  . #x4573)	; &I-J78-4573; [37-83]
-      (=jis-x0208@1983	  . #x5E39)	; &I-J83-5E39; [62-25]
-      (=jis-x0208@1990	  . #x5E39)	; &I-J90-5E39; [62-25]
-      ))
     (=jis-x0208@1978	. #x5E39)	; &GT-22393; [62-25]
     (=jis-x0208@1983	. #x4573)	; &I-J83-4573; [37-83]
     (=jis-x0208@1990	. #x4573)	; &I-J90-4573; [37-83]
     (=gt		. 22393)	; &I-GT-22393;
     (=gt-pj-1		. #x4573)	; &I-GT-22393; [37-83]
     (=ucs@jis		. #x6D9B)	; &GT-22393;
+    (<-simplified@JP
+     ((=ucs		  . #x6FE4)	; 濤
+      (=jis-x0208@1978	  . #x4573)	; &I-J78-4573; [37-83]
+      (=jis-x0208@1983	  . #x5E39)	; &I-J83-5E39; [62-25]
+      (=jis-x0208@1990	  . #x5E39)	; &I-J90-5E39; [62-25]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -8447,11 +8499,6 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x307C)	; &GT-22462; [16-92]
-      (=ks-x1001	  . #x6B62)	; &I-K0-6B62; [75-66]
-      (=daikanwa	  . 17678)	; &I-M-17678;
-      ))
     (=gb2312		. #x5279)	; &GT-22466; [50-89]
     (=jis-x0208@1983	. #x307C)	; &I-J83-307C; [16-92]
     (=jis-x0208@1990	. #x307C)	; &I-J90-307C; [16-92]
@@ -8461,29 +8508,30 @@
     (=gt-pj-1		. #x307C)	; &I-GT-22466; [16-92]
     (=jef-china3	. #x57C8)	; &I-JC3-57C8;
     (=ucs@unicode	. #x6DEB)	; &GT-22466;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x307C)	; &GT-22462; [16-92]
+      (=ks-x1001	  . #x6B62)	; &I-K0-6B62; [75-66]
+      (=daikanwa	  . 17678)	; &I-M-17678;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6DEC)	; æ·¬
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (shinjigen-2	. 4275)
-    (=jis-x0208		. #x5E43)	; &GT-22535; [62-35]
-    (=big5		. #xB266)	; &I-B-B266;
-    (=gt		. 22535)	; &I-GT-22535;
-    (=gt-pj-1		. #x5E43)	; &I-GT-22535; [62-35]
-    (=daikanwa		. 17679)	; &I-M-17679;
-    (=ucs@jis		. #x6DEC)	; &GT-22535;
-    ))
-(define-char
-  '((morohashi-daikanwa	17679 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (shinjigen-2	. 4275)
     (=ucs		. #x6DEC)	; æ·¬
-    (=gb2312		. #x3463)	; &I-G0-3463; [20-67]
-    (=cns11643-1	. #x5B6B)	; &I-C1-5B6B; [59-75]
+    (=big5		. #xB266)	; &I-B-B266;
+    (->subsumptive
+     ((shinjigen-2	  . 4275)
+      (=jis-x0208	  . #x5E43)	; &GT-22535; [62-35]
+      (=gt		  . 22535)	; &I-GT-22535;
+      (=gt-pj-1		  . #x5E43)	; &I-GT-22535; [62-35]
+      (=daikanwa	  . 17679)	; &I-M-17679;
+      (=ucs@jis		  . #x6DEC)	; &GT-22535;
+      )
+     ((=gb2312		  . #x3463)	; &C1-5B6B; [20-67]
+      (=cns11643-1	  . #x5B6B)	; &I-C1-5B6B; [59-75]
+      (=ucs@unicode	  . #x6DEC)	; &C1-5B6B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -8737,27 +8785,25 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (shinjigen-2	. 4274)
     (=ucs		. #x6DF7)	; æ··
-    (=jis-x0208		. #x3A2E)	; &I-J90-3A2E; [26-14]
-    (=gb2312		. #x3B6C)	; &I-G0-3B6C; [27-76]
-    (=ks-x1001		. #x7B68)	; &I-K0-7B68; [91-72]
-    (=big5		. #xB256)	; &I-B-B256;
-    (=gt		. 22532)	; &I-GT-22532;
-    (=gt-pj-1		. #x3A2E)	; &I-GT-22532; [26-14]
-    (=daikanwa		. 17694)	; &I-M-17694;
-    ))
-(define-char
-  '((=>ucs		. #x6DF7)	; æ··
-    (morohashi-daikanwa	17694 0 0)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=cns11643-1	. #x5B5B)	; &C1-5B5B; [59-59]
+    (->subsumptive
+     ((shinjigen-2	  . 4274)
+      (=jis-x0208	  . #x3A2E)	; &GT-22532; [26-14]
+      (=gb2312		  . #x3B6C)	; &I-G0-3B6C; [27-76]
+      (=ks-x1001	  . #x7B68)	; &I-K0-7B68; [91-72]
+      (=big5		  . #xB256)	; &I-B-B256;
+      (=gt		  . 22532)	; &I-GT-22532;
+      (=gt-pj-1		  . #x3A2E)	; &I-GT-22532; [26-14]
+      (=daikanwa	  . 17694)	; &I-M-17694;
+      (=ucs@unicode	  . #x6DF7)	; &GT-22532;
+      )
+     ((=cns11643-1	  . #x5B5B)	; &C1-5B5B; [59-59]
+      ))
     ))
 (define-char
   '((<-denotational
      ((=big5		  . #xB24D)	; &B-B24D;
+      (=jis-x0208@1997	  . #x4036)	; &B-B24D; [32-22]
       ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
@@ -8783,6 +8829,7 @@
 (define-char
   '((<-denotational
      ((=big5		  . #xB24D)	; &B-B24D;
+      (=jis-x0208@1997	  . #x4036)	; &B-B24D; [32-22]
       ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
@@ -8805,23 +8852,20 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (shinjigen-2	. 4260)
     (=ucs		. #x6DF9)	; æ·¹
-    (=jis-x0208		. #x5E3B)	; &I-J90-5E3B; [62-27]
-    (=gb2312		. #x514D)	; &I-G0-514D; [49-45]
-    (=ks-x1001		. #x6574)	; &I-K0-6574; [69-84]
-    (=big5		. #xB254)	; &I-B-B254;
-    (=gt		. 22473)	; &I-GT-22473;
-    (=gt-pj-1		. #x5E3B)	; &I-GT-22473; [62-27]
-    (=daikanwa		. 17696)	; &I-M-17696;
-    ))
-(define-char
-  '((=>ucs		. #x6DF9)	; æ·¹
-    (morohashi-daikanwa	17696 0 0)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=cns11643-1	. #x5B59)	; &C1-5B59; [59-57]
+    (->subsumptive
+     ((shinjigen-2	  . 4260)
+      (=jis-x0208	  . #x5E3B)	; &GT-22473; [62-27]
+      (=gb2312		  . #x514D)	; &I-G0-514D; [49-45]
+      (=ks-x1001	  . #x6574)	; &I-K0-6574; [69-84]
+      (=big5		  . #xB254)	; &I-B-B254;
+      (=gt		  . 22473)	; &I-GT-22473;
+      (=gt-pj-1		  . #x5E3B)	; &I-GT-22473; [62-27]
+      (=daikanwa	  . 17696)	; &I-M-17696;
+      (=ucs@unicode	  . #x6DF9)	; &GT-22473;
+      )
+     ((=cns11643-1	  . #x5B59)	; &C1-5B59; [59-57]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -8840,28 +8884,38 @@
     (=daikanwa		. 17697)	; &I-M-17697;
     ))
 (define-char
-  '((=>ucs		. #x6DFB)	; æ·»
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=ucs		. #x6DFB)	; æ·»
+    (=big5		. #xB24B)	; &I-B-B24B;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6DFB)	; æ·»
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (shinjigen-2	. 4299)
     (=jis-x0208		. #x453A)	; &GT-22622; [37-26]
     (=ks-x1001		. #x7455)	; &I-K0-7455; [84-53]
-    (=big5		. #xB24B)	; &I-B-B24B;
     (=gt		. 22622)	; &I-GT-22622;
     (=gt-pj-1		. #x453A)	; &I-GT-22622; [37-26]
     (=daikanwa		. 17698)	; &I-M-17698;
     (=ucs@jis		. #x6DFB)	; &GT-22622;
     ))
 (define-char
-  '((morohashi-daikanwa	17698 0 2)
+  '((<-denotational
+     ((=ucs		  . #x6DFB)	; æ·»
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x6DFB)	; æ·»
-    (=gb2312		. #x4C6D)	; &I-G0-4C6D; [44-77]
+    (=gb2312		. #x4C6D)	; &C1-5B50; [44-77]
     (=cns11643-1	. #x5B50)	; &I-C1-5B50; [59-48]
     (=jef-china3	. #x56B9)	; &I-JC3-56B9;
+    (=ucs@unicode	. #x6DFB)	; &C1-5B50;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -9082,13 +9136,6 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6E34)	; 渴
-      (=jis-x0213-1-2000  . #x7678)	; &I-JX1-7678; [86-88]
-      (=daikanwa	  . 17788)	; &I-M-17788;
-      ))
-    (<-simplified@JP/Jouyou*sources
-     daikanwa JP/Jouyou)
     (shinjigen-2	. 4263)
     (=ucs		. #x6E07)	; 渇
     (=jis-x0208		. #x3369)	; &I-J90-3369; [19-73]
@@ -9097,57 +9144,58 @@
     (=gt-k		. 07730)	; &I-GT-K07730;
     (=gt-pj-1		. #x3369)	; &I-GT-22493; [19-73]
     (=daikanwa		. 17748)	; &I-M-17748;
-    ))
-(define-char
-  '((=>ucs		. #x6E08)	; 済
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
     (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5F3B)	; &GT-23685; [63-27]
-      (=ks-x1001	  . #x702D)	; &I-K0-702D; [80-13]
-      (=daikanwa	  . 18498)	; &I-M-18498;
+     ((=ucs		  . #x6E34)	; 渴
+      (=jis-x0213-1-2000  . #x7678)	; &I-JX1-7678; [86-88]
+      (=daikanwa	  . 17788)	; &I-M-17788;
       ))
-    (shinjigen-2	. 4292)
-    (=jis-x0208		. #x3A51)	; &GT-22583; [26-49]
-    (=gt		. 22583)	; &I-GT-22583;
-    (=gt-pj-1		. #x3A51)	; &I-GT-22583; [26-49]
-    (=daikanwa		. 17749)	; &I-M-17749;
-    (=ucs@jis		. #x6E08)	; &GT-22583;
+    (<-simplified@JP/Jouyou*sources
+     daikanwa JP/Jouyou)
     ))
 (define-char
-  '((morohashi-daikanwa	17749 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x6E08)	; 済
-    (=cns11643-3	. #x3676)	; &I-C3-3676; [22-86]
-    ))
-(define-char
-  '((=>ucs		. #x6E09)	; 渉
-    (morohashi-daikanwa	17749 1)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x606F)	; &M-17530; [64-79]
-      (=jis-x0213-1-2000  . #x766C)	; &I-JX1-766C; [86-76]
-      (=daikanwa	  . 17530)	; &I-M-17530;
+    (->subsumptive
+     ((shinjigen-2	  . 4292)
+      (=jis-x0208	  . #x3A51)	; &GT-22583; [26-49]
+      (=gt		  . 22583)	; &I-GT-22583;
+      (=gt-pj-1		  . #x3A51)	; &I-GT-22583; [26-49]
+      (=daikanwa	  . 17749)	; &I-M-17749;
+      (=ucs@jis		  . #x6E08)	; &GT-22583;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5F3B)	; &GT-23685; [63-27]
+	(=ks-x1001	    . #x702D)	; &I-K0-702D; [80-13]
+	(=daikanwa	    . 18498)	; &I-M-18498;
+	))
+      )
+     ((=cns11643-3	  . #x3676)	; &C3-3676; [22-86]
+      (=ucs@unicode	  . #x6E08)	; &C3-3676;
       ))
-    (=jis-x0208		. #x3E44)	; &GT-22570; [30-36]
-    (=gt		. 22570)	; &I-GT-22570;
-    (=gt-pj-1		. #x3E44)	; &I-GT-22570; [30-36]
-    (=jef-china3	. #x56A5)	; &I-JC3-56A5;
-    (=ucs@jis		. #x6E09)	; &GT-22570;
-    (mojikyo		. 050253)	; &MCS-6000C44D;
     ))
 (define-char
-  '((morohashi-daikanwa	17749 1 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x6E09)	; 渉
-    (=cns11643-3	. #x3725)	; &I-C3-3725; [23-05]
+    (->subsumptive
+     ((morohashi-daikanwa	17749 1)
+      (=jis-x0208	  . #x3E44)	; &GT-22570; [30-36]
+      (=gt		  . 22570)	; &I-GT-22570;
+      (=gt-pj-1		  . #x3E44)	; &I-GT-22570; [30-36]
+      (=jef-china3	  . #x56A5)	; &I-JC3-56A5;
+      (=ucs@jis		  . #x6E09)	; &GT-22570;
+      (mojikyo		  . 050253)	; &MCS-6000C44D;
+      (<-simplified@JP/Jouyou
+       ((=ks-x1001	    . #x606F)	; &M-17530; [64-79]
+	(=jis-x0213-1-2000  . #x766C)	; &I-JX1-766C; [86-76]
+	(=daikanwa	    . 17530)	; &I-M-17530;
+	))
+      )
+     ((=cns11643-3	  . #x3725)	; &C3-3725; [23-05]
+      (=ucs@unicode	  . #x6E09)	; &C3-3725;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -9167,16 +9215,16 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6F81)	; 澁
-      (=jis-x0208	  . #x5F27)	; &I-J90-5F27; [63-07]
-      ))
     (=ucs		. #x6E0B)	; 渋
     (=jis-x0208		. #x3D42)	; &I-J90-3D42; [29-34]
     (=cns11643-4	. #x326D)	; &I-C4-326D; [18-77]
     (=gt		. 22556)	; &I-GT-22556;
     (=gt-pj-1		. #x3D42)	; &I-GT-22556; [29-34]
     (mojikyo		. 050254)	; &MCS-6000C44E;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x6F81)	; 澁
+      (=jis-x0208	  . #x5F27)	; &I-J90-5F27; [63-07]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -9377,6 +9425,22 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (=ucs		. #x6E13)	; 渓
+    (=jis-x0208		. #x374C)	; &I-J90-374C; [23-44]
+    (=gt		. 22516)	; &I-GT-22516;
+    (=gt-pj-1		. #x374C)	; &I-GT-22516; [23-44]
+    (=cbeta		. 00557)	; &I-CB00557;
+    (mojikyo		. 054093)	; &MCS-6000D34D;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5E64)	; &GT-22931; [62-68]
+      (=ks-x1001	  . #x4D22)	; &I-K0-4D22; [45-02]
+      (=daikanwa	  . 17967)	; &I-M-17967;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
     (=ucs		. #x6E14)	; 渔
     (=gb2312		. #x5366)	; &I-G0-5366; [51-70]
     ))
@@ -9828,11 +9892,6 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified@JP
-     ((=ucs		  . #xFA46)	; 渚
-      (=jis-x0208@1978	  . #x3D6D)	; &I-J78-3D6D; [29-77]
-      (=jis-x0213-1-2000  . #x7677)	; &I-JX1-7677; [86-87]
-      ))
     (=gb2312		. #x643E)	; &GT-22563; [68-30]
     (=jis-x0208@1983	. #x3D6D)	; &I-J83-3D6D; [29-77]
     (=jis-x0208@1990	. #x3D6D)	; &I-J90-3D6D; [29-77]
@@ -9842,6 +9901,11 @@
     (=jef-china3	. #x55AF)	; &I-JC3-55AF;
     (=ucs@unicode	. #x6E1A)	; &GT-22563;
     (mojikyo		. 054158)	; &MCS-6000D38E;
+    (<-simplified@JP/jis
+     ((=ucs		  . #xFA46)	; 渚
+      (=jis-x0208@1978	  . #x3D6D)	; &I-J78-3D6D; [29-77]
+      (=jis-x0213-1-2000  . #x7677)	; &I-JX1-7677; [86-87]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -9921,49 +9985,46 @@
     (=daikanwa		. 17762)	; &I-M-17762;
     ))
 (define-char
-  '((=>ucs		. #x6E1F)	; 渟
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (shinjigen-2	. 4347)
-    (=jis-x0208		. #x5E5B)	; &GT-22832; [62-59]
-    (=ks-x1001		. #x6F65)	; &I-K0-6F65; [79-69]
-    (=big5		. #xD9EA)	; &I-B-D9EA;
-    (=gt		. 22832)	; &I-GT-22832;
-    (=gt-pj-1		. #x5E5B)	; &I-GT-22832; [62-59]
-    (=daikanwa		. 17763)	; &I-M-17763;
-    (=ucs@jis		. #x6E1F)	; &GT-22832;
-    ))
-(define-char
-  '((morohashi-daikanwa	17763 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x6E1F)	; 渟
-    (=cns11643-2	. #x3D2F)	; &I-C2-3D2F; [29-15]
+    (=big5		. #xD9EA)	; &I-B-D9EA;
+    (->subsumptive
+     ((shinjigen-1	  . 4347)
+      (shinjigen-2	  . 4347)
+      (=jis-x0208	  . #x5E5B)	; &GT-22832; [62-59]
+      (=ks-x1001	  . #x6F65)	; &I-K0-6F65; [79-69]
+      (=gt		  . 22832)	; &I-GT-22832;
+      (=gt-pj-1		  . #x5E5B)	; &I-GT-22832; [62-59]
+      (=daikanwa	  . 17763)	; &I-M-17763;
+      (=ucs@jis		  . #x6E1F)	; &GT-22832;
+      )
+     ((=cns11643-2	  . #x3D2F)	; &C2-3D2F; [29-15]
+      (=ucs@unicode	  . #x6E1F)	; &C2-3D2F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x6E20)	; 渠
-    (=jis-x0208		. #x3574)	; &I-J90-3574; [21-84]
-    (=gb2312		. #x477E)	; &I-G0-477E; [39-94]
-    (=ks-x1001		. #x4B62)	; &I-K0-4B62; [43-66]
     (=big5		. #xB4EB)	; &I-B-B4EB;
-    (=gt		. 22731)	; &I-GT-22731;
-    (=gt-k		. 09029)	; &I-GT-K09029;
-    (=gt-pj-1		. #x3574)	; &I-GT-22731; [21-84]
-    (=daikanwa		. 17764)	; &I-M-17764;
-    (=jef-china3	. #x54C6)	; &I-JC3-54C6;
-    ))
-(define-char
-  '((=>ucs		. #x6E20)	; 渠
-    (morohashi-daikanwa	17764 0 1)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=cns11643-1	. #x6032)	; &C1-6032; [64-18]
+    (->subsumptive
+     ((shinjigen-1	  . 4322)
+      (=daikanwa	  . 17764)	; &M-17764;
+      )
+     ((=jis-x0208	  . #x3574)	; &GT-22731; [21-84]
+      (=gb2312		  . #x477E)	; &I-G0-477E; [39-94]
+      (=ks-x1001	  . #x4B62)	; &I-K0-4B62; [43-66]
+      (=gt		  . 22731)	; &I-GT-22731;
+      (=gt-k		  . 09029)	; &I-GT-K09029;
+      (=gt-pj-1		  . #x3574)	; &I-GT-22731; [21-84]
+      (=jef-china3	  . #x54C6)	; &I-JC3-54C6;
+      (=ucs@unicode	  . #x6E20)	; &GT-22731;
+      )
+     ((=cns11643-1	  . #x6032)	; &C1-6032; [64-18]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -10070,7 +10131,13 @@
     (=daikanwa		. 17770)	; &I-M-17770;
     ))
 (define-char
-  '((=>ucs		. #x6E26)	; 渦
+  '((ideographic-radical . 85)	; ⽔
+    (=ucs		. #x6E26)	; 渦
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6E26)	; 渦
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -10085,32 +10152,31 @@
     (=ucs@jis		. #x6E26)	; &GT-22708;
     ))
 (define-char
-  '((morohashi-daikanwa	17771 0 5)
+  '((<-denotational
+     ((=ucs		  . #x6E26)	; 渦
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x6E26)	; 渦
-    (=gb12345		. #x4E50)	; 渦 [46-48]
-    ))
-(define-char
-  '((=>ucs		. #x6E27)	; 渧
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=jis-x0212		. #x476B)	; &M-17772; [39-75]
-    (=jis-x0213-2-2000	. #x6E70)	; &I-JX2-6E70; [78-80]
-    (=big5		. #xDA4D)	; &I-B-DA4D;
-    (=daikanwa		. 17772)	; &I-M-17772;
-    (=ucs@jis		. #x6E27)	; &M-17772;
+    (=gb12345		. #x4E50)	; &UU+6E26; [46-48]
+    (=ucs@unicode	. #x6E26)	; &UU+6E26;
     ))
 (define-char
-  '((morohashi-daikanwa	17772 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x6E27)	; 渧
-    (=cns11643-2	. #x3D51)	; &I-C2-3D51; [29-49]
-    (=jef-china3	. #x56BE)	; &I-JC3-56BE;
+    (=big5		. #xDA4D)	; &I-B-DA4D;
+    (->subsumptive
+     ((=jis-x0212	  . #x476B)	; &M-17772; [39-75]
+      (=jis-x0213-2-2000  . #x6E70)	; &I-JX2-6E70; [78-80]
+      (=daikanwa	  . 17772)	; &I-M-17772;
+      (=jef-china3	  . #x56BE)	; &I-JC3-56BE;
+      (=ucs@jis		  . #x6E27)	; &M-17772;
+      )
+     ((=cns11643-2	  . #x3D51)	; &C2-3D51; [29-49]
+      (=ucs@unicode	  . #x6E27)	; &C2-3D51;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -10125,6 +10191,15 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (shinjigen-2	. 4319)
+    (=ucs		. #x6E29)	; 温
+    (=jis-x0208		. #x3239)	; &I-J90-3239; [18-25]
+    (=gb2312		. #x4E42)	; &I-G0-4E42; [46-34]
+    (=cns11643-3	. #x3C6B)	; &I-C3-3C6B; [28-75]
+    (=gt		. 22707)	; &I-GT-22707;
+    (=gt-k		. 09002)	; &I-GT-K09002;
+    (=gt-pj-1		. #x3239)	; &I-GT-22707; [18-25]
+    (=daikanwa		. 17774)	; &I-M-17774;
     (<-simplified@JP/Jouyou
      ((=ucs		  . #x6EAB)	; 溫
       (=jis-x0213-1-2000  . #x767C)	; &I-JX1-767C; [86-92]
@@ -10135,15 +10210,6 @@
       ))
     (<-vulgar*sources
      zihui daikanwa)
-    (shinjigen-2	. 4319)
-    (=ucs		. #x6E29)	; 温
-    (=jis-x0208		. #x3239)	; &I-J90-3239; [18-25]
-    (=gb2312		. #x4E42)	; &I-G0-4E42; [46-34]
-    (=cns11643-3	. #x3C6B)	; &I-C3-3C6B; [28-75]
-    (=gt		. 22707)	; &I-GT-22707;
-    (=gt-k		. 09002)	; &I-GT-K09002;
-    (=gt-pj-1		. #x3239)	; &I-GT-22707; [18-25]
-    (=daikanwa		. 17774)	; &I-M-17774;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -12226,15 +12292,15 @@
      ((=gb2312		  . #x4D65)	; &G0-4D65; [45-69]
       (=ucs@unicode	  . #x6E7E)	; &G0-4D65;
       )
-     ((<-simplified@JP/Jouyou
+     ((=jis-x0208@1990	  . #x4F51)	; &GT-22896; [47-49]
+      (=gt		  . 22896)	; &I-GT-22896;
+      (=gt-pj-1		  . #x4F51)	; &I-GT-22896; [47-49]
+      (=ucs@jis		  . #x6E7E)	; &GT-22896;
+      (<-simplified@JP/Jouyou
        ((=jis-x0208	    . #x5F54)	; &GT-24126; [63-52]
 	(=ks-x1001	    . #x583D)	; &I-K0-583D; [56-29]
 	(=daikanwa	    . 18823)	; &I-M-18823;
 	))
-      (=jis-x0208@1990	  . #x4F51)	; &GT-22896; [47-49]
-      (=gt		  . 22896)	; &I-GT-22896;
-      (=gt-pj-1		  . #x4F51)	; &I-GT-22896; [47-49]
-      (=ucs@jis		  . #x6E7E)	; &GT-22896;
       )
      ((=cns11643-3	  . #x3C63)	; &C3-3C63; [28-67]
       (=ucs@cns		  . #x6E7E)	; &C3-3C63;
@@ -12245,16 +12311,16 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6FD5)	; 濕
-      (=jis-x0208	  . #x5F3C)	; &I-J90-5F3C; [63-28]
-      ))
     (=ucs		. #x6E7F)	; 湿
     (=jis-x0208		. #x3C3E)	; &I-J90-3C3E; [28-30]
     (=gb2312		. #x4A2A)	; &I-G0-4A2A; [42-10]
     (=gt		. 22768)	; &I-GT-22768;
     (=gt-pj-1		. #x3C3E)	; &I-GT-22768; [28-30]
     (mojikyo		. 050257)	; &MCS-6000C451;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x6FD5)	; 濕
+      (=jis-x0208	  . #x5F3C)	; &I-J90-5F3C; [63-28]
+      ))
     ))
 (define-char
   '((=>ucs		. #x3D1E)	; 㴞
@@ -12277,11 +12343,6 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5E60)	; &GT-23251; [62-64]
-      (=ks-x1001	  . #x583B)	; &I-K0-583B; [56-27]
-      (=daikanwa	  . 18099)	; &I-M-18099;
-      ))
     (=ucs		. #x6E80)	; 満
     (=jis-x0208		. #x4B7E)	; &I-J90-4B7E; [43-94]
     (=cns11643-3	. #x3C68)	; &I-C3-3C68; [28-72]
@@ -12289,6 +12350,11 @@
     (=gt-k		. 09146)	; &I-GT-K09146;
     (=gt-pj-1		. #x4B7E)	; &I-GT-22876; [43-94]
     (mojikyo		. 050258)	; &MCS-6000C452;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5E60)	; &GT-23251; [62-64]
+      (=ks-x1001	  . #x583B)	; &I-K0-583B; [56-27]
+      (=daikanwa	  . 18099)	; &I-M-18099;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -12381,18 +12447,18 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x482E)	; &M-18225; [40-14]
-      (=jis-x0212	  . #x4855)	; &I-JSP-4855; [40-53]
-      (=jis-x0213-1-2000  . #x7729)	; &I-JX1-7729; [87-09]
-      (=daikanwa	  . 18225)	; &I-M-18225;
-      ))
     (=ucs		. #x6E8C)	; 溌
     (=jis-x0208@1983	. #x482E)	; &I-J83-482E; [40-14]
     (=jis-x0208@1990	. #x482E)	; &I-J90-482E; [40-14]
     (=gt		. 22854)	; &I-GT-22854;
     (=gt-pj-1		. #x482E)	; &I-GT-22854; [40-14]
     (=jef-china3	. #x70DA)	; &I-JC3-70DA;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x482E)	; &M-18225; [40-14]
+      (=jis-x0212	  . #x4855)	; &I-JSP-4855; [40-53]
+      (=jis-x0213-1-2000  . #x7729)	; &I-JX1-7729; [87-09]
+      (=daikanwa	  . 18225)	; &I-M-18225;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -12724,11 +12790,6 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x3942)	; &M-17944; [25-34]
-      (=ks-x1001	  . #x4F35)	; &I-K0-4F35; [47-21]
-      (=daikanwa	  . 17944)	; &I-M-17944;
-      ))
     (=jis-x0208@1983	. #x3942)	; &GT-22946; [25-34]
     (=jis-x0208@1990	. #x3942)	; &I-J90-3942; [25-34]
     (=cns11643-1	. #x6464)	; &I-C1-6464; [68-68]
@@ -12737,6 +12798,11 @@
     (=gt-pj-1		. #x3942)	; &I-GT-22946; [25-34]
     (=jef-china3	. #x57C6)	; &I-JC3-57C6;
     (=ucs@unicode	. #x6E9D)	; &GT-22946;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x3942)	; &M-17944; [25-34]
+      (=ks-x1001	  . #x4F35)	; &I-K0-4F35; [47-21]
+      (=daikanwa	  . 17944)	; &I-M-17944;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -12854,17 +12920,17 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (->subsumptive
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x306E)	; &GT-22899; [16-78]
-	(=ks-x1001	    . #x6C6E)	; &I-K0-6C6E; [76-78]
-	(=daikanwa	    . 17951)	; &I-M-17951;
-	))
-      (=jis-x0208@1983	  . #x306E)	; &GT-22900; [16-78]
+     ((=jis-x0208@1983	  . #x306E)	; &GT-22900; [16-78]
       (=jis-x0208@1990	  . #x306E)	; &I-J90-306E; [16-78]
       (=gt		  . 22900)	; &I-GT-22900;
       (=gt-pj-1		  . #x306E)	; &I-GT-22900; [16-78]
       (=jef-china3	  . #x57C9)	; &I-JC3-57C9;
       (=ucs@jis		  . #x6EA2)	; &GT-22900;
+      (<-simplified@JP
+       ((=jis-x0208@1978    . #x306E)	; &GT-22899; [16-78]
+	(=ks-x1001	    . #x6C6E)	; &I-K0-6C6E; [76-78]
+	(=daikanwa	    . 17951)	; &I-M-17951;
+	))
       )
      ((=gb2312		  . #x5267)	; &C1-645E; [50-71]
       (=cns11643-1	  . #x645E)	; &I-C1-645E; [68-62]
@@ -13061,14 +13127,22 @@
     (=daikanwa		. 17966)	; &I-M-17966;
     ))
 (define-char
-  '((=>ucs		. #x6EAA)	; 溪
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs		. #x6EAA)	; 溪
+    (=big5		. #xB7CB)	; &I-B-B7CB;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6EAA)	; 溪
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (shinjigen-2	. 4269)
     (=jis-x0208		. #x5E64)	; &GT-22931; [62-68]
     (=ks-x1001		. #x4D22)	; &I-K0-4D22; [45-02]
-    (=big5		. #xB7CB)	; &I-B-B7CB;
     (=gt		. 22931)	; &I-GT-22931;
     (=gt-k		. 10316)	; &I-GT-K10316;
     (=gt-pj-1		. #x5E64)	; &I-GT-22931; [62-68]
@@ -13076,37 +13150,18 @@
     (=ucs@jis		. #x6EAA)	; &GT-22931;
     ))
 (define-char
-  '((morohashi-daikanwa	17967 0 2)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=ucs		. #x6EAA)	; 溪
-    (=gb2312		. #x4F2A)	; &I-G0-4F2A; [47-10]
-    ))
-(define-char
-  '((=>ucs		. #x6EAA)	; 溪
-    (morohashi-daikanwa	17967 0 3)
+  '((<-denotational
+     ((=ucs		  . #x6EAA)	; 溪
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=cns11643-1	. #x6471)	; &C1-6471; [68-81]
-    ))
-(define-char
-  '((morohashi-daikanwa	17967 0 8)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5E64)	; &GT-22931; [62-68]
-      (=ks-x1001	  . #x4D22)	; &I-K0-4D22; [45-02]
-      (=daikanwa	  . 17967)	; &I-M-17967;
+    (->subsumptive
+     ((=gb2312		  . #x4F2A)	; &G0-4F2A; [47-10]
+      (=ucs@unicode	  . #x6EAA)	; &G0-4F2A;
+      )
+     ((=cns11643-1	  . #x6471)	; &C1-6471; [68-81]
       ))
-    (=ucs		. #x6E13)	; 渓
-    (=jis-x0208		. #x374C)	; &I-J90-374C; [23-44]
-    (=gt		. 22516)	; &I-GT-22516;
-    (=gt-pj-1		. #x374C)	; &I-GT-22516; [23-44]
-    (=cbeta		. 00557)	; &I-CB00557;
-    (mojikyo		. 054093)	; &MCS-6000D34D;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -13422,11 +13477,6 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x452E)	; &GT-23029; [37-14]
-      (=ks-x1001	  . #x527C)	; &I-K0-527C; [50-92]
-      (=daikanwa	  . 17990)	; &I-M-17990;
-      ))
     (=gb2312		. #x4467)	; &GT-23030; [36-71]
     (=jis-x0208@1983	. #x452E)	; &I-J83-452E; [37-14]
     (=jis-x0208@1990	. #x452E)	; &I-J90-452E; [37-14]
@@ -13435,6 +13485,11 @@
     (=gt-pj-1		. #x452E)	; &I-GT-23030; [37-14]
     (=jef-china3	. #x70D6)	; &I-JC3-70D6;
     (=ucs@unicode	. #x6EBA)	; &GT-23030;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x452E)	; &GT-23029; [37-14]
+      (=ks-x1001	  . #x527C)	; &I-K0-527C; [50-92]
+      (=daikanwa	  . 17990)	; &I-M-17990;
+      ))
     ))
 (define-char
   '((=>ucs		. #x6EBB)	; 溻
@@ -14516,53 +14571,65 @@
     (=daikanwa		. 18066)	; &I-M-18066;
     ))
 (define-char
-  '((=>ucs		. #x6EDD)	; 滝
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x426D)	; &GT-23937; [34-77]
-      (=ks-x1001	  . #x5669)	; &I-K0-5669; [54-73]
-      (=daikanwa	  . 18671)	; &I-M-18671;
+    (=ucs		. #x6EDD)	; 滝
+    (->subsumptive
+     ((shinjigen-2	  . 4410)
+      (=jis-x0208	  . #x426C)	; &GT-23089; [34-76]
+      (=gt		  . 23089)	; &I-GT-23089;
+      (=gt-pj-1		  . #x426C)	; &I-GT-23089; [34-76]
+      (=daikanwa	  . 18067)	; &I-M-18067;
+      (=ucs@jis		  . #x6EDD)	; &GT-23089;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x426D)	; &GT-23937; [34-77]
+	(=ks-x1001	    . #x5669)	; &I-K0-5669; [54-73]
+	(=daikanwa	    . 18671)	; &I-M-18671;
+	))
+      )
+     ((=cns11643-3	  . #x423D)	; &C3-423D; [34-29]
+      (=ucs@unicode	  . #x6EDD)	; &C3-423D;
       ))
-    (shinjigen-2	. 4410)
-    (=jis-x0208		. #x426C)	; &GT-23089; [34-76]
-    (=gt		. 23089)	; &I-GT-23089;
-    (=gt-pj-1		. #x426C)	; &I-GT-23089; [34-76]
-    (=daikanwa		. 18067)	; &I-M-18067;
-    (=ucs@jis		. #x6EDD)	; &GT-23089;
     ))
 (define-char
-  '((morohashi-daikanwa	18067 0 0)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=ucs		. #x6EDD)	; 滝
-    (=cns11643-3	. #x423D)	; &I-C3-423D; [34-29]
+  '((ideographic-radical . 85)	; ⽔
+    (=ucs		. #x6EDE)	; 滞
+    (<-simplified@ucs
+     ((=ucs		  . #x6EEF)	; 滯
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6EDE)	; 滞
+  '((<-denotational
+     ((=ucs		  . #x6EDE)	; 滞
+      ))
     (morohashi-daikanwa	18067 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6EEF)	; 滯
-      (=jis-x0208	  . #x5E7C)	; &I-J90-5E7C; [62-92]
-      ))
     (=jis-x0208		. #x425A)	; &GT-23018; [34-58]
     (=gt		. 23018)	; &I-GT-23018;
     (=gt-pj-1		. #x425A)	; &I-GT-23018; [34-58]
     (=ucs@jis		. #x6EDE)	; &GT-23018;
     (mojikyo		. 050259)	; &MCS-6000C453;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x6EEF)	; 滯
+      (=jis-x0208	  . #x5E7C)	; &I-J90-5E7C; [62-92]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	18067 1 5)
+  '((<-denotational
+     ((=ucs		  . #x6EDE)	; 滞
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs		. #x6EDE)	; 滞
-    (=gb2312		. #x564D)	; &I-G0-564D; [54-45]
+    (=gb2312		. #x564D)	; &G0-564D; [54-45]
+    (=ucs@unicode	. #x6EDE)	; &G0-564D;
+    (<-simplified@CN
+     ((=ucs		  . #x6EEF)	; 滯
+      (=gb12345		  . #x564D)	; 滯 [54-45]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -14584,6 +14651,11 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
+    (=jis-x0208		. #x3441)	; &GT-22918; [20-33]
+    (=gt		. 22918)	; &I-GT-22918;
+    (=gt-pj-1		. #x3441)	; &I-GT-22918; [20-33]
+    (=ucs@jis		. #x6F22)	; &GT-22918;
+    (mojikyo		. 050260)	; &MCS-6000C454;
     (<-simplified@JP/Jouyou
      ((=ucs		  . #xFA47)	; 漢
       (=jis-x0213-1-2000  . #x7725)	; &I-JX1-7725; [87-05]
@@ -14591,11 +14663,6 @@
       ))
     (<-simplified@JP/Jouyou*sources
      daikanwa JP/Jouyou)
-    (=jis-x0208		. #x3441)	; &GT-22918; [20-33]
-    (=gt		. 22918)	; &I-GT-22918;
-    (=gt-pj-1		. #x3441)	; &I-GT-22918; [20-33]
-    (=ucs@jis		. #x6F22)	; &GT-22918;
-    (mojikyo		. 050260)	; &MCS-6000C454;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -15987,11 +16054,6 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4E7A)	; &M-18155; [46-90]
-      (=ks-x1001	  . #x557E)	; &I-K0-557E; [53-94]
-      (=daikanwa	  . 18155)	; &I-M-18155;
-      ))
     (=jis-x0208@1983	. #x4E7A)	; &GT-23087; [46-90]
     (=jis-x0208@1990	. #x4E7A)	; &I-J90-4E7A; [46-90]
     (=gb12345		. #x4130)	; &GT-23087; [33-16]
@@ -16000,6 +16062,11 @@
     (=gt-pj-1		. #x4E7A)	; &I-GT-23087; [46-90]
     (=jef-china3	. #x70DC)	; &I-JC3-70DC;
     (=ucs@unicode	. #x6F23)	; &GT-23087;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x4E7A)	; &M-18155; [46-90]
+      (=ks-x1001	  . #x557E)	; &I-K0-557E; [53-94]
+      (=daikanwa	  . 18155)	; &I-M-18155;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -17374,10 +17441,6 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5F2A)	; &GT-23401; [63-10]
-      (=daikanwa	  . 18240)	; &I-M-18240;
-      ))
     (shinjigen-2	. 4467)
     (=ucs		. #x6F5C)	; 潜
     (=jis-x0208		. #x4078)	; &I-J90-4078; [32-88]
@@ -17386,6 +17449,10 @@
     (=gt		. 23402)	; &I-GT-23402;
     (=gt-pj-1		. #x4078)	; &I-GT-23402; [32-88]
     (=daikanwa		. 18241)	; &I-M-18241;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5F2A)	; &GT-23401; [63-10]
+      (=daikanwa	  . 18240)	; &I-M-18240;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -17552,10 +17619,6 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x3442)	; &CB00589; [20-34]
-      (=cns11643-3	  . #x4C7C)	; &I-C3-4C7C; [44-92]
-      ))
     (=ucs		. #x6F97)	; 澗
     (=jis-x0208@1983	. #x3442)	; &I-J83-3442; [20-34]
     (=ks-x1001		. #x4A55)	; &I-K0-4A55; [42-53]
@@ -17566,6 +17629,10 @@
     (=gt		. 23319)	; &I-GT-23319;
     (=gt-pj-1		. #x3442)	; &I-GT-23319; [20-34]
     (=jef-china3	. #x57A6)	; &I-JC3-57A6;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x3442)	; &CB00589; [20-34]
+      (=cns11643-3	  . #x4C7C)	; &I-C3-4C7C; [44-92]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -21274,69 +21341,79 @@
   '((<-denotational
      ((=ucs		  . #x701E)	; 瀞
       ))
-    (=>ucs@cns		. #x2F914)	; 瀞
+    (=>ucs@cns		. #x2F914)	; &C4-565D;
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
+    (=daikanwa		. 18520)	; &M-18520;
+    (=jef-china3	. #x57B6)	; &I-JC3-57B6;
     (<-vulgar
      ((=jis-x0208@1978	  . #x4654)	; &M-18659; [38-52]
       (=ks-x1001	  . #x6F67)	; &I-K0-6F67; [79-71]
       (=daikanwa	  . 18659)	; &I-M-18659;
       ))
     (<-vulgar*sources
-     zhengzi-tong daikanwa)
-    (=daikanwa		. 18520)	; &M-18520;
-    (=jef-china3	. #x57B6)	; &I-JC3-57B6;
+     zhengzitong daikanwa)
     ))
 (define-char
   '((<-denotational
      ((=ucs		  . #x701E)	; 瀞
       ))
-    (=>ucs@cns		. #x2F914)	; 瀞
+    (=>ucs*		. #x701E)	; 瀞
+    (=>ucs@gb		. #x701E)	; &GT-23701;
+    (=>ucs@jis		. #x701E)	; &GT-23701;
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
+    (=ucs		. #x2F914)	; 瀞
     (->subsumptive
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x4654)	; &M-18659; [38-52]
-	(=ks-x1001	    . #x6F67)	; &I-K0-6F67; [79-71]
-	(=daikanwa	    . 18659)	; &I-M-18659;
-	))
-      (=jis-x0208@1983	  . #x4654)	; &GT-23701; [38-52]
+     ((=jis-x0208@1983	  . #x4654)	; &GT-23701; [38-52]
       (=jis-x0208@1990	  . #x4654)	; &I-J90-4654; [38-52]
       (=gt		  . 23701)	; &I-GT-23701;
       (=gt-pj-1		  . #x4654)	; &I-GT-23701; [38-52]
       (=jef-china3	  . #x70D8)	; &I-JC3-70D8;
       (=ucs@unicode	  . #x701E)	; &GT-23701;
+      (<-simplified@JP
+       ((=jis-x0208@1978    . #x4654)	; &M-18659; [38-52]
+	(=ks-x1001	    . #x6F67)	; &I-K0-6F67; [79-71]
+	(=daikanwa	    . 18659)	; &I-M-18659;
+	))
       )
-     ((=>ucs*		  . #x701E)	; 瀞
-      (=>ucs@gb		  . #x701E)	; &GT-23701;
-      (=>ucs@jis	  . #x701E)	; &GT-23701;
-      (=ucs		  . #x2F914)	; 瀞
-      (=cns11643-4	  . #x565D)	; &I-C4-565D; [54-61]
+     ((=cns11643-4	  . #x565D)	; &C4-565D; [54-61]
+      (=ucs@iso		  . #x2F914)	; &C4-565D;
       ))
     ))
 (define-char
-  '((=>ucs		. #x6FEB)	; æ¿«
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x6FEB)	; æ¿«
+    (=big5		. #xC0DD)	; &I-B-C0DD;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6FEB)	; æ¿«
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=jis-x0208		. #x4D74)	; &GT-23755; [45-84]
     (=ks-x1001		. #x553D)	; &I-K0-553D; [53-29]
     (=cns11643-1	. #x7428)	; &I-C1-7428; [84-08]
-    (=big5		. #xC0DD)	; &I-B-C0DD;
     (=gt		. 23755)	; &I-GT-23755;
     (=gt-pj-1		. #x4D74)	; &I-GT-23755; [45-84]
     (=daikanwa		. 18521)	; &I-M-18521;
     (=ucs@jis		. #x6FEB)	; &GT-23755;
     ))
 (define-char
-  '((morohashi-daikanwa	18521 0 1)
+  '((<-denotational
+     ((=ucs		  . #x6FEB)	; æ¿«
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x6FEB)	; æ¿«
-    (=gb12345		. #x4044)	; æ¿« [32-36]
+    (=gb12345		. #x4044)	; &UU+6FEB; [32-36]
+    (=ucs@unicode	. #x6FEB)	; &UU+6FEB;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -21727,11 +21804,11 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
+    (=jis-x0212		. #x4927)	; &JSP-4927; [41-07]
+    (=ucs@unicode	. #x6FF9)	; &JSP-4927;
     (<-simplified@JP
      ((=jis-x0213-1-2000  . #x7739)	; &JX1-7739; [87-25]
       ))
-    (=jis-x0212		. #x4927)	; &JSP-4927; [41-07]
-    (=ucs@unicode	. #x6FF9)	; &JSP-4927;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -22089,18 +22166,18 @@
     (total-strokes	 . 10)
     (=ucs		. #x6D9C)	; 涜
     (->subsumptive
-     ((<-simplified@JP
+     ((=jis-x0208@1983	  . #x4642)	; &GT-22395; [38-34]
+      (=jis-x0208@1990	  . #x4642)	; &I-J90-4642; [38-34]
+      (=gt		  . 22395)	; &I-GT-22395;
+      (=gt-pj-1		  . #x4642)	; &I-GT-22395; [38-34]
+      (=ucs@unicode	  . #x6D9C)	; &GT-22395;
+      (<-simplified@JP
        ((=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-2000  . #x773D)	; &I-JX1-773D; [87-29]
 	(=daikanwa	    . 18591)	; &I-M-18591;
 	))
-      (=jis-x0208@1983	  . #x4642)	; &GT-22395; [38-34]
-      (=jis-x0208@1990	  . #x4642)	; &I-J90-4642; [38-34]
-      (=gt		  . 22395)	; &I-GT-22395;
-      (=gt-pj-1		  . #x4642)	; &I-GT-22395; [38-34]
-      (=ucs@unicode	  . #x6D9C)	; &GT-22395;
       )
      ((=jef-china3	  . #x70D7)	; &JC3-70D7;
       ))
@@ -22788,30 +22865,28 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x494E)	; &M-18636; [41-46]
-      (=ks-x1001	  . #x5E35)	; &I-K0-5E35; [62-21]
-      (=daikanwa	  . 18636)	; &I-M-18636;
-      ))
     (=jis-x0208@1983	. #x494E)	; &GT-23988; [41-46]
     (=jis-x0208@1990	. #x494E)	; &I-J90-494E; [41-46]
     (=gt		. 23988)	; &I-GT-23988;
     (=gt-pj-1		. #x494E)	; &I-GT-23988; [41-46]
     (=jef-china3	. #x70DB)	; &I-JC3-70DB;
     (=ucs@jis		. #x7015)	; &GT-23988;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x494E)	; &M-18636; [41-46]
+      (=ks-x1001	  . #x5E35)	; &I-K0-5E35; [62-21]
+      (=daikanwa	  . 18636)	; &I-M-18636;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (=ucs		. #x7016)	; 瀖
+    (=big5		. #xF25F)	; &I-B-F25F;
     (->subsumptive
-     ((=big5		  . #xF25F)	; &B-F25F;
-      (->subsumptive
-       ((=daikanwa	    . 18638)	; &M-18638;
-	)
-       ((=ucs@unicode	    . #x7016)	; &UU+7016;
-	))
+     ((=daikanwa	  . 18638)	; &M-18638;
+      )
+     ((=ucs@unicode	  . #x7016)	; &UU+7016;
       )
      ((=cns11643-2	  . #x656A)	; &C2-656A; [69-74]
       (=ucs@cns		  . #x7016)	; &C2-656A;
@@ -23174,10 +23249,6 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4375)	; &M-18670; [35-85]
-      (=daikanwa	  . 18670)	; &I-M-18670;
-      ))
     (=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]
@@ -23186,6 +23257,10 @@
     (=jef-china3	. #x70D5)	; &I-JC3-70D5;
     (=ucs@unicode	. #x7026)	; &GT-23825;
     (mojikyo		. 054231)	; &MCS-6000D3D7;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x4375)	; &M-18670; [35-85]
+      (=daikanwa	  . 18670)	; &I-M-18670;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -23251,18 +23326,18 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x566E)	; &M-18672; [54-78]
-      (=cns11643-1	  . #x7842)	; &I-C1-7842; [88-34]
-      (=jis-x0213-1-2000  . #x773E)	; &I-JX1-773E; [87-30]
-      (=daikanwa	  . 18672)	; &I-M-18672;
-      ))
     (=ucs		. #x702C)	; 瀬
     (=jis-x0208		. #x4025)	; &I-J90-4025; [32-05]
     (=cns11643-3	. #x5A53)	; &I-C3-5A53; [58-51]
     (=gt		. 23931)	; &I-GT-23931;
     (=gt-pj-1		. #x4025)	; &I-GT-23931; [32-05]
     (mojikyo		. 050262)	; &MCS-6000C456;
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x566E)	; &M-18672; [54-78]
+      (=cns11643-1	  . #x7842)	; &I-C1-7842; [88-34]
+      (=jis-x0213-1-2000  . #x773E)	; &I-JX1-773E; [87-30]
+      (=daikanwa	  . 18672)	; &I-M-18672;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el
index 6b248b0..87930b1 100644
--- a/lisp/utf-2000/Ideograph-R086-Fire.el
+++ b/lisp/utf-2000/Ideograph-R086-Fire.el
@@ -24,16 +24,6 @@
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-formed@component/connect-above
-     ((=ucs		  . #x706B)	; 火
-      ))
-    (<-formed@component/connect-above*sources
-     jiyun zhengzitong daikanwa)
-    (<-s/active
-     ((=ucs		  . #x706B)	; 火
-      ))
-    (<-s/active*sources
-     jiyun daikanwa)
     (=ucs		. #x706C)	; 灬
     (=gb2312		. #x6C61)	; &I-G0-6C61; [76-65]
     (=jis-x0212		. #x4944)	; &I-JSP-4944; [41-36]
@@ -44,6 +34,16 @@
     (=gt-pj-k1		. #x376C)	; 灬 [23-76]
     (=daikanwa		. 18851)	; &I-M-18851;
     (=jef-china3	. #x57CA)	; &I-JC3-57CA;
+    (<-formed@component/connect-above
+     ((=ucs		  . #x706B)	; 火
+      ))
+    (<-formed@component/connect-above*sources
+     jiyun zhengzitong daikanwa)
+    (<-s/active
+     ((=ucs		  . #x706B)	; 火
+      ))
+    (<-s/active*sources
+     jiyun daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -53,10 +53,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA3)	; ⺣
     (<-identical@component/connect-above
      ((=ucs		  . #x706C)	; 灬
       ))
-    (=ucs		. #x2EA3)	; ⺣
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
@@ -89,77 +89,84 @@
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x706B)	; 火
-      )
-     ((=ucs		  . #x513F)	; 儿
-      ))
     (=ucs		. #x706E)	; 灮
-    (=jis-x0212		. #x4945)	; &I-JSP-4945; [41-37]
-    (=jis-x0213-2-2000	. #x6F59)	; &I-JX2-6F59; [79-57]
-    (=daikanwa		. 18854)	; &I-M-18854;
-    (=cbeta		. 00210)	; &I-CB00210;
-    (=jef-china3	. #x57CE)	; &I-JC3-57CE;
-    ))
-(define-char
-  '((=>ucs		. #x706E)	; 灮
-    (morohashi-daikanwa	18854 0 0)
-    (ideographic-radical . 86)	; ⽕
-    (ideographic-strokes . 2)
-    (total-strokes	 . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=cns11643-1	  . #x4556)	; &C1-4556; [37-54]
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=jis-x0208	    . #x3250)	; &GT-24152; [18-48]
+	(=gb2312	    . #x3B70)	; &I-G0-3B70; [27-80]
+	(=ks-x1001	    . #x7B7D)	; &I-K0-7B7D; [91-93]
+	(=daikanwa	    . 18850)	; &I-M-18850;
+	)
+       ((=ucs		    . #x513F)	; 儿
+	))
+      (=jis-x0212	  . #x4945)	; &M-18854; [41-37]
+      (=jis-x0213-2-2000  . #x6F59)	; &I-JX2-6F59; [79-57]
+      (=daikanwa	  . 18854)	; &I-M-18854;
+      (=cbeta		  . 00210)	; &I-CB00210;
+      (=jef-china3	  . #x57CE)	; &I-JC3-57CE;
+      (=ucs@unicode	  . #x706E)	; &M-18854;
       )
-     ((=ucs		  . #x513F)	; 儿
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=cns11643-1	    . #x4556)	; &C1-4556; [37-54]
+	)
+       ((=ucs		    . #x513F)	; 儿
+	))
+      (=cns11643-3	  . #x2428)	; &C3-2428; [04-08]
       ))
-    (=cns11643-3	. #x2428)	; &C3-2428; [04-08]
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
+    (=ucs		. #x706F)	; 灯
+    (<-simplified@ucs
      ((=ucs		  . #x71C8)	; 燈
-      (=jis-x0208	  . #x4575)	; &I-J90-4575; [37-85]
       ))
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x706B)	; 火
-      )
-     ((=ucs		  . #x4E01)	; 丁
-      ))
-    (shinjigen-2	. 4554)
-    (=ucs		. #x706F)	; 灯
-    (=jis-x0208		. #x4574)	; &I-J90-4574; [37-84]
-    (=gb2312		. #x3546)	; &I-G0-3546; [21-38]
-    (=gt		. 24168)	; &I-GT-24168;
-    (=gt-pj-1		. #x4574)	; &I-GT-24168; [37-84]
-    (=daikanwa		. 18855)	; &I-M-18855;
-    (=cbeta		. 04520)	; &I-CB04520;
-    ))
-(define-char
-  '((=>ucs		. #x706F)	; 灯
-    (morohashi-daikanwa	18855 0 0)
-    (ideographic-radical . 86)	; ⽕
-    (ideographic-strokes . 2)
-    (total-strokes	 . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=cns11643-1	  . #x4556)	; &C1-4556; [37-54]
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x3250)	; &GT-24152; [18-48]
+	(=gb2312	    . #x3B70)	; &I-G0-3B70; [27-80]
+	(=ks-x1001	    . #x7B7D)	; &I-K0-7B7D; [91-93]
+	(=daikanwa	    . 18850)	; &I-M-18850;
+	)
+       ((=ucs		    . #x4E01)	; 丁
+	))
+      (shinjigen-2	  . 4554)
+      (=jis-x0208	  . #x4574)	; &GT-24168; [37-84]
+      (=gb2312		  . #x3546)	; &I-G0-3546; [21-38]
+      (=gt		  . 24168)	; &I-GT-24168;
+      (=gt-pj-1		  . #x4574)	; &I-GT-24168; [37-84]
+      (=daikanwa	  . 18855)	; &I-M-18855;
+      (=cbeta		  . 04520)	; &I-CB04520;
+      (=ucs@unicode	  . #x706F)	; &GT-24168;
+      (<-simplified@CN
+       ((=ucs		    . #x71C8)	; 燈
+	(=gb12345	    . #x3546)	; 燈 [21-38]
+	))
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x71C8)	; 燈
+	(=jis-x0208	    . #x4575)	; &I-J90-4575; [37-85]
+	))
       )
-     ((=ucs		  . #x4E01)	; 丁
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=cns11643-1	    . #x4556)	; &C1-4556; [37-54]
+	)
+       ((=ucs		    . #x4E01)	; 丁
+	))
+      (=cns11643-3	  . #x2426)	; &C3-2426; [04-06]
       ))
-    (=cns11643-3	. #x2426)	; &C3-2426; [04-06]
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
@@ -216,14 +223,7 @@
     (=>ucs*		. #x7070)	; 灰
     (=ucs		. #x2F835)	; 灰
     (->subsumptive
-     ((<-vulgar
-       ((=gb2312	    . #x3B52)	; &M-18858; [27-50]
-	(=ks-x1001	    . #x7C69)	; &I-K0-7C69; [92-73]
-	(=daikanwa	    . 18858)	; &I-M-18858;
-	))
-      (<-vulgar*sources
-       zhonghua-dazidian daikanwa)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
 	(=ucs		    . #x2FF8)	; ⿸
 	)
@@ -239,6 +239,13 @@
       (=daikanwa	  . 18859)	; &I-M-18859;
       (=cbeta		  . 01926)	; &I-CB01926;
       (=ucs@jis		  . #x7070)	; &GT-24159;
+      (<-vulgar
+       ((=gb2312	    . #x3B52)	; &M-18858; [27-50]
+	(=ks-x1001	    . #x7C69)	; &I-K0-7C69; [92-73]
+	(=daikanwa	    . 18858)	; &I-M-18858;
+	))
+      (<-vulgar*sources
+       zhonghua-dazidian daikanwa)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
@@ -364,9 +371,6 @@
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (<-simplified@misc
-     ((=big5-cdp	  . #x8BE3)	; &CDP-8BE3;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -377,6 +381,9 @@
       ))
     (=gt-k		. 01443)	; &GT-K01443;
     (=gt-pj-k1		. #x322A)	; &GT-K01443; [18-10]
+    (<-simplified@misc
+     ((=big5-cdp	  . #x8BE3)	; &CDP-8BE3;
+      ))
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
@@ -1016,42 +1023,56 @@
     (=cns11643-3	. #x2970)	; &C3-2970; [09-80]
     ))
 (define-char
-  '((=>ucs		. #x7089)	; 炉
-    (ideographic-radical . 86)	; ⽕
+  '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=daikanwa		. 18902)	; &M-18902;
+    (=ucs		. #x7089)	; 炉
+    (<-simplified@ucs
+     ((=ucs		  . #x7210)	; 爐
+      ))
     ))
 (define-char
-  '((=>ucs		. #x7089)	; 炉
-    (morohashi-daikanwa	18902 0 0)
+  '((<-denotational
+     ((=ucs		  . #x7089)	; 炉
+      ))
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=cns11643-3	. #x2975)	; &C3-2975; [09-85]
+    (->subsumptive
+     ((=daikanwa	  . 18902)	; &M-18902;
+      )
+     ((=cns11643-3	  . #x2975)	; &C3-2975; [09-85]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x7089)	; 炉
-    (morohashi-daikanwa	18902 0 2)
+  '((<-denotational
+     ((=ucs		  . #x7089)	; 炉
+      ))
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
+    (=gb2312		. #x422F)	; &G0-422F; [34-15]
+    (=ucs@unicode	. #x7089)	; &G0-422F;
+    (<-simplified@CN
      ((=ucs		  . #x7210)	; 爐
-      (=jis-x0208	  . #x6024)	; &I-J90-6024; [64-04]
+      (=gb12345		  . #x422F)	; 爐 [34-15]
       ))
-    (=jis-x0208		. #x4F27)	; &GT-24239; [47-07]
-    (=gt		. 24239)	; &I-GT-24239;
-    (=gt-pj-1		. #x4F27)	; &I-GT-24239; [47-07]
-    (=ucs@jis		. #x7089)	; &GT-24239;
     ))
 (define-char
-  '((morohashi-daikanwa	18902 0 4)
+  '((<-denotational
+     ((=ucs		  . #x7089)	; 炉
+      ))
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x7089)	; 炉
-    (=gb2312		. #x422F)	; &I-G0-422F; [34-15]
+    (=jis-x0208		. #x4F27)	; &GT-24239; [47-07]
+    (=gt		. 24239)	; &I-GT-24239;
+    (=gt-pj-1		. #x4F27)	; &I-GT-24239; [47-07]
+    (=ucs@jis		. #x7089)	; &GT-24239;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x7210)	; 爐
+      (=jis-x0208	  . #x6024)	; &I-J90-6024; [64-04]
+      ))
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
@@ -1847,6 +1868,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x70AD)	; 炭
+    (=big5		. #xACB4)	; &I-B-ACB4;
     ))
 (define-char
   '((<-denotational
@@ -1856,7 +1878,6 @@
      ((shinjigen-2	  . 4581)
       (=jis-x0208	  . #x433A)	; &GT-24283; [35-26]
       (=ks-x1001	  . #x7729)	; &I-K0-7729; [87-09]
-      (=big5		  . #xACB4)	; &I-B-ACB4;
       (=gt		  . 24283)	; &I-GT-24283;
       (=gt-k		  . 05138)	; &I-GT-K05138;
       (=gt-pj-1		  . #x433A)	; &I-GT-24283; [35-26]
@@ -1870,8 +1891,13 @@
   '((<-denotational
      ((=ucs		  . #x70AD)	; 炭
       ))
+    (=>ucs*		. #x70AD)	; 炭
+    (=ucs		. #x2F91A)	; 炭
     (->subsumptive
      ((morohashi-daikanwa	18953 1)
+      (=gb2312		  . #x4C3F)	; &G0-4C3F; [44-31]
+      (=ucs@unicode	  . #x70AD)	; &G0-4C3F;
+      (mojikyo		  . 050263)	; &MCS-6000C457;
       (<-vulgar
        ((=jis-x0208	    . #x433A)	; &GT-24283; [35-26]
 	(=ks-x1001	    . #x7729)	; &I-K0-7729; [87-09]
@@ -1879,35 +1905,28 @@
 	))
       (<-vulgar*sources
        daikanwa)
-      (=gb2312		  . #x4C3F)	; &G0-4C3F; [44-31]
-      (=ucs@unicode	  . #x70AD)	; &G0-4C3F;
-      (mojikyo		  . 050263)	; &MCS-6000C457;
       )
-     ((=>ucs*		  . #x70AD)	; 炭
-      (=ucs		  . #x2F91A)	; 炭
-      (=cns11643-6	  . #x3248)	; &I-C6-3248; [18-40]
+     ((=cns11643-6	  . #x3248)	; &C6-3248; [18-40]
+      (=ucs@iso		  . #x2F91A)	; &C6-3248;
       ))
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (shinjigen-2	. 4584)
     (=ucs		. #x70AE)	; 炮
-    (=jis-x0208		. #x5F5C)	; &I-J90-5F5C; [63-60]
-    (=gb2312		. #x455A)	; &I-G0-455A; [37-58]
-    (=big5		. #xACB6)	; &I-B-ACB6;
-    (=gt		. 24298)	; &I-GT-24298;
-    (=gt-pj-1		. #x5F5C)	; &I-GT-24298; [63-60]
-    (=daikanwa		. 18954)	; &I-M-18954;
-    ))
-(define-char
-  '((=>ucs		. #x70AE)	; 炮
-    (morohashi-daikanwa	18954 0 0)
-    (ideographic-radical . 86)	; ⽕
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (=cns11643-1	. #x5239)	; &C1-5239; [50-25]
+    (->subsumptive
+     ((shinjigen-2	  . 4584)
+      (=jis-x0208	  . #x5F5C)	; &GT-24298; [63-60]
+      (=gb2312		  . #x455A)	; &I-G0-455A; [37-58]
+      (=big5		  . #xACB6)	; &I-B-ACB6;
+      (=gt		  . 24298)	; &I-GT-24298;
+      (=gt-pj-1		  . #x5F5C)	; &I-GT-24298; [63-60]
+      (=daikanwa	  . 18954)	; &I-M-18954;
+      (=ucs@unicode	  . #x70AE)	; &GT-24298;
+      )
+     ((=cns11643-1	  . #x5239)	; &C1-5239; [50-25]
+      ))
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
@@ -2334,10 +2353,6 @@
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9EDE)	; 點
-      (=jis-x0208	  . #x735A)	; &I-J90-735A; [83-58]
-      ))
     (shinjigen-2	. 9825)
     (=ucs		. #x70B9)	; 点
     (=jis-x0208		. #x4540)	; &I-J90-4540; [37-32]
@@ -2347,28 +2362,45 @@
     (=gt		. 24287)	; &I-GT-24287;
     (=gt-pj-1		. #x4540)	; &I-GT-24287; [37-32]
     (=daikanwa		. 18980)	; &I-M-18980;
+    (<-simplified@CN
+     ((=ucs		  . #x9EDE)	; 點
+      (=gb12345		  . #x3563)	; 點 [21-67]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x9EDE)	; 點
+      (=jis-x0208	  . #x735A)	; &I-J90-735A; [83-58]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x9EDE)	; 點
+      ))
     ))
 (define-char
-  '((=>ucs		. #x241C7)	; 𤇇
-    (ideographic-radical . 86)	; ⽕
+  '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=daikanwa		. 18981)	; &M-18981;
+    (=ucs		. #x241C7)	; 𤇇
     ))
 (define-char
-  '((=>ucs		. #x241C7)	; 𤇇
-    (morohashi-daikanwa	18981 0 0)
+  '((<-denotational
+     ((=ucs		  . #x241C7)	; 𤇇
+      ))
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=cns11643-6	. #x3246)	; &C6-3246; [18-38]
+    (->subsumptive
+     ((=daikanwa	  . 18981)	; &M-18981;
+      )
+     ((=cns11643-6	  . #x3246)	; &C6-3246; [18-38]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	18981 0 1)
+  '((<-denotational
+     ((=ucs		  . #x241C7)	; 𤇇
+      ))
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x241C7)	; 𤇇
+    (=ucs@iso		. #x241C7)	; &U-000241C7;
     ))
 (define-char
   '((<-denotational
@@ -2378,11 +2410,6 @@
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x602A)	; &GT-25270; [64-10]
-      (=ks-x1001	  . #x6A53)	; &I-K0-6A53; [74-51]
-      (=daikanwa	  . 19686)	; &I-M-19686;
-      ))
     (shinjigen-1	. 4702)
     (shinjigen-2	. 4702)
     (=ucs		. #x70BA)	; 為
@@ -2393,6 +2420,11 @@
     (=gt-k		. 05018)	; &I-GT-K05018;
     (=gt-pj-1		. #x3059)	; &I-GT-24243; [16-57]
     (mojikyo		. 050264)	; &MCS-6000C458;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x602A)	; &GT-25270; [64-10]
+      (=ks-x1001	  . #x6A53)	; &I-K0-6A53; [74-51]
+      (=daikanwa	  . 19686)	; &I-M-19686;
+      ))
     ))
 (define-char
   '((ideographic-radical@simplified . 86)	; ⽕
@@ -4348,67 +4380,66 @@
     (=cns11643-6	. #x4153)	; &I-C6-4153; [33-51]
     ))
 (define-char
-  '((=>ucs		. #x2425F)	; 𤉟
-    (ideographic-radical . 86)	; ⽕
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (hanyu-dazidian	3 2204 15)
-    (=cns11643-5	. #x3345)	; &M-19090; [19-37]
-    (=daikanwa		. 19090)	; &I-M-19090;
-    (=hanziku-6		. #xC5C2)	; &I-HZK06-C5C2;
-    ))
-(define-char
-  '((morohashi-daikanwa	19090 0 1)
-    (ideographic-radical . 86)	; ⽕
+  '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x2425F)	; 𤉟
+    (->subsumptive
+     ((=daikanwa	  . 19090)	; &M-19090;
+      )
+     ((=cns11643-5	  . #x3345)	; &C5-3345; [19-37]
+      )
+     ((hanyu-dazidian	  3 2204 15)
+      (=hanziku-6	  . #xC5C2)	; &HZK06-C5C2;
+      )
+     ((=ucs@iso		  . #x2425F)	; &U-0002425F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (hanyu-dazidian	3 2204 9)
     (=ucs		. #x2424A)	; 𤉊
-    (=cns11643-6	. #x4149)	; &I-C6-4149; [33-41]
-    (=daikanwa		. 19091)	; &I-M-19091;
-    (=hanziku-6		. #xC5BC)	; &I-HZK06-C5BC;
+    (->subsumptive
+     ((hanyu-dazidian	  3 2204 9)
+      (=daikanwa	  . 19091)	; &M-19091;
+      (=hanziku-6	  . #xC5BC)	; &I-HZK06-C5BC;
+      (=ucs@iso		  . #x2424A)	; &M-19091;
+      )
+     ((=cns11643-6	  . #x4149)	; &C6-4149; [33-41]
+      ))
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x710F)	; 焏
-    (=jis-x0212		. #x4969)	; &I-JSP-4969; [41-73]
-    (=cns11643-3	. #x3733)	; &I-C3-3733; [23-19]
-    (=jis-x0213-1-2000	. #x774C)	; &I-JX1-774C; [87-44]
-    (=daikanwa		. 19092)	; &I-M-19092;
-    (=jef-china3	. #x58A6)	; &I-JC3-58A6;
-    ))
-(define-char
-  '((=>ucs		. #x3DC0)	; 㷀
-    (ideographic-radical . 86)	; ⽕
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=daikanwa		. 19097)	; &M-19097;
-    ))
-(define-char
-  '((=>ucs		. #x3DC0)	; 㷀
-    (morohashi-daikanwa	19097 0 0)
-    (ideographic-radical . 86)	; ⽕
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=cns11643-4	. #x3277)	; &C4-3277; [18-87]
+    (->subsumptive
+     ((=jis-x0212	  . #x4969)	; &M-19092; [41-73]
+      (=cns11643-3	  . #x3733)	; &I-C3-3733; [23-19]
+      (=jis-x0213-1-2000  . #x774C)	; &I-JX1-774C; [87-44]
+      (=daikanwa	  . 19092)	; &I-M-19092;
+      (=ucs@jis		  . #x710F)	; &M-19092;
+      )
+     ((=jef-china3	  . #x58A6)	; &JC3-58A6;
+      (=ucs@unicode	  . #x710F)	; &JC3-58A6;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	19097 0 1)
-    (ideographic-radical . 86)	; ⽕
+  '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x3DC0)	; 㷀
-    (=jis-x0213-2-2000	. #x6F70)	; &I-JX2-6F70; [79-80]
-    (=cbeta		. 00671)	; &I-CB00671;
-    (mojikyo		. 019097)	; &MCS-60004A99;
+    (->subsumptive
+     ((=daikanwa	  . 19097)	; &M-19097;
+      )
+     ((=cns11643-4	  . #x3277)	; &C4-3277; [18-87]
+      )
+     ((=jis-x0213-2-2000  . #x6F70)	; &CB00671; [79-80]
+      (=cbeta		  . 00671)	; &I-CB00671;
+      (=ucs@unicode	  . #x3DC0)	; &CB00671;
+      (mojikyo		  . 019097)	; &MCS-60004A99;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -4421,10 +4452,6 @@
     (ideographic-radical@daikanwa=19098 . 86)	; ⽕
     (ideographic-strokes@daikanwa=19098 . 7)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9ED1)	; 黑
-      (=jis-x0213-1-2000  . #x7E72)	; &I-JX1-7E72; [94-82]
-      ))
     (shinjigen-1	. 9817)
     (shinjigen-2	. 9817)
     (=ucs		. #x9ED2)	; 黒
@@ -4433,6 +4460,10 @@
     (=gt		. 65517)	; &I-GT-65517;
     (=gt-k		. 07761)	; &I-GT-K07761;
     (=gt-pj-1		. #x3975)	; &I-GT-65517; [25-85]
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x9ED1)	; 黑
+      (=jis-x0213-1-2000  . #x7E72)	; &I-JX1-7E72; [94-82]
+      ))
     (->subsumptive
      ((ideographic-radical . 86)	; ⽕
       (ideographic-strokes . 7)
@@ -5288,19 +5319,19 @@
     (->subsumptive
      ((=ucs@unicode	  . #x7114)	; &UU+7114;
       )
-     ((<-simplified@JP
+     ((=jis-x0208@1983	  . #x316B)	; &GT-24380; [17-75]
+      (=jis-x0208@1990	  . #x316B)	; &I-J90-316B; [17-75]
+      (=gt		  . 24380)	; &I-GT-24380;
+      (=gt-pj-1		  . #x316B)	; &I-GT-24380; [17-75]
+      (=jef-china3	  . #x70E0)	; &I-JC3-70E0;
+      (=ucs@jis		  . #x7114)	; &GT-24380;
+      (<-simplified@JP
        ((=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-2000  . #x7751)	; &I-JX1-7751; [87-49]
 	(=daikanwa	    . 19141)	; &I-M-19141;
 	))
-      (=jis-x0208@1983	  . #x316B)	; &GT-24380; [17-75]
-      (=jis-x0208@1990	  . #x316B)	; &I-J90-316B; [17-75]
-      (=gt		  . 24380)	; &I-GT-24380;
-      (=gt-pj-1		  . #x316B)	; &I-GT-24380; [17-75]
-      (=jef-china3	  . #x70E0)	; &I-JC3-70E0;
-      (=ucs@jis		  . #x7114)	; &GT-24380;
       ))
     ))
 (define-char
@@ -5418,81 +5449,75 @@
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (hanyu-dazidian	3 2208 3)
     (=ucs		. #x2426B)	; 𤉫
-    (=cns11643-6	. #x4A75)	; &I-C6-4A75; [42-85]
-    (=daikanwa		. 19147)	; &I-M-19147;
-    (=hanziku-6		. #xC677)	; &I-HZK06-C677;
+    (->subsumptive
+     ((hanyu-dazidian	  3 2208 3)
+      (=daikanwa	  . 19147)	; &M-19147;
+      (=hanziku-6	  . #xC677)	; &I-HZK06-C677;
+      (=ucs@iso		  . #x2426B)	; &M-19147;
+      )
+     ((=cns11643-6	  . #x4A75)	; &C6-4A75; [42-85]
+      ))
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x7135)	; 焵
-    (=daikanwa		. 19148)	; &I-M-19148;
-    ))
-(define-char
-  '((=>ucs		. #x7135)	; 焵
-    (morohashi-daikanwa	19148 0 0)
-    (ideographic-radical . 86)	; ⽕
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=cns11643-3	. #x3C71)	; &C3-3C71; [28-81]
+    (->subsumptive
+     ((=daikanwa	  . 19148)	; &M-19148;
+      (=ucs@unicode	  . #x7135)	; &M-19148;
+      )
+     ((=cns11643-3	  . #x3C71)	; &C3-3C71; [28-81]
+      ))
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (shinjigen-2	. 4613)
     (=ucs		. #x7136)	; 然
-    (=jis-x0208		. #x4133)	; &I-J90-4133; [33-19]
-    (=gb2312		. #x483B)	; &I-G0-483B; [40-27]
-    (=ks-x1001		. #x6654)	; &I-K0-6654; [70-52]
-    (=big5		. #xB54D)	; &I-B-B54D;
-    (=gt		. 24509)	; &I-GT-24509;
-    (=gt-k		. 09084)	; &I-GT-K09084;
-    (=gt-pj-1		. #x4133)	; &I-GT-24509; [33-19]
-    (=daikanwa		. 19149)	; &I-M-19149;
-    ))
-(define-char
-  '((=>ucs		. #x7136)	; 然
-    (morohashi-daikanwa	19149 0 1)
-    (ideographic-radical . 86)	; ⽕
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=cns11643-1	. #x6053)	; &C1-6053; [64-51]
-    ))
-(define-char
-  '((=>ucs		. #x2426C)	; 𤉬
-    (ideographic-radical . 86)	; ⽕
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=daikanwa		. 19150)	; &M-19150;
+    (->subsumptive
+     ((shinjigen-1	  . 4612)
+      (shinjigen-2	  . 4613)
+      (=jis-x0208	  . #x4133)	; &GT-24509; [33-19]
+      (=gb2312		  . #x483B)	; &I-G0-483B; [40-27]
+      (=ks-x1001	  . #x6654)	; &I-K0-6654; [70-52]
+      (=big5		  . #xB54D)	; &I-B-B54D;
+      (=gt		  . 24509)	; &I-GT-24509;
+      (=gt-k		  . 09084)	; &I-GT-K09084;
+      (=gt-pj-1		  . #x4133)	; &I-GT-24509; [33-19]
+      (=daikanwa	  . 19149)	; &I-M-19149;
+      (=ucs@unicode	  . #x7136)	; &GT-24509;
+      )
+     ((=cns11643-1	  . #x6053)	; &C1-6053; [64-51]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	19150 0 0)
-    (ideographic-radical . 86)	; ⽕
+  '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (hanyu-dazidian	3 2210 15)
     (=ucs		. #x2426C)	; 𤉬
-    (=hanziku-6		. #xC9A6)	; &I-HZK06-C9A6;
-    ))
-(define-char
-  '((=>ucs		. #x2426C)	; 𤉬
-    (morohashi-daikanwa	19150 0 1)
-    (ideographic-radical . 86)	; ⽕
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=cns11643-4	. #x3866)	; &C4-3866; [24-70]
+    (->subsumptive
+     ((=daikanwa	  . 19150)	; &M-19150;
+      )
+     ((hanyu-dazidian	  3 2210 15)
+      (=hanziku-6	  . #xC9A6)	; &HZK06-C9A6;
+      (=ucs@iso		  . #x2426C)	; &HZK06-C9A6;
+      )
+     ((=cns11643-4	  . #x3866)	; &C4-3866; [24-70]
+      ))
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x7137)	; 焷
-    (=cns11643-3	. #x3C73)	; &I-C3-3C73; [28-83]
-    (=daikanwa		. 19151)	; &I-M-19151;
+    (->subsumptive
+     ((=daikanwa	  . 19151)	; &M-19151;
+      (=ucs@unicode	  . #x7137)	; &M-19151;
+      )
+     ((=cns11643-3	  . #x3C73)	; &C3-3C73; [28-83]
+      ))
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
@@ -5716,13 +5741,6 @@
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA48)	; 煮
-      (=jis-x0213-1-2000  . #x7755)	; &I-JX1-7755; [87-53]
-      (=daikanwa	  . 19188)	; &I-M-19188;
-      ))
-    (<-simplified@JP/Jouyou*sources
-     daikanwa JP/Jouyou)
     (=jis-x0208		. #x3C51)	; &GT-24489; [28-49]
     (=gb2312		. #x5673)	; &I-G0-5673; [54-83]
     (=cns11643-1	. #x6054)	; &I-C1-6054; [64-52]
@@ -5731,6 +5749,13 @@
     (=gt-pj-1		. #x3C51)	; &I-GT-24489; [28-49]
     (=ucs@unicode	. #x716E)	; &GT-24489;
     (mojikyo		. 050265)	; &MCS-6000C459;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA48)	; 煮
+      (=jis-x0213-1-2000  . #x7755)	; &I-JX1-7755; [87-53]
+      (=daikanwa	  . 19188)	; &I-M-19188;
+      ))
+    (<-simplified@JP/Jouyou*sources
+     daikanwa JP/Jouyou)
     ))
 (define-char
   '((=>ucs		. #x2F91B)	; 𠔥
@@ -5754,17 +5779,17 @@
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5F76)	; &GT-24883; [63-86]
-      (=ks-x1001	  . #x6140)	; &I-K0-6140; [65-32]
-      (=daikanwa	  . 19420)	; &I-M-19420;
-      ))
     (shinjigen-1	. 4609)
     (=ucs		. #x713C)	; 焼
     (=jis-x0208		. #x3E46)	; &I-J90-3E46; [30-38]
     (=gt		. 24502)	; &I-GT-24502;
     (=gt-pj-1		. #x3E46)	; &I-GT-24502; [30-38]
     (mojikyo		. 050266)	; &MCS-6000C45A;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5F76)	; &GT-24883; [63-86]
+      (=ks-x1001	  . #x6140)	; &I-K0-6140; [65-32]
+      (=daikanwa	  . 19420)	; &I-M-19420;
+      ))
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
@@ -6216,12 +6241,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (->subsumptive
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x4079)	; &M-19184; [32-89]
-	(=ks-x1001	    . #x6F21)	; &I-K0-6F21; [79-01]
-	(=daikanwa	    . 19184)	; &I-M-19184;
-	))
-      (=gb2312		  . #x3C65)	; &GT-24620; [28-69]
+     ((=gb2312		  . #x3C65)	; &GT-24620; [28-69]
       (=jis-x0208@1983	  . #x4079)	; &I-J83-4079; [32-89]
       (=jis-x0208@1990	  . #x4079)	; &I-J90-4079; [32-89]
       (=big5		  . #xB7CE)	; &I-B-B7CE;
@@ -6230,6 +6250,11 @@
       (=gt-pj-1		  . #x4079)	; &I-GT-24620; [32-89]
       (=jef-china3	  . #x58AB)	; &I-JC3-58AB;
       (=ucs@unicode	  . #x714E)	; &GT-24620;
+      (<-simplified@JP/misc
+       ((=jis-x0208@1978    . #x4079)	; &M-19184; [32-89]
+	(=ks-x1001	    . #x6F21)	; &I-K0-6F21; [79-01]
+	(=daikanwa	    . 19184)	; &I-M-19184;
+	))
       )
      ((=cns11643-1	  . #x6474)	; &C1-6474; [68-84]
       ))
@@ -7346,10 +7371,10 @@
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 19248)	; &M-19248;
     (<-unknown
      ((=ucs		  . #x2431B)	; 𤌛
       ))
-    (=daikanwa		. 19248)	; &M-19248;
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
@@ -7778,6 +7803,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x717D)	; 煽
+    (=big5		. #xBAB4)	; &I-B-BAB4;
     ))
 (define-char
   '((<-denotational
@@ -7787,7 +7813,6 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ks-x1001		. #x6043)	; &M-19272; [64-35]
-    (=big5		. #xBAB4)	; &I-B-BAB4;
     (=daikanwa		. 19272)	; &I-M-19272;
     ))
 (define-char
@@ -7816,16 +7841,16 @@
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (<-simplified@JP
-     ((=ks-x1001	  . #x6043)	; &M-19272; [64-35]
-      (=daikanwa	  . 19272)	; &I-M-19272;
-      ))
     (=jis-x0208@1983	. #x407A)	; &GT-24721; [32-90]
     (=jis-x0208@1990	. #x407A)	; &I-J90-407A; [32-90]
     (=gt		. 24721)	; &I-GT-24721;
     (=gt-pj-1		. #x407A)	; &I-GT-24721; [32-90]
     (=jef-china3	. #x58AC)	; &I-JC3-58AC;
     (=ucs@jis		. #x717D)	; &GT-24721;
+    (<-simplified@JP/misc
+     ((=ks-x1001	  . #x6043)	; &M-19272; [64-35]
+      (=daikanwa	  . 19272)	; &I-M-19272;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -8632,11 +8657,11 @@
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=ucs		. #x2431B)	; 𤌛
+    (=cns11643-5	. #x4679)	; &I-C5-4679; [38-89]
     (<-unknown
      ((=daikanwa	  . 19248)	; &M-19248;
       ))
-    (=ucs		. #x2431B)	; 𤌛
-    (=cns11643-5	. #x4679)	; &I-C5-4679; [38-89]
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
@@ -10914,6 +10939,14 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x71D6)	; 燖
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x71D6)	; 燖
+      ))
+    (ideographic-radical . 86)	; ⽕
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
     (->subsumptive
      ((=jis-x0212	  . #x4A38)	; &M-19430; [42-24]
       (=big5		  . #xEA4B)	; &I-B-EA4B;
@@ -10922,12 +10955,22 @@
       )
      ((=cns11643-2	  . #x5837)	; &C2-5837; [56-23]
       (=ucs@cns		  . #x71D6)	; &C2-5837;
-      )
-     ((=ucs@unicode	  . #x71D6)	; &UU+71D6;
       ))
     ))
 (define-char
-  '((ideographic-radical . 86)	; ⽕
+  '((<-denotational
+     ((=ucs		  . #x71D6)	; 燖
+      ))
+    (ideographic-radical . 86)	; ⽕
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x71D6)	; &UU+71D6;
+    ))
+(define-char
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x5F73)	; &J97-5F73; [63-83]
+      ))
+    (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x71D7)	; 燗
@@ -10948,6 +10991,28 @@
   '((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]
+      ))
+    (ideographic-radical . 86)	; ⽕
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (=ucs		. #x243D0)	; 𤏐
+    (->subsumptive
+     ((=jis-x0208@1978/i1 . #x5F73)	; &CB10565; [63-83]
+      (=jis-x0208@1978/i-4 . #x5F73)	; &CB10565; [63-83]
+      (=cbeta		  . 10565)	; &CB10565;
+      )
+     ((=ucs@iso		  . #x243D0)	; &U-000243D0;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 86)	; ⽕
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
     (=ucs		. #x71D8)	; 燘
     (->subsumptive
      ((=daikanwa	  . 19432)	; &M-19432;
diff --git a/lisp/utf-2000/Ideograph-R087-Claw.el b/lisp/utf-2000/Ideograph-R087-Claw.el
index 2f53aff..cbdc60b 100644
--- a/lisp/utf-2000/Ideograph-R087-Claw.el
+++ b/lisp/utf-2000/Ideograph-R087-Claw.el
@@ -20,10 +20,23 @@
   '((ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=ucs		. #x244EF)	; 𤓯
+    (->subsumptive
+     ((=daikanwa	  . 19654)	; &M-19654;
+      )
+     ((=ucs@iso		  . #x244EF)	; &U-000244EF;
+      )
+     ((=cns11643-5	  . #x214B)	; &C5-214B; [01-43]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 0)
+    (total-strokes	 . 4)
+    (=ucs		. #x722B)	; 爫
     (<-formed@component/connect-below
      ((=ucs		  . #x722A)	; 爪
       ))
-    (=ucs		. #x722B)	; 爫
     ))
 (define-char
   '((<-denotational
@@ -46,10 +59,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA5)	; ⺥
     (<-identical@component/connect-below
      ((=ucs		  . #x722A)	; 爪
       ))
-    (=ucs		. #x2EA5)	; ⺥
     ))
 (define-char
   '((<-denotational
@@ -78,18 +91,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA4)	; ⺤
     (<-identical@component/connect-below
      ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA49")
       (=ucs		  . #xFA49)	; 爫
       ))
-    (=ucs		. #x2EA4)	; ⺤
-    ))
-(define-char
-  '((ideographic-radical . 87)	; ⽖
-    (ideographic-strokes . 0)
-    (total-strokes	 . 4)
-    (=ucs		. #x244EF)	; 𤓯
-    (=cns11643-5	. #x214B)	; &I-C5-214B; [01-43]
     ))
 (define-char
   '((ideographic-radical . 87)	; ⽖
@@ -97,16 +103,46 @@
     (total-strokes	 . 5)
     (=ucs		. #x244F1)	; 𤓱
     (=cns11643-6	. #x2330)	; &I-C6-2330; [03-16]
+    (=daikanwa		. 19656)	; &I-M-19656;
     ))
 (define-char
   '((ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x244F2)	; 𤓲
-    (=cns11643-6	. #x284D)	; &I-C6-284D; [08-45]
     ))
 (define-char
-  '((ideographic-radical . 87)	; ⽖
+  '((<-denotational
+     ((=ucs		  . #x244F2)	; 𤓲
+      ))
+    (ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
+    (->subsumptive
+     ((=daikanwa	  . 19657)	; &M-19657;
+      )
+     ((=cns11643-6	  . #x284D)	; &C6-284D; [08-45]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x244F2)	; 𤓲
+      ))
+    (ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
+    (=ucs@iso		. #x244F2)	; &U-000244F2;
+    ))
+(define-char
+  '((=>ucs		. #x244F3)	; 𤓳
+    (ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
+    (=daikanwa		. 19658)	; &M-19658;
+    ))
+(define-char
+  '((=>daikanwa		. 19658)	; &M-19658;
+    (ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x244F3)	; 𤓳
@@ -201,13 +237,59 @@
   '((ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=ucs		. #x244FD)	; 𤓽
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x244FD)	; 𤓽
+      ))
+    (ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=daikanwa		. 19667)	; &M-19667;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x244FD)	; 𤓽
+      ))
+    (ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=cns11643-6	. #x324E)	; &C6-324E; [18-46]
+    (=ucs@iso		. #x244FD)	; &C6-324E;
+    ))
+(define-char
+  '((ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=ucs		. #x244FE)	; 𤓾
+    (->subsumptive
+     ((=daikanwa	  . 19668)	; &M-19668;
+      )
+     ((=ucs@iso		  . #x244FE)	; &U-000244FE;
+      )
+     ((=cns11643-5	  . #x2A2B)	; &C5-2A2B; [10-11]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
     (=ucs		. #x722E)	; 爮
     (=cns11643-3	. #x2D69)	; &I-C3-2D69; [13-73]
     (=daikanwa		. 19670)	; &I-M-19670;
     (=cbeta		. 01787)	; &I-CB01787;
     ))
 (define-char
-  '((=>ucs		. #x722F)	; 爯
+  '((ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=ucs		. #x722F)	; 爯
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x722F)	; 爯
+      ))
     (ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
@@ -216,23 +298,34 @@
     (=ucs@jis		. #x722F)	; &M-19671;
     ))
 (define-char
-  '((morohashi-daikanwa	19671 0 2)
+  '((<-denotational
+     ((=ucs		  . #x722F)	; 爯
+      ))
     (ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x722F)	; 爯
-    (=cns11643-4	. #x2A2A)	; &I-C4-2A2A; [10-10]
+    (=cns11643-4	. #x2A2A)	; &CDP-8CA8; [10-10]
     (=big5-cdp		. #x8CA8)	; &I-CDP-8CA8;
+    (=ucs@unicode	. #x722F)	; &CDP-8CA8;
     ))
 (define-char
-  '((=>ucs		. #x7230)	; 爰
+  '((ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=ucs		. #x7230)	; 爰
+    (=big5		. #xACB8)	; &I-B-ACB8;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7230)	; 爰
+      ))
     (ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (shinjigen-1	. 4701)
     (shinjigen-2	. 4701)
     (=jis-x0208		. #x6029)	; &GT-25242; [64-09]
     (=ks-x1001		. #x6A3A)	; &I-K0-6A3A; [74-26]
-    (=big5		. #xACB8)	; &I-B-ACB8;
     (=gt		. 25242)	; &I-GT-25242;
     (=gt-k		. 05358)	; &I-GT-K05358;
     (=gt-pj-1		. #x6029)	; &I-GT-25242; [64-09]
@@ -240,41 +333,53 @@
     (=ucs@jis		. #x7230)	; &GT-25242;
     ))
 (define-char
-  '((morohashi-daikanwa	19672 0 2)
+  '((<-denotational
+     ((=ucs		  . #x7230)	; 爰
+      ))
     (ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x7230)	; 爰
-    (=gb2312		. #x6B3C)	; &I-G0-6B3C; [75-28]
+    (=gb2312		. #x6B3C)	; &C1-523B; [75-28]
     (=cns11643-1	. #x523B)	; &I-C1-523B; [50-27]
+    (=ucs@unicode	. #x7230)	; &C1-523B;
     ))
 (define-char
-  '((ideographic-radical . 87)	; ⽖
+  '((=>ucs		. #x24500)	; 𤔀
+    (ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x244FD)	; 𤓽
-    (=cns11643-6	. #x324E)	; &I-C6-324E; [18-46]
+    (=daikanwa		. 19673)	; &M-19673;
     ))
 (define-char
-  '((ideographic-radical . 87)	; ⽖
+  '((=>daikanwa		. 19673)	; &M-19673;
+    (ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x244FE)	; 𤓾
-    (=cns11643-5	. #x2A2B)	; &I-C5-2A2B; [10-11]
+    (=ucs		. #x24500)	; 𤔀
+    (->subsumptive
+     ((=ucs@iso		  . #x24500)	; &U-00024500;
+      )
+     ((=cns11643-5	  . #x2A29)	; &C5-2A29; [10-09]
+      ))
     ))
 (define-char
-  '((ideographic-radical . 87)	; ⽖
+  '((=>ucs		. #x24501)	; 𤔁
+    (ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x24500)	; 𤔀
-    (=cns11643-5	. #x2A29)	; &I-C5-2A29; [10-09]
+    (=daikanwa		. 19674)	; &M-19674;
     ))
 (define-char
-  '((ideographic-radical . 87)	; ⽖
+  '((=>daikanwa		. 19674)	; &M-19674;
+    (ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x24501)	; 𤔁
-    (=cns11643-6	. #x324F)	; &I-C6-324F; [18-47]
+    (->subsumptive
+     ((=ucs@iso		  . #x24501)	; &U-00024501;
+      )
+     ((=cns11643-6	  . #x324F)	; &C6-324F; [18-47]
+      ))
     ))
 (define-char
   '((ideographic-radical . 87)	; ⽖
@@ -326,35 +431,41 @@
     (=cns11643-5	. #x2E50)	; &I-C5-2E50; [14-48]
     ))
 (define-char
-  '((=>ucs		. #x24510)	; 𤔐
-    (ideographic-radical . 87)	; ⽖
+  '((ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (<-ancient
-     ((=gt		  . 25281)	; &GT-25281;
-      (=daikanwa	  . 19687)	; &I-M-19687;
+    (=ucs		. #x24510)	; 𤔐
+    (->subsumptive
+     ((=daikanwa	  . 19682)	; &M-19682;
+      (<-ancient
+       ((=gt		    . 25281)	; &GT-25281;
+	(=daikanwa	    . 19687)	; &I-M-19687;
+	))
+      (<-ancient*sources
+       shuowen daikanwa)
+      )
+     ((=cns11643-6	  . #x4157)	; &C6-4157; [33-55]
+      (=ucs@iso		  . #x24510)	; &C6-4157;
       ))
-    (<-ancient*sources
-     shuowen daikanwa)
-    (=daikanwa		. 19682)	; &M-19682;
     ))
 (define-char
-  '((morohashi-daikanwa	19682 0 0)
-    (ideographic-radical . 87)	; ⽖
+  '((ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x24510)	; 𤔐
-    (=cns11643-6	. #x4157)	; &I-C6-4157; [33-55]
+    (=ucs		. #x24511)	; 𤔑
+    (=cns11643-6	. #x4156)	; &I-C6-4156; [33-54]
+    (=daikanwa		. 19683)	; &I-M-19683;
     ))
 (define-char
-  '((ideographic-radical . 87)	; ⽖
+  '((=>ucs		. #x24512)	; 𤔒
+    (ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x24511)	; 𤔑
-    (=cns11643-6	. #x4156)	; &I-C6-4156; [33-54]
+    (=daikanwa		. 19684)	; &M-19684;
     ))
 (define-char
-  '((ideographic-radical . 87)	; ⽖
+  '((=>daikanwa		. 19684)	; &M-19684;
+    (ideographic-radical . 87)	; ⽖
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x24512)	; 𤔒
@@ -412,40 +523,67 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x24514)	; 𤔔
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24514)	; 𤔔
+      ))
+    (ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=gt		. 25281)	; &GT-25281;
+    (=gt-k		. 09318)	; &I-GT-K09318;
+    (=gt-pj-4		. #x624B)	; &GT-25281; [66-43]
+    (=daikanwa		. 19687)	; &I-M-19687;
+    (<-same
+     ((=jis-x0208	  . #x502C)	; &GT-00285; [48-12]
+      (=daikanwa	  . 00214)	; &I-M-00214;
+      ))
+    (<-same*sources
+     shuowen daikanwa)
+    (->ancient
+     ((=daikanwa	  . 19682)	; &M-19682;
+      ))
+    (->ancient*sources
+     zhengzitong shuowen shuowen-zhu daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24514)	; 𤔔
+      ))
+    (ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=gt		. 25282)	; &GT-25282;
+    (=gt-k		. 09799)	; &I-GT-K09799;
+    (=gt-pj-9		. #x4B68)	; &GT-25282; [43-72]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24514)	; 𤔔
+      ))
+    (ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=gt		. 25283)	; &GT-25283;
+    (=gt-k		. 09319)	; &I-GT-K09319;
+    (=gt-pj-9		. #x6634)	; &GT-25283; [70-20]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24514)	; 𤔔
+      ))
+    (ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
     (->subsumptive
-     ((<-same
-       ((=jis-x0208	    . #x502C)	; &GT-00285; [48-12]
-	(=daikanwa	    . 00214)	; &I-M-00214;
-	))
-      (<-same*sources
-       shuowen daikanwa)
-      (=gt		  . 25281)	; &GT-25281;
-      (=gt-k		  . 09318)	; &I-GT-K09318;
-      (=gt-pj-4		  . #x624B)	; &GT-25281; [66-43]
-      (=daikanwa	  . 19687)	; &I-M-19687;
-      (->ancient
-       ((=daikanwa	    . 19682)	; &M-19682;
-	))
-      (->ancient*sources
-       zhengzi-tong shuowen shuowen-zhu daikanwa)
-      )
-     ((=gt		  . 25283)	; &GT-25283;
-      (=gt-k		  . 09319)	; &I-GT-K09319;
-      (=gt-pj-9		  . #x6634)	; &GT-25283; [70-20]
+     ((=gt-k		  . 09372)	; &GT-K09372;
+      (=gt-pj-k2	  . #x363B)	; &GT-K09372; [22-27]
+      (=ucs@iso		  . #x24514)	; &GT-K09372;
+      (mojikyo		  . 073769)	; &MCS-60012029;
       )
-     ((=gt		  . 25282)	; &GT-25282;
-      (=gt-k		  . 09799)	; &I-GT-K09799;
-      (=gt-pj-9		  . #x4B68)	; &GT-25282; [43-72]
-      )
-     ((->subsumptive
-       ((=cns11643-4	    . #x386A)	; &CDP-8C7D; [24-74]
-	(=big5-cdp	    . #x8C7D)	; &I-CDP-8C7D;
-	)
-       ((=gt-k		    . 09372)	; &GT-K09372;
-	(=gt-pj-k2	    . #x363B)	; &GT-K09372; [22-27]
-	(=ucs@iso	    . #x24514)	; &GT-K09372;
-	(mojikyo	    . 073769)	; &MCS-60012029;
-	))
+     ((=cns11643-4	  . #x386A)	; &CDP-8C7D; [24-74]
+      (=big5-cdp	  . #x8C7D)	; &I-CDP-8C7D;
       ))
     ))
 (define-char
@@ -453,12 +591,25 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x24515)	; 𤔕
-    (->subsumptive
-     ((=daikanwa	  . 19688)	; &M-19688;
-      )
-     ((=cns11643-6	  . #x4B22)	; &C6-4B22; [43-02]
-      (=ucs@iso		  . #x24515)	; &C6-4B22;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24515)	; 𤔕
       ))
+    (ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=daikanwa		. 19688)	; &M-19688;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24515)	; 𤔕
+      ))
+    (ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=cns11643-6	. #x4B22)	; &C6-4B22; [43-02]
+    (=ucs@iso		. #x24515)	; &C6-4B22;
     ))
 (define-char
   '((ideographic-radical@ucs . 87)	; ⽖
diff --git a/lisp/utf-2000/Ideograph-R090-Half-Tree-Trunk.el b/lisp/utf-2000/Ideograph-R090-Half-Tree-Trunk.el
index 89e2519..535abdb 100644
--- a/lisp/utf-2000/Ideograph-R090-Half-Tree-Trunk.el
+++ b/lisp/utf-2000/Ideograph-R090-Half-Tree-Trunk.el
@@ -598,14 +598,14 @@
     (total-strokes	 . 13)
     (=ucs		. #x2458D)	; 𤖍
     (->subsumptive
-     ((<-ancient
+     ((=daikanwa	  . 19791)	; &M-19791;
+      (=ucs@iso		  . #x2458D)	; &M-19791;
+      (<-ancient
        ((=ucs		    . #xFA67)	; 逸
 	(=daikanwa	    . 38951)	; &I-M-38951;
 	))
       (<-ancient*sources
        jiyun daikanwa)
-      (=daikanwa	  . 19791)	; &M-19791;
-      (=ucs@iso		  . #x2458D)	; &M-19791;
       )
      ((=cns11643-6	  . #x546E)	; &C6-546E; [52-78]
       ))
@@ -615,9 +615,9 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x7244)	; 牄
+    (=big5		. #xE2C5)	; &I-B-E2C5;
     (->subsumptive
-     ((=big5		  . #xE2C5)	; &M-19792;
-      (=daikanwa	  . 19792)	; &I-M-19792;
+     ((=daikanwa	  . 19792)	; &M-19792;
       )
      ((=cns11643-2	  . #x4B6B)	; &C2-4B6B; [43-75]
       (=ucs@cns		  . #x7244)	; &C2-4B6B;
@@ -630,61 +630,68 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x24593)	; 𤖓
-    (=daikanwa		. 19796)	; &I-M-19796;
-    ))
-(define-char
-  '((=>ucs		. #x24593)	; 𤖓
-    (morohashi-daikanwa	19796 0 1)
-    (ideographic-radical . 90)	; ⽙
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-7	. #x247D)	; &C7-247D; [04-93]
+    (->subsumptive
+     ((=daikanwa	  . 19796)	; &M-19796;
+      (=ucs@iso		  . #x24593)	; &M-19796;
+      )
+     ((=cns11643-7	  . #x247D)	; &C7-247D; [04-93]
+      ))
     ))
 (define-char
   '((ideographic-radical . 90)	; ⽙
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x7245)	; 牅
-    (=jis-x0212		. #x4A50)	; &I-JSP-4A50; [42-48]
-    (=daikanwa		. 19797)	; &I-M-19797;
-    ))
-(define-char
-  '((=>ucs		. #x7245)	; 牅
-    (morohashi-daikanwa	19797 0 1)
-    (ideographic-radical . 90)	; ⽙
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-4	. #x4A6D)	; &C4-4A6D; [42-77]
+    (->subsumptive
+     ((=jis-x0212	  . #x4A50)	; &M-19797; [42-48]
+      (=daikanwa	  . 19797)	; &I-M-19797;
+      (=ucs@jis		  . #x7245)	; &M-19797;
+      )
+     ((=ucs@unicode	  . #x7245)	; &UU+7245;
+      )
+     ((=cns11643-4	  . #x4A6D)	; &C4-4A6D; [42-77]
+      ))
     ))
 (define-char
   '((ideographic-radical . 90)	; ⽙
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x24595)	; 𤖕
-    (=cns11643-7	. #x247E)	; &I-C7-247E; [04-94]
-    (=daikanwa		. 49280)	; &I-M-49280;
+    (->subsumptive
+     ((=daikanwa	  . 49280)	; &M-49280;
+      )
+     ((=ucs@iso		  . #x24595)	; &U-00024595;
+      )
+     ((=cns11643-7	  . #x247E)	; &C7-247E; [04-94]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x24596)	; 𤖖
-    (ideographic-radical . 90)	; ⽙
+  '((ideographic-radical . 90)	; ⽙
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=daikanwa		. 19798)	; &M-19798;
+    (=ucs		. #x24596)	; 𤖖
     ))
 (define-char
-  '((morohashi-daikanwa	19798 0 1)
+  '((<-denotational
+     ((=ucs		  . #x24596)	; 𤖖
+      ))
     (ideographic-radical . 90)	; ⽙
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=ucs		. #x24596)	; 𤖖
+    (=daikanwa		. 19798)	; &M-19798;
     ))
 (define-char
-  '((=>ucs		. #x24596)	; 𤖖
-    (morohashi-daikanwa	19798 0 2)
+  '((<-denotational
+     ((=ucs		  . #x24596)	; 𤖖
+      ))
     (ideographic-radical . 90)	; ⽙
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=cns11643-5	. #x5543)	; &C5-5543; [53-35]
+    (->subsumptive
+     ((=ucs@iso		  . #x24596)	; &U-00024596;
+      )
+     ((=cns11643-5	  . #x5543)	; &C5-5543; [53-35]
+      ))
     ))
 (define-char
   '((ideographic-radical . 90)	; ⽙
diff --git a/lisp/utf-2000/Ideograph-R093-Cow.el b/lisp/utf-2000/Ideograph-R093-Cow.el
index e51ac16..91df8df 100644
--- a/lisp/utf-2000/Ideograph-R093-Cow.el
+++ b/lisp/utf-2000/Ideograph-R093-Cow.el
@@ -17,14 +17,13 @@
     (=daikanwa		. 19922)	; &I-M-19922;
     ))
 (define-char
-  '((=>daikanwa		. 19923)	; &CDP-8BA9;
-    (ideographic-radical . 93)	; ⽜
+  '((ideographic-radical . 93)	; ⽜
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-ideographic-component-forms
+    (=ucs		. #x725C)	; 牜
+    (<-formed@component/connect-right
      ((=ucs		  . #x725B)	; 牛
       ))
-    (=ucs		. #x725C)	; 牜
     (->subsumptive
      ((=big5-cdp	  . #x8BA9)	; &CDP-8BA9;
       (=daikanwa	  . 19923)	; &I-M-19923;
@@ -1051,28 +1050,45 @@
     (=daikanwa		. 20024)	; &I-M-20024;
     ))
 (define-char
-  '((=>ucs		. #x727D)	; 牽
-    (ideographic-radical . 93)	; ⽜
+  '((ideographic-radical . 93)	; ⽜
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (shinjigen-2	. 4745)
-    (=jis-x0208		. #x3823)	; &GT-25686; [24-03]
-    (=ks-x1001		. #x4C32)	; &I-K0-4C32; [44-18]
+    (=ucs		. #x727D)	; 牽
     (=big5		. #xB26F)	; &I-B-B26F;
-    (=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;
-    (=ucs@jis		. #x727D)	; &GT-25686;
+    (->subsumptive
+     ((shinjigen-2	  . 4745)
+      (=jis-x0208	  . #x3823)	; &GT-25686; [24-03]
+      (=ks-x1001	  . #x4C32)	; &I-K0-4C32; [44-18]
+      (=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;
+      (=ucs@jis		  . #x727D)	; &GT-25686;
+      )
+     ((=cns11643-1	  . #x5B74)	; &C1-5B74; [59-84]
+      (=gb12345		  . #x4723)	; &C1-5B74; [39-03]
+      (=ucs@unicode	  . #x727D)	; &C1-5B74;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	20025 0 1)
-    (ideographic-radical . 93)	; ⽜
+  '((ideographic-radical . 93)	; ⽜
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x727D)	; 牽
-    (=cns11643-1	. #x5B74)	; &I-C1-5B74; [59-84]
-    (=gb12345		. #x4723)	; 牽 [39-03]
+    (=ucs		. #x3E3D)	; 㸽
+    (=cns11643-3	. #x3738)	; &I-C3-3738; [23-24]
+    (=daikanwa		. 20026)	; &I-M-20026;
+    ))
+(define-char
+  '((ideographic-radical . 93)	; ⽜
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=ucs		. #x2465E)	; 𤙞
+    (->subsumptive
+     ((=daikanwa	  . 20027)	; &M-20027;
+      (=ucs@iso		  . #x2465E)	; &M-20027;
+      )
+     ((=cns11643-5	  . #x3349)	; &C5-3349; [19-41]
+      ))
     ))
 (define-char
   '((ideographic-radical . 93)	; ⽜
@@ -1088,6 +1104,30 @@
     (=daikanwa		. 20028)	; &I-M-20028;
     ))
 (define-char
+  '((ideographic-radical . 93)	; ⽜
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=ucs		. #x3E3E)	; 㸾
+    (->subsumptive
+     ((=cns11643-6	  . #x4166)	; &M-20029; [33-70]
+      (=daikanwa	  . 20029)	; &I-M-20029;
+      )
+     ((=ucs@unicode	  . #x3E3E)	; &UU+3E3E;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 93)	; ⽜
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=ucs		. #x24660)	; 𤙠
+    (->subsumptive
+     ((=daikanwa	  . 20031)	; &M-20031;
+      (=ucs@iso		  . #x24660)	; &M-20031;
+      )
+     ((=cns11643-4	  . #x327D)	; &C4-327D; [18-93]
+      ))
+    ))
+(define-char
   '((=>ucs		. #x727F)	; 牿
     (ideographic-radical . 93)	; ⽜
     (ideographic-strokes . 7)
@@ -1125,19 +1165,54 @@
     (=cns11643-4	. #x327C)	; &I-C4-327C; [18-92]
     ))
 (define-char
-  '((=>ucs		. #x24664)	; 𤙤
+  '((ideographic-radical . 93)	; ⽜
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=ucs		. #x24662)	; 𤙢
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24662)	; 𤙢
+      ))
     (ideographic-radical . 93)	; ⽜
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=daikanwa		. 20036)	; &M-20036;
+    (=daikanwa		. 20034)	; &M-20034;
+    (=ucs@iso		. #x24662)	; &M-20034;
     ))
 (define-char
-  '((morohashi-daikanwa	20036 0 2)
+  '((<-denotational
+     ((=ucs		  . #x24662)	; 𤙢
+      ))
     (ideographic-radical . 93)	; ⽜
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=cns11643-5	. #x334B)	; &C5-334B; [19-43]
+    ))
+(define-char
+  '((ideographic-radical . 93)	; ⽜
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
     (=ucs		. #x24664)	; 𤙤
-    (=cns11643-5	. #x334C)	; &I-C5-334C; [19-44]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24664)	; 𤙤
+      ))
+    (ideographic-radical . 93)	; ⽜
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=daikanwa		. 20036)	; &M-20036;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24664)	; 𤙤
+      ))
+    (ideographic-radical . 93)	; ⽜
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=cns11643-5	. #x334C)	; &C5-334C; [19-44]
+    (=ucs@iso		. #x24664)	; &C5-334C;
     ))
 (define-char
   '((ideographic-radical . 93)	; ⽜
@@ -1187,19 +1262,16 @@
     (=daikanwa		. 20042)	; &I-M-20042;
     ))
 (define-char
-  '((=>ucs		. #x2466B)	; 𤙫
-    (ideographic-radical . 93)	; ⽜
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=daikanwa		. 20043)	; &M-20043;
-    ))
-(define-char
-  '((morohashi-daikanwa	20043 0 0)
-    (ideographic-radical . 93)	; ⽜
+  '((ideographic-radical . 93)	; ⽜
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x2466B)	; 𤙫
-    (=cns11643-6	. #x4164)	; &I-C6-4164; [33-68]
+    (->subsumptive
+     ((=daikanwa	  . 20043)	; &M-20043;
+      )
+     ((=cns11643-6	  . #x4164)	; &C6-4164; [33-68]
+      (=ucs@iso		  . #x2466B)	; &C6-4164;
+      ))
     ))
 (define-char
   '((ideographic-radical . 93)	; ⽜
@@ -1211,69 +1283,24 @@
     ))
 (define-char
   '((ideographic-radical . 93)	; ⽜
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=ucs		. #x3E3D)	; 㸽
-    (=cns11643-3	. #x3738)	; &I-C3-3738; [23-24]
-    ))
-(define-char
-  '((ideographic-radical . 93)	; ⽜
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=ucs		. #x3E3E)	; 㸾
-    (=cns11643-6	. #x4166)	; &I-C6-4166; [33-70]
-    ))
-(define-char
-  '((ideographic-radical . 93)	; ⽜
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=ucs		. #x2465E)	; 𤙞
-    (=cns11643-5	. #x3349)	; &I-C5-3349; [19-41]
-    ))
-(define-char
-  '((ideographic-radical . 93)	; ⽜
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=ucs		. #x24660)	; 𤙠
-    (=cns11643-4	. #x327D)	; &I-C4-327D; [18-93]
-    ))
-(define-char
-  '((ideographic-radical . 93)	; ⽜
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=ucs		. #x24662)	; 𤙢
-    (=cns11643-5	. #x334B)	; &I-C5-334B; [19-43]
-    ))
-(define-char
-  '((ideographic-radical . 93)	; ⽜
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=ucs		. #x2468A)	; 𤚊
-    (=cns11643-5	. #x334A)	; &I-C5-334A; [19-42]
-    ))
-(define-char
-  '((=>ucs		. #x7280)	; 犀
-    (ideographic-radical . 93)	; ⽜
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (shinjigen-2	. 4748)
-    (=jis-x0208		. #x3A54)	; &GT-25725; [26-52]
-    (=ks-x1001		. #x5F79)	; &I-K0-5F79; [63-89]
-    (=big5		. #xB552)	; &I-B-B552;
-    (=gt		. 25725)	; &I-GT-25725;
-    (=gt-k		. 09054)	; &I-GT-K09054;
-    (=gt-pj-1		. #x3A54)	; &I-GT-25725; [26-52]
-    (=daikanwa		. 20045)	; &I-M-20045;
-    (=ucs@jis		. #x7280)	; &GT-25725;
-    ))
-(define-char
-  '((morohashi-daikanwa	20045 0 2)
-    (ideographic-radical . 93)	; ⽜
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x7280)	; 犀
-    (=gb2312		. #x4F2C)	; &I-G0-4F2C; [47-12]
-    (=cns11643-1	. #x6058)	; &I-C1-6058; [64-56]
+    (->subsumptive
+     ((shinjigen-2	  . 4748)
+      (=jis-x0208	  . #x3A54)	; &GT-25725; [26-52]
+      (=ks-x1001	  . #x5F79)	; &I-K0-5F79; [63-89]
+      (=big5		  . #xB552)	; &I-B-B552;
+      (=gt		  . 25725)	; &I-GT-25725;
+      (=gt-k		  . 09054)	; &I-GT-K09054;
+      (=gt-pj-1		  . #x3A54)	; &I-GT-25725; [26-52]
+      (=daikanwa	  . 20045)	; &I-M-20045;
+      (=ucs@jis		  . #x7280)	; &GT-25725;
+      )
+     ((=gb2312		  . #x4F2C)	; &C1-6058; [47-12]
+      (=cns11643-1	  . #x6058)	; &I-C1-6058; [64-56]
+      (=ucs@unicode	  . #x7280)	; &C1-6058;
+      ))
     ))
 (define-char
   '((ideographic-radical . 93)	; ⽜
@@ -1293,8 +1320,12 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x7283)	; 犃
-    (=cns11643-3	. #x3D23)	; &I-C3-3D23; [29-03]
-    (=daikanwa		. 20052)	; &I-M-20052;
+    (->subsumptive
+     ((=daikanwa	  . 20052)	; &M-20052;
+      )
+     ((=cns11643-3	  . #x3D23)	; &C3-3D23; [29-03]
+      (=ucs@unicode	  . #x7283)	; &C3-3D23;
+      ))
     ))
 (define-char
   '((ideographic-radical . 93)	; ⽜
@@ -1398,22 +1429,36 @@
     (=ucs		. #x3E43)	; 㹃
     ))
 (define-char
-  '((=>ucs		. #x7289)	; 犉
-    (ideographic-radical . 93)	; ⽜
+  '((ideographic-radical . 93)	; ⽜
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=jis-x0212		. #x4A67)	; &M-20062; [42-71]
+    (=ucs		. #x7289)	; 犉
     (=big5		. #xDA69)	; &I-B-DA69;
-    (=daikanwa		. 20062)	; &I-M-20062;
-    (=ucs@jis		. #x7289)	; &M-20062;
+    (->subsumptive
+     ((=jis-x0212	  . #x4A67)	; &M-20062; [42-71]
+      (=daikanwa	  . 20062)	; &I-M-20062;
+      (=ucs@jis		  . #x7289)	; &M-20062;
+      )
+     ((=cns11643-2	  . #x3D6D)	; &C2-3D6D; [29-77]
+      (=ucs@unicode	  . #x7289)	; &C2-3D6D;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	20062 0 0)
-    (ideographic-radical . 93)	; ⽜
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=ucs		. #x7289)	; 犉
-    (=cns11643-2	. #x3D6D)	; &I-C2-3D6D; [29-77]
+  '((ideographic-radical . 93)	; ⽜
+    (=ucs		. #x2468A)	; 𤚊
+    (->subsumptive
+     ((ideographic-strokes . 8)
+      (total-strokes	   . 12)
+      (=daikanwa	  . 20065)	; &M-20065;
+      )
+     ((ideographic-strokes . 8)
+      (total-strokes	   . 12)
+      (=ucs@iso		  . #x2468A)	; &U-0002468A;
+      )
+     ((ideographic-strokes . 7)
+      (total-strokes	   . 11)
+      (=cns11643-5	  . #x334A)	; &C5-334A; [19-42]
+      ))
     ))
 (define-char
   '((ideographic-radical . 93)	; ⽜
@@ -2744,15 +2789,15 @@
     (ideographic-radical . 93)	; ⽜
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x72A7)	; 犧
-      (=jis-x0208	  . #x603A)	; &I-J90-603A; [64-26]
-      ))
     (=ucs		. #x72A0)	; 犠
     (=jis-x0208		. #x353E)	; &I-J90-353E; [21-30]
     (=gt		. 25890)	; &I-GT-25890;
     (=gt-pj-1		. #x353E)	; &I-GT-25890; [21-30]
     (mojikyo		. 050275)	; &MCS-6000C463;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x72A7)	; 犧
+      (=jis-x0208	  . #x603A)	; &I-J90-603A; [64-26]
+      ))
     ))
 (define-char
   '((ideographic-radical . 93)	; ⽜
diff --git a/lisp/utf-2000/Ideograph-R094-Dog.el b/lisp/utf-2000/Ideograph-R094-Dog.el
index e94865e..e50d5a2 100644
--- a/lisp/utf-2000/Ideograph-R094-Dog.el
+++ b/lisp/utf-2000/Ideograph-R094-Dog.el
@@ -20,12 +20,6 @@
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
-    (<-formed@component/connect-right
-     ((=ucs		  . #x72AC)	; 犬
-      (=daikanwa	  . 20234)	; &I-M-20234;
-      ))
-    (<-formed@component/connect-right*sources
-     zihui/char-index daikanwa)
     (=ucs		. #x72AD)	; 犭
     (=gb2312		. #x616B)	; &I-G0-616B; [65-75]
     (=jis-x0212		. #x4A6D)	; &I-JSP-4A6D; [42-77]
@@ -33,6 +27,12 @@
     (=jis-x0213-2-2000	. #x703A)	; &I-JX2-703A; [80-26]
     (=daikanwa		. 20235)	; &I-M-20235;
     (=jef-china3	. #x58D2)	; &I-JC3-58D2;
+    (<-formed@component/connect-right
+     ((=ucs		  . #x72AC)	; 犬
+      (=daikanwa	  . 20234)	; &I-M-20234;
+      ))
+    (<-formed@component/connect-right*sources
+     zihui/char-index daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -42,11 +42,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA8)	; ⺨
+    (=big5-cdp		. #x8BAF)	; &I-CDP-8BAF;
     (<-identical@component
      ((=ucs		  . #x72AD)	; 犭
       ))
-    (=ucs		. #x2EA8)	; ⺨
-    (=big5-cdp		. #x8BAF)	; &I-CDP-8BAF;
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
@@ -247,7 +247,10 @@
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 3)
-    (=daikanwa		. 20252)	; &M-20252;
+    (total-strokes	 . 6)
+    (=ucs		. #x2472E)	; 𤜮
+    (=daikanwa		. 20252)	; &I-M-20252;
+    (=hanziku-4		. #xBA6C)	; &I-HZK04-BA6C;
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
@@ -261,30 +264,35 @@
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
-    (=daikanwa		. 20254)	; &M-20254;
+    (=ucs		. #x24727)	; 𤜧
+    (=daikanwa		. 20254)	; &I-M-20254;
+    (=hanziku-4		. #xBA4C)	; &I-HZK04-BA4C;
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (=daikanwa		. 20255)	; &M-20255;
+    (=ucs		. #x24729)	; 𤜩
+    (=daikanwa		. 20255)	; &I-M-20255;
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x2472B)	; 𤜫
-    (=cns11643-5	. #x2279)	; &I-C5-2279; [02-89]
-    (=daikanwa		. 20256)	; &I-M-20256;
+    (->subsumptive
+     ((=daikanwa	  . 20256)	; &M-20256;
+      )
+     ((=cns11643-5	  . #x2279)	; &C5-2279; [02-89]
+      )
+     ((=ucs@iso		  . #x2472B)	; &U-0002472B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x72C0)	; 狀
-      (=jis-x0213-1-2000  . #x776A)	; &I-JX1-776A; [87-74]
-      ))
+    (shinjigen-1	. 4762)
     (shinjigen-2	. 4762)
     (=ucs		. #x72B6)	; 状
     (=jis-x0208		. #x3E75)	; &I-J90-3E75; [30-85]
@@ -294,6 +302,20 @@
     (=gt-k		. 02580)	; &I-GT-K02580;
     (=gt-pj-1		. #x3E75)	; &I-GT-25994; [30-85]
     (=daikanwa		. 20257)	; &I-M-20257;
+    (<-simplified@CN
+     ((=ks-x1001	  . #x5F52)	; &M-20280; [63-50]
+      (=jis-x0213-1-2000  . #x776A)	; &I-JX1-776A; [87-74]
+      (=gb12345		  . #x5734)	; &M-20280; [55-20]
+      (=daikanwa	  . 20280)	; &I-M-20280;
+      ))
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x5F52)	; &M-20280; [63-50]
+      (=jis-x0213-1-2000  . #x776A)	; &I-JX1-776A; [87-74]
+      (=daikanwa	  . 20280)	; &I-M-20280;
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x72C0)	; 狀
+      ))
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
@@ -487,7 +509,13 @@
     (=jef-china3	. #x58D6)	; &I-JC3-58D6;
     ))
 (define-char
-  '((=>ucs		. #x2473A)	; 𤜺
+  '((ideographic-radical . 94)	; ⽝
+    (=ucs		. #x2473A)	; 𤜺
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2473A)	; 𤜺
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
@@ -495,56 +523,70 @@
     (mojikyo		. 020277)	; &MCS-60004F35;
     ))
 (define-char
-  '((morohashi-daikanwa	20277 0 2)
+  '((<-denotational
+     ((=ucs		  . #x2473A)	; 𤜺
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=ucs		. #x2473A)	; 𤜺
-    (=cns11643-6	. #x2C72)	; &I-C6-2C72; [12-82]
+    (=cns11643-6	. #x2C72)	; &C6-2C72; [12-82]
+    (=ucs@iso		. #x2473A)	; &C6-2C72;
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x2473B)	; 𤜻
-    (=cns11643-4	. #x2457)	; &I-C4-2457; [04-55]
-    (=daikanwa		. 20278)	; &I-M-20278;
+    (->subsumptive
+     ((=daikanwa	  . 20278)	; &M-20278;
+      (=ucs@iso		  . #x2473B)	; &M-20278;
+      )
+     ((=cns11643-4	  . #x2457)	; &C4-2457; [04-55]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x72BF)	; 犿
+  '((ideographic-radical . 94)	; ⽝
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=ucs		. #x72BF)	; 犿
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x72BF)	; 犿
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=daikanwa		. 20279)	; &M-20279;
     ))
 (define-char
-  '((morohashi-daikanwa	20279 0 0)
+  '((<-denotational
+     ((=ucs		  . #x72BF)	; 犿
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=ucs		. #x72BF)	; 犿
-    (=cns11643-2	. #x2461)	; &I-C2-2461; [04-65]
+    (=cns11643-2	. #x2461)	; &C2-2461; [04-65]
     (=big5		. #xCB61)	; &I-B-CB61;
+    (=ucs@unicode	. #x72BF)	; &C2-2461;
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x72C0)	; 狀
-    (=ks-x1001		. #x5F52)	; &I-K0-5F52; [63-50]
-    (=jis-x0213-1-2000	. #x776A)	; &I-JX1-776A; [87-74]
-    (=gb12345		. #x5734)	; 狀 [55-20]
-    (=big5		. #xAAAC)	; &I-B-AAAC;
-    (=daikanwa		. 20280)	; &I-M-20280;
-    (=jef-china3	. #x58D7)	; &I-JC3-58D7;
-    ))
-(define-char
-  '((=>ucs		. #x72C0)	; 狀
-    (morohashi-daikanwa	20280 0 0)
-    (ideographic-radical . 94)	; ⽝
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (=cns11643-1	. #x4E6D)	; &C1-4E6D; [46-77]
+    (->subsumptive
+     ((shinjigen-1	  . 4763)
+      (=ks-x1001	  . #x5F52)	; &M-20280; [63-50]
+      (=jis-x0213-1-2000  . #x776A)	; &I-JX1-776A; [87-74]
+      (=gb12345		  . #x5734)	; &M-20280; [55-20]
+      (=big5		  . #xAAAC)	; &I-B-AAAC;
+      (=daikanwa	  . 20280)	; &I-M-20280;
+      (=jef-china3	  . #x58D7)	; &I-JC3-58D7;
+      (=ucs@unicode	  . #x72C0)	; &M-20280;
+      )
+     ((=cns11643-1	  . #x4E6D)	; &C1-4E6D; [46-77]
+      ))
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
@@ -642,22 +684,35 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x72C3)	; 狃
-    (->subsumptive
-     ((shinjigen-1	  . 4765)
-      (shinjigen-2	  . 4765)
-      (=jis-x0208	  . #x603D)	; &GT-25993; [64-29]
-      (=cns11643-2	  . #x2463)	; &I-C2-2463; [04-67]
-      (=big5		  . #xCB63)	; &I-B-CB63;
-      (=gt		  . 25993)	; &I-GT-25993;
-      (=gt-k		  . 02717)	; &I-GT-K02717;
-      (=gt-pj-1		  . #x603D)	; &I-GT-25993; [64-29]
-      (=daikanwa	  . 20289)	; &I-M-20289;
-      (=ucs@cns		  . #x72C3)	; &GT-25993;
-      (=ucs@jis		  . #x72C3)	; &GT-25993;
-      )
-     ((=gb2312		  . #x6170)	; &G0-6170; [65-80]
-      (=ucs@unicode	  . #x72C3)	; &G0-6170;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x72C3)	; 狃
       ))
+    (ideographic-radical . 94)	; ⽝
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (shinjigen-1	. 4765)
+    (shinjigen-2	. 4765)
+    (=jis-x0208		. #x603D)	; &GT-25993; [64-29]
+    (=cns11643-2	. #x2463)	; &I-C2-2463; [04-67]
+    (=big5		. #xCB63)	; &I-B-CB63;
+    (=gt		. 25993)	; &I-GT-25993;
+    (=gt-k		. 02717)	; &I-GT-K02717;
+    (=gt-pj-1		. #x603D)	; &I-GT-25993; [64-29]
+    (=daikanwa		. 20289)	; &I-M-20289;
+    (=ucs@cns		. #x72C3)	; &GT-25993;
+    (=ucs@jis		. #x72C3)	; &GT-25993;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x72C3)	; 狃
+      ))
+    (ideographic-radical . 94)	; ⽝
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=gb2312		. #x6170)	; &G0-6170; [65-80]
+    (=ucs@unicode	. #x72C3)	; &G0-6170;
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
@@ -665,11 +720,7 @@
     (total-strokes	 . 7)
     (=ucs		. #x72C4)	; 狄
     (->subsumptive
-     ((<-formed
-       ((=jis-x0208	    . #x6D78)	; &GT-52140; [77-88]
-	(=daikanwa	    . 38886)	; &I-M-38886;
-	))
-      (shinjigen-1	  . 4767)
+     ((shinjigen-1	  . 4767)
       (shinjigen-2	  . 4767)
       (=jis-x0208	  . #x603F)	; &GT-26001; [64-31]
       (=gb2312		  . #x3552)	; &I-G0-3552; [21-50]
@@ -680,6 +731,10 @@
       (=gt-pj-1		  . #x603F)	; &I-GT-26001; [64-31]
       (=daikanwa	  . 20290)	; &I-M-20290;
       (=ucs@unicode	  . #x72C4)	; &GT-26001;
+      (<-formed
+       ((=jis-x0208	    . #x6D78)	; &GT-52140; [77-88]
+	(=daikanwa	    . 38886)	; &I-M-38886;
+	))
       )
      ((=cns11643-1	  . #x4B29)	; &C1-4B29; [43-09]
       ))
@@ -1849,17 +1904,58 @@
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 6)
-    (=daikanwa		. 20398)	; &M-20398;
+    (total-strokes	 . 9)
+    (=ucs		. #x2478D)	; 𤞍
+    (=daikanwa		. 20398)	; &I-M-20398;
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (=ucs		. #x2478E)	; 𤞎
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2478E)	; 𤞎
+      ))
+    (ideographic-radical . 94)	; ⽝
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
     (=daikanwa		. 20399)	; &M-20399;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x2478E)	; 𤞎
+      ))
+    (ideographic-radical . 94)	; ⽝
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (=ucs@iso		. #x2478E)	; &U-0002478E;
+    ))
+(define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (=ucs		. #x24789)	; 𤞉
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24789)	; 𤞉
+      ))
+    (ideographic-radical . 94)	; ⽝
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
     (=daikanwa		. 20400)	; &M-20400;
+    (=ucs@iso		. #x24789)	; &M-20400;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24789)	; 𤞉
+      ))
+    (ideographic-radical . 94)	; ⽝
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (=cbeta		. 06088)	; &CB06088;
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
@@ -1872,41 +1968,48 @@
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 6)
-    (=daikanwa		. 20402)	; &M-20402;
+    (total-strokes	 . 9)
+    (=ucs		. #x2478B)	; 𤞋
+    (=daikanwa		. 20402)	; &I-M-20402;
+    (=hanziku-4		. #xBCB5)	; &I-HZK04-BCB5;
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 6)
-    (=daikanwa		. 20403)	; &M-20403;
+    (total-strokes	 . 9)
+    (=ucs		. #x2478C)	; 𤞌
+    (->subsumptive
+     ((=daikanwa	  . 20403)	; &M-20403;
+      (=cbeta		  . 06343)	; &I-CB06343;
+      )
+     ((=hanziku-4	  . #xBCF8)	; &HZK04-BCF8;
+      (=ucs@iso		  . #x2478C)	; &HZK04-BCF8;
+      ))
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 6)
-    (=daikanwa		. 20404)	; &M-20404;
+    (total-strokes	 . 9)
+    (=ucs		. #x2478A)	; 𤞊
+    (=daikanwa		. 20404)	; &I-M-20404;
+    (=hanziku-4		. #xBC79)	; &I-HZK04-BC79;
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x247A3)	; 𤞣
-    (=daikanwa		. 20405)	; &I-M-20405;
-    ))
-(define-char
-  '((=>ucs		. #x247A3)	; 𤞣
-    (morohashi-daikanwa	20405 0 0)
-    (ideographic-radical . 94)	; ⽝
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=cns11643-6	. #x3945)	; &C6-3945; [25-37]
+    (->subsumptive
+     ((=daikanwa	  . 20405)	; &M-20405;
+      (=ucs@iso		  . #x247A3)	; &M-20405;
+      )
+     ((=cns11643-6	  . #x3945)	; &C6-3945; [25-37]
+      ))
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x7368)	; 獨
-      (=jis-x0208	  . #x6057)	; &I-J90-6057; [64-55]
-      ))
     (shinjigen-2	. 4781)
     (=ucs		. #x72EC)	; 独
     (=jis-x0208		. #x4648)	; &I-J90-4648; [38-40]
@@ -1915,16 +2018,23 @@
     (=gt		. 26125)	; &I-GT-26125;
     (=gt-pj-1		. #x4648)	; &I-GT-26125; [38-40]
     (=daikanwa		. 20406)	; &I-M-20406;
+    (<-simplified@CN
+     ((=ucs		  . #x7368)	; 獨
+      (=gb12345		  . #x3640)	; 獨 [22-32]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x7368)	; 獨
+      (=jis-x0208	  . #x6057)	; &I-J90-6057; [64-55]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x7368)	; 獨
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	20406 1)
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x72F9)	; 狹
-      (=jis-x0208	  . #x6045)	; &I-J90-6045; [64-37]
-      ))
     (=ucs		. #x72ED)	; 狭
     (=jis-x0208		. #x3639)	; &I-J90-3639; [22-25]
     (=gb2312		. #x4F41)	; &I-G0-4F41; [47-33]
@@ -1932,6 +2042,17 @@
     (=gt		. 26091)	; &I-GT-26091;
     (=gt-pj-1		. #x3639)	; &I-GT-26091; [22-25]
     (mojikyo		. 050276)	; &MCS-6000C464;
+    (<-simplified@CN
+     ((=ucs		  . #x72F9)	; 狹
+      (=gb12345		  . #x4F41)	; 狹 [47-33]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x72F9)	; 狹
+      (=jis-x0208	  . #x6045)	; &I-J90-6045; [64-37]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x72F9)	; 狹
+      ))
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
@@ -3308,13 +3429,6 @@
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified
-     ((=ks-x1001	  . #x6E44)	; &M-20534; [78-36]
-      (=jis-x0213-1-2000  . #x776F)	; &I-JX1-776F; [87-79]
-      (=daikanwa	  . 20534)	; &I-M-20534;
-      ))
-    (<-simplified*sources
-     daikanwa)
     (=jis-x0208		. #x4376)	; &GT-26237; [35-86]
     (=gb2312		. #x566D)	; &I-G0-566D; [54-77]
     (=gt		. 26237)	; &I-GT-26237;
@@ -3322,6 +3436,13 @@
     (=gt-pj-1		. #x4376)	; &I-GT-26237; [35-86]
     (=ucs@unicode	. #x732A)	; &GT-26237;
     (mojikyo		. 050277)	; &MCS-6000C465;
+    (<-simplified
+     ((=ks-x1001	  . #x6E44)	; &M-20534; [78-36]
+      (=jis-x0213-1-2000  . #x776F)	; &I-JX1-776F; [87-79]
+      (=daikanwa	  . 20534)	; &I-M-20534;
+      ))
+    (<-simplified*sources
+     daikanwa)
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
@@ -3336,20 +3457,20 @@
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((shinjigen-1	  . 4811)
-      (=ucs		  . #x7375)	; 獵
-      (=jis-x0208	  . #x605A)	; &I-J90-605A; [64-58]
-      (=daikanwa	  . 20768)	; &I-M-20768;
-      ))
-    (<-simplified@JP/Jouyou*sources
-     daikanwa shinjigen-1 JP/Jouyou)
     (shinjigen-1	. 4810)
     (=ucs		. #x731F)	; 猟
     (=jis-x0208		. #x4E44)	; &I-J90-4E44; [46-36]
     (=gt		. 26249)	; &I-GT-26249;
     (=gt-pj-1		. #x4E44)	; &I-GT-26249; [46-36]
     (mojikyo		. 050278)	; &MCS-6000C466;
+    (<-simplified@JP/Jouyou
+     ((shinjigen-1	  . 4811)
+      (=jis-x0208	  . #x605A)	; &GT-26597; [64-58]
+      (=ks-x1001	  . #x5634)	; &I-K0-5634; [54-20]
+      (=daikanwa	  . 20768)	; &I-M-20768;
+      ))
+    (<-simplified@JP/Jouyou*sources
+     daikanwa shinjigen-1 JP/Jouyou)
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
@@ -3716,19 +3837,19 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x732D)	; 猭
-    (=cns11643-2	. #x3D79)	; &I-C2-3D79; [29-89]
     (=big5		. #xDA75)	; &I-B-DA75;
-    (=daikanwa		. 20538)	; &I-M-20538;
+    (->subsumptive
+     ((=daikanwa	  . 20538)	; &M-20538;
+      )
+     ((=ucs@unicode	  . #x732D)	; &UU+732D;
+      )
+     ((=cns11643-2	  . #x3D79)	; &C2-3D79; [29-89]
+      ))
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x605B)	; &GT-26617; [64-59]
-      (=ks-x1001	  . #x7A4C)	; &I-K0-7A4C; [90-44]
-      (=daikanwa	  . 20783)	; &I-M-20783;
-      ))
     (shinjigen-2	. 4816)
     (=ucs		. #x732E)	; 献
     (=jis-x0208		. #x3825)	; &I-J90-3825; [24-05]
@@ -3737,6 +3858,17 @@
     (=gt		. 26346)	; &I-GT-26346;
     (=gt-pj-1		. #x3825)	; &I-GT-26346; [24-05]
     (=daikanwa		. 20539)	; &I-M-20539;
+    (<-simplified@CN
+     ((=gb12345		  . #x4F57)	; &UU+737B; [47-55]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x605B)	; &GT-26617; [64-59]
+      (=ks-x1001	  . #x7A4C)	; &I-K0-7A4C; [90-44]
+      (=daikanwa	  . 20783)	; &I-M-20783;
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x737B)	; 獻
+      ))
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
@@ -5970,35 +6102,63 @@
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=daikanwa		. 20712)	; &M-20712;
+    (=ucs		. #x24884)	; 𤢄
     ))
 (define-char
-  '((ideographic-radical . 94)	; ⽝
+  '((<-denotational
+     ((=ucs		  . #x24884)	; 𤢄
+      ))
+    (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=daikanwa		. 20713)	; &M-20713;
+    (=daikanwa		. 20712)	; &M-20712;
+    (=hanziku-4		. #xC1A8)	; &I-HZK04-C1A8;
     ))
 (define-char
-  '((=>ucs		. #x248A0)	; 𤢠
+  '((<-denotational
+     ((=ucs		  . #x24884)	; 𤢄
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=daikanwa		. 20714)	; &M-20714;
-    (mojikyo		. 020714)	; &MCS-600050EA;
+    (=ucs@iso		. #x24884)	; &U-00024884;
     ))
 (define-char
-  '((morohashi-daikanwa	20714 0 1)
-    (ideographic-radical . 94)	; ⽝
+  '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (=ucs		. #x24880)	; 𤢀
+    (=daikanwa		. 20713)	; &I-M-20713;
+    (=hanziku-4		. #xC16C)	; &I-HZK04-C16C;
+    ))
+(define-char
+  '((ideographic-radical . 94)	; ⽝
     (=ucs		. #x248A0)	; 𤢠
-    (=cns11643-7	. #x2532)	; &I-C7-2532; [05-18]
+    (->subsumptive
+     ((ideographic-strokes . 12)
+      (total-strokes	   . 15)
+      (=daikanwa	  . 20714)	; &M-20714;
+      (mojikyo		  . 020714)	; &MCS-600050EA;
+      )
+     ((ideographic-strokes@ucs . 13)
+      (total-strokes@ucs       . 16)
+      (ideographic-strokes@cns . 12)
+      (total-strokes@cns       . 15)
+      (=cns11643-7	  . #x2532)	; &C7-2532; [05-18]
+      (=ucs@iso		  . #x248A0)	; &C7-2532;
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	20714 1)
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (shinjigen-1	. 4842)
+    (=ucs		. #x7363)	; 獣
+    (=jis-x0208		. #x3D43)	; &I-J90-3D43; [29-35]
+    (=gt		. 26528)	; &I-GT-26528;
+    (=gt-pj-1		. #x3D43)	; &I-GT-26528; [29-35]
+    (mojikyo		. 050279)	; &MCS-6000C467;
     (<-simplified@JP/Jouyou
      ((shinjigen-1	  . 4843)
       (=ucs		  . #x7378)	; 獸
@@ -6007,12 +6167,6 @@
       ))
     (<-simplified@JP/Jouyou*sources
      daikanwa shinjigen-1 JP/Jouyou)
-    (shinjigen-1	. 4842)
-    (=ucs		. #x7363)	; 獣
-    (=jis-x0208		. #x3D43)	; &I-J90-3D43; [29-35]
-    (=gt		. 26528)	; &I-GT-26528;
-    (=gt-pj-1		. #x3D43)	; &I-GT-26528; [29-35]
-    (mojikyo		. 050279)	; &MCS-6000C467;
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
@@ -6051,64 +6205,106 @@
     (=cns11643-7	. #x252D)	; &I-C7-252D; [05-13]
     ))
 (define-char
-  '((=>ucs		. #x2488C)	; 𤢌
-    (ideographic-radical . 94)	; ⽝
+  '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=daikanwa		. 20715)	; &M-20715;
-    (mojikyo		. 020715)	; &MCS-600050EB;
+    (=ucs		. #x2488C)	; 𤢌
     ))
 (define-char
-  '((morohashi-daikanwa	20715 0 0)
+  '((<-denotational
+     ((=ucs		  . #x2488C)	; 𤢌
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs		. #x2488C)	; 𤢌
+    (->subsumptive
+     ((=daikanwa	  . 20715)	; &M-20715;
+      (mojikyo		  . 020715)	; &MCS-600050EB;
+      )
+     ((=ucs@iso		  . #x2488C)	; &U-0002488C;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x2488C)	; 𤢌
-    (morohashi-daikanwa	20715 0 2)
+  '((<-denotational
+     ((=ucs		  . #x2488C)	; 𤢌
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (=cns11643-5	. #x5557)	; &C5-5557; [53-55]
     ))
 (define-char
-  '((=>ucs		. #x3E9A)	; 㺚
+  '((ideographic-radical . 94)	; ⽝
+    (=ucs		. #x3E9A)	; 㺚
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3E9A)	; 㺚
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
+    (shinjigen-1	. 4861)
     (=daikanwa		. 20716)	; &M-20716;
+    (=hanziku-4		. #xC1E4)	; &I-HZK04-C1E4;
+    (<-formed
+     ((shinjigen-1	  . 4860)
+      (=jis-x0208	  . #x605C)	; &GT-26607; [64-60]
+      (=ks-x1001	  . #x5337)	; &I-K0-5337; [51-23]
+      (=cns11643-1	  . #x784C)	; &I-C1-784C; [88-44]
+      (=daikanwa	  . 20782)	; &I-M-20782;
+      ))
+    (<-formed*sources
+     shinjigen-1)
     ))
 (define-char
-  '((morohashi-daikanwa	20716 0 2)
+  '((<-denotational
+     ((=ucs		  . #x3E9A)	; 㺚
+      ))
     (ideographic-radical . 94)	; ⽝
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x3E9A)	; 㺚
-    (=cns11643-7	. #x2F74)	; &I-C7-2F74; [15-84]
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x3E9A)	; &UU+3E9A;
     ))
 (define-char
-  '((=>ucs		. #x2488D)	; 𤢍
+  '((<-denotational
+     ((=ucs		  . #x3E9A)	; 㺚
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=daikanwa		. 20717)	; &M-20717;
+    (=cns11643-7	. #x2F74)	; &C7-2F74; [15-84]
     ))
 (define-char
-  '((=>ucs		. #x2488D)	; 𤢍
-    (morohashi-daikanwa	20717 0 2)
+  '((ideographic-radical . 94)	; ⽝
+    (=ucs		. #x2488D)	; 𤢍
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2488D)	; 𤢍
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=cns11643-4	. #x5135)	; &C4-5135; [49-21]
+    (=daikanwa		. 20717)	; &M-20717;
     ))
 (define-char
-  '((morohashi-daikanwa	20717 0 3)
+  '((<-denotational
+     ((=ucs		  . #x2488D)	; 𤢍
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x2488D)	; 𤢍
+    (=ucs@iso		. #x2488D)	; &U-0002488D;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2488D)	; 𤢍
+      ))
+    (ideographic-radical . 94)	; ⽝
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=cns11643-4	. #x5135)	; &C4-5135; [49-21]
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
@@ -6828,57 +7024,80 @@
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
+    (=ucs		. #x7375)	; 獵
+    (=big5		. #xC279)	; &I-B-C279;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7375)	; 獵
+      ))
+    (ideographic-radical . 94)	; ⽝
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
     (shinjigen-1	. 4811)
     (shinjigen-2	. 4813)
-    (=ucs		. #x7375)	; 獵
-    (=jis-x0208		. #x605A)	; &I-J90-605A; [64-58]
+    (=jis-x0208		. #x605A)	; &GT-26597; [64-58]
     (=ks-x1001		. #x5634)	; &I-K0-5634; [54-20]
-    (=gb12345		. #x4154)	; 獵 [33-52]
-    (=big5		. #xC279)	; &I-B-C279;
+    (=gb12345		. #x4154)	; &GT-26597; [33-52]
     (=gt		. 26597)	; &I-GT-26597;
     (=gt-pj-1		. #x605A)	; &I-GT-26597; [64-58]
     (=daikanwa		. 20768)	; &I-M-20768;
+    (=ucs@unicode	. #x7375)	; &GT-26597;
     ))
 (define-char
-  '((=>ucs		. #x7375)	; 獵
-    (morohashi-daikanwa	20768 0 4)
+  '((<-denotational
+     ((=ucs		  . #x7375)	; 獵
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (=cns11643-1	. #x7665)	; &C1-7665; [86-69]
     ))
 (define-char
-  '((=>ucs		. #x248B8)	; 𤢸
-    (ideographic-radical . 94)	; ⽝
+  '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=daikanwa		. 20769)	; &M-20769;
+    (=ucs		. #x248B8)	; 𤢸
+    (->subsumptive
+     ((=daikanwa	  . 20769)	; &M-20769;
+      )
+     ((=cns11643-7	  . #x4059)	; &C7-4059; [32-57]
+      (=ucs@iso		  . #x248B8)	; &C7-4059;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	20769 0 0)
-    (ideographic-radical . 94)	; ⽝
+  '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x248B8)	; 𤢸
-    (=cns11643-7	. #x4059)	; &I-C7-4059; [32-57]
+    (=ucs		. #x7376)	; 獶
+    (=big5		. #xEFFE)	; &I-B-EFFE;
     ))
 (define-char
-  '((ideographic-radical . 94)	; ⽝
+  '((<-denotational
+     ((=ucs		  . #x7376)	; 獶
+      ))
+    (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x7376)	; 獶
     (->subsumptive
      ((=daikanwa	  . 20770)	; &M-20770;
       )
+     ((mojikyo		  . 020770)	; &MCS-60005122;
+      )
      ((=cns11643-2	  . #x622C)	; &C2-622C; [66-12]
       (=ucs@cns		  . #x7376)	; &C2-622C;
-      (mojikyo		  . 020770)	; &MCS-60005122;
-      )
-     ((=big5		  . #xEFFE)	; &B-EFFE;
-      (=ucs@unicode	  . #x7376)	; &B-EFFE;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x7376)	; 獶
+      ))
+    (ideographic-radical . 94)	; ⽝
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs@unicode	. #x7376)	; &UU+7376;
+    ))
+(define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
@@ -6900,36 +7119,45 @@
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (=ucs		. #x3EA0)	; 㺠
-    (=cns11643-4	. #x5B67)	; &I-C4-5B67; [59-71]
-    (=daikanwa		. 20773)	; &I-M-20773;
+    (->subsumptive
+     ((=daikanwa	  . 20773)	; &M-20773;
+      )
+     ((=cns11643-4	  . #x5B67)	; &C4-5B67; [59-71]
+      )
+     ((=ucs@unicode	  . #x3EA0)	; &UU+3EA0;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x7377)	; 獷
-    (ideographic-radical . 94)	; ⽝
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=jis-x0212		. #x4B4A)	; &M-20774; [43-42]
-    (=jis-x0213-2-2000	. #x7057)	; &I-JX2-7057; [80-55]
-    (=big5		. #xC278)	; &I-B-C278;
-    (=daikanwa		. 20774)	; &I-M-20774;
-    (=jef-china3	. #x58F6)	; &I-JC3-58F6;
-    (=ucs@jis		. #x7377)	; &M-20774;
+  '((ideographic-radical . 94)	; ⽝
+    (=ucs		. #x7377)	; 獷
     ))
 (define-char
-  '((=>ucs		. #x7377)	; 獷
-    (morohashi-daikanwa	20774 0 1)
+  '((<-denotational
+     ((=ucs		  . #x7377)	; 獷
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=cns11643-1	. #x7664)	; &C1-7664; [86-68]
+    (=big5		. #xC278)	; &B-C278;
+    (->subsumptive
+     ((=jis-x0212	  . #x4B4A)	; &M-20774; [43-42]
+      (=jis-x0213-2-2000  . #x7057)	; &I-JX2-7057; [80-55]
+      (=daikanwa	  . 20774)	; &I-M-20774;
+      (=jef-china3	  . #x58F6)	; &I-JC3-58F6;
+      (=ucs@jis		  . #x7377)	; &M-20774;
+      )
+     ((=cns11643-1	  . #x7664)	; &C1-7664; [86-68]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	20774 0 4)
+  '((<-denotational
+     ((=ucs		  . #x7377)	; 獷
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x7377)	; 獷
-    (=gb12345		. #x616E)	; 獷 [65-78]
+    (=gb12345		. #x616E)	; &UU+7377; [65-78]
+    (=ucs@unicode	. #x7377)	; &UU+7377;
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
@@ -6949,10 +7177,27 @@
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
+    (=ucs		. #x248BC)	; 𤢼
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x248BC)	; 𤢼
+      ))
+    (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 15)
+    (total-strokes	 . 18)
     (=daikanwa		. 20776)	; &M-20776;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x248BC)	; 𤢼
+      ))
+    (ideographic-radical . 94)	; ⽝
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs@iso		. #x248BC)	; &U-000248BC;
+    ))
+(define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
@@ -6974,51 +7219,65 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (=ucs		. #x3EA1)	; 㺡
-    (=cns11643-5	. #x683B)	; &I-C5-683B; [72-27]
-    (=daikanwa		. 20778)	; &I-M-20778;
-    ))
-(define-char
-  '((=>ucs		. #x248C5)	; 𤣅
-    (ideographic-radical . 94)	; ⽝
-    (ideographic-strokes . 16)
-    (total-strokes	 . 20)
-    (=daikanwa		. 20779)	; &M-20779;
+    (->subsumptive
+     ((=daikanwa	  . 20778)	; &M-20778;
+      (=ucs@unicode	  . #x3EA1)	; &M-20778;
+      )
+     ((=cns11643-5	  . #x683B)	; &C5-683B; [72-27]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	20779 0 1)
-    (ideographic-radical . 94)	; ⽝
+  '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
     (=ucs		. #x248C5)	; 𤣅
+    (->subsumptive
+     ((=daikanwa	  . 20779)	; &M-20779;
+      )
+     ((=ucs@iso		  . #x248C5)	; &U-000248C5;
+      )
+     ((=cns11643-4	  . #x6364)	; &C4-6364; [67-68]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x248C5)	; 𤣅
-    (morohashi-daikanwa	20779 0 2)
-    (ideographic-radical . 94)	; ⽝
+  '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
-    (total-strokes	 . 20)
-    (=cns11643-4	. #x6364)	; &C4-6364; [67-68]
+    (total-strokes	 . 19)
+    (=ucs		. #x7379)	; 獹
+    (->subsumptive
+     ((=jis-x0212	  . #x4B4B)	; &M-20780; [43-43]
+      (=daikanwa	  . 20780)	; &I-M-20780;
+      (=ucs@unicode	  . #x7379)	; &M-20780;
+      )
+     ((=cns11643-4	  . #x6025)	; &C4-6025; [64-05]
+      ))
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (=ucs		. #x7379)	; 獹
-    (=jis-x0212		. #x4B4B)	; &I-JSP-4B4B; [43-43]
-    (=cns11643-4	. #x6025)	; &I-C4-6025; [64-05]
-    (=daikanwa		. 20780)	; &I-M-20780;
+    (=ucs		. #x248C6)	; 𤣆
+    (->subsumptive
+     ((=daikanwa	  . 20781)	; &M-20781;
+      )
+     ((=hanziku-4	  . #xC366)	; &HZK04-C366;
+      (=ucs@iso		  . #x248C6)	; &HZK04-C366;
+      ))
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (=daikanwa		. 20781)	; &M-20781;
+    (=ucs		. #x737A)	; 獺
     ))
 (define-char
-  '((=>ucs		. #x737A)	; 獺
+  '((<-denotational
+     ((=ucs		  . #x737A)	; 獺
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
+    (shinjigen-1	. 4860)
     (shinjigen-2	. 4860)
     (=jis-x0208		. #x605C)	; &GT-26607; [64-60]
     (=ks-x1001		. #x5337)	; &I-K0-5337; [51-23]
@@ -7030,15 +7289,25 @@
     (=ucs@jis		. #x737A)	; &GT-26607;
     ))
 (define-char
-  '((morohashi-daikanwa	20782 0 4)
+  '((<-denotational
+     ((=ucs		  . #x737A)	; 獺
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (=ucs		. #x737A)	; 獺
-    (=gb12345		. #x4C21)	; 獺 [44-01]
+    (=gb12345		. #x4C21)	; &UU+737A; [44-01]
+    (=ucs@unicode	. #x737A)	; &UU+737A;
     ))
 (define-char
-  '((=>ucs		. #x737B)	; 獻
+  '((ideographic-radical . 94)	; ⽝
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=ucs		. #x737B)	; 獻
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x737B)	; 獻
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
@@ -7052,43 +7321,49 @@
     (=ucs@jis		. #x737B)	; &GT-26617;
     ))
 (define-char
-  '((morohashi-daikanwa	20783 0 2)
-    (ideographic-radical . 94)	; ⽝
-    (ideographic-strokes . 16)
-    (total-strokes	 . 20)
-    (=ucs		. #x737B)	; 獻
-    (=gb12345		. #x4F57)	; 獻 [47-55]
-    ))
-(define-char
-  '((=>ucs		. #x737B)	; 獻
-    (morohashi-daikanwa	20783 0 3)
+  '((<-denotational
+     ((=ucs		  . #x737B)	; 獻
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=cns11643-1	. #x7978)	; &C1-7978; [89-88]
+    (->subsumptive
+     ((=gb12345		  . #x4F57)	; &UU+737B; [47-55]
+      (=ucs@unicode	  . #x737B)	; &UU+737B;
+      )
+     ((=cns11643-1	  . #x7978)	; &C1-7978; [89-88]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x248CA)	; 𤣊
-    (ideographic-radical . 94)	; ⽝
+  '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (=daikanwa		. 20785)	; &M-20785;
+    (=ucs		. #x248CA)	; 𤣊
+    (->subsumptive
+     ((=daikanwa	  . 20785)	; &M-20785;
+      )
+     ((=cns11643-7	  . #x4776)	; &C7-4776; [39-86]
+      (=ucs@iso		  . #x248CA)	; &C7-4776;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	20785 0 1)
-    (ideographic-radical . 94)	; ⽝
+  '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (=ucs		. #x248CA)	; 𤣊
-    (=cns11643-7	. #x4776)	; &I-C7-4776; [39-86]
+    (=ucs		. #x248CC)	; 𤣌
+    (=daikanwa		. 20786)	; &I-M-20786;
+    (=hanziku-4		. #xC3A9)	; &I-HZK04-C3A9;
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
-    (=daikanwa		. 20786)	; &M-20786;
+    (total-strokes	 . 19)
+    (=ucs		. #x248A9)	; 𤢩
     ))
 (define-char
-  '((=>ucs		. #x248A9)	; 𤢩
+  '((<-denotational
+     ((=ucs		  . #x248A9)	; 𤢩
+      ))
     (morohashi-daikanwa	20786 1)
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
@@ -7098,41 +7373,61 @@
     (mojikyo		. 050281)	; &MCS-6000C469;
     ))
 (define-char
-  '((=>ucs		. #x248A9)	; 𤢩
-    (morohashi-daikanwa	20786 1 2)
+  '((<-denotational
+     ((=ucs		  . #x248A9)	; 𤢩
+      ))
     (ideographic-radical . 94)	; ⽝
-    (ideographic-strokes . 16)
-    (total-strokes	 . 19)
-    (=cns11643-7	. #x4777)	; &C7-4777; [39-87]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs@iso		. #x248A9)	; &U-000248A9;
     ))
 (define-char
-  '((morohashi-daikanwa	20786 1 3)
+  '((<-denotational
+     ((=ucs		  . #x248A9)	; 𤢩
+      ))
     (ideographic-radical . 94)	; ⽝
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x248A9)	; 𤢩
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (=cns11643-7	. #x4777)	; &C7-4777; [39-87]
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (=ucs		. #x248CB)	; 𤣋
-    (=daikanwa		. 20787)	; &I-M-20787;
     ))
 (define-char
-  '((=>ucs		. #x248CB)	; 𤣋
-    (morohashi-daikanwa	20787 0 2)
+  '((<-denotational
+     ((=ucs		  . #x248CB)	; 𤣋
+      ))
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (=cns11643-7	. #x4774)	; &C7-4774; [39-84]
+    (=daikanwa		. 20787)	; &M-20787;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x248CB)	; 𤣋
+      ))
+    (ideographic-radical . 94)	; ⽝
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (->subsumptive
+     ((=ucs@iso		  . #x248CB)	; &U-000248CB;
+      )
+     ((=cns11643-7	  . #x4774)	; &C7-4774; [39-84]
+      ))
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (=ucs		. #x248C8)	; 𤣈
-    (=cns11643-7	. #x4778)	; &I-C7-4778; [39-88]
+    (->subsumptive
+     ((=cns11643-7	  . #x4778)	; &C7-4778; [39-88]
+      )
+     ((=ucs@iso		  . #x248C8)	; &U-000248C8;
+      ))
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
diff --git a/lisp/utf-2000/Ideograph-R095-Profound.el b/lisp/utf-2000/Ideograph-R095-Profound.el
index 71c7352..e0188c3 100644
--- a/lisp/utf-2000/Ideograph-R095-Profound.el
+++ b/lisp/utf-2000/Ideograph-R095-Profound.el
@@ -1,71 +1,69 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (define-char
-  '((=>ucs		. #x7384)	; 玄
-    (ideographic-radical . 95)	; ⽞
-    (ideographic-strokes . 0)
-    (total-strokes	 . 5)
-    (shinjigen-2	. 4867)
-    (=jis-x0208		. #x383C)	; &GT-26647; [24-28]
-    (=ks-x1001		. #x7A5C)	; &I-K0-7A5C; [90-60]
-    (=big5		. #xA5C8)	; &I-B-A5C8;
-    (=gt		. 26647)	; &I-GT-26647;
-    (=gt-k		. 00923)	; &I-GT-K00923;
-    (=gt-pj-1		. #x383C)	; &I-GT-26647; [24-28]
-    (=daikanwa		. 20814)	; &I-M-20814;
-    (=ucs@jis		. #x7384)	; &GT-26647;
-    ))
-(define-char
-  '((morohashi-daikanwa	20814 0 0)
-    (ideographic-radical . 95)	; ⽞
+  '((ideographic-radical . 95)	; ⽞
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
     (=ucs		. #x7384)	; 玄
-    (=gb2312		. #x507E)	; &I-G0-507E; [48-94]
-    (=cns11643-1	. #x4668)	; &I-C1-4668; [38-72]
-    ))
-(define-char
-  '((=>ucs		. #x7385)	; 玅
-    (ideographic-radical . 95)	; ⽞
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (=jis-x0212		. #x4B50)	; &M-20815; [43-48]
-    (=jis-x0213-2-2000	. #x7059)	; &I-JX2-7059; [80-57]
-    (=big5		. #xCFC6)	; &I-B-CFC6;
-    (=daikanwa		. 20815)	; &I-M-20815;
-    (=jef-china3	. #x58FE)	; &I-JC3-58FE;
-    (=ucs@jis		. #x7385)	; &M-20815;
+    (=big5		. #xA5C8)	; &I-B-A5C8;
+    (->subsumptive
+     ((shinjigen-2	  . 4867)
+      (=jis-x0208	  . #x383C)	; &GT-26647; [24-28]
+      (=ks-x1001	  . #x7A5C)	; &I-K0-7A5C; [90-60]
+      (=gt		  . 26647)	; &I-GT-26647;
+      (=gt-k		  . 00923)	; &I-GT-K00923;
+      (=gt-pj-1		  . #x383C)	; &I-GT-26647; [24-28]
+      (=daikanwa	  . 20814)	; &I-M-20814;
+      (=ucs@jis		  . #x7384)	; &GT-26647;
+      )
+     ((=gb2312		  . #x507E)	; &C1-4668; [48-94]
+      (=cns11643-1	  . #x4668)	; &I-C1-4668; [38-72]
+      (=ucs@unicode	  . #x7384)	; &C1-4668;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	20815 0 0)
-    (ideographic-radical . 95)	; ⽞
+  '((ideographic-radical . 95)	; ⽞
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
     (=ucs		. #x7385)	; 玅
-    (=cns11643-2	. #x2C28)	; &I-C2-2C28; [12-08]
+    (=big5		. #xCFC6)	; &I-B-CFC6;
+    (->subsumptive
+     ((=jis-x0212	  . #x4B50)	; &M-20815; [43-48]
+      (=jis-x0213-2-2000  . #x7059)	; &I-JX2-7059; [80-57]
+      (=daikanwa	  . 20815)	; &I-M-20815;
+      (=jef-china3	  . #x58FE)	; &I-JC3-58FE;
+      (=ucs@jis		  . #x7385)	; &M-20815;
+      )
+     ((=cns11643-2	  . #x2C28)	; &C2-2C28; [12-08]
+      (=ucs@unicode	  . #x7385)	; &C2-2C28;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x7386)	; 玆
-    (ideographic-radical . 95)	; ⽞
+  '((ideographic-radical . 95)	; ⽞
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (=ks-x1001		. #x6D35)	; &M-20816; [77-21]
-    (=jis-x0212		. #x4B51)	; &I-JSP-4B51; [43-49]
+    (=ucs		. #x7386)	; 玆
     (=big5		. #xAF59)	; &I-B-AF59;
-    (=daikanwa		. 20816)	; &I-M-20816;
-    (=jef-china3	. #x58FC)	; &I-JC3-58FC;
-    (=ucs@jis		. #x7386)	; &M-20816;
+    (->subsumptive
+     ((=ks-x1001	  . #x6D35)	; &M-20816; [77-21]
+      (=jis-x0212	  . #x4B51)	; &I-JSP-4B51; [43-49]
+      (=daikanwa	  . 20816)	; &I-M-20816;
+      (=jef-china3	  . #x58FC)	; &I-JC3-58FC;
+      (=ucs@jis		  . #x7386)	; &M-20816;
+      )
+     ((=cns11643-1	  . #x565C)	; &C1-565C; [54-60]
+      (=ucs@unicode	  . #x7386)	; &C1-565C;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	20816 0 0)
-    (ideographic-radical . 95)	; ⽞
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (=ucs		. #x7386)	; 玆
-    (=cns11643-1	. #x565C)	; &I-C1-565C; [54-60]
+  '((ideographic-radical . 95)	; ⽞
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
+    (=ucs		. #x7387)	; 率
     ))
 (define-char
-  '((=>ucs		. #x7387)	; 率
-    (morohashi-daikanwa	20817)
+  '((<-denotational
+     ((=ucs		  . #x7387)	; 率
+      ))
     (ideographic-radical . 95)	; ⽞
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
@@ -74,144 +72,87 @@
     (mojikyo		. 020817)	; &MCS-60005151;
     ))
 (define-char
-  '((=>ucs		. #x7387)	; 率
-    (morohashi-daikanwa	20817 1)
-    (ideographic-radical . 95)	; ⽞
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
-    (=jis-x0208		. #x4E28)	; &GT-26651; [46-08]
-    (=ks-x1001		. #x6163)	; &I-K0-6163; [65-67]
-    (=big5		. #xB276)	; &I-B-B276;
-    (=gt		. 26651)	; &I-GT-26651;
-    (=gt-k		. 07893)	; &I-GT-K07893;
-    (=gt-pj-1		. #x4E28)	; &I-GT-26651; [46-08]
-    (=ucs@jis		. #x7387)	; &GT-26651;
-    (mojikyo		. 050282)	; &MCS-6000C46A;
-    ))
-(define-char
-  '((morohashi-daikanwa	20817 1 0)
+  '((<-denotational
+     ((=ucs		  . #x7387)	; 率
+      ))
     (ideographic-radical . 95)	; ⽞
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (->mojikyo		. 050282)	; &GT-26651;
-    (=ucs		. #x7387)	; 率
-    (=gb2312		. #x424A)	; &I-G0-424A; [34-42]
-    (=cns11643-1	. #x5B7B)	; &I-C1-5B7B; [59-91]
-    ))
-(define-char
-  '((=>ucs		. #x7388)	; 玈
-    (ideographic-radical . 95)	; ⽞
-    (ideographic-strokes . 6)
-    (=big5		. #xD66A)	; &M-20818;
-    (=daikanwa		. 20818)	; &I-M-20818;
+    (=big5		. #xB276)	; &B-B276;
+    (->subsumptive
+     ((morohashi-daikanwa	20817 1)
+      (=jis-x0208	  . #x4E28)	; &GT-26651; [46-08]
+      (=ks-x1001	  . #x6163)	; &I-K0-6163; [65-67]
+      (=gt		  . 26651)	; &I-GT-26651;
+      (=gt-k		  . 07893)	; &I-GT-K07893;
+      (=gt-pj-1		  . #x4E28)	; &I-GT-26651; [46-08]
+      (=ucs@jis		  . #x7387)	; &GT-26651;
+      (mojikyo		  . 050282)	; &MCS-6000C46A;
+      )
+     ((=gb2312		  . #x424A)	; &C1-5B7B; [34-42]
+      (=cns11643-1	  . #x5B7B)	; &I-C1-5B7B; [59-91]
+      (=ucs@unicode	  . #x7387)	; &C1-5B7B;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	20818 0 0)
-    (ideographic-radical . 95)	; ⽞
+  '((ideographic-radical . 95)	; ⽞
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs		. #x7388)	; 玈
-    (=cns11643-2	. #x372F)	; &I-C2-372F; [23-15]
-    ))
-(define-char
-  '((=>ucs		. #x248E7)	; 𤣧
-    (ideographic-radical . 95)	; ⽞
-    (ideographic-strokes . 7)
-    (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=big5		. #xD66A)	; &I-B-D66A;
+    (->subsumptive
+     ((=daikanwa	  . 20818)	; &M-20818;
       )
-     ((=jis-x0208	  . #x383C)	; &GT-26647; [24-28]
-      (=ks-x1001	  . #x7A5C)	; &I-K0-7A5C; [90-60]
-      (=daikanwa	  . 20814)	; &I-M-20814;
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs		    . #x5C71)	; å±±
-	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	  (=ucs		      . #x2FF1)	; ⿱
-	  )
-	 ((name*	      . "ideographic component person for top")
-	  (=ucs		      . #x20089)	; 𠂉
-	  )
-	 ((name		      . "CJK RADICAL DIVINATION")
-	  (=ucs		      . #x2E8A)	; ⺊
-	  ))
-	))
+     ((=cns11643-2	  . #x372F)	; &C2-372F; [23-15]
+      (=ucs@unicode	  . #x7388)	; &C2-372F;
       ))
-    (=daikanwa		. 20819)	; &M-20819;
     ))
 (define-char
-  '((morohashi-daikanwa	20819 0 0)
-    (ideographic-radical . 95)	; ⽞
+  '((ideographic-radical . 95)	; ⽞
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 291 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x7384)	; 玄
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs		    . #x5C71)	; å±±
-	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	  (=ucs		      . #x2FF1)	; ⿱
-	  )
-	 ((name*	      . "ideographic component person for top")
-	  (=ucs		      . #x20089)	; 𠂉
-	  )
-	 ((name		      . "CJK RADICAL DIVINATION")
-	  (=ucs		      . #x2E8A)	; ⺊
-	  ))
-	))
-      ))
     (=ucs		. #x248E7)	; 𤣧
-    (=cns11643-6	. #x4B46)	; &I-C6-4B46; [43-38]
-    (=hanziku-1		. #xE1F1)	; &I-HZK01-E1F1;
-    ))
-(define-char
-  '((=>ucs		. #x248E8)	; 𤣨
-    (ideographic-radical . 95)	; ⽞
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (->subsumptive
+     ((=daikanwa	  . 20819)	; &M-20819;
       )
-     ((=jis-x0208	  . #x383C)	; &GT-26647; [24-28]
-      (=ks-x1001	  . #x7A5C)	; &I-K0-7A5C; [90-60]
-      (=daikanwa	  . 20814)	; &I-M-20814;
+     ((hanyu-dazidian	  1 291 1)
+      (=hanziku-1	  . #xE1F1)	; &HZK01-E1F1;
+      (=ucs@iso		  . #x248E7)	; &HZK01-E1F1;
       )
-     ((=ucs		  . #x66F7)	; 曷
+     ((=cns11643-6	  . #x4B46)	; &C6-4B46; [43-38]
       ))
-    (=daikanwa		. 20820)	; &M-20820;
     ))
 (define-char
-  '((morohashi-daikanwa	20820 0 0)
-    (ideographic-radical . 95)	; ⽞
+  '((ideographic-radical . 95)	; ⽞
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 292 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x248E8)	; 𤣨
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0208	    . #x383C)	; &GT-26647; [24-28]
+	(=ks-x1001	    . #x7A5C)	; &I-K0-7A5C; [90-60]
+	(=daikanwa	    . 20814)	; &I-M-20814;
+	)
+       ((=ucs		    . #x66F7)	; 曷
+	))
+      (=daikanwa	  . 20820)	; &M-20820;
       )
-     ((=ucs		  . #x7384)	; 玄
+     ((hanyu-dazidian	  1 292 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gb2312	    . #x507E)	; &C1-4668; [48-94]
+	(=cns11643-1	    . #x4668)	; &I-C1-4668; [38-72]
+	)
+       ((=ucs		    . #x66F7)	; 曷
+	))
+      (=hanziku-1	  . #xE254)	; &HZK01-E254;
+      (=ucs@iso		  . #x248E8)	; &HZK01-E254;
       )
-     ((=ucs		  . #x66F7)	; 曷
+     ((=cns11643-6	  . #x5E72)	; &C6-5E72; [62-82]
       ))
-    (=ucs		. #x248E8)	; 𤣨
-    (=cns11643-6	. #x5E72)	; &I-C6-5E72; [62-82]
-    (=hanziku-1		. #xE254)	; &I-HZK01-E254;
     ))
diff --git a/lisp/utf-2000/Ideograph-R096-Jade.el b/lisp/utf-2000/Ideograph-R096-Jade.el
index 09d4b1d..e842bc1 100644
--- a/lisp/utf-2000/Ideograph-R096-Jade.el
+++ b/lisp/utf-2000/Ideograph-R096-Jade.el
@@ -49,18 +49,18 @@
   '((ideographic-radical . 96)	; ⽟
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-formed@component/connect-right
-     ((=ucs		  . #x7389)	; 玉
-      (=daikanwa	  . 20821)	; &I-M-20821;
-      ))
-    (<-formed@component/connect-right*sources
-     zihui/char-index daikanwa)
     (shinjigen-1	. 4874)
     (=ucs		. #x248E9)	; 𤣩
     (=cns11643-5	. #x214C)	; &I-C5-214C; [01-44]
     (=gt		. 26658)	; &I-GT-26658;
     (=gt-pj-4		. #x6D74)	; &I-GT-26658; [77-84]
     (=daikanwa		. 20824)	; &I-M-20824;
+    (<-formed@component/connect-right
+     ((=ucs		  . #x7389)	; 玉
+      (=daikanwa	  . 20821)	; &I-M-20821;
+      ))
+    (<-formed@component/connect-right*sources
+     zihui/char-index daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -70,6 +70,9 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA9)	; ⺩
+    (=gt-k		. 00402)	; &I-GT-K00402;
+    (=gt-pj-k1		. #x3467)	; ⺩ [20-71]
     (<-formed@component/connect-right
      ((=ucs		  . #x738B)	; 王
       )
@@ -78,9 +81,6 @@
     (<-identical@component/connect-right
      ((=ucs		  . #x248E9)	; 𤣩
       ))
-    (=ucs		. #x2EA9)	; ⺩
-    (=gt-k		. 00402)	; &I-GT-K00402;
-    (=gt-pj-k1		. #x3467)	; ⺩ [20-71]
     ))
 (define-char
   '((ideographic-radical . 96)	; ⽟
@@ -1319,27 +1319,45 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x73CE)	; 珎
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x73CE)	; 珎
+      ))
+    (ideographic-radical . 96)	; ⽟
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
     (->subsumptive
-     ((<-vulgar
+     ((=jis-x0208@1978	  . #x605F)	; &GT-26768; [64-63]
+      (=cns11643-3	  . #x2D7E)	; &I-C3-2D7E; [13-94]
+      (=gt		  . 26768)	; &I-GT-26768;
+      (=gt-pj-4		  . #x6E70)	; &I-GT-26768; [78-80]
+      (=daikanwa	  . 20921)	; &I-M-20921;
+      (<-vulgar
        ((=ucs		    . #x73CD)	; 珍
 	(=daikanwa	    . 20920)	; &I-M-20920;
 	))
       (<-vulgar*sources
        jiyun daikanwa)
-      (=jis-x0208@1978	  . #x605F)	; &M-20921; [64-63]
-      (=daikanwa	  . 20921)	; &I-M-20921;
-      (=ucs@unicode	  . #x73CE)	; &M-20921;
       )
-     ((=jis-x0208@1983	  . #x605F)	; &GT-26769; [64-63]
-      (=jis-x0208@1990	  . #x605F)	; &I-J90-605F; [64-63]
-      (=cns11643-3	  . #x2D7E)	; &I-C3-2D7E; [13-94]
-      (=gt		  . 26769)	; &I-GT-26769;
-      (=gt-pj-1		  . #x605F)	; &I-GT-26769; [64-63]
-      (=jef-china3	  . #x5AAB)	; &I-JC3-5AAB;
-      (=ucs@jis		  . #x73CE)	; &GT-26769;
+     ((=ucs@unicode	  . #x73CE)	; &UU+73CE;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x73CE)	; 珎
+      ))
+    (ideographic-radical . 96)	; ⽟
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=jis-x0208@1983	. #x605F)	; &GT-26769; [64-63]
+    (=jis-x0208@1990	. #x605F)	; &I-J90-605F; [64-63]
+    (=gt		. 26769)	; &I-GT-26769;
+    (=gt-pj-1		. #x605F)	; &I-GT-26769; [64-63]
+    (=jef-china3	. #x5AAB)	; &I-JC3-5AAB;
+    (=ucs@jis		. #x73CE)	; &GT-26769;
+    ))
+(define-char
   '((ideographic-radical . 96)	; ⽟
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
@@ -4289,13 +4307,6 @@
     (ideographic-radical . 96)	; ⽟
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x6076)	; &GT-27116; [64-86]
-      (=jis-x0208@1983	  . #x7424)	; &I-J83-7424; [84-04]
-      (=ks-x1001	  . #x687D)	; &I-K0-687D; [72-93]
-      (=jis-x0208@1990	  . #x7424)	; &I-J90-7424; [84-04]
-      (=daikanwa	  . 21149)	; &I-M-21149;
-      ))
     (=jis-x0208@1983	. #x6076)	; &GT-27062; [64-86]
     (=jis-x0208@1990	. #x6076)	; &I-J90-6076; [64-86]
     (=gt		. 27062)	; &I-GT-27062;
@@ -4303,9 +4314,22 @@
     (=jef-china3	. #x59A2)	; &I-JC3-59A2;
     (=ucs@jis		. #x7476)	; &GT-27062;
     (mojikyo		. 054613)	; &MCS-6000D555;
+    (<-simplified@JP/misc
+     ((=jis-x0208@1978	  . #x6076)	; &GT-27116; [64-86]
+      (=jis-x0208@1983	  . #x7424)	; &I-J83-7424; [84-04]
+      (=ks-x1001	  . #x687D)	; &I-K0-687D; [72-93]
+      (=jis-x0208@1990	  . #x7424)	; &I-J90-7424; [84-04]
+      (=daikanwa	  . 21149)	; &I-M-21149;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 96)	; ⽟
+    (=ucs		. #x249EB)	; 𤧫
     ))
 (define-char
-  '((=>ucs		. #x249EB)	; 𤧫
+  '((<-denotational
+     ((=ucs		  . #x249EB)	; 𤧫
+      ))
     (ideographic-radical . 96)	; ⽟
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
@@ -4313,30 +4337,50 @@
     (mojikyo		. 021150)	; &MCS-6000529E;
     ))
 (define-char
-  '((=>ucs		. #x249EB)	; 𤧫
-    (morohashi-daikanwa	21150 0 2)
+  '((<-denotational
+     ((=ucs		  . #x249EB)	; 𤧫
+      ))
     (ideographic-radical . 96)	; ⽟
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=cns11643-5	. #x4741)	; &C5-4741; [39-33]
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=ucs@iso		. #x249EB)	; &U-000249EB;
     ))
 (define-char
-  '((morohashi-daikanwa	21150 0 3)
+  '((<-denotational
+     ((=ucs		  . #x249EB)	; 𤧫
+      ))
     (ideographic-radical . 96)	; ⽟
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=ucs		. #x249EB)	; 𤧫
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=cns11643-5	. #x4741)	; &C5-4741; [39-33]
     ))
 (define-char
   '((ideographic-radical . 96)	; ⽟
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x7465)	; 瑥
-    (=ks-x1001		. #x682F)	; &I-K0-682F; [72-15]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7465)	; 瑥
+      ))
+    (ideographic-radical . 96)	; ⽟
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ks-x1001		. #x682F)	; &M-21151; [72-15]
     (=cns11643-3	. #x477C)	; &I-C3-477C; [39-92]
     (=daikanwa		. 21151)	; &I-M-21151;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x7465)	; 瑥
+      ))
+    (ideographic-radical . 96)	; ⽟
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x7465)	; &UU+7465;
+    ))
+(define-char
   '((ideographic-radical . 96)	; ⽟
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
@@ -5093,15 +5137,26 @@
   '((ideographic-radical . 96)	; ⽟
     (=ucs		. #x7488)	; 璈
     (=big5		. #xE6A9)	; &I-B-E6A9;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7488)	; 璈
+      ))
+    (ideographic-radical . 96)	; ⽟
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=jis-x0213-2-2000	. #x707A)	; &M-21204; [80-90]
+    (=daikanwa		. 21204)	; &I-M-21204;
+    (=jef-china3	. #x9DFE)	; &I-JC3-9DFE;
+    (=ucs@jis		. #x7488)	; &M-21204;
+    (mojikyo		. 021204)	; &MCS-600052D4;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7488)	; 璈
+      ))
+    (ideographic-radical . 96)	; ⽟
     (->subsumptive
-     ((ideographic-strokes . 11)
-      (total-strokes	   . 15)
-      (=jis-x0213-2-2000  . #x707A)	; &M-21204; [80-90]
-      (=daikanwa	  . 21204)	; &I-M-21204;
-      (=jef-china3	  . #x9DFE)	; &I-JC3-9DFE;
-      (=ucs@jis		  . #x7488)	; &M-21204;
-      (mojikyo		  . 021204)	; &MCS-600052D4;
-      )
      ((ideographic-strokes . 10)
       (total-strokes	   . 14)
       (=iso-ir165	  . #x2C4C)	; &EGB-2C4C; [12-44]
@@ -5125,16 +5180,16 @@
     (ideographic-radical . 96)	; ⽟
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (<-ancient
-     ((=ks-x1001	  . #x5627)	; &M-38902; [54-07]
-      (=daikanwa	  . 38902)	; &I-M-38902;
-      ))
     (=ks-x1001		. #x5622)	; &M-21206; [54-02]
     (=jis-x0212		. #x4C50)	; &I-JSP-4C50; [44-48]
     (=jis-x0213-1-2000	. #x7838)	; &I-JX1-7838; [88-24]
     (=daikanwa		. 21206)	; &I-M-21206;
     (=jef-china3	. #x59F4)	; &I-JC3-59F4;
     (=ucs@jis		. #x7489)	; &M-21206;
+    (<-ancient
+     ((=ks-x1001	  . #x5627)	; &M-38902; [54-07]
+      (=daikanwa	  . 38902)	; &I-M-38902;
+      ))
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R098-Tile.el b/lisp/utf-2000/Ideograph-R098-Tile.el
index ee15fb6..c220b23 100644
--- a/lisp/utf-2000/Ideograph-R098-Tile.el
+++ b/lisp/utf-2000/Ideograph-R098-Tile.el
@@ -443,11 +443,6 @@
   '((ideographic-radical . 98)	; ⽡
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x5C3A)	; &M-21537; [60-26]
-      (=jis-x0213-1-2000  . #x7847)	; &I-JX1-7847; [88-39]
-      (=daikanwa	  . 21537)	; &I-M-21537;
-      ))
     (shinjigen-2	. 4989)
     (=ucs		. #x74F6)	; 瓶
     (=jis-x0208		. #x4953)	; &I-J90-4953; [41-51]
@@ -458,6 +453,11 @@
     (=gt-k		. 07865)	; &I-GT-K07865;
     (=gt-pj-1		. #x4953)	; &I-GT-27617; [41-51]
     (=daikanwa		. 21486)	; &I-M-21486;
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x5C3A)	; &M-21537; [60-26]
+      (=jis-x0213-1-2000  . #x7847)	; &I-JX1-7847; [88-39]
+      (=daikanwa	  . 21537)	; &I-M-21537;
+      ))
     ))
 (define-char
   '((ideographic-radical . 98)	; ⽡
diff --git a/lisp/utf-2000/Ideograph-R099-Sweet.el b/lisp/utf-2000/Ideograph-R099-Sweet.el
index 7bb6db6..5a69e14 100644
--- a/lisp/utf-2000/Ideograph-R099-Sweet.el
+++ b/lisp/utf-2000/Ideograph-R099-Sweet.el
@@ -61,21 +61,27 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
     (=ucs		. #x24BBC)	; 𤮼
-    (=daikanwa		. 21647)	; &I-M-21647;
+    (->subsumptive
+     ((=daikanwa	  . 21647)	; &M-21647;
+      (=ucs@iso		  . #x24BBC)	; &M-21647;
+      )
+     ((=cns11643-5	  . #x2733)	; &C5-2733; [07-19]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x24BBC)	; 𤮼
-    (morohashi-daikanwa	21647 0 9)
-    (ideographic-radical . 99)	; â½¢
-    (ideographic-strokes . 3)
-    (total-strokes	 . 8)
-    (=cns11643-5	. #x2733)	; &C5-2733; [07-19]
+  '((ideographic-radical . 99)	; â½¢
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=ucs		. #x751A)	; 甚
     ))
 (define-char
-  '((=>ucs		. #x751A)	; 甚
+  '((<-denotational
+     ((=ucs		  . #x751A)	; 甚
+      ))
     (ideographic-radical . 99)	; â½¢
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
+    (shinjigen-1	. 5007)
     (shinjigen-2	. 5007)
     (=jis-x0208		. #x3F53)	; &GT-27811; [31-51]
     (=ks-x1001		. #x6424)	; &I-K0-6424; [68-04]
@@ -87,26 +93,31 @@
     (=ucs@jis		. #x751A)	; &GT-27811;
     ))
 (define-char
-  '((=>ucs		. #x751A)	; 甚
-    (morohashi-daikanwa	21648 0 0)
+  '((<-denotational
+     ((=ucs		  . #x751A)	; 甚
+      ))
     (ideographic-radical . 99)	; â½¢
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (=cns11643-1	. #x5249)	; &C1-5249; [50-41]
+    (=gb2312		. #x4975)	; &G0-4975; [41-85]
+    (=ucs@unicode	. #x751A)	; &G0-4975;
     ))
 (define-char
-  '((morohashi-daikanwa	21648 0 2)
+  '((<-denotational
+     ((=ucs		  . #x751A)	; 甚
+      ))
     (ideographic-radical . 99)	; â½¢
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (=ucs		. #x751A)	; 甚
-    (=gb2312		. #x4975)	; &I-G0-4975; [41-85]
+    (=cns11643-1	. #x5249)	; &C1-5249; [50-41]
     ))
 (define-char
   '((ideographic-radical . 99)	; â½¢
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (=daikanwa		. 21649)	; &M-21649;
+    (=ucs		. #x24BC2)	; 𤯂
+    (=daikanwa		. 21649)	; &I-M-21649;
+    (=hanziku-6		. #xF2F6)	; &I-HZK06-F2F6;
     ))
 (define-char
   '((ideographic-radical . 99)	; â½¢
@@ -120,7 +131,9 @@
   '((ideographic-radical . 99)	; â½¢
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (=daikanwa		. 21651)	; &M-21651;
+    (=ucs		. #x24BC4)	; 𤯄
+    (=daikanwa		. 21651)	; &I-M-21651;
+    (=hanziku-6		. #xF2F7)	; &I-HZK06-F2F7;
     ))
 (define-char
   '((ideographic-radical . 99)	; â½¢
@@ -134,7 +147,9 @@
   '((ideographic-radical . 99)	; â½¢
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (=daikanwa		. 21653)	; &M-21653;
+    (=ucs		. #x24BC5)	; 𤯅
+    (=daikanwa		. 21653)	; &I-M-21653;
+    (=hanziku-6		. #xF2F9)	; &I-HZK06-F2F9;
     ))
 (define-char
   '((ideographic-radical . 99)	; â½¢
diff --git a/lisp/utf-2000/Ideograph-R100-Life.el b/lisp/utf-2000/Ideograph-R100-Life.el
index a812586..3e04dcc 100644
--- a/lisp/utf-2000/Ideograph-R100-Life.el
+++ b/lisp/utf-2000/Ideograph-R100-Life.el
@@ -29,28 +29,28 @@
     (ideographic-strokes@unicode . 1)
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x751F)	; 生
-      ))
     (=ucs		. #x9FB6)	; 龶
     (=big5-cdp		. #x8B77)	; &I-CDP-8B77;
     (=gt-k		. 00586)	; &I-GT-K00586;
     (=gt-pj-k1		. #x323F)	; 龶 [18-31]
     (=jef-china3	. #x72FD)	; &I-JC3-72FD;
     (mojikyo		. 073909)	; &MCS-600120B5;
+    (<-formed@component/connect-below
+     ((=ucs		  . #x751F)	; 生
+      ))
     ))
 (define-char
-  '((=>ucs		. #x9FB6)	; 龶
+  '((<-denotational
+     ((=ucs		  . #x9FB6)	; 龶
+      ))
     (ideographic-radical . 100)	; â½£
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x751F)	; 生
-      )
-     ((=ucs		  . #x9FB6)	; 龶
-      ))
     (=gt-k		. 00587)	; &GT-K00587;
     (=gt-pj-k1		. #x347B)	; &GT-K00587; [20-91]
+    (<-formed@component/connect-right
+     ((=ucs		  . #x9FB6)	; 龶
+      ))
     ))
 (define-char
   '((ideographic-radical . 100)	; â½£
@@ -187,45 +187,51 @@
     (=daikanwa		. 21683)	; &I-M-21683;
     ))
 (define-char
-  '((=>ucs		. #x7522)	; 產
-    (ideographic-radical . 100)	; â½£
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
-    (=big5		. #xB2A3)	; &M-21684;
-    (=daikanwa		. 21684)	; &I-M-21684;
-    (=jef-china3	. #x5ABF)	; &I-JC3-5ABF;
-    (mojikyo		. 021684)	; &MCS-600054B4;
-    ))
-(define-char
-  '((morohashi-daikanwa	21684 0 0)
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x3B3A)	; &J97-3B3A; [27-26]
+      ))
     (ideographic-radical . 100)	; â½£
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs		. #x7522)	; 產
-    (=cns11643-1	. #x5C28)	; &I-C1-5C28; [60-08]
+    (=big5		. #xB2A3)	; &I-B-B2A3;
+    (->subsumptive
+     ((=daikanwa	  . 21684)	; &M-21684;
+      (=jef-china3	  . #x5ABF)	; &I-JC3-5ABF;
+      (mojikyo		  . 021684)	; &MCS-600054B4;
+      )
+     ((=cns11643-1	  . #x5C28)	; &C1-5C28; [60-08]
+      (=ucs@unicode	  . #x7522)	; &C1-5C28;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x7523)	; 産
-    (morohashi-daikanwa	21684 1)
-    (ideographic-radical . 100)	; â½£
+  '((ideographic-radical . 100)	; â½£
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (=jis-x0208		. #x3B3A)	; &GT-27847; [27-26]
-    (=ks-x1001		. #x5F27)	; &I-K0-5F27; [63-07]
-    (=gt		. 27847)	; &I-GT-27847;
-    (=gt-k		. 07770)	; &I-GT-K07770;
-    (=gt-pj-1		. #x3B3A)	; &I-GT-27847; [27-26]
-    (=ucs@jis		. #x7523)	; &GT-27847;
-    (mojikyo		. 050288)	; &MCS-6000C470;
+    (=jis-x0208@1997	. #x3B3A)	; &J97-3B3A; [27-26]
     ))
 (define-char
-  '((morohashi-daikanwa	21684 1 0)
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x3B3A)	; &J97-3B3A; [27-26]
+      ))
     (ideographic-radical . 100)	; â½£
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs		. #x7523)	; 産
-    (=cns11643-3	. #x3745)	; &I-C3-3745; [23-37]
-    (=gb12345		. #x327A)	; 産 [18-90]
+    (->subsumptive
+     ((morohashi-daikanwa	21684 1)
+      (=jis-x0208	  . #x3B3A)	; &GT-27847; [27-26]
+      (=ks-x1001	  . #x5F27)	; &I-K0-5F27; [63-07]
+      (=gt		  . 27847)	; &I-GT-27847;
+      (=gt-k		  . 07770)	; &I-GT-K07770;
+      (=gt-pj-1		  . #x3B3A)	; &I-GT-27847; [27-26]
+      (=ucs@jis		  . #x7523)	; &GT-27847;
+      (mojikyo		  . 050288)	; &MCS-6000C470;
+      )
+     ((=cns11643-3	  . #x3745)	; &C3-3745; [23-37]
+      (=gb12345		  . #x327A)	; &C3-3745; [18-90]
+      (=ucs@unicode	  . #x7523)	; &C3-3745;
+      ))
     ))
 (define-char
   '((ideographic-radical . 100)	; â½£
diff --git a/lisp/utf-2000/Ideograph-R101-Use.el b/lisp/utf-2000/Ideograph-R101-Use.el
index e6eee0c..35c9ebd 100644
--- a/lisp/utf-2000/Ideograph-R101-Use.el
+++ b/lisp/utf-2000/Ideograph-R101-Use.el
@@ -180,42 +180,40 @@
     (=daikanwa		. 21711)	; &I-M-21711;
     ))
 (define-char
-  '((=>ucs		. #x200F0)	; 𠃰
-    (ideographic-radical . 101)	; ⽤
-    (ideographic-strokes . 3)
+  '((ideographic-radical@ucs . 5)	; ⼄
+    (ideographic-strokes@ucs . 7)
+    (ideographic-radical@cns . 101)	; ⽤
+    (ideographic-strokes@cns . 3)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 8)
-    (=daikanwa		. 21712)	; &M-21712;
-    (mojikyo		. 021712)	; &MCS-600054D0;
-    ))
-(define-char
-  '((morohashi-daikanwa	21712 0 1)
-    (ideographic-	(:radical	101 ; ⽤
-			 :strokes	3)
-			(:radical	5 ; ⼄
-			 :strokes	7))
-    (total-strokes	 . 8)
-    (<-same
-     ((=daikanwa	  . 21712)	; &M-21712;
-      ))
-    (hanyu-dazidian	1 55 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
+    (=ucs		. #x200F0)	; 𠃰
+    (->subsumptive
+     ((ideographic-radical . 101)	; ⽤
+      (ideographic-strokes . 3)
+      (=daikanwa	  . 21712)	; &M-21712;
+      (mojikyo		  . 021712)	; &MCS-600054D0;
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
+     ((hanyu-dazidian	  1 55 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=big5-cdp	    . #x89C2)	; &CDP-89C2;
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((=big5-cdp	      . #x89C2)	; &CDP-89C2;
+	  )
+	 ((=big5-cdp	      . #x89C7)	; &CDP-89C7;
+	  ))
 	)
-       ((=big5-cdp	    . #x89C7)	; &CDP-89C7;
+       ((=ucs		    . #x7528)	; 用
 	))
-      )
-     ((=ucs		  . #x7528)	; 用
+      (=cns11643-6	  . #x2D2C)	; &HZK01-AF63; [13-12]
+      (=hanziku-1	  . #xAF63)	; &I-HZK01-AF63;
+      (=ucs@iso		  . #x200F0)	; &HZK01-AF63;
       ))
-    (=ucs		. #x200F0)	; 𠃰
-    (=cns11643-6	. #x2D2C)	; &I-C6-2D2C; [13-12]
-    (=hanziku-1		. #xAF63)	; &I-HZK01-AF63;
     ))
 (define-char
   '((ideographic-radical . 101)	; ⽤
@@ -236,35 +234,54 @@
     (=big5		. #xCFD9)	; &I-B-CFD9;
     ))
 (define-char
-  '((=>ucs		. #x24C07)	; 𤰇
-    (ideographic-radical . 101)	; ⽤
+  '((ideographic-radical . 101)	; ⽤
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (=daikanwa		. 21714)	; &M-21714;
-    (mojikyo		. 021714)	; &MCS-600054D2;
+    (=ucs		. #x24C07)	; 𤰇
     ))
 (define-char
-  '((morohashi-daikanwa	21714 0 3)
+  '((<-denotational
+     ((=ucs		  . #x24C07)	; 𤰇
+      ))
     (ideographic-radical . 101)	; ⽤
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (=ucs		. #x24C07)	; 𤰇
+    (=daikanwa		. 21714)	; &M-21714;
+    (mojikyo		. 021714)	; &MCS-600054D2;
     ))
 (define-char
-  '((=>ucs		. #x24C07)	; 𤰇
-    (morohashi-daikanwa	21714 0 4)
+  '((<-denotational
+     ((=ucs		  . #x24C07)	; 𤰇
+      ))
     (ideographic-radical . 101)	; ⽤
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (=cns11643-6	. #x395D)	; &C6-395D; [25-61]
+    (->subsumptive
+     ((=ucs@iso		  . #x24C07)	; &U-00024C07;
+      )
+     ((=cns11643-6	  . #x395D)	; &CDP-8C73; [25-61]
+      (=big5-cdp	  . #x8C73)	; &I-CDP-8C73;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x20CEB)	; 𠳫
-    (ideographic-radical . 101)	; ⽤
-    (ideographic-strokes . 5)
+  '((ideographic-radical@ucs . 30)	; ⼝
+    (ideographic-strokes@ucs . 7)
+    (ideographic-radical@cns . 101)	; ⽤
+    (ideographic-strokes@cns . 5)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 10)
-    (=cns11643-6	. #x395E)	; &M-21715; [25-62]
-    (=daikanwa		. 21715)	; &I-M-21715;
+    (=ucs		. #x20CEB)	; 𠳫
+    (->subsumptive
+     ((hanyu-dazidian	  1 626 2)
+      (=daikanwa	  . 21715)	; &M-21715;
+      (=hanziku-2	  . #xD349)	; &I-HZK02-D349;
+      (=ucs@iso		  . #x20CEB)	; &M-21715;
+      )
+     ((ideographic-radical . 101)	; ⽤
+      (ideographic-strokes . 5)
+      (=cns11643-6	  . #x395E)	; &C6-395E; [25-62]
+      ))
     ))
 (define-char
   '((ideographic-radical . 101)	; ⽤
diff --git a/lisp/utf-2000/Ideograph-R102-Field.el b/lisp/utf-2000/Ideograph-R102-Field.el
index 970c786..3ac89a6 100644
--- a/lisp/utf-2000/Ideograph-R102-Field.el
+++ b/lisp/utf-2000/Ideograph-R102-Field.el
@@ -132,6 +132,19 @@
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 2)
     (total-strokes	 . 7)
+    (=ucs		. #x3F55)	; 㽕
+    (->subsumptive
+     ((=daikanwa	  . 21733)	; &M-21733;
+      )
+     ((=cns11643-5	  . #x2463)	; &C5-2463; [04-67]
+      )
+     ((=ucs@unicode	  . #x3F55)	; &UU+3F55;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 2)
+    (total-strokes	 . 7)
     (=ucs		. #x7539)	; 甹
     (=jis-x0212		. #x4D2C)	; &I-JSP-4D2C; [45-12]
     (=cns11643-2	. #x246E)	; &I-C2-246E; [04-78]
@@ -178,31 +191,28 @@
     (ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 2)
     (total-strokes	 . 7)
+    (=ucs		. #x753C)	; 甼
+    (=jis-x0208		. #x6136)	; &I-J90-6136; [65-22]
+    (=gt		. 27911)	; &I-GT-27911;
+    (=gt-pj-1		. #x6136)	; &I-GT-27911; [65-22]
+    (mojikyo		. 054615)	; &MCS-6000D557;
     (<-same
      ((=ucs		  . #x753A)	; 町
       (=daikanwa	  . 21735)	; &I-M-21735;
       ))
     (<-same*sources
      daikanwa)
-    (=ucs		. #x753C)	; 甼
-    (=jis-x0208		. #x6136)	; &I-J90-6136; [65-22]
-    (=gt		. 27911)	; &I-GT-27911;
-    (=gt-pj-1		. #x6136)	; &I-GT-27911; [65-22]
-    (mojikyo		. 054615)	; &MCS-6000D557;
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 2)
     (total-strokes	 . 7)
     (=ucs		. #x3540)	; 㕀
-    (=cns11643-6	. #x2864)	; &I-C6-2864; [08-68]
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 2)
-    (total-strokes	 . 7)
-    (=ucs		. #x3F55)	; 㽕
-    (=cns11643-5	. #x2463)	; &I-C5-2463; [04-67]
+    (->subsumptive
+     ((=ucs@unicode	  . #x3540)	; &UU+3540;
+      )
+     ((=cns11643-6	  . #x2864)	; &C6-2864; [08-68]
+      ))
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
@@ -216,29 +226,40 @@
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
-    (shinjigen-1	. 5026)
     (=ucs		. #x753B)	; 画
-    (=gb2312		. #x3B2D)	; &I-G0-3B2D; [27-13]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x753B)	; 画
+      ))
+    (ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 3)
+    (total-strokes	 . 8)
+    (shinjigen-1	. 5026)
+    (=gb2312		. #x3B2D)	; &M-21739; [27-13]
     (=cns11643-3	. #x2A37)	; &I-C3-2A37; [10-23]
     (=daikanwa		. 21739)	; &I-M-21739;
+    (=ucs@unicode	. #x753B)	; &M-21739;
     (mojikyo		. 021739)	; &MCS-600054EB;
     ))
 (define-char
-  '((=>ucs		. #x753B)	; 画
+  '((<-denotational
+     ((=ucs		  . #x753B)	; 画
+      ))
     (morohashi-daikanwa	21739 1)
     (ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x756B)	; 畫
-      (=jis-x0208	  . #x6141)	; &I-J90-6141; [65-33]
-      ))
     (shinjigen-1	. 5023)
     (=jis-x0208		. #x3268)	; &GT-27920; [18-72]
     (=gt		. 27920)	; &I-GT-27920;
     (=gt-pj-1		. #x3268)	; &I-GT-27920; [18-72]
     (=ucs@jis		. #x753B)	; &GT-27920;
     (mojikyo		. 050289)	; &MCS-6000C471;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x756B)	; 畫
+      (=jis-x0208	  . #x6141)	; &I-J90-6141; [65-33]
+      ))
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
@@ -502,7 +523,14 @@
     (total-strokes	 . 9)
     (=ucs		. #x7546)	; 畆
     (->subsumptive
-     ((<-vulgar
+     ((shinjigen-1	  . 5047)
+      (shinjigen-2	  . 5047)
+      (=jis-x0208	  . #x613C)	; &GT-27975; [65-28]
+      (=gt		  . 27975)	; &I-GT-27975;
+      (=gt-pj-1		  . #x613C)	; &I-GT-27975; [65-28]
+      (=daikanwa	  . 21763)	; &I-M-21763;
+      (=ucs@jis		  . #x7546)	; &GT-27975;
+      (<-vulgar
        ((shinjigen-1	    . 5044)
 	(=jis-x0208	    . #x4026)	; &GT-28010; [32-06]
 	(=ks-x1001	    . #x596F)	; &I-K0-596F; [57-79]
@@ -510,13 +538,6 @@
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 5047)
-      (shinjigen-2	  . 5047)
-      (=jis-x0208	  . #x613C)	; &GT-27975; [65-28]
-      (=gt		  . 27975)	; &I-GT-27975;
-      (=gt-pj-1		  . #x613C)	; &I-GT-27975; [65-28]
-      (=daikanwa	  . 21763)	; &I-M-21763;
-      (=ucs@jis		  . #x7546)	; &GT-27975;
       )
      ((=cns11643-3	  . #x2E27)	; &C3-2E27; [14-07]
       (=ucs@unicode	  . #x7546)	; &C3-2E27;
@@ -650,9 +671,6 @@
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (<-vulgar
-     ((=ucs		  . #x200BD)	; 𠂽
-      ))
     (shinjigen-1	. 5030)
     (shinjigen-2	. 5030)
     (=ucs		. #x754F)	; 畏
@@ -665,6 +683,9 @@
     (=gt-k		. 05019)	; &I-GT-K05019;
     (=gt-pj-1		. #x305A)	; &I-GT-27943; [16-58]
     (=daikanwa		. 21778)	; &I-M-21778;
+    (<-vulgar
+     ((=ucs		  . #x200BD)	; 𠂽
+      ))
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
@@ -1097,7 +1118,12 @@
     (total-strokes	 . 10)
     (=ucs		. #x755E)	; 畞
     (->subsumptive
-     ((<-ancient
+     ((shinjigen-1	  . 5046)
+      (=jis-x0212	  . #x4D38)	; &M-21816; [45-24]
+      (=cns11643-3	  . #x3251)	; &I-C3-3251; [18-49]
+      (=daikanwa	  . 21816)	; &I-M-21816;
+      (=ucs@jis		  . #x755E)	; &M-21816;
+      (<-ancient
        ((shinjigen-1	    . 5044)
 	(=jis-x0208	    . #x4026)	; &GT-28010; [32-06]
 	(=ks-x1001	    . #x596F)	; &I-K0-596F; [57-79]
@@ -1105,11 +1131,6 @@
 	))
       (<-ancient*sources
        shinjigen-1)
-      (shinjigen-1	  . 5046)
-      (=jis-x0212	  . #x4D38)	; &M-21816; [45-24]
-      (=cns11643-3	  . #x3251)	; &I-C3-3251; [18-49]
-      (=daikanwa	  . 21816)	; &I-M-21816;
-      (=ucs@jis		  . #x755E)	; &M-21816;
       )
      ((=ucs@unicode	  . #x755E)	; &UU+755E;
       ))
@@ -1120,6 +1141,14 @@
     (total-strokes	 . 10)
     (=ucs		. #x755F)	; 畟
     (=big5		. #xD2C2)	; &I-B-D2C2;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x755F)	; 畟
+      ))
+    (ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
     (->subsumptive
      ((=daikanwa	  . 21817)	; &M-21817;
       )
@@ -1127,14 +1156,28 @@
       )
      ((=cns11643-2	  . #x3125)	; &C2-3125; [17-05]
       (=ucs@cns		  . #x755F)	; &C2-3125;
-      )
-     ((=jis-x0212	  . #x4D39)	; &JSP-4D39; [45-25]
-      (=ucs@jis		  . #x755F)	; &JSP-4D39;
-      )
-     ((=ucs@unicode	  . #x755F)	; &UU+755F;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x755F)	; 畟
+      ))
+    (ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (=ucs@unicode	. #x755F)	; &UU+755F;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x755F)	; 畟
+      ))
+    (ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (=jis-x0212		. #x4D39)	; &JSP-4D39; [45-25]
+    (=ucs@jis		. #x755F)	; &JSP-4D39;
+    ))
+(define-char
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
@@ -1345,22 +1388,34 @@
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
+    (=ucs		. #x7562)	; 畢
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7562)	; 畢
+      ))
+    (ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (shinjigen-2	. 5058)
-    (=ucs		. #x7562)	; 畢
-    (=jis-x0208		. #x492D)	; &I-J90-492D; [41-13]
-    (=ks-x1001		. #x7934)	; &I-K0-7934; [89-20]
-    (=gb12345		. #x314F)	; 畢 [17-47]
-    (=big5		. #xB2A6)	; &I-B-B2A6;
-    (=gt		. 28043)	; &I-GT-28043;
-    (=gt-k		. 07861)	; &I-GT-K07861;
-    (=gt-pj-1		. #x492D)	; &I-GT-28043; [41-13]
-    (=daikanwa		. 21829)	; &I-M-21829;
+    (->subsumptive
+     ((=gb12345		  . #x314F)	; &GT-28043; [17-47]
+      (=gt		  . 28043)	; &I-GT-28043;
+      (=gt-k		  . 07861)	; &I-GT-K07861;
+      (=gt-pj-1		  . #x492D)	; &I-GT-28043; [41-13]
+      (=daikanwa	  . 21829)	; &GT-28043;
+      (=ucs@unicode	  . #x7562)	; &GT-28043;
+      )
+     ((shinjigen-2	  . 5058)
+      (=jis-x0208	  . #x492D)	; &J90-492D; [41-13]
+      (=ks-x1001	  . #x7934)	; &I-K0-7934; [89-20]
+      (=big5		  . #xB2A6)	; &I-B-B2A6;
+      (=ucs@jis		  . #x7562)	; &J90-492D;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x7562)	; 畢
-    (morohashi-daikanwa	21829 0 1)
+  '((<-denotational
+     ((=ucs		  . #x7562)	; 畢
+      ))
     (ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
@@ -1643,17 +1698,29 @@
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (shinjigen-2	. 5066)
+    (=ucs		. #x3F5F)	; 㽟
+    (=cns11643-3	. #x3D41)	; &I-C3-3D41; [29-33]
+    (=daikanwa		. 21857)	; &I-M-21857;
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
     (=ucs		. #x756A)	; 番
-    (=jis-x0208		. #x4856)	; &I-J90-4856; [40-54]
-    (=gb2312		. #x372C)	; &I-G0-372C; [23-12]
-    (=ks-x1001		. #x5B63)	; &I-K0-5B63; [59-67]
-    (=cns11643-1	. #x606C)	; &I-C1-606C; [64-76]
-    (=big5		. #xB566)	; &I-B-B566;
-    (=gt		. 28068)	; &I-GT-28068;
-    (=gt-k		. 09127)	; &I-GT-K09127;
-    (=gt-pj-1		. #x4856)	; &I-GT-28068; [40-54]
-    (=daikanwa		. 21858)	; &I-M-21858;
+    (->subsumptive
+     ((shinjigen-2	  . 5066)
+      (=jis-x0208	  . #x4856)	; &GT-28068; [40-54]
+      (=gb2312		  . #x372C)	; &I-G0-372C; [23-12]
+      (=ks-x1001	  . #x5B63)	; &I-K0-5B63; [59-67]
+      (=big5		  . #xB566)	; &I-B-B566;
+      (=gt		  . 28068)	; &I-GT-28068;
+      (=gt-k		  . 09127)	; &I-GT-K09127;
+      (=gt-pj-1		  . #x4856)	; &I-GT-28068; [40-54]
+      (=daikanwa	  . 21858)	; &I-M-21858;
+      (=ucs@unicode	  . #x756A)	; &GT-28068;
+      )
+     ((=cns11643-1	  . #x606C)	; &C1-606C; [64-76]
+      ))
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
@@ -1699,10 +1766,24 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
     (=ucs		. #x7572)	; 畲
-    (=gb2312		. #x6E34)	; &I-G0-6E34; [78-20]
-    (=cns11643-4	. #x392C)	; &I-C4-392C; [25-12]
-    (=jis-x0213-2-2000	. #x713E)	; &I-JX2-713E; [81-30]
-    (=daikanwa		. 21862)	; &I-M-21862;
+    (->subsumptive
+     ((=cns11643-4	  . #x392C)	; &M-21862; [25-12]
+      (=daikanwa	  . 21862)	; &I-M-21862;
+      )
+     ((=gb2312		  . #x6E34)	; &JX2-713E; [78-20]
+      (=jis-x0213-2-2000  . #x713E)	; &I-JX2-713E; [81-30]
+      (=ucs@unicode	  . #x7572)	; &JX2-713E;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
+    (hanyu-dazidian	4 2542 11)
+    (=ucs		. #x24C7C)	; 𤱼
+    (=cns11643-4	. #x392B)	; &I-C4-392B; [25-11]
+    (=daikanwa		. 21863)	; &I-M-21863;
+    (=hanziku-7		. #xB775)	; &I-HZK07-B775;
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
@@ -1718,24 +1799,46 @@
     (total-strokes	 . 12)
     (=ucs		. #x756F)	; 畯
     (=big5		. #xDAAD)	; &I-B-DAAD;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x756F)	; 畯
+      ))
+    (ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
     (->subsumptive
      ((=daikanwa	  . 21865)	; &M-21865;
       )
      ((=cns11643-2	  . #x3E31)	; &C2-3E31; [30-17]
       (=ucs@cns		  . #x756F)	; &C2-3E31;
-      )
-     ((=ks-x1001	  . #x7161)	; &JX1-784A; [81-65]
-      (=jis-x0212	  . #x4D3B)	; &I-JSP-4D3B; [45-27]
-      (=jis-x0213-1-2000  . #x784A)	; &I-JX1-784A; [88-42]
-      (=jef-china3	  . #x5AD0)	; &I-JC3-5AD0;
-      (=ucs@jis		  . #x756F)	; &JX1-784A;
-      )
-     ((=iso-ir165	  . #x7D51)	; &EGB-7D51; [93-49]
-      (=ucs@unicode	  . #x756F)	; &EGB-7D51;
       ))
     ))
 (define-char
   '((<-denotational
+     ((=ucs		  . #x756F)	; 畯
+      ))
+    (ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
+    (=ks-x1001		. #x7161)	; &JX1-784A; [81-65]
+    (=jis-x0212		. #x4D3B)	; &I-JSP-4D3B; [45-27]
+    (=jis-x0213-1-2000	. #x784A)	; &I-JX1-784A; [88-42]
+    (=jef-china3	. #x5AD0)	; &I-JC3-5AD0;
+    (=ucs@jis		. #x756F)	; &JX1-784A;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x756F)	; 畯
+      ))
+    (ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
+    (=iso-ir165		. #x7D51)	; &EGB-7D51; [93-49]
+    (=ucs@unicode	. #x756F)	; &EGB-7D51;
+    ))
+(define-char
+  '((<-denotational
      ((=jis-x0208@1997	  . #x305B)	; &J97-305B; [16-59]
       ))
     (=>ucs*		. #x7570)	; 異
@@ -1840,15 +1943,15 @@
     (ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x758A)	; 疊
-      (=jis-x0208	  . #x6148)	; &I-J90-6148; [65-40]
-      ))
     (=ucs		. #x7573)	; 畳
     (=jis-x0208		. #x3E76)	; &I-J90-3E76; [30-86]
     (=gt		. 28062)	; &I-GT-28062;
     (=gt-pj-1		. #x3E76)	; &I-GT-28062; [30-86]
     (mojikyo		. 050291)	; &MCS-6000C473;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x758A)	; 疊
+      (=jis-x0208	  . #x6148)	; &I-J90-6148; [65-40]
+      ))
     ))
 (define-char
   '((=>ucs		. #x24C83)	; 𤲃
@@ -1859,7 +1962,7 @@
     (mojikyo		. 049335)	; &MCS-6000C0B7;
     ))
 (define-char
-  '((morohashi-daikanwa	49335 0 2)
+  '((=>daikanwa		. 49335)	; &M-49335;
     (ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
@@ -1871,41 +1974,32 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
     (=ucs		. #x24C84)	; 𤲄
-    (=cns11643-6	. #x4B59)	; &I-C6-4B59; [43-57]
-    (=daikanwa		. 49337)	; &I-M-49337;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 7)
-    (total-strokes	 . 12)
-    (=ucs		. #x3F5F)	; 㽟
-    (=cns11643-3	. #x3D41)	; &I-C3-3D41; [29-33]
+    (->subsumptive
+     ((=daikanwa	  . 49337)	; &M-49337;
+      )
+     ((=ucs@iso		  . #x24C84)	; &U-00024C84;
+      )
+     ((=cns11643-6	  . #x4B59)	; &C6-4B59; [43-57]
+      ))
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
     (=ucs		. #x7574)	; 畴
-    (=gb2312		. #x336B)	; &I-G0-336B; [19-75]
-    ))
-(define-char
-  '((=>ucs		. #x7574)	; 畴
-    (ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 7)
-    (total-strokes	 . 12)
-    (=jis-x0208		. #x6147)	; &GT-28065; [65-39]
-    (=gt		. 28065)	; &I-GT-28065;
-    (=gt-pj-1		. #x6147)	; &I-GT-28065; [65-39]
-    (=ucs@jis		. #x7574)	; &GT-28065;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 7)
-    (total-strokes	 . 12)
-    (hanyu-dazidian	4 2542 11)
-    (=ucs		. #x24C7C)	; 𤱼
-    (=cns11643-4	. #x392B)	; &I-C4-392B; [25-11]
-    (=hanziku-7		. #xB775)	; &I-HZK07-B775;
+    (->subsumptive
+     ((=jis-x0208	  . #x6147)	; &GT-28065; [65-39]
+      (=gt		  . 28065)	; &I-GT-28065;
+      (=gt-pj-1		  . #x6147)	; &I-GT-28065; [65-39]
+      (=ucs@jis		  . #x7574)	; &GT-28065;
+      )
+     ((=gb2312		  . #x336B)	; &G0-336B; [19-75]
+      (=ucs@unicode	  . #x7574)	; &G0-336B;
+      (<-simplified@CN
+       ((=ucs		    . #x7587)	; 疇
+	(=gb12345	    . #x336B)	; 疇 [19-75]
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
diff --git a/lisp/utf-2000/Ideograph-R103-Bolt-Of-Cloth.el b/lisp/utf-2000/Ideograph-R103-Bolt-Of-Cloth.el
index 761680d..85f4408 100644
--- a/lisp/utf-2000/Ideograph-R103-Bolt-Of-Cloth.el
+++ b/lisp/utf-2000/Ideograph-R103-Bolt-Of-Cloth.el
@@ -210,24 +210,22 @@
   '((ideographic-radical . 103)	; ⽦
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (shinjigen-2	. 5088)
     (=ucs		. #x7591)	; 疑
-    (=jis-x0208		. #x353F)	; &I-J90-353F; [21-31]
-    (=gb2312		. #x5249)	; &I-G0-5249; [50-41]
-    (=ks-x1001		. #x6B77)	; &I-K0-6B77; [75-87]
-    (=big5		. #xBAC3)	; &I-B-BAC3;
-    (=gt		. 28247)	; &I-GT-28247;
-    (=gt-k		. 11111)	; &I-GT-K11111;
-    (=gt-pj-1		. #x353F)	; &I-GT-28247; [21-31]
-    (=daikanwa		. 22007)	; &I-M-22007;
-    ))
-(define-char
-  '((=>ucs		. #x7591)	; 疑
-    (morohashi-daikanwa	22007 0 0)
-    (ideographic-radical . 103)	; ⽦
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (=cns11643-1	. #x696A)	; &C1-696A; [73-74]
+    (->subsumptive
+     ((shinjigen-1	  . 5088)
+      (shinjigen-2	  . 5088)
+      (=jis-x0208	  . #x353F)	; &GT-28247; [21-31]
+      (=gb2312		  . #x5249)	; &I-G0-5249; [50-41]
+      (=ks-x1001	  . #x6B77)	; &I-K0-6B77; [75-87]
+      (=big5		  . #xBAC3)	; &I-B-BAC3;
+      (=gt		  . 28247)	; &I-GT-28247;
+      (=gt-k		  . 11111)	; &I-GT-K11111;
+      (=gt-pj-1		  . #x353F)	; &I-GT-28247; [21-31]
+      (=daikanwa	  . 22007)	; &I-M-22007;
+      (=ucs@unicode	  . #x7591)	; &GT-28247;
+      )
+     ((=cns11643-1	  . #x696A)	; &C1-696A; [73-74]
+      ))
     ))
 (define-char
   '((ideographic-radical . 103)	; ⽦
@@ -241,25 +239,39 @@
   '((ideographic-radical . 103)	; ⽦
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (=daikanwa		. 22009)	; &M-22009;
+    (=ucs		. #x3684)	; 㚄
+    (=cns11643-3	. #x4D41)	; &I-C3-4D41; [45-33]
     ))
 (define-char
   '((ideographic-radical . 103)	; ⽦
-    (ideographic-strokes . 10)
-    (total-strokes	 . 15)
-    (=ucs		. #x3684)	; 㚄
-    (=cns11643-3	. #x4D41)	; &I-C3-4D41; [45-33]
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
+    (=ucs		. #x24D1F)	; 𤴟
+    (=cns11643-5	. #x5563)	; &I-C5-5563; [53-67]
+    (=daikanwa		. 22009)	; &I-M-22009;
+    (=hanziku-7		. #xE4CF)	; &I-HZK07-E4CF;
+    (=cbeta		. 08514)	; &I-CB08514;
     ))
 (define-char
   '((ideographic-radical . 103)	; ⽦
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
     (=ucs		. #x24D20)	; 𤴠
-    (=daikanwa		. 22010)	; &I-M-22010;
     ))
 (define-char
-  '((=>ucs		. #x24D20)	; 𤴠
-    (morohashi-daikanwa	22010 0 5)
+  '((<-denotational
+     ((=ucs		  . #x24D20)	; 𤴠
+      ))
+    (ideographic-radical . 103)	; ⽦
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
+    (=daikanwa		. 22010)	; &M-22010;
+    (=ucs@iso		. #x24D20)	; &M-22010;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24D20)	; 𤴠
+      ))
     (ideographic-radical . 103)	; ⽦
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
@@ -278,26 +290,33 @@
   '((ideographic-radical . 103)	; ⽦
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=daikanwa		. 22012)	; &M-22012;
+    (=ucs		. #x24D22)	; 𤴢
+    (->subsumptive
+     ((=daikanwa	  . 22012)	; &M-22012;
+      )
+     ((=ucs@iso		  . #x24D22)	; &U-00024D22;
+      ))
     ))
 (define-char
   '((ideographic-radical . 103)	; ⽦
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
-    (=daikanwa		. 22013)	; &M-22013;
+    (=ucs		. #x24D23)	; 𤴣
+    (->subsumptive
+     ((=daikanwa	  . 22013)	; &M-22013;
+      )
+     ((=ucs@iso		  . #x24D23)	; &U-00024D23;
+      ))
     ))
 (define-char
   '((ideographic-radical . 103)	; ⽦
     (ideographic-strokes . 17)
     (total-strokes	 . 22)
     (=ucs		. #x24D24)	; 𤴤
-    (=daikanwa		. 22014)	; &I-M-22014;
-    ))
-(define-char
-  '((=>ucs		. #x24D24)	; 𤴤
-    (morohashi-daikanwa	22014 0 2)
-    (ideographic-radical . 103)	; ⽦
-    (ideographic-strokes . 17)
-    (total-strokes	 . 22)
-    (=cns11643-7	. #x583F)	; &C7-583F; [56-31]
+    (->subsumptive
+     ((=daikanwa	  . 22014)	; &M-22014;
+      (=ucs@iso		  . #x24D24)	; &M-22014;
+      )
+     ((=cns11643-7	  . #x583F)	; &C7-583F; [56-31]
+      ))
     ))
diff --git a/lisp/utf-2000/Ideograph-R104-Sickness.el b/lisp/utf-2000/Ideograph-R104-Sickness.el
index bd65f6d..ebf371c 100644
--- a/lisp/utf-2000/Ideograph-R104-Sickness.el
+++ b/lisp/utf-2000/Ideograph-R104-Sickness.el
@@ -1604,148 +1604,149 @@
     (=cns11643-6	. #x396C)	; &I-C6-396C; [25-76]
     ))
 (define-char
-  '((=>ucs		. #x75B5)	; 疵
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
-    (=jis-x0208		. #x6153)	; &GT-28409; [65-51]
-    (=ks-x1001		. #x6D37)	; &I-K0-6D37; [77-23]
-    (=gt		. 28409)	; &I-GT-28409;
-    (=gt-k		. 07959)	; &I-GT-K07959;
-    (=gt-pj-1		. #x6153)	; &I-GT-28409; [65-51]
-    (=daikanwa		. 22089)	; &I-M-22089;
-    (=ucs@jis		. #x75B5)	; &GT-28409;
+  '((ideographic-radical@ucs . 186)	; â¾¹
+    (ideographic-radical@ucs*sources
+     daikanwa ucs)
+    (ideographic-radical@cns . 104)	; ⽧
+    (ideographic-strokes@cns . 5)
+    (total-strokes	 . 14)
+    (=ucs		. #x2983E)	; ð© ¾
+    (->subsumptive
+     ((ideographic-radical . 186)	; â¾¹
+      (ideographic-strokes . 5)
+      (total-strokes	   . 14)
+      (=daikanwa	  . 44523)	; &M-44523;
+      )
+     ((ideographic-radical . 186)	; â¾¹
+      (ideographic-strokes . 5)
+      (=ucs@iso		  . #x2983E)	; &U-0002983E;
+      )
+     ((ideographic-radical . 104)	; ⽧
+      (ideographic-strokes . 9)
+      (=cns11643-5	  . #x4754)	; &C5-4754; [39-52]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22089 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs		. #x75B5)	; 疵
-    (=gb2312		. #x3443)	; &I-G0-3443; [20-35]
-    ))
-(define-char
-  '((=>ucs		. #x75B5)	; 疵
-    (morohashi-daikanwa	22089 0 1)
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
-    (=big5		. #xB2AB)	; &B-B2AB;
-    ))
-(define-char
-  '((=>ucs		. #x75B5)	; 疵
-    (morohashi-daikanwa	22089 0 2)
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
-    (=cns11643-1	. #x5C30)	; &C1-5C30; [60-16]
-    ))
-(define-char
-  '((=>ucs		. #x75CA)	; 痊
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
-    (shinjigen-2	. 5117)
-    (=jis-x0208		. #x6159)	; &GT-28421; [65-57]
-    (=big5		. #xB2AC)	; &I-B-B2AC;
-    (=gt		. 28421)	; &I-GT-28421;
-    (=gt-pj-1		. #x6159)	; &I-GT-28421; [65-57]
-    (=daikanwa		. 22141)	; &I-M-22141;
-    (=ucs@jis		. #x75CA)	; &GT-28421;
-    (mojikyo		. 022141)	; &MCS-6000567D;
-    ))
-(define-char
-  '((=>ucs		. #x75CA)	; 痊
-    (morohashi-daikanwa	22141 0 0)
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
-    (=cns11643-1	. #x5C31)	; &C1-5C31; [60-17]
+    (=big5		. #xB2AB)	; &I-B-B2AB;
+    (->subsumptive
+     ((=jis-x0208	  . #x6153)	; &GT-28409; [65-51]
+      (=ks-x1001	  . #x6D37)	; &I-K0-6D37; [77-23]
+      (=gt		  . 28409)	; &I-GT-28409;
+      (=gt-k		  . 07959)	; &I-GT-K07959;
+      (=gt-pj-1		  . #x6153)	; &I-GT-28409; [65-51]
+      (=daikanwa	  . 22089)	; &I-M-22089;
+      (=ucs@jis		  . #x75B5)	; &GT-28409;
+      )
+     ((=gb2312		  . #x3443)	; &G0-3443; [20-35]
+      (=ucs@unicode	  . #x75B5)	; &G0-3443;
+      )
+     ((=cns11643-1	  . #x5C30)	; &C1-5C30; [60-16]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22141 0 1)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs		. #x75CA)	; 痊
-    (=gb2312		. #x482C)	; &I-G0-482C; [40-12]
     ))
 (define-char
-  '((=>ucs		. #x75CB)	; 痋
+  '((<-denotational
+     ((=ucs		  . #x75CA)	; 痊
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (=big5		. #xD6A1)	; &M-22144;
-    (=daikanwa		. 22144)	; &I-M-22144;
+    (=big5		. #xB2AC)	; &B-B2AC;
+    (->subsumptive
+     ((shinjigen-2	  . 5117)
+      (=jis-x0208	  . #x6159)	; &GT-28421; [65-57]
+      (=gt		  . 28421)	; &I-GT-28421;
+      (=gt-pj-1		  . #x6159)	; &I-GT-28421; [65-57]
+      (=daikanwa	  . 22141)	; &I-M-22141;
+      (=ucs@jis		  . #x75CA)	; &GT-28421;
+      (mojikyo		  . 022141)	; &MCS-6000567D;
+      )
+     ((=cns11643-1	  . #x5C31)	; &C1-5C31; [60-17]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22144 0 0)
+  '((<-denotational
+     ((=ucs		  . #x75CA)	; 痊
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (=ucs		. #x75CB)	; 痋
-    (=cns11643-2	. #x3744)	; &I-C2-3744; [23-36]
+    (=gb2312		. #x482C)	; &G0-482C; [40-12]
+    (=ucs@unicode	. #x75CA)	; &G0-482C;
     ))
 (define-char
-  '((=>ucs		. #x75CC)	; 痌
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (=jis-x0212		. #x4D54)	; &M-22145; [45-52]
-    (=big5		. #xD6A2)	; &I-B-D6A2;
-    (=daikanwa		. 22145)	; &I-M-22145;
-    (=ucs@jis		. #x75CC)	; &M-22145;
+    (=ucs		. #x75CB)	; 痋
+    (=big5		. #xD6A1)	; &I-B-D6A1;
+    (->subsumptive
+     ((=daikanwa	  . 22144)	; &M-22144;
+      )
+     ((=cns11643-2	  . #x3744)	; &C2-3744; [23-36]
+      (=ucs@unicode	  . #x75CB)	; &C2-3744;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22145 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs		. #x75CC)	; 痌
-    (=cns11643-2	. #x3745)	; &I-C2-3745; [23-37]
-    ))
-(define-char
-  '((=>ucs		. #x75CD)	; 痍
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
-    (shinjigen-2	. 5113)
-    (=jis-x0208		. #x6158)	; &GT-28394; [65-56]
-    (=ks-x1001		. #x6C37)	; &I-K0-6C37; [76-23]
-    (=big5		. #xB2AD)	; &I-B-B2AD;
-    (=gt		. 28394)	; &I-GT-28394;
-    (=gt-pj-1		. #x6158)	; &I-GT-28394; [65-56]
-    (=daikanwa		. 22148)	; &I-M-22148;
-    (=ucs@jis		. #x75CD)	; &GT-28394;
+    (=big5		. #xD6A2)	; &I-B-D6A2;
+    (->subsumptive
+     ((=jis-x0212	  . #x4D54)	; &M-22145; [45-52]
+      (=daikanwa	  . 22145)	; &I-M-22145;
+      (=ucs@jis		  . #x75CC)	; &M-22145;
+      )
+     ((=cns11643-2	  . #x3745)	; &C2-3745; [23-37]
+      (=ucs@unicode	  . #x75CC)	; &C2-3745;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22148 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs		. #x75CD)	; 痍
-    (=gb2312		. #x706A)	; &I-G0-706A; [80-74]
-    (=cns11643-1	. #x5C32)	; &I-C1-5C32; [60-18]
-    ))
-(define-char
-  '((=>ucs		. #x75CE)	; 痎
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
-    (=jis-x0212		. #x4D55)	; &M-22152; [45-53]
-    (=jis-x0213-1-2000	. #x784E)	; &I-JX1-784E; [88-46]
-    (=big5		. #xD67C)	; &I-B-D67C;
-    (=daikanwa		. 22152)	; &I-M-22152;
-    (=jef-china3	. #x5AE2)	; &I-JC3-5AE2;
-    (=ucs@jis		. #x75CE)	; &M-22152;
+    (=big5		. #xB2AD)	; &I-B-B2AD;
+    (->subsumptive
+     ((shinjigen-2	  . 5113)
+      (=jis-x0208	  . #x6158)	; &GT-28394; [65-56]
+      (=ks-x1001	  . #x6C37)	; &I-K0-6C37; [76-23]
+      (=gt		  . 28394)	; &I-GT-28394;
+      (=gt-pj-1		  . #x6158)	; &I-GT-28394; [65-56]
+      (=daikanwa	  . 22148)	; &I-M-22148;
+      (=ucs@jis		  . #x75CD)	; &GT-28394;
+      )
+     ((=gb2312		  . #x706A)	; &C1-5C32; [80-74]
+      (=cns11643-1	  . #x5C32)	; &I-C1-5C32; [60-18]
+      (=ucs@unicode	  . #x75CD)	; &C1-5C32;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22152 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs		. #x75CE)	; 痎
-    (=cns11643-2	. #x3741)	; &I-C2-3741; [23-33]
+    (=big5		. #xD67C)	; &I-B-D67C;
+    (->subsumptive
+     ((=jis-x0212	  . #x4D55)	; &M-22152; [45-53]
+      (=jis-x0213-1-2000  . #x784E)	; &I-JX1-784E; [88-46]
+      (=daikanwa	  . 22152)	; &I-M-22152;
+      (=jef-china3	  . #x5AE2)	; &I-JC3-5AE2;
+      (=ucs@jis		  . #x75CE)	; &M-22152;
+      )
+     ((=cns11643-2	  . #x3741)	; &C2-3741; [23-33]
+      (=ucs@unicode	  . #x75CE)	; &C2-3741;
+      ))
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
@@ -2951,242 +2952,200 @@
     (=cns11643-4	. #x3E77)	; &I-C4-3E77; [30-87]
     ))
 (define-char
-  '((=>ucs		. #x75ED)	; 痭
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=daikanwa		. 22247)	; &M-22247;
-    (mojikyo		. 022247)	; &MCS-600056E7;
-    ))
-(define-char
-  '((=>ucs		. #x75ED)	; 痭
-    (morohashi-daikanwa	22247 0 0)
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=big5		. #xDED2)	; &B-DED2;
-    ))
-(define-char
-  '((morohashi-daikanwa	22247 0 1)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=ucs		. #x75ED)	; 痭
-    (=cns11643-2	. #x4538)	; &I-C2-4538; [37-24]
     ))
 (define-char
-  '((=>ucs		. #x75EE)	; 痮
+  '((<-denotational
+     ((=ucs		  . #x75ED)	; 痭
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (=jis-x0212		. #x4D5F)	; &M-22248; [45-63]
-    (=jis-x0213-2-2000	. #x7155)	; &I-JX2-7155; [81-53]
-    (=daikanwa		. 22248)	; &I-M-22248;
-    (=ucs@jis		. #x75EE)	; &M-22248;
+    (=daikanwa		. 22247)	; &M-22247;
+    (mojikyo		. 022247)	; &MCS-600056E7;
     ))
 (define-char
-  '((morohashi-daikanwa	22248 0 0)
+  '((<-denotational
+     ((=ucs		  . #x75ED)	; 痭
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (=ucs		. #x75EE)	; 痮
-    (=cns11643-3	. #x427C)	; &I-C3-427C; [34-92]
+    (=big5		. #xDED2)	; &B-DED2;
+    (->subsumptive
+     ((=cns11643-2	  . #x4538)	; &C2-4538; [37-24]
+      (=ucs@unicode	  . #x75ED)	; &C2-4538;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x75EF)	; 痯
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (=jis-x0212		. #x4D60)	; &M-22250; [45-64]
-    (=big5		. #xDEC7)	; &I-B-DEC7;
-    (=daikanwa		. 22250)	; &I-M-22250;
-    (=ucs@jis		. #x75EF)	; &M-22250;
+    (=ucs		. #x75EE)	; 痮
+    (->subsumptive
+     ((=jis-x0212	  . #x4D5F)	; &M-22248; [45-63]
+      (=jis-x0213-2-2000  . #x7155)	; &I-JX2-7155; [81-53]
+      (=daikanwa	  . 22248)	; &I-M-22248;
+      (=ucs@jis		  . #x75EE)	; &M-22248;
+      )
+     ((=cns11643-3	  . #x427C)	; &C3-427C; [34-92]
+      (=ucs@unicode	  . #x75EE)	; &C3-427C;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22250 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=ucs		. #x75EF)	; 痯
-    (=cns11643-2	. #x452D)	; &I-C2-452D; [37-13]
-    ))
-(define-char
-  '((=>ucs		. #x75F0)	; 痰
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (shinjigen-2	. 5133)
-    (=jis-x0208		. #x6162)	; &GT-28571; [65-66]
-    (=ks-x1001		. #x5343)	; &I-K0-5343; [51-35]
-    (=big5		. #xB7F0)	; &I-B-B7F0;
-    (=gt		. 28571)	; &I-GT-28571;
-    (=gt-pj-1		. #x6162)	; &I-GT-28571; [65-66]
-    (=daikanwa		. 22251)	; &I-M-22251;
-    (=ucs@jis		. #x75F0)	; &GT-28571;
+    (=big5		. #xDEC7)	; &I-B-DEC7;
+    (->subsumptive
+     ((=jis-x0212	  . #x4D60)	; &M-22250; [45-64]
+      (=daikanwa	  . 22250)	; &I-M-22250;
+      (=ucs@jis		  . #x75EF)	; &M-22250;
+      )
+     ((=cns11643-2	  . #x452D)	; &C2-452D; [37-13]
+      (=ucs@unicode	  . #x75EF)	; &C2-452D;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22251 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=ucs		. #x75F0)	; 痰
-    (=gb2312		. #x4C35)	; &I-G0-4C35; [44-21]
-    ))
-(define-char
-  '((=>ucs		. #x75F0)	; 痰
-    (morohashi-daikanwa	22251 0 1)
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=cns11643-1	. #x6538)	; &C1-6538; [69-24]
-    ))
-(define-char
-  '((=>ucs		. #x75F1)	; 痱
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=big5		. #xB7F3)	; &M-22252;
-    (=daikanwa		. 22252)	; &I-M-22252;
-    (mojikyo		. 022252)	; &MCS-600056EC;
-    ))
-(define-char
-  '((=>ucs		. #x75F1)	; 痱
-    (morohashi-daikanwa	22252 0 0)
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=jis-x0212		. #x4D61)	; &JX2-7156; [45-65]
-    (=jis-x0213-2-2000	. #x7156)	; &I-JX2-7156; [81-54]
-    (=ucs@jis		. #x75F1)	; &JX2-7156;
-    ))
-(define-char
-  '((=>ucs		. #x75F1)	; 痱
-    (morohashi-daikanwa	22252 0 1)
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=cns11643-1	. #x653B)	; &C1-653B; [69-27]
+    (=big5		. #xB7F0)	; &I-B-B7F0;
+    (->subsumptive
+     ((shinjigen-2	  . 5133)
+      (=jis-x0208	  . #x6162)	; &GT-28571; [65-66]
+      (=ks-x1001	  . #x5343)	; &I-K0-5343; [51-35]
+      (=gt		  . 28571)	; &I-GT-28571;
+      (=gt-pj-1		  . #x6162)	; &I-GT-28571; [65-66]
+      (=daikanwa	  . 22251)	; &I-M-22251;
+      (=ucs@jis		  . #x75F0)	; &GT-28571;
+      )
+     ((=gb2312		  . #x4C35)	; &G0-4C35; [44-21]
+      (=ucs@unicode	  . #x75F0)	; &G0-4C35;
+      )
+     ((=cns11643-1	  . #x6538)	; &C1-6538; [69-24]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22252 0 2)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=ucs		. #x75F1)	; 痱
-    (=gb2312		. #x7072)	; &I-G0-7072; [80-82]
-    ))
-(define-char
-  '((=>ucs		. #x75F2)	; 痲
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (shinjigen-2	. 5138)
-    (=jis-x0208		. #x6164)	; &GT-28592; [65-68]
-    (=ks-x1001		. #x5826)	; &I-K0-5826; [56-06]
-    (=big5		. #xB7F2)	; &I-B-B7F2;
-    (=gt		. 28592)	; &I-GT-28592;
-    (=gt-k		. 10327)	; &I-GT-K10327;
-    (=gt-pj-1		. #x6164)	; &I-GT-28592; [65-68]
-    (=daikanwa		. 22254)	; &I-M-22254;
-    (=ucs@jis		. #x75F2)	; &GT-28592;
+    (=big5		. #xB7F3)	; &I-B-B7F3;
+    (->subsumptive
+     ((=daikanwa	  . 22252)	; &M-22252;
+      (mojikyo		  . 022252)	; &MCS-600056EC;
+      )
+     ((=jis-x0212	  . #x4D61)	; &JX2-7156; [45-65]
+      (=jis-x0213-2-2000  . #x7156)	; &I-JX2-7156; [81-54]
+      (=ucs@jis		  . #x75F1)	; &JX2-7156;
+      )
+     ((=cns11643-1	  . #x653B)	; &C1-653B; [69-27]
+      )
+     ((=gb2312		  . #x7072)	; &G0-7072; [80-82]
+      (=ucs@unicode	  . #x75F1)	; &G0-7072;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22254 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=ucs		. #x75F2)	; 痲
+    (=big5		. #xB7F2)	; &I-B-B7F2;
+    (->subsumptive
+     ((shinjigen-1	  . 5138)
+      (shinjigen-2	  . 5138)
+      (=jis-x0208	  . #x6164)	; &GT-28592; [65-68]
+      (=ks-x1001	  . #x5826)	; &I-K0-5826; [56-06]
+      (=gt		  . 28592)	; &I-GT-28592;
+      (=gt-k		  . 10327)	; &I-GT-K10327;
+      (=gt-pj-1		  . #x6164)	; &I-GT-28592; [65-68]
+      (=daikanwa	  . 22254)	; &I-M-22254;
+      (=ucs@jis		  . #x75F2)	; &GT-28592;
+      )
+     ((=ucs@unicode	  . #x75F2)	; &UU+75F2;
+      )
+     ((=cns11643-1	  . #x653A)	; &C1-653A; [69-26]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x75F2)	; 痲
-    (morohashi-daikanwa	22254 0 1)
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=cns11643-1	. #x653A)	; &C1-653A; [69-26]
-    ))
-(define-char
-  '((=>ucs		. #x75F3)	; 痳
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (shinjigen-2	. 5140)
-    (=jis-x0208		. #x6165)	; &GT-28597; [65-69]
-    (=big5		. #xB7F7)	; &I-B-B7F7;
-    (=gt		. 28597)	; &I-GT-28597;
-    (=gt-k		. 10328)	; &I-GT-K10328;
-    (=gt-pj-1		. #x6165)	; &I-GT-28597; [65-69]
-    (=daikanwa		. 22255)	; &I-M-22255;
-    (=ucs@jis		. #x75F3)	; &GT-28597;
-    ))
-(define-char
-  '((morohashi-daikanwa	22255 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=ucs		. #x75F3)	; 痳
-    (=iso-ir165		. #x2F78)	; &I-EGB-2F78; [15-88]
-    (=cns11643-1	. #x653F)	; &I-C1-653F; [69-31]
-    ))
-(define-char
-  '((=>ucs		. #x75F4)	; 痴
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6177)	; &GT-28948; [65-87]
-      (=ks-x1001	  . #x7642)	; &I-K0-7642; [86-34]
-      (=daikanwa	  . 22591)	; &I-M-22591;
+    (=big5		. #xB7F7)	; &I-B-B7F7;
+    (->subsumptive
+     ((shinjigen-1	  . 5140)
+      (shinjigen-2	  . 5140)
+      (=jis-x0208	  . #x6165)	; &GT-28597; [65-69]
+      (=gt		  . 28597)	; &I-GT-28597;
+      (=gt-k		  . 10328)	; &I-GT-K10328;
+      (=gt-pj-1		  . #x6165)	; &I-GT-28597; [65-69]
+      (=daikanwa	  . 22255)	; &I-M-22255;
+      (=ucs@jis		  . #x75F3)	; &GT-28597;
+      )
+     ((=iso-ir165	  . #x2F78)	; &C1-653F; [15-88]
+      (=cns11643-1	  . #x653F)	; &I-C1-653F; [69-31]
+      (=ucs@unicode	  . #x75F3)	; &C1-653F;
       ))
-    (shinjigen-2	. 5134)
-    (=jis-x0208		. #x4354)	; &GT-28572; [35-52]
-    (=ks-x1001		. #x7641)	; &I-K0-7641; [86-33]
-    (=big5		. #xB7F6)	; &I-B-B7F6;
-    (=gt		. 28572)	; &I-GT-28572;
-    (=gt-pj-1		. #x4354)	; &I-GT-28572; [35-52]
-    (=daikanwa		. 22257)	; &I-M-22257;
-    (=ucs@jis		. #x75F4)	; &GT-28572;
     ))
 (define-char
-  '((morohashi-daikanwa	22257 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=ucs		. #x75F4)	; 痴
-    (=gb2312		. #x3355)	; &I-G0-3355; [19-53]
-    (=cns11643-1	. #x653E)	; &I-C1-653E; [69-30]
-    ))
-(define-char
-  '((=>ucs		. #x75F5)	; 痵
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=big5		. #xDED3)	; &M-22258;
-    (=daikanwa		. 22258)	; &I-M-22258;
+    (=big5		. #xB7F6)	; &I-B-B7F6;
+    (->subsumptive
+     ((shinjigen-1	  . 5134)
+      (shinjigen-2	  . 5134)
+      (=jis-x0208	  . #x4354)	; &GT-28572; [35-52]
+      (=ks-x1001	  . #x7641)	; &I-K0-7641; [86-33]
+      (=gt		  . 28572)	; &I-GT-28572;
+      (=gt-pj-1		  . #x4354)	; &I-GT-28572; [35-52]
+      (=daikanwa	  . 22257)	; &I-M-22257;
+      (=ucs@jis		  . #x75F4)	; &GT-28572;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6177)	; &GT-28948; [65-87]
+	(=ks-x1001	    . #x7642)	; &I-K0-7642; [86-34]
+	(=daikanwa	    . 22591)	; &I-M-22591;
+	))
+      )
+     ((=gb2312		  . #x3355)	; &C1-653E; [19-53]
+      (=cns11643-1	  . #x653E)	; &I-C1-653E; [69-30]
+      (=ucs@unicode	  . #x75F4)	; &C1-653E;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22258 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=ucs		. #x75F5)	; 痵
-    (=cns11643-2	. #x4539)	; &I-C2-4539; [37-25]
-    ))
-(define-char
-  '((=>ucs		. #x75F6)	; 痶
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=big5		. #xDED1)	; &M-22268;
-    (=daikanwa		. 22268)	; &I-M-22268;
+    (=big5		. #xDED3)	; &I-B-DED3;
+    (->subsumptive
+     ((=daikanwa	  . 22258)	; &M-22258;
+      )
+     ((=ucs@unicode	  . #x75F5)	; &UU+75F5;
+      )
+     ((=cns11643-2	  . #x4539)	; &C2-4539; [37-25]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22268 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=ucs		. #x75F6)	; 痶
-    (=cns11643-2	. #x4537)	; &I-C2-4537; [37-23]
+    (=big5		. #xDED1)	; &I-B-DED1;
+    (->subsumptive
+     ((=daikanwa	  . 22268)	; &M-22268;
+      )
+     ((=cns11643-2	  . #x4537)	; &C2-4537; [37-23]
+      (=ucs@unicode	  . #x75F6)	; &C2-4537;
+      ))
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
@@ -3204,168 +3163,139 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x75F8)	; 痸
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=big5		. #xDECE)	; &M-22272;
-    (=daikanwa		. 22272)	; &I-M-22272;
-    ))
-(define-char
-  '((morohashi-daikanwa	22272 0 0)
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=ucs		. #x75F8)	; 痸
-    (=cns11643-2	. #x4534)	; &I-C2-4534; [37-20]
-    ))
-(define-char
-  '((=>ucs		. #x75F9)	; 痹
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=jis-x0212		. #x4D62)	; &M-22279; [45-66]
-    (=jis-x0213-2-2000	. #x7157)	; &I-JX2-7157; [81-55]
-    (=big5		. #xDECD)	; &I-B-DECD;
-    (=daikanwa		. 22279)	; &I-M-22279;
-    (=jef-china3	. #x8BE5)	; &I-JC3-8BE5;
-    (=ucs@jis		. #x75F9)	; &M-22279;
-    ))
-(define-char
-  '((morohashi-daikanwa	22279 0 0)
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=ucs		. #x75F9)	; 痹
-    (=gb2312		. #x3154)	; &I-G0-3154; [17-52]
-    (=cns11643-2	. #x4533)	; &I-C2-4533; [37-19]
-    ))
-(define-char
-  '((=>ucs		. #x75FA)	; 痺
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=jis-x0208		. #x6163)	; &GT-28585; [65-67]
-    (=ks-x1001		. #x5D76)	; &I-K0-5D76; [61-86]
-    (=big5		. #xB7F4)	; &I-B-B7F4;
-    (=gt		. 28585)	; &I-GT-28585;
-    (=gt-k		. 10326)	; &I-GT-K10326;
-    (=gt-pj-1		. #x6163)	; &I-GT-28585; [65-67]
-    (=daikanwa		. 22280)	; &I-M-22280;
-    (=ucs@jis		. #x75FA)	; &GT-28585;
-    ))
-(define-char
-  '((morohashi-daikanwa	22280 0 0)
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=ucs		. #x75FA)	; 痺
-    (=cns11643-1	. #x653C)	; &I-C1-653C; [69-28]
-    ))
-(define-char
-  '((=>ucs		. #x75FB)	; 痻
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=big5		. #xDED0)	; &M-22283;
-    (=daikanwa		. 22283)	; &I-M-22283;
-    ))
-(define-char
-  '((morohashi-daikanwa	22283 0 0)
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (=ucs		. #x75FB)	; 痻
-    (=cns11643-2	. #x4536)	; &I-C2-4536; [37-22]
-    ))
-(define-char
-  '((=>ucs		. #x75FC)	; 痼
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 13)
-    (shinjigen-2	. 5130)
-    (=jis-x0208		. #x6160)	; &GT-28545; [65-64]
-    (=ks-x1001		. #x4D40)	; &I-K0-4D40; [45-32]
-    (=big5		. #xDECC)	; &I-B-DECC;
-    (=gt		. 28545)	; &I-GT-28545;
-    (=gt-pj-1		. #x6160)	; &I-GT-28545; [65-64]
-    (=daikanwa		. 22285)	; &I-M-22285;
-    (=ucs@jis		. #x75FC)	; &GT-28545;
-    ))
-(define-char
-  '((morohashi-daikanwa	22285 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (=ucs		. #x75FC)	; 痼
-    (=gb2312		. #x7073)	; &I-G0-7073; [80-83]
-    (=cns11643-2	. #x4532)	; &I-C2-4532; [37-18]
+    (=ucs		. #x75F8)	; 痸
+    (=big5		. #xDECE)	; &I-B-DECE;
+    (->subsumptive
+     ((=daikanwa	  . 22272)	; &M-22272;
+      )
+     ((=cns11643-2	  . #x4534)	; &C2-4534; [37-20]
+      (=ucs@unicode	  . #x75F8)	; &C2-4534;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x75FD)	; 痽
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (=big5		. #xDED4)	; &M-22287;
-    (=daikanwa		. 22287)	; &I-M-22287;
+    (=ucs		. #x75F9)	; 痹
+    (=big5		. #xDECD)	; &I-B-DECD;
+    (->subsumptive
+     ((=jis-x0212	  . #x4D62)	; &M-22279; [45-66]
+      (=jis-x0213-2-2000  . #x7157)	; &I-JX2-7157; [81-55]
+      (=daikanwa	  . 22279)	; &I-M-22279;
+      (=jef-china3	  . #x8BE5)	; &I-JC3-8BE5;
+      (=ucs@jis		  . #x75F9)	; &M-22279;
+      )
+     ((=gb2312		  . #x3154)	; &C2-4533; [17-52]
+      (=cns11643-2	  . #x4533)	; &I-C2-4533; [37-19]
+      (=ucs@unicode	  . #x75F9)	; &C2-4533;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22287 0 1)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (=ucs		. #x75FD)	; 痽
-    (=cns11643-2	. #x453A)	; &I-C2-453A; [37-26]
+    (=ucs		. #x75FA)	; 痺
+    (=big5		. #xB7F4)	; &I-B-B7F4;
+    (->subsumptive
+     ((=jis-x0208	  . #x6163)	; &GT-28585; [65-67]
+      (=ks-x1001	  . #x5D76)	; &I-K0-5D76; [61-86]
+      (=gt		  . 28585)	; &I-GT-28585;
+      (=gt-k		  . 10326)	; &I-GT-K10326;
+      (=gt-pj-1		  . #x6163)	; &I-GT-28585; [65-67]
+      (=daikanwa	  . 22280)	; &I-M-22280;
+      (=ucs@jis		  . #x75FA)	; &GT-28585;
+      )
+     ((=cns11643-1	  . #x653C)	; &C1-653C; [69-28]
+      (=ucs@unicode	  . #x75FA)	; &C1-653C;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x75FE)	; 痾
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (shinjigen-2	. 5128)
-    (=jis-x0208		. #x615E)	; &GT-28515; [65-62]
-    (=big5		. #xDECB)	; &I-B-DECB;
-    (=gt		. 28515)	; &I-GT-28515;
-    (=gt-pj-1		. #x615E)	; &I-GT-28515; [65-62]
-    (=daikanwa		. 22289)	; &I-M-22289;
-    (=ucs@jis		. #x75FE)	; &GT-28515;
+    (=ucs		. #x75FB)	; 痻
+    (=big5		. #xDED0)	; &I-B-DED0;
+    (->subsumptive
+     ((=daikanwa	  . 22283)	; &M-22283;
+      )
+     ((=cns11643-2	  . #x4536)	; &C2-4536; [37-22]
+      (=ucs@unicode	  . #x75FB)	; &C2-4536;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22289 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (=ucs		. #x75FE)	; 痾
-    (=cns11643-2	. #x4531)	; &I-C2-4531; [37-17]
+    (=ucs		. #x75FC)	; 痼
+    (=big5		. #xDECC)	; &I-B-DECC;
+    (->subsumptive
+     ((shinjigen-2	  . 5130)
+      (=jis-x0208	  . #x6160)	; &GT-28545; [65-64]
+      (=ks-x1001	  . #x4D40)	; &I-K0-4D40; [45-32]
+      (=gt		  . 28545)	; &I-GT-28545;
+      (=gt-pj-1		  . #x6160)	; &I-GT-28545; [65-64]
+      (=daikanwa	  . 22285)	; &I-M-22285;
+      (=ucs@jis		  . #x75FC)	; &GT-28545;
+      )
+     ((=gb2312		  . #x7073)	; &C2-4532; [80-83]
+      (=cns11643-2	  . #x4532)	; &I-C2-4532; [37-18]
+      (=ucs@unicode	  . #x75FC)	; &C2-4532;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x75FF)	; 痿
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (shinjigen-2	. 5129)
-    (=jis-x0208		. #x615F)	; &GT-28518; [65-63]
-    (=big5		. #xB7F5)	; &I-B-B7F5;
-    (=gt		. 28518)	; &I-GT-28518;
-    (=gt-pj-1		. #x615F)	; &I-GT-28518; [65-63]
-    (=daikanwa		. 22290)	; &I-M-22290;
-    (=ucs@jis		. #x75FF)	; &GT-28518;
+    (=ucs		. #x75FD)	; 痽
+    (=big5		. #xDED4)	; &I-B-DED4;
+    (->subsumptive
+     ((=daikanwa	  . 22287)	; &M-22287;
+      )
+     ((=cns11643-2	  . #x453A)	; &C2-453A; [37-26]
+      (=ucs@unicode	  . #x75FD)	; &C2-453A;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22290 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (=ucs		. #x75FF)	; 痿
-    (=gb2312		. #x7074)	; &I-G0-7074; [80-84]
+    (=ucs		. #x75FE)	; 痾
+    (=big5		. #xDECB)	; &I-B-DECB;
+    (->subsumptive
+     ((shinjigen-2	  . 5128)
+      (=jis-x0208	  . #x615E)	; &GT-28515; [65-62]
+      (=gt		  . 28515)	; &I-GT-28515;
+      (=gt-pj-1		  . #x615E)	; &I-GT-28515; [65-62]
+      (=daikanwa	  . 22289)	; &I-M-22289;
+      (=ucs@jis		  . #x75FE)	; &GT-28515;
+      )
+     ((=cns11643-2	  . #x4531)	; &C2-4531; [37-17]
+      (=ucs@unicode	  . #x75FE)	; &C2-4531;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x75FF)	; 痿
-    (morohashi-daikanwa	22290 0 1)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (=cns11643-1	. #x653D)	; &C1-653D; [69-29]
+    (=ucs		. #x75FF)	; 痿
+    (=big5		. #xB7F5)	; &I-B-B7F5;
+    (->subsumptive
+     ((shinjigen-1	  . 5129)
+      (shinjigen-2	  . 5129)
+      (=jis-x0208	  . #x615F)	; &GT-28518; [65-63]
+      (=gt		  . 28518)	; &I-GT-28518;
+      (=gt-pj-1		  . #x615F)	; &I-GT-28518; [65-63]
+      (=daikanwa	  . 22290)	; &I-M-22290;
+      (=ucs@jis		  . #x75FF)	; &GT-28518;
+      )
+     ((=gb2312		  . #x7074)	; &G0-7074; [80-84]
+      (=ucs@unicode	  . #x75FF)	; &G0-7074;
+      )
+     ((=cns11643-1	  . #x653D)	; &C1-653D; [69-29]
+      ))
     ))
 (define-char
   '((=>ucs		. #x24DD6)	; 𤷖
@@ -4856,22 +4786,61 @@
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
+    (=ucs		. #x3FB6)	; 㾶
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3FB6)	; 㾶
+      ))
+    (ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
+    (->subsumptive
+     ((=daikanwa	  . 22379)	; &M-22379;
+      )
+     ((=cns11643-7	  . #x2558)	; &C7-2558; [05-56]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3FB6)	; 㾶
+      ))
+    (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (=ucs		. #x24E89)	; 𤺉
-    (=cns11643-4	. #x4529)	; &I-C4-4529; [37-09]
+    (=ucs@unicode	. #x3FB6)	; &UU+3FB6;
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (=ucs		. #x2983E)	; ð© ¾
-    (=cns11643-5	. #x4754)	; &I-C5-4754; [39-52]
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
+    (=ucs		. #x3FB7)	; ã¾·
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3FB7)	; ã¾·
+      ))
+    (ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
+    (->subsumptive
+     ((=daikanwa	  . 22382)	; &M-22382;
+      )
+     ((=cns11643-4	  . #x4B38)	; &C4-4B38; [43-24]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3FB7)	; ã¾·
+      ))
+    (ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x3FB7)	; &UU+3FB7;
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
     (=ucs		. #x7619)	; 瘙
-    (=big5		. #xE6B1)	; &I-B-E6B1;
     ))
 (define-char
   '((<-denotational
@@ -4880,6 +4849,7 @@
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
+    (=big5		. #xE6B1)	; &B-E6B1;
     (->subsumptive
      ((=ks-x1001	  . #x6144)	; &M-22383; [65-36]
       (=jis-x0212	  . #x4D70)	; &I-JSP-4D70; [45-80]
@@ -4902,20 +4872,30 @@
     (=ucs@unicode	. #x7619)	; &G0-707E;
     ))
 (define-char
-  '((=>ucs		. #x761A)	; 瘚
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (=big5		. #xE6B5)	; &M-22386;
-    (=daikanwa		. 22386)	; &I-M-22386;
+    (=ucs		. #x3FB8)	; 㾸
+    (->subsumptive
+     ((=daikanwa	  . 22385)	; &M-22385;
+      )
+     ((=cns11643-3	  . #x4D42)	; &C3-4D42; [45-34]
+      (=ucs@unicode	  . #x3FB8)	; &C3-4D42;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22386 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
     (=ucs		. #x761A)	; 瘚
-    (=cns11643-2	. #x523D)	; &I-C2-523D; [50-29]
+    (=big5		. #xE6B5)	; &I-B-E6B5;
+    (->subsumptive
+     ((=daikanwa	  . 22386)	; &M-22386;
+      )
+     ((=cns11643-2	  . #x523D)	; &C2-523D; [50-29]
+      )
+     ((=ucs@unicode	  . #x761A)	; &UU+761A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
@@ -4941,6 +4921,47 @@
   '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
+    (=ucs		. #x24E2E)	; 𤸮
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24E2E)	; 𤸮
+      ))
+    (ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
+    (=daikanwa		. 22389)	; &M-22389;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24E2E)	; 𤸮
+      ))
+    (ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
+    (->subsumptive
+     ((=ucs@iso		  . #x24E2E)	; &U-00024E2E;
+      )
+     ((=cns11643-5	  . #x4E53)	; &C5-4E53; [46-51]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
+    (=ucs		. #x24E2F)	; 𤸯
+    (->subsumptive
+     ((=daikanwa	  . 22390)	; &M-22390;
+      )
+     ((=ucs@iso		  . #x24E2F)	; &U-00024E2F;
+      )
+     ((=cns11643-4	  . #x4B34)	; &C4-4B34; [43-20]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
     (=ucs		. #x761C)	; 瘜
     (=big5		. #xE6B3)	; &I-B-E6B3;
     (->subsumptive
@@ -5147,28 +5168,56 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x7624)	; 瘤
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (shinjigen-2	. 5156)
-    (=jis-x0208		. #x616E)	; &GT-28748; [65-78]
-    (=ks-x1001		. #x573B)	; &I-K0-573B; [55-27]
+    (=ucs		. #x7624)	; 瘤
     (=big5		. #xBD46)	; &I-B-BD46;
-    (=gt		. 28748)	; &I-GT-28748;
-    (=gt-pj-1		. #x616E)	; &I-GT-28748; [65-78]
-    (=daikanwa		. 22408)	; &I-M-22408;
-    (=ucs@jis		. #x7624)	; &GT-28748;
-    (mojikyo		. 022408)	; &MCS-60005788;
+    (->subsumptive
+     ((shinjigen-2	  . 5156)
+      (=jis-x0208	  . #x616E)	; &GT-28748; [65-78]
+      (=ks-x1001	  . #x573B)	; &I-K0-573B; [55-27]
+      (=gt		  . 28748)	; &I-GT-28748;
+      (=gt-pj-1		  . #x616E)	; &I-GT-28748; [65-78]
+      (=daikanwa	  . 22408)	; &I-M-22408;
+      (=ucs@jis		  . #x7624)	; &GT-28748;
+      (mojikyo		  . 022408)	; &MCS-60005788;
+      )
+     ((=gb2312		  . #x4176)	; &C1-6D6F; [33-86]
+      (=cns11643-1	  . #x6D6F)	; &I-C1-6D6F; [77-79]
+      (=ucs@unicode	  . #x7624)	; &C1-6D6F;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 104)	; ⽧
+    (=ucs		. #x3FBC)	; ã¾¼
     ))
 (define-char
-  '((morohashi-daikanwa	22408 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3FBC)	; ã¾¼
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (=ucs		. #x7624)	; 瘤
-    (=gb2312		. #x4176)	; &I-G0-4176; [33-86]
-    (=cns11643-1	. #x6D6F)	; &I-C1-6D6F; [77-79]
+    (=daikanwa		. 22411)	; &M-22411;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3FBC)	; ã¾¼
+      ))
+    (ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x3FBC)	; &UU+3FBC;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3FBC)	; ã¾¼
+      ))
+    (ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
+    (=cns11643-4	. #x4B2F)	; &C4-4B2F; [43-15]
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
@@ -5229,122 +5278,134 @@
     (total-strokes	 . 12)
     (=ucs		. #x75E9)	; 痩
     (->subsumptive
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x4169)	; &M-22415; [33-73]
-	(=ks-x1001	    . #x6231)	; &I-K0-6231; [66-17]
-	(=jis-x0212	    . #x4D77)	; &I-JSP-4D77; [45-87]
-	(=daikanwa	    . 22415)	; &I-M-22415;
-	))
-      (=jis-x0208@1983	  . #x4169)	; &GT-28480; [33-73]
+     ((=jis-x0208@1983	  . #x4169)	; &GT-28480; [33-73]
       (=jis-x0208@1990	  . #x4169)	; &I-J90-4169; [33-73]
       (=gt		  . 28480)	; &I-GT-28480;
       (=gt-pj-1		  . #x4169)	; &I-GT-28480; [33-73]
       (=jef-china3	  . #x5AF5)	; &I-JC3-5AF5;
       (=ucs@jis		  . #x75E9)	; &GT-28480;
+      (<-simplified@JP
+       ((=jis-x0208@1978    . #x4169)	; &M-22415; [33-73]
+	(=ks-x1001	    . #x6231)	; &I-K0-6231; [66-17]
+	(=jis-x0212	    . #x4D77)	; &I-JSP-4D77; [45-87]
+	(=daikanwa	    . 22415)	; &I-M-22415;
+	))
       )
      ((=ucs@unicode	  . #x75E9)	; &UU+75E9;
       ))
     ))
 (define-char
-  '((=>ucs		. #x7627)	; 瘧
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (shinjigen-2	. 5149)
-    (=jis-x0208		. #x616A)	; &GT-28619; [65-74]
-    (=big5		. #xBAC4)	; &I-B-BAC4;
-    (=gt		. 28619)	; &I-GT-28619;
-    (=gt-pj-1		. #x616A)	; &I-GT-28619; [65-74]
-    (=daikanwa		. 22419)	; &I-M-22419;
-    (=ucs@jis		. #x7627)	; &GT-28619;
+  '((ideographic-radical . 104)	; ⽧
+    (=ucs		. #x3FBD)	; ã¾½
     ))
 (define-char
-  '((morohashi-daikanwa	22419 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3FBD)	; ã¾½
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x7627)	; 瘧
-    (=gb12345		. #x4531)	; 瘧 [37-17]
+    (total-strokes	 . 15)
+    (=daikanwa		. 22416)	; &M-22416;
     ))
 (define-char
-  '((=>ucs		. #x7627)	; 瘧
-    (morohashi-daikanwa	22419 0 1)
+  '((<-denotational
+     ((=ucs		  . #x3FBD)	; ã¾½
+      ))
     (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 10)
+    (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (=cns11643-1	. #x696B)	; &C1-696B; [73-75]
+    (=ucs@unicode	. #x3FBD)	; &UU+3FBD;
     ))
 (define-char
-  '((=>ucs		. #x7628)	; 瘨
+  '((<-denotational
+     ((=ucs		  . #x3FBD)	; ã¾½
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (=jis-x0213-2-2000	. #x7163)	; &M-22420; [81-67]
-    (=big5		. #xE6B6)	; &I-B-E6B6;
-    (=daikanwa		. 22420)	; &I-M-22420;
-    (=ucs@jis		. #x7628)	; &M-22420;
+    (=cns11643-7	. #x255C)	; &C7-255C; [05-60]
     ))
 (define-char
-  '((morohashi-daikanwa	22420 0 4)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
-    (total-strokes	 . 15)
-    (=ucs		. #x7628)	; 瘨
-    (=cns11643-2	. #x523E)	; &I-C2-523E; [50-30]
+    (total-strokes	 . 14)
+    (=ucs		. #x7627)	; 瘧
+    (=big5		. #xBAC4)	; &I-B-BAC4;
+    (->subsumptive
+     ((shinjigen-1	  . 5149)
+      (shinjigen-2	  . 5149)
+      (=jis-x0208	  . #x616A)	; &GT-28619; [65-74]
+      (=gt		  . 28619)	; &I-GT-28619;
+      (=gt-pj-1		  . #x616A)	; &I-GT-28619; [65-74]
+      (=daikanwa	  . 22419)	; &I-M-22419;
+      (=ucs@jis		  . #x7627)	; &GT-28619;
+      )
+     ((=gb12345		  . #x4531)	; &UU+7627; [37-17]
+      (=ucs@unicode	  . #x7627)	; &UU+7627;
+      )
+     ((=cns11643-1	  . #x696B)	; &C1-696B; [73-75]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x7629)	; 瘩
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (=big5		. #xBD44)	; &M-22437;
-    (=daikanwa		. 22437)	; &I-M-22437;
+    (=ucs		. #x7628)	; 瘨
+    (=big5		. #xE6B6)	; &I-B-E6B6;
     ))
 (define-char
-  '((=>ucs		. #x7629)	; 瘩
-    (morohashi-daikanwa	22437 0 0)
+  '((<-denotational
+     ((=ucs		  . #x7628)	; 瘨
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (=cns11643-1	. #x6D6D)	; &C1-6D6D; [77-77]
-    ))
-(define-char
-  '((=>ucs		. #x7629)	; 瘩
-    (morohashi-daikanwa	22437 0 2)
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (=jis-x0212		. #x4D78)	; &JSP-4D78; [45-88]
-    (=ucs@jis		. #x7629)	; &JSP-4D78;
+    (=jis-x0213-2-2000	. #x7163)	; &M-22420; [81-67]
+    (=daikanwa		. 22420)	; &I-M-22420;
+    (=ucs@jis		. #x7628)	; &M-22420;
     ))
 (define-char
-  '((morohashi-daikanwa	22437 0 3)
+  '((<-denotational
+     ((=ucs		  . #x7628)	; 瘨
+      ))
     (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (=ucs		. #x7629)	; 瘩
-    (=gb2312		. #x3471)	; &I-G0-3471; [20-81]
-    ))
-(define-char
-  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (=ucs		. #x3FB6)	; 㾶
-    (=cns11643-7	. #x2558)	; &I-C7-2558; [05-56]
+    (=cns11643-2	. #x523E)	; &C2-523E; [50-30]
+    (=ucs@unicode	. #x7628)	; &C2-523E;
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 10)
-    (total-strokes	 . 15)
-    (=ucs		. #x3FB7)	; ã¾·
-    (=cns11643-4	. #x4B38)	; &I-C4-4B38; [43-24]
+    (=ucs		. #x7629)	; 瘩
+    (=big5		. #xBD44)	; &I-B-BD44;
     ))
 (define-char
-  '((ideographic-radical . 104)	; ⽧
+  '((<-denotational
+     ((=ucs		  . #x7629)	; 瘩
+      ))
+    (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (=ucs		. #x3FB8)	; 㾸
-    (=cns11643-3	. #x4D42)	; &I-C3-4D42; [45-34]
+    (->subsumptive
+     ((=daikanwa	  . 22437)	; &M-22437;
+      )
+     ((=cns11643-1	  . #x6D6D)	; &C1-6D6D; [77-77]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7629)	; 瘩
+      ))
+    (ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (->subsumptive
+     ((=jis-x0212	  . #x4D78)	; &JSP-4D78; [45-88]
+      (=ucs@jis		  . #x7629)	; &JSP-4D78;
+      )
+     ((=gb2312		  . #x3471)	; &G0-3471; [20-81]
+      (=ucs@unicode	  . #x7629)	; &G0-3471;
+      ))
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
@@ -5364,20 +5425,6 @@
   '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (=ucs		. #x3FBC)	; ã¾¼
-    (=cns11643-4	. #x4B2F)	; &I-C4-4B2F; [43-15]
-    ))
-(define-char
-  '((ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 10)
-    (total-strokes	 . 15)
-    (=ucs		. #x3FBD)	; ã¾½
-    (=cns11643-7	. #x255C)	; &I-C7-255C; [05-60]
-    ))
-(define-char
-  '((ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 10)
-    (total-strokes	 . 15)
     (=ucs		. #x3FBE)	; ã¾¾
     (=cns11643-4	. #x4B2E)	; &I-C4-4B2E; [43-14]
     ))
@@ -5434,20 +5481,6 @@
   '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (=ucs		. #x24E2E)	; 𤸮
-    (=cns11643-5	. #x4E53)	; &I-C5-4E53; [46-51]
-    ))
-(define-char
-  '((ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 10)
-    (total-strokes	 . 15)
-    (=ucs		. #x24E2F)	; 𤸯
-    (=cns11643-4	. #x4B34)	; &I-C4-4B34; [43-20]
-    ))
-(define-char
-  '((ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 10)
-    (total-strokes	 . 15)
     (=ucs		. #x24E30)	; 𤸰
     (=cns11643-7	. #x255D)	; &I-C7-255D; [05-61]
     ))
@@ -6050,13 +6083,6 @@
   '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (=ucs		. #x24D1F)	; 𤴟
-    (=cns11643-5	. #x5563)	; &I-C5-5563; [53-67]
-    ))
-(define-char
-  '((ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 11)
-    (total-strokes	 . 16)
     (=ucs		. #x24E5D)	; 𤹝
     (=cns11643-4	. #x514B)	; &I-C4-514B; [49-43]
     ))
@@ -6311,27 +6337,55 @@
     (=ucs		. #x7641)	; 癁
     ))
 (define-char
-  '((=>ucs		. #x7642)	; 療
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (shinjigen-2	. 5169)
-    (=jis-x0208		. #x4E45)	; &GT-28883; [46-37]
-    (=ks-x1001		. #x567B)	; &I-K0-567B; [54-91]
+    (=ucs		. #x7642)	; 療
     (=big5		. #xC0F8)	; &I-B-C0F8;
-    (=gt		. 28883)	; &I-GT-28883;
-    (=gt-pj-1		. #x4E45)	; &I-GT-28883; [46-37]
-    (=daikanwa		. 22500)	; &I-M-22500;
-    (=ucs@jis		. #x7642)	; &GT-28883;
+    (->subsumptive
+     ((shinjigen-2	  . 5169)
+      (=jis-x0208	  . #x4E45)	; &GT-28883; [46-37]
+      (=ks-x1001	  . #x567B)	; &I-K0-567B; [54-91]
+      (=gt		  . 28883)	; &I-GT-28883;
+      (=gt-pj-1		  . #x4E45)	; &I-GT-28883; [46-37]
+      (=daikanwa	  . 22500)	; &I-M-22500;
+      (=ucs@jis		  . #x7642)	; &GT-28883;
+      )
+     ((=cns11643-1	  . #x7443)	; &C1-7443; [84-35]
+      (=gb12345		  . #x4146)	; &C1-7443; [33-38]
+      (=ucs@unicode	  . #x7642)	; &C1-7443;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 104)	; ⽧
+    (=ucs		. #x24E89)	; 𤺉
     ))
 (define-char
-  '((morohashi-daikanwa	22500 0 0)
+  '((<-denotational
+     ((=ucs		  . #x24E89)	; 𤺉
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=ucs		. #x7642)	; 療
-    (=cns11643-1	. #x7443)	; &I-C1-7443; [84-35]
-    (=gb12345		. #x4146)	; 療 [33-38]
+    (=daikanwa		. 22501)	; &M-22501;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24E89)	; 𤺉
+      ))
+    (ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs@iso		. #x24E89)	; &U-00024E89;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24E89)	; 𤺉
+      ))
+    (ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=cns11643-4	. #x4529)	; &C4-4529; [37-09]
     ))
 (define-char
   '((=>ucs		. #x24E8B)	; 𤺋
@@ -6352,24 +6406,21 @@
     (=cns11643-7	. #x3947)	; &I-C7-3947; [25-39]
     ))
 (define-char
-  '((=>ucs		. #x7643)	; 癃
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 12)
-    (total-strokes	 . 17)
-    (=jis-x0212		. #x4E26)	; &M-22506; [46-06]
-    (=jis-x0213-1-2000	. #x7859)	; &I-JX1-7859; [88-57]
-    (=big5		. #xED74)	; &I-B-ED74;
-    (=daikanwa		. 22506)	; &I-M-22506;
-    (=ucs@jis		. #x7643)	; &M-22506;
-    ))
-(define-char
-  '((morohashi-daikanwa	22506 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
     (=ucs		. #x7643)	; 癃
-    (=gb2312		. #x712A)	; &I-G0-712A; [81-10]
-    (=cns11643-2	. #x5D60)	; &I-C2-5D60; [61-64]
+    (=big5		. #xED74)	; &I-B-ED74;
+    (->subsumptive
+     ((=jis-x0212	  . #x4E26)	; &M-22506; [46-06]
+      (=jis-x0213-1-2000  . #x7859)	; &I-JX1-7859; [88-57]
+      (=daikanwa	  . 22506)	; &I-M-22506;
+      (=ucs@jis		  . #x7643)	; &M-22506;
+      )
+     ((=gb2312		  . #x712A)	; &C2-5D60; [81-10]
+      (=cns11643-2	  . #x5D60)	; &I-C2-5D60; [61-64]
+      (=ucs@unicode	  . #x7643)	; &C2-5D60;
+      ))
     ))
 (define-char
   '((=>ucs		. #x7644)	; 癄
@@ -6841,35 +6892,29 @@
     (=cns11643-4	. #x5B78)	; &I-C4-5B78; [59-88]
     ))
 (define-char
-  '((=>ucs		. #x7650)	; 癐
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 13)
-    (total-strokes	 . 18)
-    (=big5		. #xF04D)	; &M-22542;
-    (=daikanwa		. 22542)	; &I-M-22542;
-    ))
-(define-char
-  '((morohashi-daikanwa	22542 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
     (=ucs		. #x7650)	; 癐
-    (=cns11643-2	. #x623A)	; &I-C2-623A; [66-26]
-    ))
-(define-char
-  '((=>ucs		. #x7651)	; 癑
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 13)
-    (total-strokes	 . 18)
-    (=daikanwa		. 22543)	; &M-22543;
+    (=big5		. #xF04D)	; &I-B-F04D;
+    (->subsumptive
+     ((=daikanwa	  . 22542)	; &M-22542;
+      )
+     ((=cns11643-2	  . #x623A)	; &C2-623A; [66-26]
+      (=ucs@unicode	  . #x7650)	; &C2-623A;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22543 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
     (=ucs		. #x7651)	; 癑
-    (=cns11643-3	. #x5833)	; &I-C3-5833; [56-19]
+    (->subsumptive
+     ((=daikanwa	  . 22543)	; &M-22543;
+      )
+     ((=cns11643-3	  . #x5833)	; &C3-5833; [56-19]
+      (=ucs@unicode	  . #x7651)	; &C3-5833;
+      ))
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
@@ -6897,17 +6942,17 @@
     (total-strokes	 . 18)
     (=big5		. #xC2A1)	; &B-C2A1;
     (->subsumptive
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x4C7E)	; &M-22545; [44-94]
-	(=ks-x1001	    . #x6B28)	; &I-K0-6B28; [75-08]
-	(=daikanwa	    . 22545)	; &I-M-22545;
-	))
-      (=jis-x0208@1983	  . #x4C7E)	; &GT-28920; [44-94]
+     ((=jis-x0208@1983	  . #x4C7E)	; &GT-28920; [44-94]
       (=jis-x0208@1990	  . #x4C7E)	; &I-J90-4C7E; [44-94]
       (=gt		  . 28920)	; &I-GT-28920;
       (=gt-pj-1		  . #x4C7E)	; &I-GT-28920; [44-94]
       (=jef-china3	  . #x5AF4)	; &I-JC3-5AF4;
       (=ucs@jis		  . #x7652)	; &GT-28920;
+      (<-simplified@JP
+       ((=jis-x0208@1978    . #x4C7E)	; &M-22545; [44-94]
+	(=ks-x1001	    . #x6B28)	; &I-K0-6B28; [75-08]
+	(=daikanwa	    . 22545)	; &I-M-22545;
+	))
       )
      ((=iso-ir165	  . #x2D74)	; &EGB-2D74; [13-84]
       (=ucs@unicode	  . #x7652)	; &EGB-2D74;
@@ -7425,19 +7470,44 @@
     (=cns11643-4	. #x6034)	; &I-C4-6034; [64-20]
     ))
 (define-char
-  '((=>ucs		. #x3FD1)	; 㿑
+  '((ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 14)
+    (total-strokes	 . 19)
+    (=ucs		. #x24ED9)	; 𤻙
+    (->subsumptive
+     ((=daikanwa	  . 22582)	; &M-22582;
+      )
+     ((=cns11643-5	  . #x6844)	; &C5-6844; [72-36]
+      (=ucs@iso		  . #x24ED9)	; &C5-6844;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 14)
+    (total-strokes	 . 19)
+    (=ucs		. #x3FD1)	; 㿑
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3FD1)	; 㿑
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
     (=daikanwa		. 22583)	; &M-22583;
     ))
 (define-char
-  '((morohashi-daikanwa	22583 0 2)
+  '((<-denotational
+     ((=ucs		  . #x3FD1)	; 㿑
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (=ucs		. #x3FD1)	; 㿑
-    (=cns11643-4	. #x6032)	; &I-C4-6032; [64-18]
+    (->subsumptive
+     ((=ucs@unicode	  . #x3FD1)	; &UU+3FD1;
+      )
+     ((=cns11643-4	  . #x6032)	; &C4-6032; [64-18]
+      ))
     ))
 (define-char
   '((=>ucs		. #x24EDA)	; 𤻚
@@ -7500,82 +7570,125 @@
     (=cns11643-7	. #x4826)	; &I-C7-4826; [40-06]
     ))
 (define-char
-  '((=>ucs		. #x765F)	; 癟
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (=jis-x0212		. #x4E2D)	; &M-22588; [46-13]
+    (=ucs		. #x765F)	; 癟
     (=big5		. #xC3A7)	; &I-B-C3A7;
-    (=daikanwa		. 22588)	; &I-M-22588;
-    (=ucs@jis		. #x765F)	; &M-22588;
+    (->subsumptive
+     ((=jis-x0212	  . #x4E2D)	; &M-22588; [46-13]
+      (=daikanwa	  . 22588)	; &I-M-22588;
+      (=ucs@jis		  . #x765F)	; &M-22588;
+      )
+     ((=cns11643-1	  . #x7852)	; &C1-7852; [88-50]
+      (=gb12345		  . #x3171)	; &C1-7852; [17-81]
+      (=ucs@unicode	  . #x765F)	; &C1-7852;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22588 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (=ucs		. #x765F)	; 癟
-    (=cns11643-1	. #x7852)	; &I-C1-7852; [88-50]
-    (=gb12345		. #x3171)	; 癟 [17-81]
+    (=ucs		. #x7660)	; 癠
+    (=big5		. #xF278)	; &I-B-F278;
+    (->subsumptive
+     ((=daikanwa	  . 22589)	; &M-22589;
+      )
+     ((=cns11643-2	  . #x6624)	; &C2-6624; [70-04]
+      (=ucs@unicode	  . #x7660)	; &C2-6624;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x7660)	; 癠
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (=big5		. #xF278)	; &M-22589;
-    (=daikanwa		. 22589)	; &I-M-22589;
+    (=ucs		. #x7661)	; 癡
+    (=big5		. #xC3A8)	; &I-B-C3A8;
+    (->subsumptive
+     ((shinjigen-1	  . 5135)
+      (shinjigen-2	  . 5135)
+      (=jis-x0208	  . #x6177)	; &GT-28948; [65-87]
+      (=ks-x1001	  . #x7642)	; &I-K0-7642; [86-34]
+      (=gt		  . 28948)	; &I-GT-28948;
+      (=gt-pj-1		  . #x6177)	; &I-GT-28948; [65-87]
+      (=daikanwa	  . 22591)	; &I-M-22591;
+      (=ucs@jis		  . #x7661)	; &GT-28948;
+      )
+     ((=ucs@unicode	  . #x7661)	; &UU+7661;
+      )
+     ((=cns11643-1	  . #x7853)	; &C1-7853; [88-51]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22589 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (=ucs		. #x7660)	; 癠
-    (=cns11643-2	. #x6624)	; &I-C2-6624; [70-04]
+    (=ucs		. #x24EEE)	; 𤻮
+    (->subsumptive
+     ((=daikanwa	  . 22594)	; &M-22594;
+      )
+     ((=cns11643-7	  . #x482A)	; &C7-482A; [40-10]
+      (=ucs@iso		  . #x24EEE)	; &C7-482A;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x7661)	; 癡
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (shinjigen-2	. 5135)
-    (=jis-x0208		. #x6177)	; &GT-28948; [65-87]
-    (=ks-x1001		. #x7642)	; &I-K0-7642; [86-34]
-    (=big5		. #xC3A8)	; &I-B-C3A8;
-    (=gt		. 28948)	; &I-GT-28948;
-    (=gt-pj-1		. #x6177)	; &I-GT-28948; [65-87]
-    (=daikanwa		. 22591)	; &I-M-22591;
-    (=ucs@jis		. #x7661)	; &GT-28948;
+    (=ucs		. #x24EE8)	; 𤻨
+    (->subsumptive
+     ((=daikanwa	  . 22597)	; &M-22597;
+      )
+     ((=cns11643-7	  . #x4825)	; &C7-4825; [40-05]
+      (=ucs@iso		  . #x24EE8)	; &C7-4825;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22591 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (=ucs		. #x7661)	; 癡
+    (=ucs		. #x24EE5)	; 𤻥
+    (->subsumptive
+     ((=daikanwa	  . 22598)	; &M-22598;
+      )
+     ((=cns11643-7	  . #x4829)	; &C7-4829; [40-09]
+      (=ucs@iso		  . #x24EE5)	; &C7-4829;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 14)
+    (total-strokes	 . 19)
+    (=ucs		. #x24EE2)	; 𤻢
     ))
 (define-char
-  '((=>ucs		. #x7661)	; 癡
-    (morohashi-daikanwa	22591 0 1)
+  '((<-denotational
+     ((=ucs		  . #x24EE2)	; 𤻢
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (=cns11643-1	. #x7853)	; &C1-7853; [88-51]
+    (->subsumptive
+     ((=daikanwa	  . 22600)	; &M-22600;
+      )
+     ((=cns11643-4	  . #x6031)	; &C4-6031; [64-17]
+      ))
     ))
 (define-char
-  '((ideographic-radical . 104)	; ⽧
+  '((<-denotational
+     ((=ucs		  . #x24EE2)	; 𤻢
+      ))
+    (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (=ucs		. #x7663)	; 癣
-    (=gb2312		. #x5122)	; &I-G0-5122; [49-02]
+    (=ucs@iso		. #x24EE2)	; &U-00024EE2;
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (=ucs		. #x24ED9)	; 𤻙
-    (=cns11643-5	. #x6844)	; &I-C5-6844; [72-36]
+    (=ucs		. #x7663)	; 癣
+    (=gb2312		. #x5122)	; &I-G0-5122; [49-02]
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
@@ -7602,39 +7715,18 @@
   '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
-    (=ucs		. #x24EE2)	; 𤻢
-    (=cns11643-4	. #x6031)	; &I-C4-6031; [64-17]
-    ))
-(define-char
-  '((ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 14)
-    (total-strokes	 . 19)
     (=ucs		. #x24EE3)	; 𤻣
     (=cns11643-7	. #x4828)	; &I-C7-4828; [40-08]
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 14)
-    (total-strokes	 . 19)
-    (=ucs		. #x24EE5)	; 𤻥
-    (=cns11643-7	. #x4829)	; &I-C7-4829; [40-09]
-    ))
-(define-char
-  '((ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 14)
-    (total-strokes	 . 19)
-    (=ucs		. #x24EE8)	; 𤻨
-    (=cns11643-7	. #x4825)	; &I-C7-4825; [40-05]
-    ))
-(define-char
-  '((ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 14)
-    (total-strokes	 . 19)
-    (=ucs		. #x24EEE)	; 𤻮
-    (=cns11643-7	. #x482A)	; &I-C7-482A; [40-10]
+    (=ucs		. #x7664)	; 癤
+    (=big5		. #xF04B)	; &I-B-F04B;
     ))
 (define-char
-  '((=>ucs		. #x7664)	; 癤
+  '((<-denotational
+     ((=ucs		  . #x7664)	; 癤
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
@@ -7644,75 +7736,87 @@
     (=ucs@jis		. #x7664)	; &M-22601;
     ))
 (define-char
-  '((=>ucs		. #x7664)	; 癤
-    (morohashi-daikanwa	22601 0 3)
+  '((<-denotational
+     ((=ucs		  . #x7664)	; 癤
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
     (=ks-x1001		. #x6F3B)	; &K0-6F3B; [79-27]
-    (=big5		. #xF04B)	; &I-B-F04B;
     ))
 (define-char
-  '((morohashi-daikanwa	22601 0 4)
+  '((<-denotational
+     ((=ucs		  . #x7664)	; 癤
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
-    (=ucs		. #x7664)	; 癤
-    (=cns11643-2	. #x6238)	; &I-C2-6238; [66-24]
-    (=gb12345		. #x705C)	; 癤 [80-60]
+    (=cns11643-2	. #x6238)	; &C2-6238; [66-24]
+    (=gb12345		. #x705C)	; &C2-6238; [80-60]
+    (=ucs@unicode	. #x7664)	; &C2-6238;
     ))
 (define-char
-  '((=>ucs		. #x7662)	; 癢
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 15)
-    (total-strokes	 . 20)
-    (shinjigen-2	. 5177)
-    (=jis-x0208		. #x6178)	; &GT-28975; [65-88]
-    (=big5		. #xC46F)	; &I-B-C46F;
-    (=gt		. 28975)	; &I-GT-28975;
-    (=gt-pj-1		. #x6178)	; &I-GT-28975; [65-88]
-    (=daikanwa		. 22602)	; &I-M-22602;
-    (=ucs@jis		. #x7662)	; &GT-28975;
+  '((ideographic-radical . 104)	; ⽧
+    (=ucs		. #x7662)	; 癢
     ))
 (define-char
-  '((=>ucs		. #x7662)	; 癢
-    (morohashi-daikanwa	22602 0 0)
+  '((<-denotational
+     ((=ucs		  . #x7662)	; 癢
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
-    (=cns11643-1	. #x797A)	; &C1-797A; [89-90]
+    (=big5		. #xC46F)	; &B-C46F;
+    (->subsumptive
+     ((shinjigen-2	  . 5177)
+      (=jis-x0208	  . #x6178)	; &GT-28975; [65-88]
+      (=gt		  . 28975)	; &I-GT-28975;
+      (=gt-pj-1		  . #x6178)	; &I-GT-28975; [65-88]
+      (=daikanwa	  . 22602)	; &I-M-22602;
+      (=ucs@jis		  . #x7662)	; &GT-28975;
+      )
+     ((=cns11643-1	  . #x797A)	; &C1-797A; [89-90]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22602 0 1)
+  '((<-denotational
+     ((=ucs		  . #x7662)	; 癢
+      ))
     (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 15)
-    (total-strokes	 . 20)
-    (=ucs		. #x7662)	; 癢
-    (=gb12345		. #x5177)	; 癢 [49-87]
+    (ideographic-strokes . 14)
+    (total-strokes	 . 19)
+    (=gb12345		. #x5177)	; &UU+7662; [49-87]
+    (=ucs@unicode	. #x7662)	; &UU+7662;
     ))
 (define-char
-  '((=>ucs		. #x7665)	; 癥
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
-    (=jis-x0212		. #x4E2F)	; &M-22608; [46-15]
-    (=jis-x0213-1-2000	. #x785C)	; &I-JX1-785C; [88-60]
-    (=big5		. #xC470)	; &I-B-C470;
-    (=daikanwa		. 22608)	; &I-M-22608;
-    (=jef-china3	. #x5AF1)	; &I-JC3-5AF1;
-    (=ucs@jis		. #x7665)	; &M-22608;
+    (=ucs		. #x7665)	; 癥
     ))
 (define-char
-  '((morohashi-daikanwa	22608 0 0)
+  '((<-denotational
+     ((=ucs		  . #x7665)	; 癥
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
-    (=ucs		. #x7665)	; 癥
-    (=gb12345		. #x5622)	; 癥 [54-02]
+    (=big5		. #xC470)	; &B-C470;
+    (->subsumptive
+     ((=jis-x0212	  . #x4E2F)	; &M-22608; [46-15]
+      (=jis-x0213-1-2000  . #x785C)	; &I-JX1-785C; [88-60]
+      (=daikanwa	  . 22608)	; &I-M-22608;
+      (=jef-china3	  . #x5AF1)	; &I-JC3-5AF1;
+      (=ucs@jis		  . #x7665)	; &M-22608;
+      )
+     ((=gb12345		  . #x5622)	; &UU+7665; [54-02]
+      (=ucs@unicode	  . #x7665)	; &UU+7665;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x7665)	; 癥
-    (morohashi-daikanwa	22608 0 2)
+  '((<-denotational
+     ((=ucs		  . #x7665)	; 癥
+      ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
@@ -7995,27 +8099,32 @@
     (=cns11643-7	. #x5379)	; &I-C7-5379; [51-89]
     ))
 (define-char
-  '((=>ucs		. #x766C)	; 癬
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 17)
-    (total-strokes	 . 22)
-    (shinjigen-2	. 5185)
-    (=jis-x0208		. #x617D)	; &GT-29006; [65-93]
-    (=ks-x1001		. #x6048)	; &I-K0-6048; [64-40]
-    (=big5		. #xC57E)	; &I-B-C57E;
-    (=gt		. 29006)	; &I-GT-29006;
-    (=gt-pj-1		. #x617D)	; &I-GT-29006; [65-93]
-    (=daikanwa		. 22629)	; &I-M-22629;
-    (=ucs@jis		. #x766C)	; &GT-29006;
+  '((ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 16)
+    (total-strokes	 . 21)
+    (sources		bos=A2003-10051-00005)
+    (=ucs		. #x24F08)	; 𤼈
+    (=ruimoku-v6	. #xE016)	; &I-RUI6-E016;
     ))
 (define-char
-  '((morohashi-daikanwa	22629 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 17)
     (total-strokes	 . 22)
     (=ucs		. #x766C)	; 癬
-    (=cns11643-1	. #x7B6A)	; &I-C1-7B6A; [91-74]
-    (=gb12345		. #x5122)	; 癬 [49-02]
+    (=big5		. #xC57E)	; &I-B-C57E;
+    (->subsumptive
+     ((shinjigen-2	  . 5185)
+      (=jis-x0208	  . #x617D)	; &GT-29006; [65-93]
+      (=ks-x1001	  . #x6048)	; &I-K0-6048; [64-40]
+      (=gt		  . 29006)	; &I-GT-29006;
+      (=gt-pj-1		  . #x617D)	; &I-GT-29006; [65-93]
+      (=daikanwa	  . 22629)	; &I-M-22629;
+      (=ucs@jis		  . #x766C)	; &GT-29006;
+      )
+     ((=cns11643-1	  . #x7B6A)	; &C1-7B6A; [91-74]
+      (=gb12345		  . #x5122)	; &C1-7B6A; [49-02]
+      (=ucs@unicode	  . #x766C)	; &C1-7B6A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
diff --git a/lisp/utf-2000/Ideograph-R105-Dotted-Tent.el b/lisp/utf-2000/Ideograph-R105-Dotted-Tent.el
index ee45027..9fb592b 100644
--- a/lisp/utf-2000/Ideograph-R105-Dotted-Tent.el
+++ b/lisp/utf-2000/Ideograph-R105-Dotted-Tent.el
@@ -4,21 +4,18 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
     (=ucs		. #x7676)	; 癶
-    (=jis-x0208		. #x6222)	; &I-J90-6222; [66-02]
-    (=iso-ir165		. #x2E6C)	; &I-EGB-2E6C; [14-76]
-    (=cns11643-3	. #x225C)	; &I-C3-225C; [02-60]
-    (=gt		. 29042)	; &I-GT-29042;
-    (=gt-k		. 01052)	; &I-GT-K01052;
-    (=gt-pj-1		. #x6222)	; &I-GT-29042; [66-02]
-    (=daikanwa		. 22657)	; &I-M-22657;
-    ))
-(define-char
-  '((=>ucs		. #x7676)	; 癶
-    (morohashi-daikanwa	22657 0 0)
-    (ideographic-radical . 105)	; ⽨
-    (ideographic-strokes . 0)
-    (total-strokes	 . 5)
-    (=big5-cdp		. #x8B6E)	; &CDP-8B6E;
+    (->subsumptive
+     ((=jis-x0208	  . #x6222)	; &GT-29042; [66-02]
+      (=iso-ir165	  . #x2E6C)	; &I-EGB-2E6C; [14-76]
+      (=cns11643-3	  . #x225C)	; &I-C3-225C; [02-60]
+      (=gt		  . 29042)	; &I-GT-29042;
+      (=gt-k		  . 01052)	; &I-GT-K01052;
+      (=gt-pj-1		  . #x6222)	; &I-GT-29042; [66-02]
+      (=daikanwa	  . 22657)	; &I-M-22657;
+      (=ucs@unicode	  . #x7676)	; &GT-29042;
+      )
+     ((=big5-cdp	  . #x8B6E)	; &CDP-8B6E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 105)	; ⽨
@@ -32,7 +29,13 @@
   '((ideographic-radical . 105)	; ⽨
     (ideographic-strokes . 2)
     (total-strokes	 . 7)
-    (=daikanwa		. 22659)	; &M-22659;
+    (=ucs		. #x24F26)	; 𤼦
+    (->subsumptive
+     ((=daikanwa	  . 22659)	; &M-22659;
+      )
+     ((=hanziku-7	  . #xE671)	; &HZK07-E671;
+      (=ucs@iso		  . #x24F26)	; &HZK07-E671;
+      ))
     ))
 (define-char
   '((ideographic-radical . 105)	; ⽨
@@ -42,28 +45,25 @@
     (mojikyo		. 059789)	; &MCS-6000E98D;
     ))
 (define-char
-  '((=>ucs		. #x7678)	; 癸
-    (ideographic-radical . 105)	; ⽨
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (shinjigen-2	. 5192)
-    (=jis-x0208		. #x6223)	; &GT-29045; [66-03]
-    (=ks-x1001		. #x4D24)	; &I-K0-4D24; [45-04]
-    (=big5		. #xACD1)	; &I-B-ACD1;
-    (=gt		. 29045)	; &I-GT-29045;
-    (=gt-k		. 05268)	; &I-GT-K05268;
-    (=gt-pj-1		. #x6223)	; &I-GT-29045; [66-03]
-    (=daikanwa		. 22660)	; &I-M-22660;
-    (=ucs@jis		. #x7678)	; &GT-29045;
-    ))
-(define-char
-  '((morohashi-daikanwa	22660 0 0)
-    (ideographic-radical . 105)	; ⽨
+  '((ideographic-radical . 105)	; ⽨
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
     (=ucs		. #x7678)	; 癸
-    (=gb2312		. #x396F)	; &I-G0-396F; [25-79]
-    (=cns11643-1	. #x5254)	; &I-C1-5254; [50-52]
+    (=big5		. #xACD1)	; &I-B-ACD1;
+    (->subsumptive
+     ((shinjigen-2	  . 5192)
+      (=jis-x0208	  . #x6223)	; &GT-29045; [66-03]
+      (=ks-x1001	  . #x4D24)	; &I-K0-4D24; [45-04]
+      (=gt		  . 29045)	; &I-GT-29045;
+      (=gt-k		  . 05268)	; &I-GT-K05268;
+      (=gt-pj-1		  . #x6223)	; &I-GT-29045; [66-03]
+      (=daikanwa	  . 22660)	; &I-M-22660;
+      (=ucs@jis		  . #x7678)	; &GT-29045;
+      )
+     ((=gb2312		  . #x396F)	; &C1-5254; [25-79]
+      (=cns11643-1	  . #x5254)	; &I-C1-5254; [50-52]
+      (=ucs@unicode	  . #x7678)	; &C1-5254;
+      ))
     ))
 (define-char
   '((ideographic-radical . 105)	; ⽨
@@ -93,18 +93,18 @@
     (ideographic-radical . 105)	; ⽨
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6224)	; &GT-29057; [66-04]
-      (=ks-x1001	  . #x5B21)	; &I-K0-5B21; [59-01]
-      (=cns11643-1	  . #x6075)	; &I-C1-6075; [64-85]
-      (=daikanwa	  . 22669)	; &I-M-22669;
-      ))
     (=ucs		. #x767A)	; 発
     (=jis-x0208		. #x482F)	; &I-J90-482F; [40-15]
     (=gt		. 29048)	; &I-GT-29048;
     (=gt-k		. 05161)	; &I-GT-K05161;
     (=gt-pj-1		. #x482F)	; &I-GT-29048; [40-15]
     (mojikyo		. 050292)	; &MCS-6000C474;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6224)	; &GT-29057; [66-04]
+      (=ks-x1001	  . #x5B21)	; &I-K0-5B21; [59-01]
+      (=cns11643-1	  . #x6075)	; &I-C1-6075; [64-85]
+      (=daikanwa	  . 22669)	; &I-M-22669;
+      ))
     ))
 (define-char
   '((ideographic-radical . 105)	; ⽨
@@ -129,19 +129,16 @@
     (=daikanwa		. 22664)	; &I-M-22664;
     ))
 (define-char
-  '((=>ucs		. #x24F2C)	; 𤼬
-    (ideographic-radical . 105)	; ⽨
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
-    (=daikanwa		. 22665)	; &M-22665;
-    ))
-(define-char
-  '((morohashi-daikanwa	22665 0 0)
-    (ideographic-radical . 105)	; ⽨
+  '((ideographic-radical . 105)	; ⽨
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs		. #x24F2C)	; 𤼬
-    (=cns11643-6	. #x423A)	; &I-C6-423A; [34-26]
+    (->subsumptive
+     ((=daikanwa	  . 22665)	; &M-22665;
+      )
+     ((=cns11643-6	  . #x423A)	; &C6-423A; [34-26]
+      (=ucs@iso		  . #x24F2C)	; &C6-423A;
+      ))
     ))
 (define-char
   '((=>ucs		. #x24F2C)	; 𤼬
@@ -155,7 +152,9 @@
   '((ideographic-radical . 105)	; ⽨
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (=daikanwa		. 22666)	; &M-22666;
+    (=ucs		. #x24F2E)	; 𤼮
+    (=daikanwa		. 22666)	; &I-M-22666;
+    (=hanziku-7		. #xE679)	; &I-HZK07-E679;
     ))
 (define-char
   '((ideographic-radical . 105)	; ⽨
@@ -169,41 +168,41 @@
   '((ideographic-radical . 105)	; ⽨
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (shinjigen-2	. 5195)
     (=ucs		. #x767B)	; 登
-    (=jis-x0208		. #x4550)	; &I-J90-4550; [37-48]
-    (=gb2312		. #x3547)	; &I-G0-3547; [21-39]
-    (=ks-x1001		. #x5474)	; &I-K0-5474; [52-84]
-    (=cns11643-1	. #x6074)	; &I-C1-6074; [64-84]
     (=big5		. #xB56E)	; &I-B-B56E;
-    (=gt		. 29054)	; &I-GT-29054;
-    (=gt-k		. 09109)	; &I-GT-K09109;
-    (=gt-pj-1		. #x4550)	; &I-GT-29054; [37-48]
-    (=daikanwa		. 22668)	; &I-M-22668;
-    ))
-(define-char
-  '((=>ucs		. #x767C)	; 發
-    (ideographic-radical . 105)	; ⽨
-    (ideographic-strokes . 7)
-    (total-strokes	 . 12)
-    (shinjigen-2	. 5194)
-    (=jis-x0208		. #x6224)	; &GT-29057; [66-04]
-    (=ks-x1001		. #x5B21)	; &I-K0-5B21; [59-01]
-    (=cns11643-1	. #x6075)	; &I-C1-6075; [64-85]
-    (=big5		. #xB56F)	; &I-B-B56F;
-    (=gt		. 29057)	; &I-GT-29057;
-    (=gt-k		. 09215)	; &I-GT-K09215;
-    (=gt-pj-1		. #x6224)	; &I-GT-29057; [66-04]
-    (=daikanwa		. 22669)	; &I-M-22669;
-    (=ucs@jis		. #x767C)	; &GT-29057;
+    (->subsumptive
+     ((shinjigen-2	  . 5195)
+      (=jis-x0208	  . #x4550)	; &GT-29054; [37-48]
+      (=gb2312		  . #x3547)	; &I-G0-3547; [21-39]
+      (=ks-x1001	  . #x5474)	; &I-K0-5474; [52-84]
+      (=cns11643-1	  . #x6074)	; &I-C1-6074; [64-84]
+      (=gt		  . 29054)	; &I-GT-29054;
+      (=gt-k		  . 09109)	; &I-GT-K09109;
+      (=gt-pj-1		  . #x4550)	; &I-GT-29054; [37-48]
+      (=daikanwa	  . 22668)	; &I-M-22668;
+      (=ucs@unicode	  . #x767B)	; &GT-29054;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22669 0 0)
-    (ideographic-radical . 105)	; ⽨
+  '((ideographic-radical . 105)	; ⽨
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
     (=ucs		. #x767C)	; 發
-    (=gb12345		. #x3722)	; 發 [23-02]
+    (=big5		. #xB56F)	; &I-B-B56F;
+    (->subsumptive
+     ((shinjigen-2	  . 5194)
+      (=jis-x0208	  . #x6224)	; &GT-29057; [66-04]
+      (=ks-x1001	  . #x5B21)	; &I-K0-5B21; [59-01]
+      (=cns11643-1	  . #x6075)	; &I-C1-6075; [64-85]
+      (=gt		  . 29057)	; &I-GT-29057;
+      (=gt-k		  . 09215)	; &I-GT-K09215;
+      (=gt-pj-1		  . #x6224)	; &I-GT-29057; [66-04]
+      (=daikanwa	  . 22669)	; &I-M-22669;
+      (=ucs@jis		  . #x767C)	; &GT-29057;
+      )
+     ((=gb12345		  . #x3722)	; &UU+767C; [23-02]
+      (=ucs@unicode	  . #x767C)	; &UU+767C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 105)	; ⽨
@@ -218,10 +217,27 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
     (=ucs		. #x24F31)	; 𤼱
-    (=cns11643-5	. #x3A41)	; &I-C5-3A41; [26-33]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24F31)	; 𤼱
+      ))
+    (ideographic-radical . 105)	; ⽨
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
+    (=cns11643-5	. #x3A41)	; &M-22671; [26-33]
     (=daikanwa		. 22671)	; &I-M-22671;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x24F31)	; 𤼱
+      ))
+    (ideographic-radical . 105)	; ⽨
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
+    (=ucs@iso		. #x24F31)	; &U-00024F31;
+    ))
+(define-char
   '((ideographic-radical . 105)	; ⽨
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
@@ -232,19 +248,42 @@
   '((ideographic-radical . 105)	; ⽨
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
+    (=ucs		. #x24F33)	; 𤼳
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24F33)	; 𤼳
+      ))
+    (ideographic-radical . 105)	; ⽨
+    (ideographic-strokes . 8)
+    (total-strokes	 . 13)
     (=daikanwa		. 22672)	; &M-22672;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x24F33)	; 𤼳
+      ))
+    (ideographic-radical . 105)	; ⽨
+    (ideographic-strokes . 8)
+    (total-strokes	 . 13)
+    (=hanziku-7		. #xE6F2)	; &HZK07-E6F2;
+    (=ucs@iso		. #x24F33)	; &HZK07-E6F2;
+    ))
+(define-char
   '((ideographic-radical . 105)	; ⽨
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (=daikanwa		. 22673)	; &M-22673;
+    (=ucs		. #x24F34)	; 𤼴
+    (=daikanwa		. 22673)	; &I-M-22673;
+    (=hanziku-7		. #xE6F3)	; &I-HZK07-E6F3;
     ))
 (define-char
   '((ideographic-radical . 105)	; ⽨
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (=daikanwa		. 22674)	; &M-22674;
+    (=ucs		. #x24F36)	; 𤼶
+    (=daikanwa		. 22674)	; &I-M-22674;
+    (=hanziku-7		. #xE6F5)	; &I-HZK07-E6F5;
     ))
 (define-char
   '((ideographic-radical . 105)	; ⽨
diff --git a/lisp/utf-2000/Ideograph-R106-White.el b/lisp/utf-2000/Ideograph-R106-White.el
index 6c4c7a7..e543046 100644
--- a/lisp/utf-2000/Ideograph-R106-White.el
+++ b/lisp/utf-2000/Ideograph-R106-White.el
@@ -309,14 +309,7 @@
     (=ucs		. #x7688)	; 皈
     (=big5		. #xACD4)	; &I-B-ACD4;
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 3961)
-	(=cns11643-3	    . #x3C48)	; &M-16308; [28-40]
-	(=daikanwa	    . 16308)	; &I-M-16308;
-	))
-      (<-vulgar*sources
-       shinjigen-1)
-      (shinjigen-1	  . 3962)
+     ((shinjigen-1	  . 3962)
       (shinjigen-2	  . 3962)
       (=jis-x0208	  . #x6227)	; &GT-29093; [66-07]
       (=cns11643-1	  . #x5257)	; &I-C1-5257; [50-55]
@@ -324,6 +317,13 @@
       (=gt-pj-1		  . #x6227)	; &I-GT-29093; [66-07]
       (=daikanwa	  . 22705)	; &I-M-22705;
       (=ucs@jis		  . #x7688)	; &GT-29093;
+      (<-vulgar
+       ((shinjigen-1	    . 3961)
+	(=cns11643-3	    . #x3C48)	; &M-16308; [28-40]
+	(=daikanwa	    . 16308)	; &I-M-16308;
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       )
      ((=gb2312		  . #x7027)	; &G0-7027; [80-07]
       (=ucs@unicode	  . #x7688)	; &G0-7027;
@@ -486,9 +486,6 @@
     (ideographic-radical . 106)	; ⽩
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (<-unknown
-     ((=ucs		  . #x768D)	; 皍
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -498,6 +495,9 @@
      ((=ucs		  . #x536C)	; 卬
       ))
     (=jef-china3	. #x5BA1)	; &JC3-5BA1;
+    (<-unknown
+     ((=ucs		  . #x768D)	; 皍
+      ))
     ))
 (define-char
   '((ideographic-radical . 106)	; ⽩
@@ -652,11 +652,6 @@
     (ideographic-radical . 106)	; ⽩
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x622B)	; &GT-29136; [66-11]
-      (=ks-x1001	  . #x7B53)	; &I-K0-7B53; [91-51]
-      (=daikanwa	  . 22732)	; &I-M-22732;
-      ))
     (=gb2312		. #x7029)	; &GT-29137; [80-09]
     (=jis-x0208@1983	. #x622B)	; &I-J83-622B; [66-11]
     (=jis-x0208@1990	. #x622B)	; &I-J90-622B; [66-11]
@@ -666,6 +661,11 @@
     (=gt-pj-1		. #x622B)	; &I-GT-29137; [66-11]
     (=jef-china3	. #x5BAC)	; &I-JC3-5BAC;
     (=ucs@unicode	. #x7693)	; &GT-29137;
+    (<-simplified@JP
+     ((=jis-x0208@1978	  . #x622B)	; &GT-29136; [66-11]
+      (=ks-x1001	  . #x7B53)	; &I-K0-7B53; [91-51]
+      (=daikanwa	  . 22732)	; &I-M-22732;
+      ))
     ))
 (define-char
   '((ideographic-radical . 106)	; ⽩
@@ -744,11 +744,11 @@
   '((ideographic-radical . 106)	; ⽩
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
+    (=ucs		. #x24F6F)	; 𤽯
+    (=cns11643-6	. #x4B6C)	; &I-C6-4B6C; [43-76]
     (<-simplified
      ((=ucs		  . #x3FE7)	; 㿧
       ))
-    (=ucs		. #x24F6F)	; 𤽯
-    (=cns11643-6	. #x4B6C)	; &I-C6-4B6C; [43-76]
     ))
 (define-char
   '((ideographic-radical . 106)	; ⽩
@@ -765,35 +765,80 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=ucs		. #x7697)	; 皗
-    (->subsumptive
-     ((=gt		  . 29152)	; &GT-29152;
-      (=gt-pj-5		  . #x3C5C)	; &GT-29152; [28-60]
-      (=daikanwa	  . 22743)	; &I-M-22743;
-      )
-     ((=cns11643-3	  . #x427E)	; &GT-29153; [34-94]
-      (=gt		  . 29153)	; &I-GT-29153;
-      (=gt-pj-9		  . #x6976)	; &I-GT-29153; [73-86]
-      (=ucs@unicode	  . #x7697)	; &GT-29153;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7697)	; 皗
+      ))
+    (ideographic-radical . 106)	; ⽩
+    (ideographic-strokes . 8)
+    (total-strokes	 . 13)
+    (=gt		. 29152)	; &GT-29152;
+    (=gt-pj-5		. #x3C5C)	; &GT-29152; [28-60]
+    (=daikanwa		. 22743)	; &I-M-22743;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7697)	; 皗
       ))
+    (ideographic-radical . 106)	; ⽩
+    (ideographic-strokes . 8)
+    (total-strokes	 . 13)
+    (=cns11643-3	. #x427E)	; &GT-29153; [34-94]
+    (=gt		. 29153)	; &I-GT-29153;
+    (=gt-pj-9		. #x6976)	; &I-GT-29153; [73-86]
+    (=ucs@unicode	. #x7697)	; &GT-29153;
     ))
 (define-char
   '((ideographic-radical . 106)	; ⽩
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=ucs		. #x24F7A)	; 𤽺
-    (=cns11643-5	. #x4067)	; &I-C5-4067; [32-71]
-    (=daikanwa		. 22744)	; &I-M-22744;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24F7A)	; 𤽺
+      ))
+    (ideographic-radical . 106)	; ⽩
+    (ideographic-strokes . 8)
+    (total-strokes	 . 13)
+    (=daikanwa		. 22744)	; &M-22744;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24F7A)	; 𤽺
+      ))
+    (ideographic-radical . 106)	; ⽩
+    (ideographic-strokes . 8)
+    (total-strokes	 . 13)
+    (=cns11643-5	. #x4067)	; &C5-4067; [32-71]
+    (=ucs@iso		. #x24F7A)	; &C5-4067;
     ))
 (define-char
   '((ideographic-radical . 106)	; ⽩
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=ucs		. #x7698)	; 皘
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7698)	; 皘
+      ))
+    (ideographic-radical . 106)	; ⽩
+    (ideographic-strokes . 8)
+    (total-strokes	 . 13)
+    (=gt		. 29149)	; &GT-29149;
+    (=gt-pj-5		. #x3C5E)	; &GT-29149; [28-62]
+    (=daikanwa		. 22745)	; &I-M-22745;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7698)	; 皘
+      ))
+    (ideographic-radical . 106)	; ⽩
+    (ideographic-strokes . 8)
+    (total-strokes	 . 13)
     (->subsumptive
-     ((=gt		  . 29149)	; &GT-29149;
-      (=gt-pj-5		  . #x3C5E)	; &GT-29149; [28-62]
-      (=daikanwa	  . 22745)	; &I-M-22745;
-      )
      ((=gt		  . 29150)	; &GT-29150;
       (=gt-pj-9		  . #x6978)	; &GT-29150; [73-88]
       (=ucs@unicode	  . #x7698)	; &GT-29150;
diff --git a/lisp/utf-2000/Ideograph-R108-Dish.el b/lisp/utf-2000/Ideograph-R108-Dish.el
index 6458f89..3fc03d5 100644
--- a/lisp/utf-2000/Ideograph-R108-Dish.el
+++ b/lisp/utf-2000/Ideograph-R108-Dish.el
@@ -735,18 +735,18 @@
     (total-strokes	 . 11)
     (=ucs		. #x76D7)	; 盗
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x5D39)	; &GT-29483; [61-25]
-	(=ks-x1001	    . #x5428)	; &I-K0-5428; [52-08]
-	(=daikanwa	    . 23006)	; &I-M-23006;
-	))
-      (shinjigen-2	  . 3915)
+     ((shinjigen-2	  . 3915)
       (=jis-x0208	  . #x4570)	; &GT-29466; [37-80]
       (=gt		  . 29466)	; &I-GT-29466;
       (=gt-k		  . 07845)	; &I-GT-K07845;
       (=gt-pj-1		  . #x4570)	; &I-GT-29466; [37-80]
       (=daikanwa	  . 23000)	; &I-M-23000;
       (=ucs@jis		  . #x76D7)	; &GT-29466;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5D39)	; &GT-29483; [61-25]
+	(=ks-x1001	    . #x5428)	; &I-K0-5428; [52-08]
+	(=daikanwa	    . 23006)	; &I-M-23006;
+	))
       )
      ((=gb2312		  . #x3541)	; &G0-3541; [21-33]
       (=ucs@unicode	  . #x76D7)	; &G0-3541;
@@ -770,11 +770,6 @@
     (ideographic-radical . 108)	; ⽫
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (<-simplified
-     ((=daikanwa	  . 23005)	; &M-23005;
-      ))
-    (<-simplified*sources
-     daikanwa)
     (=jis-x0208		. #x4039)	; &GT-29465; [32-25]
     (=gb2312		. #x4A22)	; &I-G0-4A22; [42-02]
     (=ks-x1001		. #x607C)	; &I-K0-607C; [64-92]
@@ -785,6 +780,11 @@
     (=gt-pj-1		. #x4039)	; &I-GT-29465; [32-25]
     (=ucs@unicode	. #x76DB)	; &GT-29465;
     (mojikyo		. 050294)	; &MCS-6000C476;
+    (<-simplified
+     ((=daikanwa	  . 23005)	; &M-23005;
+      ))
+    (<-simplified*sources
+     daikanwa)
     ))
 (define-char
   '((script		CN Simplified Ideograph)
diff --git a/lisp/utf-2000/Ideograph-R109-Eye.el b/lisp/utf-2000/Ideograph-R109-Eye.el
index 6e5d1be..7433a98 100644
--- a/lisp/utf-2000/Ideograph-R109-Eye.el
+++ b/lisp/utf-2000/Ideograph-R109-Eye.el
@@ -24,26 +24,26 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EAB)	; ⺫
     (<-formed@component/connect-below
      ((=ucs		  . #x76EE)	; 目
       ))
     (<-identical@component/connect-below
      ((=big5-cdp	  . #x8B48)	; &GT-36329;
       ))
-    (=ucs		. #x2EAB)	; ⺫
     ))
 (define-char
   '((=>ucs		. #x2EAB)	; ⺫
     (ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
-    (<-formed@component
-     ((=ucs		  . #x76EE)	; 目
-      ))
     (=big5-cdp		. #x8B48)	; &GT-36329;
     (=gt		. 36329)	; &I-GT-36329;
     (=gt-k		. 01549)	; &I-GT-K01549;
     (=gt-pj-5		. #x7264)	; &I-GT-36329; [82-68]
+    (<-formed@component
+     ((=ucs		  . #x76EE)	; 目
+      ))
     ))
 (define-char
   '((ideographic-radical . 109)	; ⽬
@@ -509,12 +509,12 @@
   '((ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
-    (<-ideographic-component-forms
+    (=big5-cdp		. #x8BB2)	; &CDP-8BB2;
+    (<-formed@component
      ((=ucs		  . #x25102)	; 𥄂
       )
      ((=ucs		  . #x76F4)	; 直
       ))
-    (=big5-cdp		. #x8BB2)	; &CDP-8BB2;
     ))
 (define-char
   '((ideographic-radical . 109)	; ⽬
@@ -532,9 +532,29 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
     (=ucs		. #x76F7)	; 盷
-    (=cns11643-2	. #x2C47)	; &I-C2-2C47; [12-39]
     (=big5		. #xCFE5)	; &I-B-CFE5;
-    (=daikanwa		. 23147)	; &I-M-23147;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x76F7)	; 盷
+      ))
+    (ideographic-radical . 109)	; ⽬
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (->subsumptive
+     ((=daikanwa	  . 23147)	; &M-23147;
+      )
+     ((=cns11643-2	  . #x2C47)	; &C2-2C47; [12-39]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x76F7)	; 盷
+      ))
+    (ideographic-radical . 109)	; ⽬
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=ucs@unicode	. #x76F7)	; &UU+76F7;
     ))
 (define-char
   '((=>ucs		. #x25103)	; 𥄃
@@ -928,28 +948,25 @@
     (=hanziku-7		. #xA9E7)	; &I-HZK07-A9E7;
     ))
 (define-char
-  '((=>ucs		. #x7701)	; 省
-    (ideographic-radical . 109)	; ⽬
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (shinjigen-2	. 5280)
-    (=jis-x0208		. #x3E4A)	; &GT-29688; [30-42]
-    (=ks-x1001		. #x607D)	; &I-K0-607D; [64-93]
-    (=big5		. #xACD9)	; &I-B-ACD9;
-    (=gt		. 29688)	; &I-GT-29688;
-    (=gt-k		. 05107)	; &I-GT-K05107;
-    (=gt-pj-1		. #x3E4A)	; &I-GT-29688; [30-42]
-    (=daikanwa		. 23179)	; &I-M-23179;
-    (=ucs@jis		. #x7701)	; &GT-29688;
-    ))
-(define-char
-  '((morohashi-daikanwa	23179 0 0)
-    (ideographic-radical . 109)	; ⽬
+  '((ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
     (=ucs		. #x7701)	; 省
-    (=gb2312		. #x4A21)	; &I-G0-4A21; [42-01]
-    (=cns11643-1	. #x525C)	; &I-C1-525C; [50-60]
+    (->subsumptive
+     ((shinjigen-2	  . 5280)
+      (=jis-x0208	  . #x3E4A)	; &GT-29688; [30-42]
+      (=ks-x1001	  . #x607D)	; &I-K0-607D; [64-93]
+      (=big5		  . #xACD9)	; &I-B-ACD9;
+      (=gt		  . 29688)	; &I-GT-29688;
+      (=gt-k		  . 05107)	; &I-GT-K05107;
+      (=gt-pj-1		  . #x3E4A)	; &I-GT-29688; [30-42]
+      (=daikanwa	  . 23179)	; &I-M-23179;
+      (=ucs@jis		  . #x7701)	; &GT-29688;
+      )
+     ((=gb2312		  . #x4A21)	; &C1-525C; [42-01]
+      (=cns11643-1	  . #x525C)	; &I-C1-525C; [50-60]
+      (=ucs@unicode	  . #x7701)	; &C1-525C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 109)	; ⽬
@@ -1334,15 +1351,15 @@
     (ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
+    (=ucs		. #x2F942)	; 𥃲
+    (=cns11643-6	. #x333D)	; &I-C6-333D; [19-29]
+    (=daikanwa		. 23210)	; &I-M-23210;
     (<-original
      ((=ucs		  . #x2F811)	; 具
       (=daikanwa	  . 01473)	; &I-M-01473;
       ))
     (<-original*sources
      daikanwa)
-    (=ucs		. #x2F942)	; 𥃲
-    (=cns11643-6	. #x333D)	; &I-C6-333D; [19-29]
-    (=daikanwa		. 23210)	; &I-M-23210;
     ))
 (define-char
   '((=>ucs		. #x2F942)	; 𥃲
@@ -1354,17 +1371,12 @@
     (mojikyo		. 023210)	; &MCS-60005AAA;
     ))
 (define-char
-  '((morohashi-daikanwa	23210 1)
-    (ideographic-radical . 109)	; ⽬
+  '((ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
     (=ucs		. #x770C)	; 県
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6551)	; &GT-35730; [69-49]
-	(=ks-x1001	    . #x7A63)	; &I-K0-7A63; [90-67]
-	(=daikanwa	    . 27784)	; &I-M-27784;
-	))
+     ((morohashi-daikanwa	23210 1)
       (shinjigen-1	  . 6140)
       (=jis-x0208	  . #x3829)	; &GT-29668; [24-09]
       (=gt		  . 29668)	; &I-GT-29668;
@@ -1372,6 +1384,11 @@
       (=gt-pj-1		  . #x3829)	; &I-GT-29668; [24-09]
       (=ucs@unicode	  . #x770C)	; &GT-29668;
       (mojikyo		  . 050295)	; &MCS-6000C477;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6551)	; &GT-35730; [69-49]
+	(=ks-x1001	    . #x7A63)	; &I-K0-7A63; [90-67]
+	(=daikanwa	    . 27784)	; &I-M-27784;
+	))
       )
      ((hanyu-dazidian	  4 2478 4)
       (=hanziku-7	  . #xAA67)	; &HZK07-AA67;
@@ -1694,95 +1711,111 @@
     (=daikanwa		. 23234)	; &I-M-23234;
     ))
 (define-char
-  '((=>ucs		. #x771E)	; 眞
-    (ideographic-radical . 109)	; ⽬
+  '((ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (hanyu-dazidian	1 249 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=ucs		  . #x5315)	; 匕
-      )
-     ((=ucs		  . #x76EE)	; 目
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
+    (=ucs		. #x771E)	; 眞
+    (->subsumptive
+     ((hanyu-dazidian	  1 249 12)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(=ucs		    . #x2FF3)	; ⿳
+	)
+       ((=ucs		    . #x5315)	; 匕
 	)
-       ((=ucs		    . #x200CA)	; 𠃊
+       ((=ucs		    . #x76EE)	; 目
 	)
-       ((=ucs		    . #x516B)	; 八
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=ucs		      . #x200CA)	; 𠃊
+	  )
+	 ((=ucs		      . #x516B)	; 八
+	  ))
 	))
+      (shinjigen-2	  . 5293)
+      (=jis-x0208	  . #x6243)	; &GT-29751; [66-35]
+      (=ks-x1001	  . #x7258)	; &I-K0-7258; [82-56]
+      (=big5-cdp	  . #x88E9)	; &I-CDP-88E9;
+      (=gt		  . 29751)	; &I-GT-29751;
+      (=gt-k		  . 06615)	; &I-GT-K06615;
+      (=gt-pj-1		  . #x6243)	; &I-GT-29751; [66-35]
+      (=daikanwa	  . 23235)	; &I-M-23235;
+      (=ucs@jis		  . #x771E)	; &GT-29751;
+      )
+     ((=ucs@unicode	  . #x771E)	; &UU+771E;
+      )
+     ((=cns11643-3	  . #x3759)	; &C3-3759; [23-57]
       ))
-    (shinjigen-2	. 5293)
-    (=jis-x0208		. #x6243)	; &GT-29751; [66-35]
-    (=ks-x1001		. #x7258)	; &I-K0-7258; [82-56]
-    (=big5-cdp		. #x88E9)	; &I-CDP-88E9;
-    (=gt		. 29751)	; &I-GT-29751;
-    (=gt-k		. 06615)	; &I-GT-K06615;
-    (=gt-pj-1		. #x6243)	; &I-GT-29751; [66-35]
-    (=daikanwa		. 23235)	; &I-M-23235;
-    (=ucs@jis		. #x771E)	; &GT-29751;
     ))
 (define-char
-  '((morohashi-daikanwa	23235 0 0)
-    (ideographic-radical . 109)	; ⽬
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (=ucs		. #x771E)	; 眞
-    ))
-(define-char
-  '((=>ucs		. #x771E)	; 眞
-    (morohashi-daikanwa	23235 0 1)
-    (ideographic-radical . 109)	; ⽬
+  '((ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (=cns11643-3	. #x3759)	; &C3-3759; [23-57]
+    (=ucs		. #x771F)	; 真
     ))
 (define-char
-  '((=>ucs		. #x771F)	; 真
+  '((<-denotational
+     ((=ucs		  . #x771F)	; 真
+      ))
     (ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6243)	; &GT-29751; [66-35]
-      (=ks-x1001	  . #x7258)	; &I-K0-7258; [82-56]
-      (=daikanwa	  . 23235)	; &I-M-23235;
+    (->subsumptive
+     ((shinjigen-2	  . 5292)
+      (=jis-x0208	  . #x3F3F)	; &GT-29752; [31-31]
+      (=gt		  . 29752)	; &I-GT-29752;
+      (=gt-k		  . 06478)	; &I-GT-K06478;
+      (=gt-pj-1		  . #x3F3F)	; &I-GT-29752; [31-31]
+      (=daikanwa	  . 23236)	; &I-M-23236;
+      (=ucs@jis		  . #x771F)	; &GT-29752;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6243)	; &GT-29751; [66-35]
+	(=ks-x1001	    . #x7258)	; &I-K0-7258; [82-56]
+	(=daikanwa	    . 23235)	; &I-M-23235;
+	))
+      )
+     ((=cns11643-6	  . #x3A2D)	; &C6-3A2D; [26-13]
       ))
-    (shinjigen-2	. 5292)
-    (=jis-x0208		. #x3F3F)	; &GT-29752; [31-31]
-    (=gt		. 29752)	; &I-GT-29752;
-    (=gt-k		. 06478)	; &I-GT-K06478;
-    (=gt-pj-1		. #x3F3F)	; &I-GT-29752; [31-31]
-    (=daikanwa		. 23236)	; &I-M-23236;
-    (=ucs@jis		. #x771F)	; &GT-29752;
     ))
 (define-char
-  '((morohashi-daikanwa	23236 0 0)
+  '((<-denotational
+     ((=ucs		  . #x771F)	; 真
+      ))
     (ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (=ucs		. #x771F)	; 真
-    (=gb2312		. #x5566)	; &I-G0-5566; [53-70]
+    (=gb2312		. #x5566)	; &C1-5678; [53-70]
     (=cns11643-1	. #x5678)	; &I-C1-5678; [54-88]
     (=big5		. #xAF75)	; &I-B-AF75;
-    ))
-(define-char
-  '((=>ucs		. #x771F)	; 真
-    (morohashi-daikanwa	23236 0 1)
-    (ideographic-radical . 109)	; ⽬
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (=cns11643-6	. #x3A2D)	; &C6-3A2D; [26-13]
+    (=ucs@unicode	. #x771F)	; &C1-5678;
     ))
 (define-char
   '((ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (=cns11643-6	. #x3A2E)	; &M-23237; [26-14]
-    (=daikanwa		. 23237)	; &I-M-23237;
+    (=ucs		. #x2F947)	; 真
+    (->subsumptive
+     ((=daikanwa	  . 23237)	; &M-23237;
+      (<-original
+       ((=jis-x0208	    . #x6243)	; &GT-29751; [66-35]
+	(=ks-x1001	    . #x7258)	; &I-K0-7258; [82-56]
+	(=daikanwa	    . 23235)	; &I-M-23235;
+	))
+      (<-original*sources
+       liushu-zongyao daikanwa)
+      (<-simplified
+       ((=jis-x0208	    . #x6243)	; &GT-29751; [66-35]
+	(=ks-x1001	    . #x7258)	; &I-K0-7258; [82-56]
+	(=daikanwa	    . 23235)	; &I-M-23235;
+	))
+      (<-simplified*sources
+       daikanwa)
+      )
+     ((=cns11643-6	  . #x3A2E)	; &C6-3A2E; [26-14]
+      (=ucs@iso		  . #x2F947)	; &C6-3A2E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 109)	; ⽬
@@ -2242,16 +2275,16 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (->subsumptive
-     ((<-original
+     ((=cns11643-4	  . #x2E55)	; &M-49364; [14-53]
+      (=daikanwa	  . 49364)	; &I-M-49364;
+      (<-original
        ((=jis-x0212	    . #x4E5F)	; &M-23221; [46-63]
 	(=daikanwa	    . 23221)	; &I-M-23221;
 	))
       (<-original*sources
        daikanwa)
-      (=daikanwa	  . 49364)	; &M-49364;
-      (=ucs@unicode	  . #x7714)	; &M-49364;
       )
-     ((=cns11643-4	  . #x2E55)	; &C4-2E55; [14-53]
+     ((=ucs@unicode	  . #x7714)	; &UU+7714;
       ))
     ))
 (define-char
@@ -5431,14 +5464,6 @@
   '((ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (<-ancient
-     ((shinjigen-1	  . 928)
-      (=ucs		  . #x53E1)	; 叡
-      (=jis-x0208	  . #x3143)	; &I-J90-3143; [17-35]
-      (=daikanwa	  . 03214)	; &I-M-03214;
-      ))
-    (<-ancient*sources
-     shuowen daikanwa shinjigen-1)
     (shinjigen-1	. 929)
     (shinjigen-2	. 929)
     (=ucs		. #x777F)	; 睿
@@ -5451,6 +5476,14 @@
     (=gt-k		. 11224)	; &I-GT-K11224;
     (=gt-pj-1		. #x624F)	; &I-GT-30057; [66-47]
     (=daikanwa		. 23536)	; &I-M-23536;
+    (<-ancient
+     ((shinjigen-1	  . 928)
+      (=ucs		  . #x53E1)	; 叡
+      (=jis-x0208	  . #x3143)	; &I-J90-3143; [17-35]
+      (=daikanwa	  . 03214)	; &I-M-03214;
+      ))
+    (<-ancient*sources
+     shuowen daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 109)	; ⽬
diff --git a/lisp/utf-2000/Ideograph-R111-Arrow.el b/lisp/utf-2000/Ideograph-R111-Arrow.el
index a9d3183..95de33f 100644
--- a/lisp/utf-2000/Ideograph-R111-Arrow.el
+++ b/lisp/utf-2000/Ideograph-R111-Arrow.el
@@ -22,11 +22,11 @@
     (ideographic-radical . 111)	; â½®
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x77E2)	; 矢
-      ))
     (=gt-k		. 01013)	; &GT-K01013;
     (=gt-pj-k1		. #x3526)	; &GT-K01013; [21-06]
+    (<-formed@component/connect-right
+     ((=ucs		  . #x77E2)	; 矢
+      ))
     ))
 (define-char
   '((ideographic-radical . 111)	; â½®
@@ -110,15 +110,12 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
     (=ucs		. #x253A9)	; 𥎩
-    (=daikanwa		. 23936)	; &I-M-23936;
-    ))
-(define-char
-  '((=>ucs		. #x253A9)	; 𥎩
-    (morohashi-daikanwa	23936 0 1)
-    (ideographic-radical . 111)	; â½®
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (=cns11643-6	. #x3341)	; &C6-3341; [19-33]
+    (->subsumptive
+     ((=daikanwa	  . 23936)	; &M-23936;
+      (=ucs@iso		  . #x253A9)	; &M-23936;
+      )
+     ((=cns11643-6	  . #x3341)	; &C6-3341; [19-33]
+      ))
     ))
 (define-char
   '((ideographic-radical . 111)	; â½®
@@ -130,7 +127,7 @@
       (=jis-x0213-2-2000  . #x7236)	; &I-JX2-7236; [82-22]
       (=daikanwa	  . 23937)	; &I-M-23937;
       (=jef-china3	  . #x5BE9)	; &I-JC3-5BE9;
-      (=ucs@jis		  . #x77E6)	; &M-23937;
+      (=ucs@unicode	  . #x77E6)	; &M-23937;
       )
      ((=big5-cdp	  . #x8AC7)	; &CDP-8AC7;
       )
@@ -610,60 +607,64 @@
     (=cns11643-6	. #x4C2A)	; &I-C6-4C2A; [44-10]
     ))
 (define-char
-  '((=>ucs		. #x20170)	; 𠅰
-    (ideographic-radical . 111)	; â½®
-    (ideographic-strokes . 7)
+  '((ideographic-radical@ucs . 8)	; ⼇
+    (ideographic-strokes@ucs . 10)
+    (ideographic-radical@cns . 111)	; â½®
+    (ideographic-strokes@cns . 7)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=jis-x0208	  . #x5035)	; &GT-00376; [48-21]
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
-	(=ucs		    . #x2FF2)	; ⿲
-	)
-       ((=ucs		    . #x571F)	; 土
+    (=ucs		. #x20170)	; 𠅰
+    (->subsumptive
+     ((ideographic-radical . 111)	; â½®
+      (ideographic-strokes . 7)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x77E2)	; 矢
+       ((=jis-x0208	    . #x5035)	; &GT-00376; [48-21]
 	)
-       ((=ucs		    . #x5315)	; 匕
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+	  (=ucs		      . #x2FF2)	; ⿲
+	  )
+	 ((=gt-k	      . 00199)	; &GT-K00199;
+	  )
+	 ((=gt-k	      . 01013)	; &GT-K01013;
+	  )
+	 ((=ucs		      . #x5315)	; 匕
+	  ))
 	))
-      ))
-    (=daikanwa		. 23981)	; &M-23981;
-    ))
-(define-char
-  '((=>ucs		. #x20170)	; 𠅰
-    (morohashi-daikanwa	23981 0 0)
-    (ideographic-radical . 111)	; â½®
-    (ideographic-strokes . 7)
-    (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4EA0)	; 亠
+      (=daikanwa	  . 23981)	; &M-23981;
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
-	(=ucs		    . #x2FF2)	; ⿲
+     ((ideographic-radical . 8)	; ⼇
+      (ideographic-strokes . 10)
+      (hanyu-dazidian	  1 290 1)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x571F)	; 土
+       ((=gb2312	    . #x596F)	; &GT-00375; [57-79]
+	(=daikanwa	    . 00286)	; &I-M-00286;
 	)
-       ((=ucs		    . #x77E2)	; 矢
-	)
-       ((=ucs		    . #x5315)	; 匕
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+	  (=ucs		      . #x2FF2)	; ⿲
+	  )
+	 ((=gt-k	      . 00199)	; &GT-K00199;
+	  )
+	 ((=gt-k	      . 01013)	; &GT-K01013;
+	  )
+	 ((=ucs		      . #x5315)	; 匕
+	  ))
 	))
+      (=hanziku-1	  . #xE1D1)	; &HZK01-E1D1;
+      (=ucs@iso		  . #x20170)	; &HZK01-E1D1;
+      )
+     ((ideographic-radical . 111)	; â½®
+      (ideographic-strokes . 7)
+      (=cns11643-6	  . #x4C2D)	; &C6-4C2D; [44-13]
       ))
-    (=cns11643-6	. #x4C2D)	; &C6-4C2D; [44-13]
-    ))
-(define-char
-  '((ideographic-radical . 111)	; â½®
-    (ideographic-strokes . 7)
-    (total-strokes	 . 12)
-    (=ucs		. #x253DF)	; 𥏟
-    (=cns11643-5	. #x3A56)	; &I-C5-3A56; [26-54]
     ))
 (define-char
   '((ideographic-radical . 111)	; â½®
@@ -674,27 +675,41 @@
     (=daikanwa		. 23985)	; &I-M-23985;
     ))
 (define-char
-  '((=>ucs		. #x253D9)	; 𥏙
+  '((ideographic-radical . 111)	; â½®
+    (ideographic-strokes . 8)
+    (total-strokes	 . 13)
+    (=ucs		. #x253D9)	; 𥏙
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x253D9)	; 𥏙
+      ))
     (ideographic-radical . 111)	; â½®
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=daikanwa		. 23986)	; &M-23986;
     ))
 (define-char
-  '((morohashi-daikanwa	23986 0 2)
+  '((<-denotational
+     ((=ucs		  . #x253D9)	; 𥏙
+      ))
     (ideographic-radical . 111)	; â½®
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (=ucs		. #x253D9)	; 𥏙
-    (=cns11643-4	. #x3F32)	; &I-C4-3F32; [31-18]
+    (=cns11643-4	. #x3F32)	; &C4-3F32; [31-18]
+    (=ucs@iso		. #x253D9)	; &C4-3F32;
     ))
 (define-char
   '((ideographic-radical . 111)	; â½®
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=ucs		. #x4094)	; 䂔
-    (=cns11643-4	. #x3F33)	; &I-C4-3F33; [31-19]
-    (=daikanwa		. 23987)	; &I-M-23987;
+    (->subsumptive
+     ((=daikanwa	  . 23987)	; &M-23987;
+      )
+     ((=cns11643-4	  . #x3F33)	; &C4-3F33; [31-19]
+      (=ucs@unicode	  . #x4094)	; &C4-3F33;
+      ))
     ))
 (define-char
   '((ideographic-radical . 111)	; â½®
@@ -709,30 +724,46 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (=ucs		. #x253DA)	; 𥏚
-    (=cns11643-6	. #x5569)	; &I-C6-5569; [53-73]
-    (=daikanwa		. 23989)	; &I-M-23989;
+    (->subsumptive
+     ((=daikanwa	  . 23989)	; &M-23989;
+      (=ucs@iso		  . #x253DA)	; &M-23989;
+      )
+     ((=cns11643-6	  . #x5569)	; &C6-5569; [53-73]
+      ))
     ))
 (define-char
-  '((ideographic-radical . 111)	; â½®
+  '((=>ucs		. #x253DF)	; 𥏟
+    (ideographic-radical . 111)	; â½®
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (shinjigen-2	. 5396)
-    (=ucs		. #x77EE)	; 矮
-    (=jis-x0208		. #x6264)	; &I-J90-6264; [66-68]
-    (=gb2312		. #x302B)	; &I-G0-302B; [16-11]
-    (=ks-x1001		. #x6861)	; &I-K0-6861; [72-65]
-    (=big5		. #xB847)	; &I-B-B847;
-    (=gt		. 30694)	; &I-GT-30694;
-    (=gt-pj-1		. #x6264)	; &I-GT-30694; [66-68]
-    (=daikanwa		. 23995)	; &I-M-23995;
+    (=daikanwa		. 23994)	; &M-23994;
     ))
 (define-char
-  '((=>ucs		. #x77EE)	; 矮
-    (morohashi-daikanwa	23995 0 1)
+  '((=>daikanwa		. 23994)	; &M-23994;
     (ideographic-radical . 111)	; â½®
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
+    (=ucs		. #x253DF)	; 𥏟
+    (=cns11643-5	. #x3A56)	; &I-C5-3A56; [26-54]
+    ))
+(define-char
+  '((ideographic-radical . 111)	; â½®
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (=cns11643-1	. #x654E)	; &C1-654E; [69-46]
+    (=ucs		. #x77EE)	; 矮
+    (->subsumptive
+     ((shinjigen-2	  . 5396)
+      (=jis-x0208	  . #x6264)	; &GT-30694; [66-68]
+      (=gb2312		  . #x302B)	; &I-G0-302B; [16-11]
+      (=ks-x1001	  . #x6861)	; &I-K0-6861; [72-65]
+      (=big5		  . #xB847)	; &I-B-B847;
+      (=gt		  . 30694)	; &I-GT-30694;
+      (=gt-pj-1		  . #x6264)	; &I-GT-30694; [66-68]
+      (=daikanwa	  . 23995)	; &I-M-23995;
+      (=ucs@unicode	  . #x77EE)	; &GT-30694;
+      )
+     ((=cns11643-1	  . #x654E)	; &C1-654E; [69-46]
+      ))
     ))
 (define-char
   '((ideographic-radical . 111)	; â½®
diff --git a/lisp/utf-2000/Ideograph-R112-Stone.el b/lisp/utf-2000/Ideograph-R112-Stone.el
index a7d0e02..e5b0acd 100644
--- a/lisp/utf-2000/Ideograph-R112-Stone.el
+++ b/lisp/utf-2000/Ideograph-R112-Stone.el
@@ -426,7 +426,15 @@
     (=cns11643-3	. #x2E3E)	; &I-C3-2E3E; [14-30]
     ))
 (define-char
-  '((=>ucs		. #x7809)	; 砉
+  '((ideographic-radical . 112)	; ⽯
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=ucs		. #x7809)	; 砉
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7809)	; 砉
+      ))
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
@@ -436,8 +444,19 @@
     (=ucs@jis		. #x7809)	; &M-24056;
     ))
 (define-char
-  '((=>ucs		. #x7809)	; 砉
-    (morohashi-daikanwa	24056 0 1)
+  '((<-denotational
+     ((=ucs		  . #x7809)	; 砉
+      ))
+    (ideographic-radical . 112)	; ⽯
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=gb2312		. #x6D39)	; &G0-6D39; [77-25]
+    (=ucs@unicode	. #x7809)	; &G0-6D39;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7809)	; 砉
+      ))
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
@@ -445,27 +464,53 @@
     (=big5		. #xCFF1)	; &I-B-CFF1;
     ))
 (define-char
-  '((morohashi-daikanwa	24056 0 2)
-    (ideographic-radical . 112)	; ⽯
+  '((ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (=ucs		. #x7809)	; 砉
-    (=gb2312		. #x6D39)	; &I-G0-6D39; [77-25]
+    (=ucs		. #x409A)	; 䂚
+    (->subsumptive
+     ((=daikanwa	  . 24057)	; &M-24057;
+      )
+     ((=cns11643-4	  . #x2A64)	; &C4-2A64; [10-68]
+      (=ucs@unicode	  . #x409A)	; &C4-2A64;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 112)	; ⽯
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=ucs		. #x780A)	; 砊
+    (->subsumptive
+     ((=daikanwa	  . 24059)	; &M-24059;
+      )
+     ((=cns11643-3	  . #x2E37)	; &C3-2E37; [14-23]
+      (=ucs@unicode	  . #x780A)	; &C3-2E37;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x780A)	; 砊
+  '((ideographic-radical . 112)	; ⽯
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=ucs		. #x409C)	; 䂜
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x409C)	; 䂜
+      ))
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (=daikanwa		. 24059)	; &M-24059;
+    (=daikanwa		. 24060)	; &M-24060;
+    (=ucs@unicode	. #x409C)	; &M-24060;
     ))
 (define-char
-  '((morohashi-daikanwa	24059 0 0)
+  '((<-denotational
+     ((=ucs		  . #x409C)	; 䂜
+      ))
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (=ucs		. #x780A)	; 砊
-    (=cns11643-3	. #x2E37)	; &I-C3-2E37; [14-23]
+    (=cns11643-4	. #x2A62)	; &C4-2A62; [10-66]
     ))
 (define-char
   '((ideographic-radical . 112)	; ⽯
@@ -576,44 +621,64 @@
   '((ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (shinjigen-2	. 5413)
     (=ucs		. #x7812)	; 砒
-    (=jis-x0208		. #x6267)	; &I-J90-6267; [66-71]
-    (=gb2312		. #x4578)	; &I-G0-4578; [37-88]
-    (=ks-x1001		. #x5D77)	; &I-K0-5D77; [61-87]
-    (=gt		. 30787)	; &I-GT-30787;
-    (=gt-pj-1		. #x6267)	; &I-GT-30787; [66-71]
-    (=daikanwa		. 24068)	; &I-M-24068;
-    ))
-(define-char
-  '((=>ucs		. #x7812)	; 砒
-    (morohashi-daikanwa	24068 0 0)
-    (ideographic-radical . 112)	; ⽯
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (=cns11643-2	. #x2C4E)	; &C2-2C4E; [12-46]
     (=big5		. #xCFEC)	; &I-B-CFEC;
+    (->subsumptive
+     ((shinjigen-2	  . 5413)
+      (=jis-x0208	  . #x6267)	; &GT-30787; [66-71]
+      (=gb2312		  . #x4578)	; &I-G0-4578; [37-88]
+      (=ks-x1001	  . #x5D77)	; &I-K0-5D77; [61-87]
+      (=gt		  . 30787)	; &I-GT-30787;
+      (=gt-pj-1		  . #x6267)	; &I-GT-30787; [66-71]
+      (=daikanwa	  . 24068)	; &I-M-24068;
+      (=ucs@unicode	  . #x7812)	; &GT-30787;
+      )
+     ((=cns11643-2	  . #x2C4E)	; &C2-2C4E; [12-46]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x7813)	; 砓
-    (ideographic-radical . 112)	; ⽯
+  '((ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (=daikanwa		. 24070)	; &M-24070;
+    (=ucs		. #x7813)	; 砓
+    (=big5		. #xCFF3)	; &I-B-CFF3;
+    (->subsumptive
+     ((=daikanwa	  . 24070)	; &M-24070;
+      )
+     ((=cns11643-2	  . #x2C55)	; &C2-2C55; [12-53]
+      (=ucs@unicode	  . #x7813)	; &C2-2C55;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	24070 0 0)
-    (ideographic-radical . 112)	; ⽯
+  '((ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (=ucs		. #x7813)	; 砓
-    (=cns11643-2	. #x2C55)	; &I-C2-2C55; [12-53]
-    (=big5		. #xCFF3)	; &I-B-CFF3;
+    (=ucs		. #x409D)	; 䂝
+    (->subsumptive
+     ((=daikanwa	  . 24074)	; &M-24074;
+      )
+     ((=ucs@unicode	  . #x409D)	; &UU+409D;
+      )
+     ((=cns11643-3	  . #x2E3C)	; &C3-2E3C; [14-28]
+      ))
     ))
 (define-char
-  '((ideographic-radical . 112)	; ⽯
+  '((<-denotational
+     ((=big5		  . #xACE3)	; &B-ACE3;
+      (=jis-x0208@1997	  . #x3826)	; &B-ACE3; [24-06]
+      ))
+    (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
+    (shinjigen-2	. 5407)
+    (=ucs		. #x7814)	; 研
+    (=jis-x0208		. #x3826)	; &I-J90-3826; [24-06]
+    (=gb2312		. #x5150)	; &I-G0-5150; [49-48]
+    (=cns11643-1	. #x5266)	; &I-C1-5266; [50-70]
+    (=gt		. 30764)	; &I-GT-30764;
+    (=gt-k		. 05062)	; &I-GT-K05062;
+    (=gt-pj-1		. #x3826)	; &I-GT-30764; [24-06]
+    (=daikanwa		. 24080)	; &I-M-24080;
     (<-simplified@JP/Jouyou
      ((=ks-x1001	  . #x665A)	; &GT-30890; [70-58]
       (=jis-x0213-1-2000  . #x7923)	; &I-JX1-7923; [89-03]
@@ -626,40 +691,29 @@
       ))
     (<-vulgar*sources
      daikanwa)
-    (shinjigen-2	. 5407)
-    (=ucs		. #x7814)	; 研
-    (=jis-x0208		. #x3826)	; &I-J90-3826; [24-06]
-    (=gb2312		. #x5150)	; &I-G0-5150; [49-48]
-    (=cns11643-1	. #x5266)	; &I-C1-5266; [50-70]
-    (=big5		. #xACE3)	; &I-B-ACE3;
-    (=gt		. 30764)	; &I-GT-30764;
-    (=gt-k		. 05062)	; &I-GT-K05062;
-    (=gt-pj-1		. #x3826)	; &I-GT-30764; [24-06]
-    (=daikanwa		. 24080)	; &I-M-24080;
+    ))
+(define-char
+  '((ideographic-radical . 112)	; ⽯
+    (=big5		. #xACE3)	; &B-ACE3;
+    (=jis-x0208@1997	. #x3826)	; &B-ACE3; [24-06]
+    (=ucs@big5		. #x7814)	; &B-ACE3;
     ))
 (define-char
   '((morohashi-daikanwa	24080 1)
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x626C)	; &GT-31028; [66-76]
-      (=ks-x1001	  . #x616F)	; &I-K0-616F; [65-79]
-      (=daikanwa	  . 24284)	; &I-M-24284;
-      ))
     (=ucs		. #x7815)	; 砕
     (=jis-x0208		. #x3A55)	; &I-J90-3A55; [26-53]
     (=cns11643-3	. #x2E3D)	; &I-C3-2E3D; [14-29]
     (=gt		. 30774)	; &I-GT-30774;
     (=gt-pj-1		. #x3A55)	; &I-GT-30774; [26-53]
     (mojikyo		. 050298)	; &MCS-6000C47A;
-    ))
-(define-char
-  '((ideographic-radical . 112)	; ⽯
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (=ucs		. #x409A)	; 䂚
-    (=cns11643-4	. #x2A64)	; &I-C4-2A64; [10-68]
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x626C)	; &GT-31028; [66-76]
+      (=ks-x1001	  . #x616F)	; &I-K0-616F; [65-79]
+      (=daikanwa	  . 24284)	; &I-M-24284;
+      ))
     ))
 (define-char
   '((ideographic-radical . 112)	; ⽯
@@ -672,20 +726,6 @@
   '((ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (=ucs		. #x409C)	; 䂜
-    (=cns11643-4	. #x2A62)	; &I-C4-2A62; [10-66]
-    ))
-(define-char
-  '((ideographic-radical . 112)	; ⽯
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (=ucs		. #x409D)	; 䂝
-    (=cns11643-3	. #x2E3C)	; &I-C3-2E3C; [14-28]
-    ))
-(define-char
-  '((ideographic-radical . 112)	; ⽯
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
     (=ucs		. #x7816)	; 砖
     (=gb2312		. #x5729)	; &I-G0-5729; [55-09]
     ))
@@ -1427,12 +1467,6 @@
     (=ucs		. #x783F)	; ç ¿
     (->subsumptive
      ((morohashi-daikanwa	ho 382)
-      (<-simplified@JP
-       ((=jis-x0208@1978    . #x395C)	; &GT-31404; [25-60]
-	(=jis-x0208@1983    . #x6268)	; &I-J83-6268; [66-72]
-	(=jis-x0208@1990    . #x6268)	; &I-J90-6268; [66-72]
-	(=daikanwa	    . 24564)	; &I-M-24564;
-	))
       (=jis-x0208@1978	  . #x6268)	; &GT-30816; [66-72]
       (=jis-x0208@1983	  . #x395C)	; &I-J83-395C; [25-60]
       (=jis-x0208@1990	  . #x395C)	; &I-J90-395C; [25-60]
@@ -1440,6 +1474,12 @@
       (=gt-pj-1		  . #x395C)	; &I-GT-30816; [25-60]
       (=ucs@jis		  . #x783F)	; &GT-30816;
       (mojikyo		  . 054120)	; &MCS-6000D368;
+      (<-simplified@JP/jis
+       ((=jis-x0208@1978    . #x395C)	; &GT-31404; [25-60]
+	(=jis-x0208@1983    . #x6268)	; &I-J83-6268; [66-72]
+	(=jis-x0208@1990    . #x6268)	; &I-J90-6268; [66-72]
+	(=daikanwa	    . 24564)	; &I-M-24564;
+	))
       )
      ((=ucs@unicode	  . #x783F)	; &UU+783F;
       ))
@@ -1476,12 +1516,6 @@
   '((ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4557)	; &GT-31400; [37-55]
-      (=jis-x0208@1983	  . #x626A)	; &I-J83-626A; [66-74]
-      (=ks-x1001	  . #x556C)	; &I-K0-556C; [53-76]
-      (=jis-x0208@1990	  . #x626A)	; &I-J90-626A; [66-74]
-      ))
     (=ucs		. #x783A)	; ç º
     (=jis-x0208@1978	. #x626A)	; &I-J78-626A; [66-74]
     (=gb2312		. #x6D42)	; &I-G0-6D42; [77-34]
@@ -1489,11 +1523,16 @@
     (=jis-x0208@1990	. #x4557)	; &I-J90-4557; [37-55]
     (=gt		. 30868)	; &I-GT-30868;
     (=gt-pj-1		. #x4557)	; &I-GT-30868; [37-55]
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x4557)	; &GT-31400; [37-55]
+      (=jis-x0208@1983	  . #x626A)	; &I-J83-626A; [66-74]
+      (=ks-x1001	  . #x556C)	; &I-K0-556C; [53-76]
+      (=jis-x0208@1990	  . #x626A)	; &I-J90-626A; [66-74]
+      ))
     ))
 (define-char
   '((ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 5)
-    (kangxi-radical	 . 212)	; ⿓
     (total-strokes	 . 10)
     (=ucs		. #x783B)	; ç »
     (=gb2312		. #x6D43)	; &I-G0-6D43; [77-35]
@@ -1969,30 +2008,39 @@
     (=daikanwa		. 24175)	; &I-M-24175;
     ))
 (define-char
-  '((=>ucs		. #x40AE)	; 䂮
-    (ideographic-radical . 112)	; ⽯
+  '((ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (=cns11643-4	. #x3360)	; &GT-30931; [19-64]
-    (=gt		. 30931)	; &I-GT-30931;
-    (=gt-pj-5		. #x4B2B)	; &I-GT-30931; [43-11]
-    (=daikanwa		. 24176)	; &I-M-24176;
+    (=ucs		. #x40AE)	; 䂮
+    (->subsumptive
+     ((=gt		  . 30931)	; &GT-30931;
+      (=gt-pj-5		  . #x4B2B)	; &GT-30931; [43-11]
+      (=daikanwa	  . 24176)	; &I-M-24176;
+      )
+     ((=cns11643-4	  . #x3360)	; &C4-3360; [19-64]
+      )
+     ((=ucs@unicode	  . #x40AE)	; &UU+40AE;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	24176 0 5)
+  '((<-denotational
+     ((=big5		  . #xACE3)	; &B-ACE3;
+      (=jis-x0208@1997	  . #x3826)	; &B-ACE3; [24-06]
+      ))
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (=ucs		. #x40AE)	; 䂮
+    (=ucs		. #x784F)	; 硏
     ))
 (define-char
-  '((=>ucs		. #x784F)	; 硏
+  '((<-denotational
+     ((=ucs		  . #x784F)	; 硏
+      ))
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ks-x1001		. #x665A)	; &GT-30890; [70-58]
     (=jis-x0213-1-2000	. #x7923)	; &I-JX1-7923; [89-03]
-    (=big5-cdp		. #xACE3)	; &I-B-ACE3;
     (=gt		. 30890)	; &I-GT-30890;
     (=gt-k		. 08239)	; &I-GT-K08239;
     (=gt-pj-5		. #x4B2C)	; &I-GT-30890; [43-12]
@@ -2001,12 +2049,14 @@
     (=ucs@jis		. #x784F)	; &GT-30890;
     ))
 (define-char
-  '((morohashi-daikanwa	24177 0 0)
+  '((<-denotational
+     ((=ucs		  . #x784F)	; 硏
+      ))
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (=ucs		. #x784F)	; 硏
-    (=cns11643-3	. #x3761)	; &I-C3-3761; [23-65]
+    (=cns11643-3	. #x3761)	; &C3-3761; [23-65]
+    (=ucs@unicode	. #x784F)	; &C3-3761;
     ))
 (define-char
   '((ideographic-radical . 112)	; ⽯
@@ -3045,10 +3095,6 @@
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x626F)	; &GT-31068; [66-79]
-      (=daikanwa	  . 24254)	; &I-M-24254;
-      ))
     (=gb2312		. #x4570)	; &GT-31069; [37-80]
     (=jis-x0208@1983	. #x626F)	; &I-J83-626F; [66-79]
     (=ks-x1001		. #x5D5D)	; &I-K0-5D5D; [61-61]
@@ -3059,6 +3105,10 @@
     (=gt-pj-1		. #x626F)	; &I-GT-31069; [66-79]
     (=jef-china3	. #x5CCD)	; &I-JC3-5CCD;
     (=ucs@unicode	. #x787C)	; &GT-31069;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x626F)	; &GT-31068; [66-79]
+      (=daikanwa	  . 24254)	; &I-M-24254;
+      ))
     ))
 (define-char
   '((ideographic-radical . 112)	; ⽯
@@ -4560,15 +4610,15 @@
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA4B)	; 碑
-      (=jis-x0213-1-2000  . #x7927)	; &I-JX1-7927; [89-07]
-      ))
     (=jis-x0208		. #x486A)	; &GT-31138; [40-74]
     (=gt		. 31138)	; &I-GT-31138;
     (=gt-pj-1		. #x486A)	; &I-GT-31138; [40-74]
     (=ucs@jis		. #x7891)	; &GT-31138;
     (mojikyo		. 050301)	; &MCS-6000C47D;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA4B)	; 碑
+      (=jis-x0213-1-2000  . #x7927)	; &I-JX1-7927; [89-07]
+      ))
     ))
 (define-char
   '((ideographic-radical . 112)	; ⽯
diff --git a/lisp/utf-2000/Ideograph-R113-Spirit.el b/lisp/utf-2000/Ideograph-R113-Spirit.el
index 52052ff..8a749bf 100644
--- a/lisp/utf-2000/Ideograph-R113-Spirit.el
+++ b/lisp/utf-2000/Ideograph-R113-Spirit.el
@@ -28,10 +28,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EAC)	; ⺬
     (<-identical@component/connect-right
      ((=ucs		  . #x793A)	; 示
       ))
-    (=ucs		. #x2EAC)	; ⺬
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
@@ -51,18 +51,12 @@
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
+    (=ucs		. #x793B)	; 礻
     (<-formed@component/connect-right
      ((=ucs		  . #x793A)	; 示
       ))
-    (=ucs		. #x793B)	; 礻
     (->subsumptive
-     ((<-vulgar@component/connect-right
-       ((=cns11643-1	    . #x467C)	; &M-24623; [38-92]
-	(=daikanwa	    . 24623)	; &I-M-24623;
-	))
-      (<-vulgar@component/connect-right*sources
-       daikanwa)
-      (=jis-x0212	  . #x504B)	; &GT-31488; [48-43]
+     ((=jis-x0212	  . #x504B)	; &GT-31488; [48-43]
       (=jis-x0213-2-2000  . #x7260)	; &I-JX2-7260; [82-64]
       (=gt		  . 31488)	; &I-GT-31488;
       (=gt-k		  . 00734)	; &I-GT-K00734;
@@ -70,6 +64,12 @@
       (=daikanwa	  . 24625)	; &I-M-24625;
       (=jef-china3	  . #x72FE)	; &I-JC3-72FE;
       (=ucs@jis		  . #x793B)	; &GT-31488;
+      (<-vulgar@component/connect-right
+       ((=cns11643-1	    . #x467C)	; &M-24623; [38-92]
+	(=daikanwa	    . 24623)	; &I-M-24623;
+	))
+      (<-vulgar@component/connect-right*sources
+       daikanwa)
       )
      ((=gb2312		  . #x6C6A)	; &CDP-8B70; [76-74]
       (=big5-cdp	  . #x8B70)	; &I-CDP-8B70;
@@ -84,10 +84,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EAD)	; ⺭
     (<-identical@component/connect-right
      ((=ucs		  . #x793B)	; 礻
       ))
-    (=ucs		. #x2EAD)	; ⺭
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
@@ -115,16 +115,16 @@
     (total-strokes	 . 6)
     (->subsumptive
      ((morohashi-daikanwa	24626 1)
-      (<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6339)	; &GT-32019; [67-25]
-	(=ks-x1001	    . #x5649)	; &I-K0-5649; [54-41]
-	(=daikanwa	    . 24844)	; &I-M-24844;
-	))
       (=jis-x0208	  . #x4E69)	; &GT-31490; [46-73]
       (=gt		  . 31490)	; &I-GT-31490;
       (=gt-k		  . 01024)	; &I-GT-K01024;
       (=gt-pj-1		  . #x4E69)	; &I-GT-31490; [46-73]
       (=ucs@jis		  . #x793C)	; &GT-31490;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6339)	; &GT-32019; [67-25]
+	(=ks-x1001	    . #x5649)	; &I-K0-5649; [54-41]
+	(=daikanwa	    . 24844)	; &I-M-24844;
+	))
       )
      ((=gb2312		  . #x4071)	; &C3-2433; [32-81]
       (=cns11643-3	  . #x2433)	; &I-C3-2433; [04-19]
@@ -261,14 +261,14 @@
     (total-strokes	 . 8)
     (->subsumptive
      ((morohashi-daikanwa	24631 1)
-      (<-simplified@JP/Jouyou
-       ((=ucs		    . #xFA4C)	; 社
-	(=jis-x0213-1-2000  . #x7933)	; &I-JX1-7933; [89-19]
-	))
       (=jis-x0208	  . #x3C52)	; &GT-31503; [28-50]
       (=gt		  . 31503)	; &I-GT-31503;
       (=gt-pj-1		  . #x3C52)	; &I-GT-31503; [28-50]
       (=ucs@jis		  . #x793E)	; &GT-31503;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #xFA4C)	; 社
+	(=jis-x0213-1-2000  . #x7933)	; &I-JX1-7933; [89-19]
+	))
       )
      ((=gb2312		  . #x4967)	; &C1-4F23; [41-71]
       (=cns11643-1	  . #x4F23)	; &I-C1-4F23; [47-03]
@@ -469,8 +469,36 @@
     (=hanziku-12	. #xEEDE)	; &HZK12-EEDE;
     ))
 (define-char
-  '((=>daikanwa		. 13171)	; &M-13171;
-    (ideographic-radical@ucs . 113)	; â½°
+  '((ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 3)
+    (total-strokes	 . 8)
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x58EB)	; 士
+	)
+       ((=cns11643-1	    . #x467C)	; &M-24623; [38-92]
+	(=daikanwa	    . 24623)	; &I-M-24623;
+	))
+      (=cbeta		  . 11755)	; &CB11755;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x58EB)	; 士
+	)
+       ((=jis-x0208	    . #x3C28)	; &GT-31489; [28-08]
+	(=gb2312	    . #x4A3E)	; &I-G0-4A3E; [42-30]
+	(=ks-x1001	    . #x6346)	; &I-K0-6346; [67-38]
+	))
+      (=big5-cdp	  . #x8C6A)	; &CDP-8C6A;
+      ))
+    ))
+(define-char
+  '((ideographic-radical@ucs . 113)	; â½°
     (ideographic-strokes@ucs . 4)
     (ideographic-radical@cns . 66)	; ⽁
     (ideographic-strokes@cns . 5)
@@ -635,14 +663,14 @@
     (total-strokes	 . 9)
     (->subsumptive
      ((morohashi-daikanwa	24640 1)
-      (<-simplified@JP/Jouyou
-       ((=ucs		    . #xFA4E)	; 祈
-	(=jis-x0213-1-2000  . #x7937)	; &I-JX1-7937; [89-23]
-	))
       (=jis-x0208	  . #x3527)	; &GT-31516; [21-07]
       (=gt		  . 31516)	; &I-GT-31516;
       (=gt-pj-1		  . #x3527)	; &I-GT-31516; [21-07]
       (=ucs@jis		  . #x7948)	; &GT-31516;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #xFA4E)	; 祈
+	(=jis-x0213-1-2000  . #x7937)	; &I-JX1-7937; [89-23]
+	))
       )
      ((=gb2312		  . #x466D)	; &C1-526B; [38-77]
       (=cns11643-1	  . #x526B)	; &I-C1-526B; [50-75]
@@ -682,14 +710,14 @@
     (total-strokes	 . 9)
     (->subsumptive
      ((morohashi-daikanwa	24641 1)
-      (<-simplified@JP/Jouyou
-       ((=ucs		    . #xFA4D)	; 祉
-	(=jis-x0213-1-2000  . #x7934)	; &I-JX1-7934; [89-20]
-	))
       (=jis-x0208	  . #x3B63)	; &GT-31522; [27-67]
       (=gt		  . 31522)	; &I-GT-31522;
       (=gt-pj-1		  . #x3B63)	; &I-GT-31522; [27-67]
       (=ucs@jis		  . #x7949)	; &GT-31522;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #xFA4D)	; 祉
+	(=jis-x0213-1-2000  . #x7934)	; &I-JX1-7934; [89-20]
+	))
       )
      ((=gb2312		  . #x6C6D)	; &C1-526A; [76-77]
       (=cns11643-1	  . #x526A)	; &I-C1-526A; [50-74]
@@ -1121,15 +1149,15 @@
     (total-strokes	 . 10)
     (->subsumptive
      ((morohashi-daikanwa	24664 1)
-      (<-simplified@JP/Jouyou
-       ((=ucs		    . #xFA50)	; 祖
-	(=jis-x0213-1-2000  . #x7939)	; &I-JX1-7939; [89-25]
-	))
       (=jis-x0208	  . #x4144)	; &GT-31578; [33-36]
       (=gt		  . 31578)	; &I-GT-31578;
       (=gt-k		  . 05126)	; &I-GT-K05126;
       (=gt-pj-1		  . #x4144)	; &I-GT-31578; [33-36]
       (=ucs@jis		  . #x7956)	; &GT-31578;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #xFA50)	; 祖
+	(=jis-x0213-1-2000  . #x7939)	; &I-JX1-7939; [89-25]
+	))
       )
      ((=gb2312		  . #x5766)	; &C1-572D; [55-70]
       (=cns11643-1	  . #x572D)	; &I-C1-572D; [55-13]
@@ -1279,15 +1307,15 @@
     (total-strokes	 . 10)
     (->subsumptive
      ((morohashi-daikanwa	24672 1)
-      (<-simplified@JP/Jouyou
-       ((=ucs		    . #xFA51)	; 祝
-	(=jis-x0213-1-2000  . #x793B)	; &I-JX1-793B; [89-27]
-	))
       (=jis-x0208	  . #x3D4B)	; &GT-31569; [29-43]
       (=gt		  . 31569)	; &I-GT-31569;
       (=gt-k		  . 05102)	; &I-GT-K05102;
       (=gt-pj-1		  . #x3D4B)	; &I-GT-31569; [29-43]
       (=ucs@jis		  . #x795D)	; &GT-31569;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #xFA51)	; 祝
+	(=jis-x0213-1-2000  . #x793B)	; &I-JX1-793B; [89-27]
+	))
       )
      ((=gb2312		  . #x5723)	; &C1-572F; [55-03]
       (=cns11643-1	  . #x572F)	; &I-C1-572F; [55-15]
@@ -1328,16 +1356,16 @@
     (total-strokes	 . 10)
     (->subsumptive
      ((morohashi-daikanwa	24673 1)
-      (<-simplified@JP/Jouyou
-       ((name		    . "CJK COMPATIBILITY IDEOGRAPH-FA19")
-	(=ucs		    . #xFA19)	; 神
-	(=jis-x0213-1-2000  . #x793C)	; &I-JX1-793C; [89-28]
-	))
       (=jis-x0208	  . #x3F40)	; &GT-31572; [31-32]
       (=gt		  . 31572)	; &I-GT-31572;
       (=gt-k		  . 05113)	; &I-GT-K05113;
       (=gt-pj-1		  . #x3F40)	; &I-GT-31572; [31-32]
       (=ucs@jis		  . #x795E)	; &GT-31572;
+      (<-simplified@JP/Jouyou
+       ((name		    . "CJK COMPATIBILITY IDEOGRAPH-FA19")
+	(=ucs		    . #xFA19)	; 神
+	(=jis-x0213-1-2000  . #x793C)	; &I-JX1-793C; [89-28]
+	))
       )
      ((=gb2312		  . #x4971)	; &C1-572E; [41-81]
       (=cns11643-1	  . #x572E)	; &I-C1-572E; [55-14]
@@ -1832,16 +1860,16 @@
     (total-strokes	 . 11)
     (->subsumptive
      ((morohashi-daikanwa	24689 1)
-      (<-simplified@JP/Jouyou
-       ((name		    . "CJK COMPATIBILITY IDEOGRAPH-FA1A")
-	(=ucs		    . #xFA1A)	; 祥
-	(=jis-x0213-1-2000  . #x793D)	; &I-JX1-793D; [89-29]
-	))
       (=jis-x0208	  . #x3E4D)	; &GT-31632; [30-45]
       (=gt		  . 31632)	; &I-GT-31632;
       (=gt-k		  . 06470)	; &I-GT-K06470;
       (=gt-pj-1		  . #x3E4D)	; &I-GT-31632; [30-45]
       (=ucs@jis		  . #x7965)	; &GT-31632;
+      (<-simplified@JP/Jouyou
+       ((name		    . "CJK COMPATIBILITY IDEOGRAPH-FA1A")
+	(=ucs		    . #xFA1A)	; 祥
+	(=jis-x0213-1-2000  . #x793D)	; &I-JX1-793D; [89-29]
+	))
       )
      ((=gb2312		  . #x4F69)	; &C1-5C40; [47-73]
       (=cns11643-1	  . #x5C40)	; &I-C1-5C40; [60-32]
@@ -3098,14 +3126,14 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
     (->subsumptive
-     ((<-vulgar
+     ((=daikanwa	  . 24754)	; &M-24754;
+      (<-vulgar
        ((=jis-x0208	    . #x6338)	; &GT-31989; [67-24]
 	(=ks-x1001	    . #x6049)	; &I-K0-6049; [64-41]
 	(=daikanwa	    . 24835)	; &I-M-24835;
 	))
       (<-vulgar*sources
        songyuan-yilai-suzipu daikanwa)
-      (=daikanwa	  . 24754)	; &M-24754;
       )
      ((=gb2312		  . #x6C78)	; &G0-6C78; [76-88]
       (=ucs@unicode	  . #x7985)	; &G0-6C78;
@@ -3397,16 +3425,16 @@
     (total-strokes	 . 14)
     (->subsumptive
      ((morohashi-daikanwa	24766 1)
-      (<-simplified@JP/Jouyou
-       ((=ucs		    . #xFA52)	; 禍
-	(=jis-x0213-1-2000  . #x793F)	; &I-JX1-793F; [89-31]
-	))
       (=jis-x0208	  . #x3252)	; &GT-31777; [18-50]
       (=gt		  . 31777)	; &I-GT-31777;
       (=gt-k		  . 10174)	; &I-GT-K10174;
       (=gt-pj-1		  . #x3252)	; &I-GT-31777; [18-50]
       (=ucs@jis		  . #x798D)	; &GT-31777;
       (mojikyo		  . 050313)	; &MCS-6000C489;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #xFA52)	; 禍
+	(=jis-x0213-1-2000  . #x793F)	; &I-JX1-793F; [89-31]
+	))
       )
      ((=cns11643-1	  . #x697E)	; &C1-697E; [73-94]
       (=ucs@cns		  . #x798D)	; &C1-697E;
@@ -3471,11 +3499,6 @@
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (<-formed
-     ((=jis-x0208@1978	  . #x492F)	; &M-38973; [41-15]
-      (=ks-x1001	  . #x793A)	; &I-K0-793A; [89-26]
-      (=daikanwa	  . 38973)	; &I-M-38973;
-      ))
     (shinjigen-1	. 5573)
     (=ucs		. #xFA1B)	; 福
     (=ks-x1001		. #x5C58)	; &I-K0-5C58; [60-56]
@@ -3484,6 +3507,11 @@
     (=jef-china3	. #x5CE4)	; &I-JC3-5CE4;
     (=ucs@ks		. #x798F)	; 福
     (mojikyo		. 024768)	; &MCS-600060C0;
+    (<-formed
+     ((=jis-x0208@1978	  . #x492F)	; &M-38973; [41-15]
+      (=ks-x1001	  . #x793A)	; &I-K0-793A; [89-26]
+      (=daikanwa	  . 38973)	; &I-M-38973;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -3494,17 +3522,17 @@
     (total-strokes	 . 14)
     (->subsumptive
      ((morohashi-daikanwa	24768 1)
-      (<-simplified@JP/Jouyou
-       ((name		    . "CJK COMPATIBILITY IDEOGRAPH-FA1B")
-	(=ucs		    . #xFA1B)	; 福
-	(=jis-x0213-1-2000  . #x7941)	; &I-JX1-7941; [89-33]
-	))
       (shinjigen-1	  . 5572)
       (=jis-x0208	  . #x4A21)	; &GT-31825; [42-01]
       (=gt		  . 31825)	; &I-GT-31825;
       (=gt-pj-1		  . #x4A21)	; &I-GT-31825; [42-01]
       (=ucs@jis		  . #x798F)	; &GT-31825;
       (mojikyo		  . 050315)	; &MCS-6000C48B;
+      (<-simplified@JP/Jouyou
+       ((name		    . "CJK COMPATIBILITY IDEOGRAPH-FA1B")
+	(=ucs		    . #xFA1B)	; 福
+	(=jis-x0213-1-2000  . #x7941)	; &I-JX1-7941; [89-33]
+	))
       )
      ((=gb2312		  . #x3823)	; &C1-697D; [24-03]
       (=cns11643-1	  . #x697D)	; &I-C1-697D; [73-93]
@@ -3897,6 +3925,10 @@
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
+    (=jis-x0208		. #x4135)	; &GT-31813; [33-21]
+    (=gt		. 31813)	; &I-GT-31813;
+    (=gt-pj-1		. #x4135)	; &I-GT-31813; [33-21]
+    (=ucs@jis		. #x7985)	; &GT-31813;
     (<-simplified@JP/Jouyou
      ((=jis-x0208	  . #x6338)	; &GT-31989; [67-24]
       (=ks-x1001	  . #x6049)	; &I-K0-6049; [64-41]
@@ -3904,10 +3936,6 @@
       ))
     (<-simplified@JP/Jouyou*sources
      daikanwa JP/Jouyou)
-    (=jis-x0208		. #x4135)	; &GT-31813; [33-21]
-    (=gt		. 31813)	; &I-GT-31813;
-    (=gt-pj-1		. #x4135)	; &I-GT-31813; [33-21]
-    (=ucs@jis		. #x7985)	; &GT-31813;
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
@@ -4833,22 +4861,31 @@
     (total-strokes	 . 16)
     (=ucs		. #x9834)	; é ´
     (->subsumptive
-     ((<-vulgar
+     ((=daikanwa	  . 24824)	; &M-24824;
+      (<-vulgar
        ((=jis-x0208	    . #x314F)	; &GT-32559; [17-47]
 	(=ks-x1001	    . #x6744)	; &I-K0-6744; [71-36]
 	(=daikanwa	    . 25267)	; &I-M-25267;
 	))
       (<-vulgar*sources
-       zhengzi-tong daikanwa)
-      (=daikanwa	  . 24824)	; &M-24824;
+       zhengzitong daikanwa)
       )
      ((=cns11643-3	  . #x5228)	; &C3-5228; [50-08]
       )
-     ((shinjigen-2	  . 5660)
+     ((shinjigen-1	  . 5660)
+      (shinjigen-2	  . 5660)
       (=jis-x0208	  . #x3150)	; &GT-31942; [17-48]
       (=gt		  . 31942)	; &I-GT-31942;
       (=gt-pj-1		  . #x3150)	; &I-GT-31942; [17-48]
       (=ucs@unicode	  . #x9834)	; &GT-31942;
+      (<-vulgar
+       ((shinjigen-1	    . 5659)
+	(=jis-x0208	    . #x314F)	; &GT-32559; [17-47]
+	(=ks-x1001	    . #x6744)	; &I-K0-6744; [71-36]
+	(=daikanwa	    . 25267)	; &I-M-25267;
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       ))
     ))
 (define-char
@@ -5388,18 +5425,18 @@
     (total-strokes	 . 12)
     (=ucs		. #x7977)	; 祷
     (->subsumptive
-     ((<-simplified@JP
+     ((=jis-x0208@1983	  . #x4578)	; &GT-31697; [37-88]
+      (=jis-x0208@1990	  . #x4578)	; &I-J90-4578; [37-88]
+      (=gt		  . 31697)	; &I-GT-31697;
+      (=gt-pj-1		  . #x4578)	; &I-GT-31697; [37-88]
+      (=ucs@jis		  . #x7977)	; &GT-31697;
+      (<-simplified@JP
        ((=jis-x0208@1978    . #x4578)	; &M-24852; [37-88]
 	(=ks-x1001	    . #x542A)	; &I-K0-542A; [52-10]
 	(=jis-x0212	    . #x5070)	; &I-JSP-5070; [48-80]
 	(=jis-x0213-1-2000  . #x7943)	; &I-JX1-7943; [89-35]
 	(=daikanwa	    . 24852)	; &I-M-24852;
 	))
-      (=jis-x0208@1983	  . #x4578)	; &GT-31697; [37-88]
-      (=jis-x0208@1990	  . #x4578)	; &I-J90-4578; [37-88]
-      (=gt		  . 31697)	; &I-GT-31697;
-      (=gt-pj-1		  . #x4578)	; &I-GT-31697; [37-88]
-      (=ucs@jis		  . #x7977)	; &GT-31697;
       )
      ((=gb2312		  . #x353B)	; &C4-395A; [21-27]
       (=cns11643-4	  . #x395A)	; &I-C4-395A; [25-58]
diff --git a/lisp/utf-2000/Ideograph-R115-Grain.el b/lisp/utf-2000/Ideograph-R115-Grain.el
index 0cd27cb..96ed9ad 100644
--- a/lisp/utf-2000/Ideograph-R115-Grain.el
+++ b/lisp/utf-2000/Ideograph-R115-Grain.el
@@ -491,6 +491,14 @@
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
+    (=ucs		. #x2577C)	; 𥝼
+    (=cns11643-6	. #x334E)	; &I-C6-334E; [19-46]
+    (=daikanwa		. 24974)	; &I-M-24974;
+    ))
+(define-char
+  '((ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
     (=ucs		. #x25784)	; 𥞄
     (->subsumptive
      ((=daikanwa	  . 25006)	; &M-25006;
@@ -641,19 +649,8 @@
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (=ucs		. #x2577C)	; 𥝼
-    (=cns11643-6	. #x334E)	; &I-C6-334E; [19-46]
-    ))
-(define-char
-  '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6330)	; &GT-31649; [67-16]
-      (=daikanwa	  . 24663)	; &I-M-24663;
-      ))
     (shinjigen-2	. 5536)
     (=ucs		. #x79D8)	; 秘
     (=jis-x0208		. #x486B)	; &I-J90-486B; [40-75]
@@ -665,6 +662,10 @@
     (=gt-k		. 06537)	; &I-GT-K06537;
     (=gt-pj-1		. #x486B)	; &I-GT-32244; [40-75]
     (=daikanwa		. 24977)	; &I-M-24977;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6330)	; &GT-31649; [67-16]
+      (=daikanwa	  . 24663)	; &I-M-24663;
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -678,21 +679,46 @@
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (=ucs		. #x79DA)	; 秚
+    (=ucs		. #x25780)	; 𥞀
     (->subsumptive
-     ((=jis-x0212	  . #x507C)	; &M-24980; [48-92]
-      (=daikanwa	  . 24980)	; &I-M-24980;
-      (=jef-china3	  . #x5CFB)	; &I-JC3-5CFB;
-      (=ucs@jis		  . #x79DA)	; &M-24980;
+     ((=daikanwa	  . 24979)	; &M-24979;
+      (=ucs@iso		  . #x25780)	; &M-24979;
       )
-     ((=cns11643-3	  . #x3273)	; &C3-3273; [18-83]
-      (=ucs@unicode	  . #x79DA)	; &C3-3273;
+     ((=cns11643-6	  . #x3A45)	; &C6-3A45; [26-37]
       ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
+    (=ucs		. #x79DA)	; 秚
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79DA)	; 秚
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (=jis-x0212		. #x507C)	; &M-24980; [48-92]
+    (=daikanwa		. 24980)	; &I-M-24980;
+    (=jef-china3	. #x5CFB)	; &I-JC3-5CFB;
+    (=ucs@jis		. #x79DA)	; &M-24980;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79DA)	; 秚
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (=cns11643-3	. #x3273)	; &C3-3273; [18-83]
+    (=ucs@unicode	. #x79DA)	; &C3-3273;
+    ))
+(define-char
+  '((ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
     (=ucs		. #x79DB)	; 秛
     (=cns11643-3	. #x3279)	; &I-C3-3279; [18-89]
     (=daikanwa		. 24981)	; &I-M-24981;
@@ -725,6 +751,14 @@
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
+    (=ucs		. #x4136)	; 䄶
+    (=cns11643-4	. #x2E65)	; &I-C4-2E65; [14-69]
+    (=daikanwa		. 24984)	; &I-M-24984;
+    ))
+(define-char
+  '((ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
     (=ucs		. #x79DE)	; 秞
     (=jis-x0212		. #x507E)	; &I-JSP-507E; [48-94]
     (=cns11643-2	. #x3157)	; &I-C2-3157; [17-55]
@@ -1039,10 +1073,6 @@
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208@1983	  . #x634A)	; &GT-32460; [67-42]
-      (=jis-x0208@1990	  . #x634A)	; &I-J90-634A; [67-42]
-      ))
     (=jis-x0208		. #x3E4E)	; &GT-32225; [30-46]
     (=gt		. 32225)	; &I-GT-32225;
     (=gt-pj-1		. #x3E4E)	; &I-GT-32225; [30-46]
@@ -1050,13 +1080,10 @@
     (=ucs@cns		. #x79F0)	; &GT-32225;
     (=ucs@jis		. #x79F0)	; &GT-32225;
     (mojikyo		. 050318)	; &MCS-6000C48E;
-    ))
-(define-char
-  '((ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (=ucs		. #x4136)	; 䄶
-    (=cns11643-4	. #x2E65)	; &I-C4-2E65; [14-69]
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208@1983	  . #x634A)	; &GT-32460; [67-42]
+      (=jis-x0208@1990	  . #x634A)	; &I-J90-634A; [67-42]
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -1090,13 +1117,6 @@
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (=ucs		. #x25780)	; 𥞀
-    (=cns11643-6	. #x3A45)	; &I-C6-3A45; [26-37]
-    ))
-(define-char
-  '((ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
     (=ucs		. #x25781)	; 𥞁
     (=cns11643-5	. #x2F3D)	; &I-C5-2F3D; [15-29]
     ))
@@ -2770,17 +2790,17 @@
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x634B)	; &GT-32541; [67-43]
-      (=ks-x1001	  . #x542B)	; &I-K0-542B; [52-11]
-      (=daikanwa	  . 25216)	; &I-M-25216;
-      ))
     (=ucs		. #x7A32)	; 稲
     (=jis-x0208		. #x3070)	; &I-J90-3070; [16-80]
     (=cns11643-3	. #x4852)	; &I-C3-4852; [40-50]
     (=gt		. 32476)	; &I-GT-32476;
     (=gt-pj-1		. #x3070)	; &I-GT-32476; [16-80]
     (mojikyo		. 050321)	; &MCS-6000C491;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x634B)	; &GT-32541; [67-43]
+      (=ks-x1001	  . #x542B)	; &I-K0-542B; [52-11]
+      (=daikanwa	  . 25216)	; &I-M-25216;
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -2802,16 +2822,16 @@
     (=ucs		. #x2F959)	; 穀
     (->subsumptive
      ((morohashi-daikanwa	25188 1)
-      (<-simplified@JP/Jouyou
-       ((=ucs		    . #xFA54)	; 穀
-	(=jis-x0213-1-2000  . #x794D)	; &I-JX1-794D; [89-45]
-	))
       (=jis-x0208	  . #x3972)	; &GT-32448; [25-82]
       (=gt		  . 32448)	; &I-GT-32448;
       (=gt-k		  . 11664)	; &I-GT-K11664;
       (=gt-pj-1		  . #x3972)	; &I-GT-32448; [25-82]
       (=jef-china3	  . #x5CF4)	; &I-JC3-5CF4;
       (=ucs@jis		  . #x7A40)	; &GT-32448;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #xFA54)	; 穀
+	(=jis-x0213-1-2000  . #x794D)	; &I-JX1-794D; [89-45]
+	))
       )
      ((mojikyo		  . 050322)	; &MCS-6000C492;
       )
@@ -3172,24 +3192,65 @@
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
+    (=ucs		. #x4173)	; 䅳
+    (->subsumptive
+     ((=daikanwa	  . 25206)	; &M-25206;
+      (=ucs@unicode	  . #x4173)	; &M-25206;
+      )
+     ((=cns11643-4	  . #x4B68)	; &C4-4B68; [43-72]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
     (=ucs		. #x7A37)	; 稷
+    ))
+(define-char
+  '((<-denotational
+     ((=big5		  . #xBD5E)	; &B-BD5E;
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
     (->subsumptive
      ((=daikanwa	  . 25207)	; &M-25207;
       )
      ((=cns11643-1	  . #x6E29)	; &C1-6E29; [78-09]
-      )
-     ((shinjigen-2	  . 5654)
-      (=jis-x0208	  . #x634D)	; &GT-32523; [67-45]
-      (=ks-x1001	  . #x7243)	; &I-K0-7243; [82-35]
-      (=gt		  . 32523)	; &I-GT-32523;
-      (=gt-pj-1		  . #x634D)	; &I-GT-32523; [67-45]
-      (=ucs@jis		  . #x7A37)	; &GT-32523;
-      )
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7A37)	; 稷
+      ))
+    (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)
+    (=gb2312		. #x7022)	; &G0-7022; [80-02]
+    (=ucs@unicode	. #x7A37)	; &G0-7022;
+    ))
+(define-char
+  '((<-denotational
      ((=big5		  . #xBD5E)	; &B-BD5E;
-      )
-     ((=gb2312		  . #x7022)	; &G0-7022; [80-02]
-      (=ucs@unicode	  . #x7A37)	; &G0-7022;
       ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 10)
+    (total-strokes	 . 15)
+    (shinjigen-2	. 5654)
+    (=jis-x0208		. #x634D)	; &GT-32523; [67-45]
+    (=ks-x1001		. #x7243)	; &I-K0-7243; [82-35]
+    (=gt		. 32523)	; &I-GT-32523;
+    (=gt-pj-1		. #x634D)	; &I-GT-32523; [67-45]
+    (=ucs@jis		. #x7A37)	; &GT-32523;
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -3586,39 +3647,30 @@
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x7A57)	; 穗
-      (=jis-x0208	  . #x634F)	; &I-J90-634F; [67-47]
-      ))
     (=ucs		. #x7A42)	; 穂
     (=jis-x0208		. #x4A66)	; &I-J90-4A66; [42-70]
     (=cns11643-3	. #x4D57)	; &I-C3-4D57; [45-55]
     (=gt		. 32528)	; &I-GT-32528;
     (=gt-pj-1		. #x4A66)	; &I-GT-32528; [42-70]
     (mojikyo		. 050323)	; &MCS-6000C493;
-    ))
-(define-char
-  '((ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 10)
-    (total-strokes	 . 15)
-    (=ucs		. #x4173)	; 䅳
-    (=cns11643-4	. #x4B68)	; &I-C4-4B68; [43-72]
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x7A57)	; 穗
+      (=jis-x0208	  . #x634F)	; &I-J90-634F; [67-47]
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
     (=ucs		. #x7A43)	; 穃
-    ))
-(define-char
-  '((=>ucs		. #x7A43)	; 穃
-    (ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 10)
-    (total-strokes	 . 15)
-    (=jis-x0208		. #x634E)	; &GT-32549; [67-46]
-    (=gt		. 32549)	; &I-GT-32549;
-    (=gt-pj-1		. #x634E)	; &I-GT-32549; [67-46]
-    (=ucs@jis		. #x7A43)	; &GT-32549;
+    (->subsumptive
+     ((=jis-x0208	  . #x634E)	; &GT-32549; [67-46]
+      (=gt		  . 32549)	; &I-GT-32549;
+      (=gt-pj-1		  . #x634E)	; &I-GT-32549; [67-46]
+      (=ucs@jis		  . #x7A43)	; &GT-32549;
+      )
+     ((=ucs@unicode	  . #x7A43)	; &UU+7A43;
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -3936,7 +3988,8 @@
     (total-strokes	 . 16)
     (=ucs		. #x7A4E)	; 穎
     (->subsumptive
-     ((shinjigen-2	  . 5659)
+     ((shinjigen-1	  . 5659)
+      (shinjigen-2	  . 5659)
       (=jis-x0208	  . #x314F)	; &GT-32559; [17-47]
       (=ks-x1001	  . #x6744)	; &I-K0-6744; [71-36]
       (=gb12345		  . #x5331)	; &GT-32559; [51-17]
@@ -4094,17 +4147,17 @@
     (total-strokes	 . 16)
     (->subsumptive
      ((morohashi-daikanwa	25280 1)
-      (<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6353)	; &GT-32701; [67-51]
-	(=ks-x1001	    . #x6831)	; &I-K0-6831; [72-17]
-	(=daikanwa	    . 25344)	; &I-M-25344;
-	))
       (=jis-x0208	  . #x323A)	; &GT-32561; [18-26]
       (=cns11643-3	  . #x522C)	; &I-C3-522C; [50-12]
       (=gt		  . 32561)	; &I-GT-32561;
       (=gt-pj-1		  . #x323A)	; &I-GT-32561; [18-26]
       (=ucs@unicode	  . #x7A4F)	; &GT-32561;
       (mojikyo		  . 050324)	; &MCS-6000C494;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6353)	; &GT-32701; [67-51]
+	(=ks-x1001	    . #x6831)	; &I-K0-6831; [72-17]
+	(=daikanwa	    . 25344)	; &I-M-25344;
+	))
       )
      ((=cns11643-7	  . #x3066)	; &C7-3066; [16-70]
       ))
@@ -5316,6 +5369,55 @@
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 16)
     (total-strokes	 . 21)
+    (=ucs		. #x25900)	; 𥤀
+    (->subsumptive
+     ((=daikanwa	  . 25376)	; &M-25376;
+      (=ucs@iso		  . #x25900)	; &M-25376;
+      )
+     ((=cns11643-7	  . #x5428)	; &C7-5428; [52-08]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 16)
+    (total-strokes	 . 21)
+    (=ucs		. #x25901)	; 𥤁
+    (->subsumptive
+     ((=daikanwa	  . 25377)	; &M-25377;
+      )
+     ((=cns11643-7	  . #x5427)	; &C7-5427; [52-07]
+      (=ucs@iso		  . #x25901)	; &C7-5427;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 16)
+    (total-strokes	 . 21)
+    (=ucs		. #x418A)	; 䆊
+    (->subsumptive
+     ((=daikanwa	  . 25378)	; &M-25378;
+      (=ucs@unicode	  . #x418A)	; &M-25378;
+      )
+     ((=cns11643-4	  . #x6665)	; &C4-6665; [70-69]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 16)
+    (total-strokes	 . 21)
+    (=ucs		. #x25902)	; 𥤂
+    (->subsumptive
+     ((=daikanwa	  . 25379)	; &M-25379;
+      )
+     ((=ucs@iso		  . #x25902)	; &U-00025902;
+      )
+     ((=cns11643-5	  . #x7058)	; &C5-7058; [80-56]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 16)
+    (total-strokes	 . 21)
     (=ucs		. #x25903)	; 𥤃
     (->subsumptive
      ((=daikanwa	  . 25380)	; &M-25380;
@@ -5340,6 +5442,8 @@
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 16)
     (total-strokes	 . 21)
+    (=cns11643-3	. #x5E47)	; &M-25381; [62-39]
+    (=daikanwa		. 25381)	; &I-M-25381;
     (<-ancient
      ((=jis-x0208	  . #x3D29)	; &GT-32182; [29-09]
       (=gb2312		  . #x476F)	; &I-G0-476F; [39-79]
@@ -5348,50 +5452,42 @@
       ))
     (<-ancient*sources
      zihui daikanwa)
-    (=cns11643-3	. #x5E47)	; &M-25381; [62-39]
-    (=daikanwa		. 25381)	; &I-M-25381;
-    ))
-(define-char
-  '((ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 16)
-    (total-strokes	 . 21)
-    (=ucs		. #x418A)	; 䆊
-    (=cns11643-4	. #x6665)	; &I-C4-6665; [70-69]
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 16)
     (total-strokes	 . 21)
     (=ucs		. #x418D)	; 䆍
-    (=cns11643-4	. #x6664)	; &I-C4-6664; [70-68]
-    ))
-(define-char
-  '((ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 16)
-    (total-strokes	 . 21)
-    (=ucs		. #x25900)	; 𥤀
-    (=cns11643-7	. #x5428)	; &I-C7-5428; [52-08]
-    ))
-(define-char
-  '((ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 16)
-    (total-strokes	 . 21)
-    (=ucs		. #x25901)	; 𥤁
-    (=cns11643-7	. #x5427)	; &I-C7-5427; [52-07]
-    ))
-(define-char
-  '((ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 16)
-    (total-strokes	 . 21)
-    (=ucs		. #x25902)	; 𥤂
-    (=cns11643-5	. #x7058)	; &I-C5-7058; [80-56]
+    (->subsumptive
+     ((=daikanwa	  . 25382)	; &M-25382;
+      )
+     ((=ucs@unicode	  . #x418D)	; &UU+418D;
+      )
+     ((=cns11643-4	  . #x6664)	; &C4-6664; [70-68]
+      ))
     ))
 (define-char
-  '((ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 16)
+  '((ideographic-radical@ucs . 213)	; ⿔
+    (ideographic-strokes@ucs . 5)
+    (ideographic-radical@ucs*sources
+     daikanwa ucs)
+    (ideographic-radical@cns . 115)	; â½²
+    (ideographic-strokes@cns . 16)
     (total-strokes	 . 21)
     (=ucs		. #x2A6BC)	; 𪚼
-    (=cns11643-7	. #x542A)	; &I-C7-542A; [52-10]
+    (->subsumptive
+     ((ideographic-radical . 213)	; ⿔
+      (ideographic-strokes . 5)
+      (=daikanwa	  . 48870)	; &M-48870;
+      )
+     ((ideographic-radical . 115)	; â½²
+      (ideographic-strokes . 16)
+      (=cns11643-7	  . #x542A)	; &C7-542A; [52-10]
+      )
+     ((ideographic-radical . 213)	; ⿔
+      (ideographic-strokes . 5)
+      (=ucs@iso		  . #x2A6BC)	; &U-0002A6BC;
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
diff --git a/lisp/utf-2000/Ideograph-R116-Cave.el b/lisp/utf-2000/Ideograph-R116-Cave.el
index 472cdab..3e92c7d 100644
--- a/lisp/utf-2000/Ideograph-R116-Cave.el
+++ b/lisp/utf-2000/Ideograph-R116-Cave.el
@@ -208,17 +208,17 @@
     (total-strokes	 . 8)
     (=ucs		. #x2592E)	; 𥤮
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=ucs		    . #xFA55)	; 突
-	(=jis-x0213-1-2000  . #x7951)	; &I-JX1-7951; [89-49]
-	))
-      (shinjigen-2	  . 5683)
+     ((shinjigen-2	  . 5683)
       (=jis-x0208	  . #x464D)	; &GT-32811; [38-45]
       (=gt		  . 32811)	; &I-GT-32811;
       (=gt-k		  . 03789)	; &I-GT-K03789;
       (=gt-pj-1		  . #x464D)	; &I-GT-32811; [38-45]
       (=daikanwa	  . 25424)	; &I-M-25424;
       (=ucs@jis		  . #x7A81)	; &GT-32811;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #xFA55)	; 突
+	(=jis-x0213-1-2000  . #x7951)	; &I-JX1-7951; [89-49]
+	))
       )
      ((=cns11643-3	  . #x2A45)	; &C3-2A45; [10-37]
       (=ucs@iso		  . #x2592E)	; &C3-2A45;
@@ -303,6 +303,34 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
+    (=ucs		. #x4193)	; 䆓
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4193)	; 䆓
+      ))
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (->subsumptive
+     ((=daikanwa	  . 25430)	; &M-25430;
+      )
+     ((=cns11643-3	  . #x2E46)	; &C3-2E46; [14-38]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4193)	; 䆓
+      ))
+    (ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=ucs@unicode	. #x4193)	; &UU+4193;
+    ))
+(define-char
+  '((ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
     (=ucs		. #x7A7D)	; 穽
     (->subsumptive
      ((shinjigen-2	  . 5685)
@@ -546,17 +574,17 @@
     (total-strokes	 . 9)
     (=ucs		. #x7A83)	; 窃
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6366)	; &GT-33169; [67-70]
-	(=ks-x1001	    . #x6F3C)	; &I-K0-6F3C; [79-28]
-	(=daikanwa	    . 25713)	; &I-M-25713;
-	))
-      (shinjigen-2	  . 5687)
+     ((shinjigen-2	  . 5687)
       (=jis-x0208	  . #x4060)	; &GT-32826; [32-64]
       (=gt		  . 32826)	; &I-GT-32826;
       (=gt-pj-1		  . #x4060)	; &I-GT-32826; [32-64]
       (=daikanwa	  . 25453)	; &I-M-25453;
       (=ucs@jis		  . #x7A83)	; &GT-32826;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6366)	; &GT-33169; [67-70]
+	(=ks-x1001	    . #x6F3C)	; &I-K0-6F3C; [79-28]
+	(=daikanwa	    . 25713)	; &I-M-25713;
+	))
       )
      ((=cns11643-3	  . #x2E48)	; &C3-2E48; [14-40]
       )
@@ -568,17 +596,6 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (=ucs		. #x4193)	; 䆓
-    (->subsumptive
-     ((=cns11643-3	  . #x2E46)	; &C3-2E46; [14-38]
-      )
-     ((=ucs@unicode	  . #x4193)	; &UU+4193;
-      ))
-    ))
-(define-char
-  '((ideographic-radical . 116)	; â½³
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
     (=ucs		. #x4194)	; 䆔
     (=cns11643-3	. #x2E45)	; &I-C3-2E45; [14-37]
     ))
diff --git a/lisp/utf-2000/Ideograph-R117-Stand.el b/lisp/utf-2000/Ideograph-R117-Stand.el
index 17c5135..7b2da0e 100644
--- a/lisp/utf-2000/Ideograph-R117-Stand.el
+++ b/lisp/utf-2000/Ideograph-R117-Stand.el
@@ -31,25 +31,25 @@
     (ideographic-radical . 117)	; â½´
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
-    (<-ideographic-component-forms
+    (=gt-k		. 01019)	; &GT-K01019;
+    (=gt-pj-k1		. #x3478)	; &GT-K01019; [20-88]
+    (<-formed@component/connect-right
      ((=jis-x0208	  . #x4E29)	; &GT-33181; [46-09]
       (=ks-x1001	  . #x5821)	; &I-K0-5821; [56-01]
       (=daikanwa	  . 25721)	; &I-M-25721;
       ))
-    (=gt-k		. 01019)	; &GT-K01019;
-    (=gt-pj-k1		. #x3478)	; &GT-K01019; [20-88]
     ))
 (define-char
   '((ideographic-radical . 117)	; â½´
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
-    (<-simplified
+    (=big5-cdp		. #x8BAE)	; &CDP-8BAE;
+    (mojikyo		. 072621)	; &MCS-60011BAD;
+    (<-simplified@component
      ((=jis-x0208	  . #x3E4F)	; &GT-33228; [30-47]
       (=ks-x1001	  . #x6D71)	; &I-K0-6D71; [77-81]
       (=daikanwa	  . 25761)	; &I-M-25761;
       ))
-    (=big5-cdp		. #x8BAE)	; &CDP-8BAE;
-    (mojikyo		. 072621)	; &MCS-60011BAD;
     ))
 (define-char
   '((ideographic-radical . 117)	; â½´
@@ -468,12 +468,7 @@
     (total-strokes	 . 10)
     (=ucs		. #x7ADC)	; 竜
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x4E36)	; &GT-66672; [46-22]
-	(=ks-x1001	    . #x5723)	; &I-K0-5723; [55-03]
-	(=daikanwa	    . 48818)	; &I-M-48818;
-	))
-      (shinjigen-1	  . 9912)
+     ((shinjigen-1	  . 9912)
       (shinjigen-2	  . 9912)
       (=jis-x0208	  . #x4E35)	; &GT-33220; [46-21]
       (=gt		  . 33220)	; &I-GT-33220;
@@ -481,6 +476,11 @@
       (=gt-pj-1		  . #x4E35)	; &I-GT-33220; [46-21]
       (=daikanwa	  . 25751)	; &I-M-25751;
       (=ucs@jis		  . #x7ADC)	; &GT-33220;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x4E36)	; &GT-66672; [46-22]
+	(=ks-x1001	    . #x5723)	; &I-K0-5723; [55-03]
+	(=daikanwa	    . 48818)	; &I-M-48818;
+	))
       )
      ((=iso-ir165	  . #x2E6B)	; &C3-3327; [14-75]
       (=cns11643-3	  . #x3327)	; &I-C3-3327; [19-07]
@@ -495,10 +495,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EEF)	; ⻯
     (<-identical@component
      ((=ucs		  . #x7ADC)	; 竜
       ))
-    (=ucs		. #x2EEF)	; ⻯
     ))
 (define-char
   '((ideographic-radical . 117)	; â½´
@@ -506,7 +506,8 @@
     (total-strokes	 . 10)
     (=ucs		. #x7ADD)	; 竝
     (->subsumptive
-     ((shinjigen-2	  . 5733)
+     ((shinjigen-1	  . 5733)
+      (shinjigen-2	  . 5733)
       (=jis-x0208	  . #x636D)	; &GT-33217; [67-77]
       (=ks-x1001	  . #x5C3D)	; &I-K0-5C3D; [60-29]
       (=gt		  . 33217)	; &I-GT-33217;
diff --git a/lisp/utf-2000/Ideograph-R118-Bamboo.el b/lisp/utf-2000/Ideograph-R118-Bamboo.el
index c6c3f3f..2b91fae 100644
--- a/lisp/utf-2000/Ideograph-R118-Bamboo.el
+++ b/lisp/utf-2000/Ideograph-R118-Bamboo.el
@@ -2164,6 +2164,56 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
+    (=ucs		. #x41F6)	; 䇶
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x41F6)	; 䇶
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
+    (=cns11643-4	. #x3F66)	; &M-26038; [31-70]
+    (=daikanwa		. 26038)	; &I-M-26038;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x41F6)	; 䇶
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
+    (=ucs@unicode	. #x41F6)	; &UU+41F6;
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
+    (=ucs		. #x41F7)	; 䇷
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x41F7)	; 䇷
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
+    (=cns11643-4	. #x3F62)	; &M-26039; [31-66]
+    (=daikanwa		. 26039)	; &I-M-26039;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x41F7)	; 䇷
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
+    (=ucs@unicode	. #x41F7)	; &UU+41F7;
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
     (=ucs		. #x7B63)	; ç­£
     (=cns11643-2	. #x4578)	; &I-C2-4578; [37-88]
     (=big5		. #xDF53)	; &I-B-DF53;
@@ -2173,7 +2223,33 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
+    (=ucs		. #x41F8)	; 䇸
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x41F8)	; 䇸
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
+    (=cns11643-4	. #x3F61)	; &M-26043; [31-65]
+    (=daikanwa		. 26043)	; &I-M-26043;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x41F8)	; 䇸
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
+    (=ucs@unicode	. #x41F8)	; &UU+41F8;
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
     (=ucs		. #x7B64)	; ç­¤
+    (=big5		. #xDF47)	; &I-B-DF47;
     (->subsumptive
      ((=jis-x0212	  . #x522B)	; &M-26047; [50-11]
       (=jis-x0213-2-2000  . #x734E)	; &I-JX2-734E; [83-46]
@@ -2182,28 +2258,48 @@
       (=ucs@jis		  . #x7B64)	; &M-26047;
       )
      ((=cns11643-2	  . #x456C)	; &C2-456C; [37-76]
-      (=big5		  . #xDF47)	; &I-B-DF47;
       (=ucs@unicode	  . #x7B64)	; &C2-456C;
       ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (=ucs		. #x7B65)	; ç­¥
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7B65)	; ç­¥
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
+    (shinjigen-2	. 5800)
+    (=jis-x0208		. #x6428)	; &GT-33570; [68-08]
+    (=cns11643-2	. #x4571)	; &I-C2-4571; [37-81]
+    (=big5		. #xDF4C)	; &I-B-DF4C;
+    (=gt		. 33570)	; &I-GT-33570;
+    (=gt-pj-1		. #x6428)	; &I-GT-33570; [68-08]
+    (=daikanwa		. 26051)	; &I-M-26051;
+    (=ucs@jis		. #x7B65)	; &GT-33570;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7B65)	; ç­¥
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 6)
+    (total-strokes	 . 12)
+    (=ucs@unicode	. #x7B65)	; &UU+7B65;
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
+    (=ucs		. #x41FB)	; 䇻
     (->subsumptive
-     ((ideographic-strokes . 7)
-      (total-strokes	   . 13)
-      (shinjigen-2	  . 5800)
-      (=jis-x0208	  . #x6428)	; &GT-33570; [68-08]
-      (=cns11643-2	  . #x4571)	; &I-C2-4571; [37-81]
-      (=big5		  . #xDF4C)	; &I-B-DF4C;
-      (=gt		  . 33570)	; &I-GT-33570;
-      (=gt-pj-1		  . #x6428)	; &I-GT-33570; [68-08]
-      (=daikanwa	  . 26051)	; &I-M-26051;
-      (=ucs@jis		  . #x7B65)	; &GT-33570;
+     ((=daikanwa	  . 26055)	; &M-26055;
+      (=ucs@unicode	  . #x41FB)	; &M-26055;
       )
-     ((ideographic-strokes . 6)
-      (total-strokes	   . 12)
-      (=ucs@unicode	  . #x7B65)	; &UU+7B65;
+     ((=cns11643-4	  . #x3F5D)	; &C4-3F5D; [31-61]
       ))
     ))
 (define-char
@@ -2211,6 +2307,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
     (=ucs		. #x7B66)	; ç­¦
+    (=big5		. #xDF46)	; &I-B-DF46;
     (->subsumptive
      ((=jis-x0212	  . #x522C)	; &M-26057; [50-12]
       (=jis-x0213-2-2000  . #x734F)	; &I-JX2-734F; [83-47]
@@ -2219,7 +2316,6 @@
       (=ucs@jis		  . #x7B66)	; &M-26057;
       )
      ((=cns11643-2	  . #x456B)	; &C2-456B; [37-75]
-      (=big5		  . #xDF46)	; &I-B-DF46;
       (=ucs@unicode	  . #x7B66)	; &C2-456B;
       ))
     ))
@@ -2470,15 +2566,6 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA56)	; 節
-      (=jis-x0213-1-2000  . #x7964)	; &I-JX1-7964; [89-68]
-      ))
-    (<-vulgar
-     ((=daikanwa	  . 26243)	; &M-26243;
-      ))
-    (<-vulgar*sources
-     cihai daikanwa)
     (shinjigen-2	. 5805)
     (=ucs		. #x7BC0)	; 節
     (=jis-x0208		. #x4061)	; &I-J90-4061; [32-65]
@@ -2490,36 +2577,52 @@
     (=gt-pj-1		. #x4061)	; &I-GT-33607; [32-65]
     (=daikanwa		. 26102)	; &I-M-26102;
     (mojikyo		. 026102)	; &MCS-600065F6;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA56)	; 節
+      (=jis-x0213-1-2000  . #x7964)	; &I-JX1-7964; [89-68]
+      ))
+    (<-vulgar
+     ((=daikanwa	  . 26243)	; &M-26243;
+      ))
+    (<-vulgar*sources
+     cihai daikanwa)
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
     (=ucs		. #x25B85)	; 𥮅
-    (=daikanwa		. 26103)	; &I-M-26103;
+    (->subsumptive
+     ((=daikanwa	  . 26103)	; &M-26103;
+      (=ucs@iso		  . #x25B85)	; &M-26103;
+      )
+     ((=cns11643-6	  . #x562F)	; &C6-562F; [54-15]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x25B85)	; 𥮅
-    (morohashi-daikanwa	26103 0 0)
-    (ideographic-radical . 118)	; â½µ
+  '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
-    (=cns11643-6	. #x562F)	; &C6-562F; [54-15]
+    (=ucs		. #x25B77)	; 𥭷
     ))
 (define-char
-  '((=>ucs		. #x25B77)	; 𥭷
+  '((<-denotational
+     ((=ucs		  . #x25B77)	; 𥭷
+      ))
     (ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
     (=daikanwa		. 49425)	; &M-49425;
     ))
 (define-char
-  '((morohashi-daikanwa	49425 0 0)
+  '((<-denotational
+     ((=ucs		  . #x25B77)	; 𥭷
+      ))
     (ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
-    (=ucs		. #x25B77)	; 𥭷
-    (=cns11643-6	. #x5635)	; &I-C6-5635; [54-21]
+    (=cns11643-6	. #x5635)	; &C6-5635; [54-21]
+    (=ucs@iso		. #x25B77)	; &C6-5635;
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -2532,27 +2635,6 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
-    (=ucs		. #x41F6)	; 䇶
-    (=cns11643-4	. #x3F66)	; &I-C4-3F66; [31-70]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 7)
-    (total-strokes	 . 13)
-    (=ucs		. #x41F7)	; 䇷
-    (=cns11643-4	. #x3F62)	; &I-C4-3F62; [31-66]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 7)
-    (total-strokes	 . 13)
-    (=ucs		. #x41F8)	; 䇸
-    (=cns11643-4	. #x3F61)	; &I-C4-3F61; [31-65]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 7)
-    (total-strokes	 . 13)
     (=ucs		. #x41F9)	; 䇹
     (=cns11643-3	. #x4352)	; &I-C3-4352; [35-50]
     ))
@@ -2567,13 +2649,6 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
-    (=ucs		. #x41FB)	; 䇻
-    (=cns11643-4	. #x3F5D)	; &I-C4-3F5D; [31-61]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 7)
-    (total-strokes	 . 13)
     (=ucs		. #x41FC)	; 䇼
     (=cns11643-3	. #x434E)	; &I-C3-434E; [35-46]
     ))
@@ -2927,12 +3002,20 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (=ucs		. #x4201)	; 䈁
+    (=cns11643-5	. #x4846)	; &I-C5-4846; [40-38]
+    (=daikanwa		. 26106)	; &I-M-26106;
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (=ucs		. #x7B83)	; 箃
     (->subsumptive
-     ((=daikanwa	  . 26107)	; &M-26107;
-      (=ucs@unicode	  . #x7B83)	; &M-26107;
+     ((=cns11643-3	  . #x4858)	; &M-26107; [40-56]
+      (=daikanwa	  . 26107)	; &I-M-26107;
       )
-     ((=cns11643-3	  . #x4858)	; &C3-4858; [40-56]
+     ((=ucs@unicode	  . #x7B83)	; &UU+7B83;
       ))
     ))
 (define-char
@@ -3000,26 +3083,41 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x7B89)	; 箉
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7B89)	; 箉
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (->subsumptive
      ((=jis-x0212	  . #x5235)	; &M-26120; [50-21]
       (=daikanwa	  . 26120)	; &I-M-26120;
       (=ucs@jis		  . #x7B89)	; &M-26120;
       )
-     ((=ucs@unicode	  . #x7B89)	; &UU+7B89;
-      )
      ((=cns11643-4	  . #x456B)	; &C4-456B; [37-75]
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x7B89)	; 箉
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x7B89)	; &UU+7B89;
+    ))
+(define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x7B8A)	; 箊
+    (=big5		. #xE350)	; &I-B-E350;
     (->subsumptive
      ((=daikanwa	  . 26121)	; &M-26121;
       )
      ((=cns11643-2	  . #x4C57)	; &C2-4C57; [44-55]
-      (=big5		  . #xE350)	; &I-B-E350;
       (=ucs@unicode	  . #x7B8A)	; &C2-4C57;
       ))
     ))
@@ -3027,17 +3125,46 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (shinjigen-2	. 5824)
     (=ucs		. #x7B8B)	; 箋
-    (=jis-x0208		. #x6435)	; &I-J90-6435; [68-21]
-    (=ks-x1001		. #x6F28)	; &I-K0-6F28; [79-08]
-    (=cns11643-1	. #x6A29)	; &I-C1-6A29; [74-09]
-    (=gb12345		. #x3C63)	; 箋 [28-67]
-    (=big5		. #xBAE0)	; &I-B-BAE0;
-    (=gt		. 33710)	; &I-GT-33710;
-    (=gt-k		. 11228)	; &I-GT-K11228;
-    (=gt-pj-1		. #x6435)	; &I-GT-33710; [68-21]
-    (=daikanwa		. 26122)	; &I-M-26122;
+    (->subsumptive
+     ((shinjigen-2	  . 5824)
+      (=jis-x0208	  . #x6435)	; &GT-33710; [68-21]
+      (=ks-x1001	  . #x6F28)	; &I-K0-6F28; [79-08]
+      (=gb12345		  . #x3C63)	; &GT-33710; [28-67]
+      (=big5		  . #xBAE0)	; &I-B-BAE0;
+      (=gt		  . 33710)	; &I-GT-33710;
+      (=gt-k		  . 11228)	; &I-GT-K11228;
+      (=gt-pj-1		  . #x6435)	; &I-GT-33710; [68-21]
+      (=daikanwa	  . 26122)	; &I-M-26122;
+      (=ucs@unicode	  . #x7B8B)	; &GT-33710;
+      )
+     ((=cns11643-1	  . #x6A29)	; &C1-6A29; [74-09]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs		. #x4206)	; 䈆
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4206)	; 䈆
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=cns11643-4	. #x4569)	; &M-26125; [37-73]
+    (=daikanwa		. 26125)	; &I-M-26125;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4206)	; 䈆
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x4206)	; &UU+4206;
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -3075,6 +3202,18 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (=ucs		. #x4208)	; 䈈
+    (->subsumptive
+     ((=daikanwa	  . 26131)	; &M-26131;
+      (=ucs@unicode	  . #x4208)	; &M-26131;
+      )
+     ((=cns11643-4	  . #x456E)	; &C4-456E; [37-78]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (=ucs		. #x7B8E)	; 箎
     ))
 (define-char
@@ -3173,9 +3312,6 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (<-formed
-     ((=daikanwa	  . 39120)	; &M-39120;
-      ))
     (=ucs		. #x7B91)	; 箑
     (=jis-x0212		. #x5238)	; &I-JSP-5238; [50-24]
     (=cns11643-2	. #x4C58)	; &I-C2-4C58; [44-56]
@@ -3183,6 +3319,22 @@
     (=big5		. #xE351)	; &I-B-E351;
     (=daikanwa		. 26136)	; &I-M-26136;
     (=jef-china3	. #x5DFE)	; &I-JC3-5DFE;
+    (<-formed
+     ((=daikanwa	  . 39120)	; &M-39120;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs		. #x4209)	; 䈉
+    (->subsumptive
+     ((=daikanwa	  . 26137)	; &M-26137;
+      )
+     ((=ucs@unicode	  . #x4209)	; &UU+4209;
+      )
+     ((=cns11643-4	  . #x4568)	; &C4-4568; [37-72]
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -3341,10 +3493,6 @@
     (ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x6439)	; &GT-33740; [68-25]
-      (=daikanwa	  . 26148)	; &I-M-26148;
-      ))
     (=jis-x0208@1983	. #x6439)	; &GT-33741; [68-25]
     (=jis-x0208@1990	. #x6439)	; &I-J90-6439; [68-25]
     (=cns11643-2	. #x4C62)	; &I-C2-4C62; [44-66]
@@ -3353,6 +3501,10 @@
     (=gt-pj-1		. #x6439)	; &I-GT-33741; [68-25]
     (=jef-china3	. #x5EC6)	; &I-JC3-5EC6;
     (=ucs@unicode	. #x7B99)	; &GT-33741;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x6439)	; &GT-33740; [68-25]
+      (=daikanwa	  . 26148)	; &I-M-26148;
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -3463,26 +3615,64 @@
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (=ucs		. #x7BA0)	; ç® 
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BA0)	; ç® 
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=jis-x0212		. #x523C)	; &M-26158; [50-28]
+    (=big5		. #xBD69)	; &I-B-BD69;
+    (=daikanwa		. 26158)	; &I-M-26158;
+    (=ucs@unicode	. #x7BA0)	; &M-26158;
+    (mojikyo		. 026158)	; &MCS-6000662E;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BA0)	; ç® 
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=cns11643-1	. #x6E34)	; &C1-6E34; [78-20]
+    (=jef-china3	. #x5EA4)	; &I-JC3-5EA4;
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs		. #x420A)	; 䈊
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x420A)	; 䈊
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (->subsumptive
-     ((ideographic-strokes . 8)
-      (total-strokes	   . 14)
-      (=jis-x0212	  . #x523C)	; &M-26158; [50-28]
-      (=big5		  . #xBD69)	; &I-B-BD69;
-      (=daikanwa	  . 26158)	; &I-M-26158;
-      (=ucs@unicode	  . #x7BA0)	; &M-26158;
-      (mojikyo		  . 026158)	; &MCS-6000662E;
+     ((=daikanwa	  . 26161)	; &M-26161;
       )
-     ((ideographic-strokes . 9)
-      (total-strokes	   . 15)
-      (=cns11643-1	  . #x6E34)	; &C1-6E34; [78-20]
-      (=jef-china3	  . #x5EA4)	; &I-JC3-5EA4;
+     ((=cns11643-3	  . #x4859)	; &C3-4859; [40-57]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x420A)	; 䈊
       ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x420A)	; &UU+420A;
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x7BA1)	; 管
+    (=big5		. #xBADE)	; &I-B-BADE;
     (->subsumptive
      ((shinjigen-2	  . 5812)
       (=jis-x0208	  . #x3449)	; &GT-33659; [20-41]
@@ -3495,7 +3685,6 @@
       )
      ((=gb2312		  . #x395C)	; &C1-6A27; [25-60]
       (=cns11643-1	  . #x6A27)	; &I-C1-6A27; [74-07]
-      (=big5		  . #xBADE)	; &I-B-BADE;
       (=ucs@unicode	  . #x7BA1)	; &C1-6A27;
       ))
     ))
@@ -3504,9 +3693,13 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x7BA2)	; 箢
-    (=gb2312		. #x736E)	; &I-G0-736E; [83-78]
-    (=cns11643-4	. #x4564)	; &I-C4-4564; [37-68]
-    (=daikanwa		. 26164)	; &I-M-26164;
+    (->subsumptive
+     ((=daikanwa	  . 26164)	; &M-26164;
+      )
+     ((=gb2312		  . #x736E)	; &C4-4564; [83-78]
+      (=cns11643-4	  . #x4564)	; &I-C4-4564; [37-68]
+      (=ucs@unicode	  . #x7BA2)	; &C4-4564;
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -3521,11 +3714,11 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x7BA4)	; 箤
+    (=big5		. #xE35C)	; &I-B-E35C;
     (->subsumptive
      ((=daikanwa	  . 26168)	; &M-26168;
       )
      ((=cns11643-2	  . #x4C63)	; &C2-4C63; [44-67]
-      (=big5		  . #xE35C)	; &I-B-E35C;
       (=ucs@unicode	  . #x7BA4)	; &C2-4C63;
       ))
     ))
@@ -3729,12 +3922,6 @@
     (ideographic-radical@cns . 118)	; â½µ
     (ideographic-strokes@cns . 8)
     (total-strokes	 . 14)
-    (<-same
-     ((=ucs		  . #x7B9A)	; 箚
-      (=daikanwa	  . 26149)	; &I-M-26149;
-      ))
-    (<-same*sources
-     kouin kangxi daikanwa)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -3749,13 +3936,12 @@
     (=big5		. #xE35A)	; &I-B-E35A;
     (=jef-china3	. #x5EC1)	; &I-JC3-5EC1;
     (mojikyo		. 054893)	; &MCS-6000D66D;
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x4201)	; 䈁
-    (=cns11643-5	. #x4846)	; &I-C5-4846; [40-38]
+    (<-same
+     ((=ucs		  . #x7B9A)	; 箚
+      (=daikanwa	  . 26149)	; &I-M-26149;
+      ))
+    (<-same*sources
+     guangyun kangxi daikanwa)
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -3782,34 +3968,6 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=ucs		. #x4206)	; 䈆
-    (=cns11643-4	. #x4569)	; &I-C4-4569; [37-73]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x4208)	; 䈈
-    (=cns11643-4	. #x456E)	; &I-C4-456E; [37-78]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x4209)	; 䈉
-    (=cns11643-4	. #x4568)	; &I-C4-4568; [37-72]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x420A)	; 䈊
-    (=cns11643-3	. #x4859)	; &I-C3-4859; [40-57]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
     (=ucs		. #x420B)	; 䈋
     (=cns11643-4	. #x456D)	; &I-C4-456D; [37-77]
     ))
@@ -4640,86 +4798,121 @@
     (=daikanwa		. 26287)	; &I-M-26287;
     ))
 (define-char
-  '((=>ucs		. #x25BF9)	; 𥯹
-    (ideographic-radical . 118)	; â½µ
+  '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
-    (=daikanwa		. 26288)	; &M-26288;
+    (=ucs		. #x25BF9)	; 𥯹
+    (->subsumptive
+     ((=daikanwa	  . 26288)	; &M-26288;
+      )
+     ((=cns11643-7	  . #x264C)	; &C7-264C; [06-44]
+      (=ucs@iso		  . #x25BF9)	; &C7-264C;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	26288 0 1)
-    (ideographic-radical . 118)	; â½µ
+  '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
-    (=ucs		. #x25BF9)	; 𥯹
-    (=cns11643-7	. #x264C)	; &I-C7-264C; [06-44]
+    (=ucs		. #x4225)	; 䈥
     ))
 (define-char
-  '((ideographic-radical . 118)	; â½µ
+  '((<-denotational
+     ((=ucs		  . #x4225)	; 䈥
+      ))
+    (ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
-    (=ucs		. #x4225)	; 䈥
-    (=cns11643-3	. #x4D68)	; &I-C3-4D68; [45-72]
+    (=cns11643-3	. #x4D68)	; &M-26289; [45-72]
     (=daikanwa		. 26289)	; &I-M-26289;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x4225)	; 䈥
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x4225)	; &UU+4225;
+    ))
+(define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x4226)	; 䈦
-    (=cns11643-4	. #x4C28)	; &I-C4-4C28; [44-08]
-    (=daikanwa		. 26290)	; &I-M-26290;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4226)	; 䈦
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (->subsumptive
+     ((=daikanwa	  . 26290)	; &M-26290;
+      )
+     ((=cns11643-4	  . #x4C28)	; &C4-4C28; [44-08]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4226)	; 䈦
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x4226)	; &UU+4226;
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x25BFA)	; 𥯺
-    (=cns11643-5	. #x4F3D)	; &I-C5-4F3D; [47-29]
-    (=daikanwa		. 26291)	; &I-M-26291;
+    (->subsumptive
+     ((=daikanwa	  . 26291)	; &M-26291;
+      )
+     ((=cns11643-5	  . #x4F3D)	; &C5-4F3D; [47-29]
+      (=ucs@iso		  . #x25BFA)	; &C5-4F3D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x7BCE)	; 篎
+    (=big5		. #xE6DA)	; &I-B-E6DA;
     (->subsumptive
-     ((=big5		  . #xE6DA)	; &M-26292;
-      (=daikanwa	  . 26292)	; &I-M-26292;
+     ((=daikanwa	  . 26292)	; &M-26292;
       )
      ((=cns11643-2	  . #x5262)	; &C2-5262; [50-66]
       (=ucs@unicode	  . #x7BCE)	; &C2-5262;
       ))
     ))
 (define-char
-  '((=>ucs		. #x25BFD)	; 𥯽
-    (ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 9)
-    (total-strokes	 . 15)
-    (=daikanwa		. 26294)	; &M-26294;
-    ))
-(define-char
-  '((morohashi-daikanwa	26294 0 0)
-    (ideographic-radical . 118)	; â½µ
+  '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x25BFD)	; 𥯽
-    (=cns11643-7	. #x2643)	; &I-C7-2643; [06-35]
+    (->subsumptive
+     ((=daikanwa	  . 26294)	; &M-26294;
+      )
+     ((=cns11643-7	  . #x2643)	; &C7-2643; [06-35]
+      (=ucs@iso		  . #x25BFD)	; &C7-2643;
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
-    (<-wrong
-     ((=daikanwa	  . 26564)	; &M-26564;
-      ))
-    (<-wrong*sources
-     kangxi daikanwa)
     (=ucs		. #x4227)	; 䈧
     (=cns11643-5	. #x4F36)	; &I-C5-4F36; [47-22]
     (=daikanwa		. 26295)	; &I-M-26295;
     (=jef-china3	. #x5EAC)	; &I-JC3-5EAC;
     (mojikyo		. 026295)	; &MCS-600066B7;
+    (<-wrong
+     ((=daikanwa	  . 26564)	; &M-26564;
+      ))
+    (<-wrong*sources
+     kangxi daikanwa)
     ))
 (define-char
   '((=>ucs		. #x25BFE)	; 𥯾
@@ -7312,7 +7505,6 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=gb2312		. #x736C)	; &G0-736C; [83-76]
-    (=jef-china3	. #x5EC2)	; &I-JC3-5EC2;
     (=ucs@unicode	. #x7BAA)	; &G0-736C;
     ))
 (define-char
@@ -7322,44 +7514,58 @@
     (ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
-    (<-simplified@JP
-     ((=ucs		  . #x7C1E)	; 簞
-      (=jis-x0208@1978	  . #x433D)	; &I-J78-433D; [35-29]
-      (=jis-x0213-1-2000  . #x7969)	; &I-JX1-7969; [89-73]
-      ))
     (=jis-x0208@1983	. #x433D)	; &GT-33841; [35-29]
     (=jis-x0208@1990	. #x433D)	; &I-J90-433D; [35-29]
     (=gt		. 33841)	; &I-GT-33841;
     (=gt-pj-1		. #x433D)	; &I-GT-33841; [35-29]
+    (=jef-china3	. #x5EC2)	; &I-JC3-5EC2;
     (=ucs@jis		. #x7BAA)	; &GT-33841;
+    (<-simplified@JP/jis
+     ((=ucs		  . #x7C1E)	; 簞
+      (=jis-x0208@1978	  . #x433D)	; &I-J78-433D; [35-29]
+      (=jis-x0213-1-2000  . #x7969)	; &I-JX1-7969; [89-73]
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
     (=ucs		. #x7C1F)	; 簟
-    (->subsumptive
-     ((=daikanwa	  . 26510)	; &M-26510;
-      )
-     ((=jis-x0208	  . #x6452)	; &GT-34211; [68-50]
-      (=gb2312		  . #x7421)	; &I-G0-7421; [84-01]
-      (=cns11643-2	  . #x6251)	; &I-C2-6251; [66-49]
-      (=big5		  . #xF065)	; &I-B-F065;
-      (=gt		  . 34211)	; &I-GT-34211;
-      (=gt-pj-1		  . #x6452)	; &I-GT-34211; [68-50]
-      (=ucs@unicode	  . #x7C1F)	; &GT-34211;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7C1F)	; 簟
       ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 12)
+    (total-strokes	 . 18)
+    (=daikanwa		. 26510)	; &M-26510;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7C1F)	; 簟
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 12)
+    (total-strokes	 . 18)
+    (=jis-x0208		. #x6452)	; &GT-34211; [68-50]
+    (=gb2312		. #x7421)	; &I-G0-7421; [84-01]
+    (=cns11643-2	. #x6251)	; &I-C2-6251; [66-49]
+    (=big5		. #xF065)	; &I-B-F065;
+    (=gt		. 34211)	; &I-GT-34211;
+    (=gt-pj-1		. #x6452)	; &I-GT-34211; [68-50]
+    (=ucs@unicode	. #x7C1F)	; &GT-34211;
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
     (=ucs		. #x7C20)	; ç° 
+    (=big5		. #xF064)	; &I-B-F064;
     (->subsumptive
      ((=jis-x0212	  . #x5268)	; &M-26517; [50-72]
       (=cns11643-2	  . #x6250)	; &I-C2-6250; [66-48]
       (=jis-x0213-1-2000  . #x796A)	; &I-JX1-796A; [89-74]
-      (=big5		  . #xF064)	; &I-B-F064;
       (=daikanwa	  . 26517)	; &I-M-26517;
       (=ucs@jis		  . #x7C20)	; &M-26517;
       )
@@ -7384,8 +7590,12 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
     (=ucs		. #x424D)	; 䉍
-    (=cns11643-3	. #x584A)	; &I-C3-584A; [56-42]
-    (=daikanwa		. 26519)	; &I-M-26519;
+    (->subsumptive
+     ((=daikanwa	  . 26519)	; &M-26519;
+      )
+     ((=cns11643-3	  . #x584A)	; &C3-584A; [56-42]
+      (=ucs@unicode	  . #x424D)	; &C3-584A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
diff --git a/lisp/utf-2000/Ideograph-R119-Rice.el b/lisp/utf-2000/Ideograph-R119-Rice.el
index b38c973..c387502 100644
--- a/lisp/utf-2000/Ideograph-R119-Rice.el
+++ b/lisp/utf-2000/Ideograph-R119-Rice.el
@@ -27,11 +27,11 @@
     (ideographic-radical . 119)	; ⽶
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x7C73)	; ç±³
-      ))
     (=gt-k		. 01687)	; &GT-K01687;
     (=gt-pj-k1		. #x3451)	; &GT-K01687; [20-49]
+    (<-formed@component/connect-right
+     ((=ucs		  . #x7C73)	; ç±³
+      ))
     ))
 (define-char
   '((ideographic-radical . 119)	; ⽶
@@ -506,11 +506,7 @@
   '((ideographic-radical . 119)	; ⽶
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x646F)	; &GT-34787; [68-79]
-      (=ks-x1001	  . #x6236)	; &I-K0-6236; [66-22]
-      (=daikanwa	  . 26987)	; &I-M-26987;
-      ))
+    (shinjigen-1	. 5902)
     (shinjigen-2	. 5902)
     (=ucs		. #x7C8B)	; 粋
     (=jis-x0208		. #x3F68)	; &I-J90-3F68; [31-72]
@@ -518,6 +514,11 @@
     (=gt		. 34630)	; &I-GT-34630;
     (=gt-pj-1		. #x3F68)	; &I-GT-34630; [31-72]
     (=daikanwa		. 26875)	; &I-M-26875;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x646F)	; &GT-34787; [68-79]
+      (=ks-x1001	  . #x6236)	; &I-K0-6236; [66-22]
+      (=daikanwa	  . 26987)	; &I-M-26987;
+      ))
     ))
 (define-char
   '((ideographic-radical . 119)	; ⽶
@@ -1891,7 +1892,8 @@
     (=ucs		. #x7CB9)	; ç²¹
     (=big5		. #xBAE9)	; &I-B-BAE9;
     (->subsumptive
-     ((shinjigen-2	  . 5903)
+     ((shinjigen-1	  . 5903)
+      (shinjigen-2	  . 5903)
       (=jis-x0208	  . #x646F)	; &GT-34787; [68-79]
       (=ks-x1001	  . #x6236)	; &I-K0-6236; [66-22]
       (=gt		  . 34787)	; &I-GT-34787;
diff --git a/lisp/utf-2000/Ideograph-R120-Silk.el b/lisp/utf-2000/Ideograph-R120-Silk.el
index 0b9c630..c1834dc 100644
--- a/lisp/utf-2000/Ideograph-R120-Silk.el
+++ b/lisp/utf-2000/Ideograph-R120-Silk.el
@@ -5,12 +5,7 @@
     (total-strokes	 . 6)
     (=ucs		. #x7CF8)	; 糸
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x652F)	; &GT-35315; [69-15]
-	(=ks-x1001	    . #x5E6A)	; &I-K0-5E6A; [62-74]
-	(=daikanwa	    . 27448)	; &I-M-27448;
-	))
-      (shinjigen-1	  . 5958)
+     ((shinjigen-1	  . 5958)
       (shinjigen-2	  . 5958)
       (=jis-x0208	  . #x3B65)	; &GT-35079; [27-69]
       (=cns11643-1	  . #x484E)	; &I-C1-484E; [40-46]
@@ -20,6 +15,11 @@
       (=gt-pj-1		  . #x3B65)	; &I-GT-35079; [27-69]
       (=daikanwa	  . 27221)	; &I-M-27221;
       (=ucs@jis		  . #x7CF8)	; &GT-35079;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x652F)	; &GT-35315; [69-15]
+	(=ks-x1001	    . #x5E6A)	; &I-K0-5E6A; [62-74]
+	(=daikanwa	    . 27448)	; &I-M-27448;
+	))
       )
      ((=gb2312		  . #x7469)	; &G0-7469; [84-73]
       (=ucs@unicode	  . #x7CF8)	; &G0-7469;
@@ -30,12 +30,12 @@
     (ideographic-radical . 120)	; â½·
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
-    (<-formed@component
-     ((=ucs		  . #x7CF8)	; 糸
-      ))
     (=ucs		. #x7CF9)	; ç³¹
     (=gb12345		. #x6679)	; ç³¹ [70-89]
     (=big5-cdp		. #x8AFB)	; &I-CDP-8AFB;
+    (<-formed@component
+     ((=ucs		  . #x7CF8)	; 糸
+      ))
     ))
 (define-char
   '((<-denotational
@@ -45,13 +45,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EAF)	; ⺯
     (<-formed@component/connect-right
      ((=ucs		  . #x7CF8)	; 糸
       ))
     (<-identical@component/connect-right
      ((=ucs		  . #x7CF9)	; ç³¹
       ))
-    (=ucs		. #x2EAF)	; ⺯
     ))
 (define-char
   '((<-denotational
@@ -61,6 +61,7 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EB0)	; ⺰
     (<-identical@component/connect-right
      ((=ucs		  . #x7E9F)	; 纟
       ))
@@ -71,12 +72,14 @@
     (<-simplified@CN/component/connect-right
      ((=ucs		  . #x7CF8)	; 糸
       ))
-    (=ucs		. #x2EB0)	; ⺰
     ))
 (define-char
   '((ideographic-radical . 120)	; â½·
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
+    (=ucs		. #x7E9F)	; 纟
+    (=gb2312		. #x6679)	; &I-G0-6679; [70-89]
+    (=big5-cdp		. #x895B)	; &I-CDP-895B;
     (<-simplified@CN
      ((=ucs		  . #x7CF9)	; ç³¹
       (=gb12345		  . #x6679)	; ç³¹ [70-89]
@@ -84,9 +87,6 @@
     (<-simplified@CN/component
      ((=ucs		  . #x7CF8)	; 糸
       ))
-    (=ucs		. #x7E9F)	; 纟
-    (=gb2312		. #x6679)	; &I-G0-6679; [70-89]
-    (=big5-cdp		. #x895B)	; &I-CDP-895B;
     ))
 (define-char
   '((ideographic-radical . 120)	; â½·
@@ -2847,18 +2847,18 @@
     (total-strokes	 . 11)
     (=ucs		. #x7D4C)	; 経
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6534)	; &GT-35378; [69-20]
-	(=ks-x1001	    . #x4C68)	; &I-K0-4C68; [44-72]
-	(=daikanwa	    . 27508)	; &I-M-27508;
-	))
-      (shinjigen-2	  . 5999)
+     ((shinjigen-2	  . 5999)
       (=jis-x0208	  . #x3750)	; &GT-35210; [23-48]
       (=gt		  . 35210)	; &I-GT-35210;
       (=gt-k		  . 07754)	; &I-GT-K07754;
       (=gt-pj-1		  . #x3750)	; &I-GT-35210; [23-48]
       (=daikanwa	  . 27392)	; &I-M-27392;
       (=ucs@jis		  . #x7D4C)	; &GT-35210;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6534)	; &GT-35378; [69-20]
+	(=ks-x1001	    . #x4C68)	; &I-K0-4C68; [44-72]
+	(=daikanwa	    . 27508)	; &I-M-27508;
+	))
       )
      ((=cns11643-3	  . #x382B)	; &C3-382B; [24-11]
       (=ucs@unicode	  . #x7D4C)	; &C3-382B;
@@ -2869,7 +2869,12 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 11)
     (=ucs		. #x42D4)	; 䋔
-    (=cns11643-3	. #x3825)	; &I-C3-3825; [24-05]
+    (->subsumptive
+     ((=daikanwa	  . 27393)	; &M-27393;
+      )
+     ((=cns11643-3	  . #x3825)	; &C3-3825; [24-05]
+      (=ucs@unicode	  . #x42D4)	; &C3-3825;
+      ))
     ))
 (define-char
   '((ideographic-radical . 120)	; â½·
@@ -4095,16 +4100,16 @@
     (=ucs		. #x7D75)	; çµµ
     (->subsumptive
      ((morohashi-daikanwa	27464 1)
-      (<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6569)	; &GT-35996; [69-73]
-	(=ks-x1001	    . #x7C6B)	; &I-K0-7C6B; [92-75]
-	(=daikanwa	    . 27939)	; &I-M-27939;
-	))
       (=jis-x0208	  . #x3328)	; &GT-35283; [19-08]
       (=gt		  . 35283)	; &I-GT-35283;
       (=gt-pj-1		  . #x3328)	; &I-GT-35283; [19-08]
       (=ucs@jis		  . #x7D75)	; &GT-35283;
       (mojikyo		  . 050346)	; &MCS-6000C4AA;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6569)	; &GT-35996; [69-73]
+	(=ks-x1001	    . #x7C6B)	; &I-K0-7C6B; [92-75]
+	(=daikanwa	    . 27939)	; &I-M-27939;
+	))
       )
      ((=cns11643-3	  . #x3E35)	; &C3-3E35; [30-21]
       (=ucs@unicode	  . #x7D75)	; &C3-3E35;
@@ -5231,17 +5236,17 @@
     (total-strokes	 . 13)
     (=ucs		. #x7D99)	; 継
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x656B)	; &GT-36072; [69-75]
-	(=ks-x1001	    . #x4D29)	; &I-K0-4D29; [45-09]
-	(=daikanwa	    . 27997)	; &I-M-27997;
-	))
-      (shinjigen-2	  . 6054)
+     ((shinjigen-2	  . 6054)
       (=jis-x0208	  . #x3751)	; &GT-35380; [23-49]
       (=gt		  . 35380)	; &I-GT-35380;
       (=gt-pj-1		  . #x3751)	; &I-GT-35380; [23-49]
       (=daikanwa	  . 27531)	; &I-M-27531;
       (=ucs@jis		  . #x7D99)	; &GT-35380;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x656B)	; &GT-36072; [69-75]
+	(=ks-x1001	    . #x4D29)	; &I-K0-4D29; [45-09]
+	(=daikanwa	    . 27997)	; &I-M-27997;
+	))
       )
      ((=ucs@unicode	  . #x7D99)	; &UU+7D99;
       )
@@ -5270,17 +5275,17 @@
     (total-strokes	 . 13)
     (=ucs		. #x7D9A)	; 続
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6574)	; &GT-36118; [69-84]
-	(=ks-x1001	    . #x6159)	; &I-K0-6159; [65-57]
-	(=daikanwa	    . 28037)	; &I-M-28037;
-	))
-      (shinjigen-2	  . 6067)
+     ((shinjigen-2	  . 6067)
       (=jis-x0208	  . #x4233)	; &GT-35416; [34-19]
       (=gt		  . 35416)	; &I-GT-35416;
       (=gt-pj-1		  . #x4233)	; &I-GT-35416; [34-19]
       (=daikanwa	  . 27533)	; &I-M-27533;
       (=ucs@jis		  . #x7D9A)	; &GT-35416;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6574)	; &GT-36118; [69-84]
+	(=ks-x1001	    . #x6159)	; &I-K0-6159; [65-57]
+	(=daikanwa	    . 28037)	; &I-M-28037;
+	))
       )
      ((=ucs@unicode	  . #x7D9A)	; &UU+7D9A;
       ))
@@ -5603,16 +5608,16 @@
     (ideographic-radical . 120)	; â½·
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x6546)	; &M-27540; [69-38]
-      (=daikanwa	  . 27540)	; &I-M-27540;
-      ))
     (=jis-x0208@1983	. #x6546)	; &GT-35449; [69-38]
     (=jis-x0208@1990	. #x6546)	; &I-J90-6546; [69-38]
     (=gt		. 35449)	; &I-GT-35449;
     (=gt-pj-1		. #x6546)	; &I-GT-35449; [69-38]
     (=jef-china3	. #x5FE2)	; &I-JC3-5FE2;
     (=ucs@jis		. #x7D9F)	; &GT-35449;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x6546)	; &M-27540; [69-38]
+      (=daikanwa	  . 27540)	; &I-M-27540;
+      ))
     ))
 (define-char
   '((ideographic-radical . 120)	; â½·
@@ -5641,17 +5646,17 @@
     (=ucs		. #x7DD1)	; 緑
     (->subsumptive
      ((morohashi-daikanwa	27541 1)
-      (<-simplified@JP/Jouyou
-       ((=ks-x1001	    . #x5660)	; &GT-35567; [54-64]
-	(=jis-x0213-1-2000  . #x7A28)	; &I-JX1-7A28; [90-08]
-	(=daikanwa	    . 27541)	; &I-M-27541;
-	))
       (=jis-x0208	  . #x4E50)	; &GT-35568; [46-48]
       (=gt		  . 35568)	; &I-GT-35568;
       (=gt-k		  . 11189)	; &I-GT-K11189;
       (=gt-pj-1		  . #x4E50)	; &I-GT-35568; [46-48]
       (=ucs@jis		  . #x7DD1)	; &GT-35568;
       (mojikyo		  . 050347)	; &MCS-6000C4AB;
+      (<-simplified@JP/Jouyou
+       ((=ks-x1001	    . #x5660)	; &GT-35567; [54-64]
+	(=jis-x0213-1-2000  . #x7A28)	; &I-JX1-7A28; [90-08]
+	(=daikanwa	    . 27541)	; &I-M-27541;
+	))
       )
      ((=gb12345		  . #x424C)	; &UU+7DD1; [34-44]
       (=ucs@unicode	  . #x7DD1)	; &UU+7DD1;
@@ -6870,16 +6875,16 @@
       (=gt-pj-5		  . #x6D25)	; &I-GT-35531; [77-05]
       (=daikanwa	  . 27620)	; &I-M-27620;
       )
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6541)	; &GT-35862; [69-33]
-	(=ks-x1001	    . #x7545)	; &I-K0-7545; [85-37]
-	(=daikanwa	    . 27844)	; &I-M-27844;
-	))
-      (shinjigen-2	  . 6088)
+     ((shinjigen-2	  . 6088)
       (=jis-x0208@1990	  . #x416D)	; &GT-35532; [33-77]
       (=gt		  . 35532)	; &I-GT-35532;
       (=gt-pj-1		  . #x416D)	; &I-GT-35532; [33-77]
       (=ucs@jis		  . #x7DCF)	; &GT-35532;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6541)	; &GT-35862; [69-33]
+	(=ks-x1001	    . #x7545)	; &I-K0-7545; [85-37]
+	(=daikanwa	    . 27844)	; &I-M-27844;
+	))
       )
      ((=cns11643-3	  . #x4873)	; &C3-4873; [40-83]
       )
@@ -6987,35 +6992,38 @@
     (ideographic-radical . 120)	; â½·
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x5623)	; &M-27689; [54-03]
-      (=jis-x0213-1-2000  . #x7A2E)	; &I-JX1-7A2E; [90-14]
-      (=daikanwa	  . 27689)	; &I-M-27689;
-      ))
     (=jis-x0208		. #x4E7D)	; &GT-35572; [46-93]
     (=gt		. 35572)	; &I-GT-35572;
     (=gt-pj-1		. #x4E7D)	; &I-GT-35572; [46-93]
     (=ucs@jis		. #x7DF4)	; &GT-35572;
     (mojikyo		. 050348)	; &MCS-6000C4AC;
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x5623)	; &M-27689; [54-03]
+      (=jis-x0213-1-2000  . #x7A2E)	; &I-JX1-7A2E; [90-14]
+      (=daikanwa	  . 27689)	; &I-M-27689;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 120)	; â½·
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x3D6F)	; &J97-3D6F; [29-79]
+      ))
+    (ideographic-radical . 120)	; â½·
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x7DD2)	; 緒
     (=big5		. #xBAFC)	; &I-B-BAFC;
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=ks-x1001	    . #x5F7D)	; &M-27633; [63-93]
-	(=jis-x0213-1-2000  . #x7A2C)	; &I-JX1-7A2C; [90-12]
-	(=daikanwa	    . 27633)	; &I-M-27633;
-	))
-      (shinjigen-2	  . 6085)
+     ((shinjigen-2	  . 6085)
       (=jis-x0208	  . #x3D6F)	; &GT-35509; [29-79]
       (=gt		  . 35509)	; &I-GT-35509;
       (=gt-pj-1		  . #x3D6F)	; &I-GT-35509; [29-79]
       (=daikanwa	  . 27632)	; &I-M-27632;
       (=ucs@jis		  . #x7DD2)	; &GT-35509;
+      (<-simplified@JP/Jouyou
+       ((=ks-x1001	    . #x5F7D)	; &M-27633; [63-93]
+	(=jis-x0213-1-2000  . #x7A2C)	; &I-JX1-7A2C; [90-12]
+	(=daikanwa	    . 27633)	; &I-M-27633;
+	))
       )
      ((=cns11643-1	  . #x6A45)	; &C1-6A45; [74-37]
       (=gb12345		  . #x5077)	; &C1-6A45; [48-87]
@@ -7024,6 +7032,10 @@
     ))
 (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)	; 𦁴
@@ -7321,7 +7333,10 @@
     (=hanziku-9		. #xC1B9)	; &HZK09-C1B9;
     ))
 (define-char
-  '((ideographic-radical . 120)	; â½·
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x3D6F)	; &J97-3D6F; [29-79]
+      ))
+    (ideographic-radical . 120)	; â½·
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x7DD6)	; 緖
@@ -7727,16 +7742,16 @@
     (=ucs		. #x7E01)	; 縁
     (->subsumptive
      ((morohashi-daikanwa	27656 1)
-      (<-simplified@JP/Jouyou
-       ((=ks-x1001	    . #x665E)	; &GT-35584; [70-62]
-	(=jis-x0213-1-2000  . #x7A2D)	; &I-JX1-7A2D; [90-13]
-	(=daikanwa	    . 27656)	; &I-M-27656;
-	))
       (=jis-x0208	  . #x316F)	; &GT-35585; [17-79]
       (=gt		  . 35585)	; &I-GT-35585;
       (=gt-pj-1		  . #x316F)	; &I-GT-35585; [17-79]
       (=ucs@jis		  . #x7E01)	; &GT-35585;
       (mojikyo		  . 050350)	; &MCS-6000C4AE;
+      (<-simplified@JP/Jouyou
+       ((=ks-x1001	    . #x665E)	; &GT-35584; [70-62]
+	(=jis-x0213-1-2000  . #x7A2D)	; &I-JX1-7A2D; [90-13]
+	(=daikanwa	    . 27656)	; &I-M-27656;
+	))
       )
      ((=cns11643-3	  . #x4D7E)	; &C3-4D7E; [45-94]
       (=ucs@unicode	  . #x7E01)	; &C3-4D7E;
@@ -8828,17 +8843,17 @@
     (total-strokes	 . 15)
     (=ucs		. #x7E04)	; 縄
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x656A)	; &GT-36019; [69-74]
-	(=ks-x1001	    . #x6331)	; &I-K0-6331; [67-17]
-	(=daikanwa	    . 27937)	; &I-M-27937;
-	))
-      (shinjigen-2	  . 6118)
+     ((shinjigen-2	  . 6118)
       (=jis-x0208	  . #x466C)	; &GT-35645; [38-76]
       (=gt		  . 35645)	; &I-GT-35645;
       (=gt-pj-1		  . #x466C)	; &I-GT-35645; [38-76]
       (=daikanwa	  . 27729)	; &I-M-27729;
       (=ucs@jis		  . #x7E04)	; &GT-35645;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x656A)	; &GT-36019; [69-74]
+	(=ks-x1001	    . #x6331)	; &I-K0-6331; [67-17]
+	(=daikanwa	    . 27937)	; &I-M-27937;
+	))
       )
      ((=cns11643-4	  . #x4C45)	; &C4-4C45; [44-37]
       (=ucs@unicode	  . #x7E04)	; &C4-4C45;
@@ -10224,15 +10239,30 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
     (=ucs		. #x430A)	; 䌊
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x430A)	; 䌊
+      ))
+    (ideographic-radical . 120)	; â½·
+    (ideographic-strokes . 10)
+    (total-strokes	 . 16)
     (->subsumptive
      ((=daikanwa	  . 27803)	; &M-27803;
       )
-     ((=ucs@unicode	  . #x430A)	; &UU+430A;
-      )
      ((=cns11643-3	  . #x523E)	; &C3-523E; [50-30]
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x430A)	; 䌊
+      ))
+    (ideographic-radical . 120)	; â½·
+    (ideographic-strokes . 10)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x430A)	; &UU+430A;
+    ))
+(define-char
   '((ideographic-radical . 120)	; â½·
     (=ucs		. #x7E41)	; 繁
     ))
@@ -10244,17 +10274,17 @@
     (ideographic-radical . 120)	; â½·
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
+    (=jis-x0208		. #x484B)	; &GT-35793; [40-43]
+    (=gt		. 35793)	; &I-GT-35793;
+    (=gt-pj-1		. #x484B)	; &I-GT-35793; [40-43]
+    (=ucs@jis		. #x7E41)	; &GT-35793;
+    (mojikyo		. 050352)	; &MCS-6000C4B0;
     (<-simplified@JP/Jouyou
      ((=ks-x1001	  . #x5B65)	; &M-27849; [59-69]
       (=cns11643-1	  . #x746D)	; &I-C1-746D; [84-77]
       (=jis-x0213-1-2000  . #x7A33)	; &I-JX1-7A33; [90-19]
       (=daikanwa	  . 27849)	; &I-M-27849;
       ))
-    (=jis-x0208		. #x484B)	; &GT-35793; [40-43]
-    (=gt		. 35793)	; &I-GT-35793;
-    (=gt-pj-1		. #x484B)	; &I-GT-35793; [40-43]
-    (=ucs@jis		. #x7E41)	; &GT-35793;
-    (mojikyo		. 050352)	; &MCS-6000C4B0;
     ))
 (define-char
   '((ideographic-radical . 120)	; â½·
@@ -10263,16 +10293,16 @@
     (=ucs		. #x7E26)	; 縦
     (->subsumptive
      ((morohashi-daikanwa	27804 1)
-      (<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6554)	; &GT-35842; [69-52]
-	(=ks-x1001	    . #x707D)	; &I-K0-707D; [80-93]
-	(=daikanwa	    . 27819)	; &I-M-27819;
-	))
       (=jis-x0208	  . #x3D44)	; &GT-35750; [29-36]
       (=gt		  . 35750)	; &I-GT-35750;
       (=gt-pj-1		  . #x3D44)	; &I-GT-35750; [29-36]
       (=ucs@jis		  . #x7E26)	; &GT-35750;
       (mojikyo		  . 050353)	; &MCS-6000C4B1;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6554)	; &GT-35842; [69-52]
+	(=ks-x1001	    . #x707D)	; &I-K0-707D; [80-93]
+	(=daikanwa	    . 27819)	; &I-M-27819;
+	))
       )
      ((=cns11643-3	  . #x5240)	; &C3-5240; [50-32]
       (=ucs@unicode	  . #x7E26)	; &C3-5240;
@@ -11559,17 +11589,17 @@
     (total-strokes	 . 17)
     (=ucs		. #x7E4A)	; 繊
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6579)	; &GT-36172; [69-89]
-	(=ks-x1001	    . #x6069)	; &I-K0-6069; [64-73]
-	(=daikanwa	    . 28072)	; &I-M-28072;
-	))
-      (shinjigen-2	  . 6171)
+     ((shinjigen-2	  . 6171)
       (=jis-x0208	  . #x4121)	; &GT-35858; [33-01]
       (=gt		  . 35858)	; &I-GT-35858;
       (=gt-pj-1		  . #x4121)	; &I-GT-35858; [33-01]
       (=daikanwa	  . 27874)	; &I-M-27874;
       (=ucs@jis		  . #x7E4A)	; &GT-35858;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6579)	; &GT-36172; [69-89]
+	(=ks-x1001	    . #x6069)	; &I-K0-6069; [64-73]
+	(=daikanwa	    . 28072)	; &I-M-28072;
+	))
       )
      ((=ucs@unicode	  . #x7E4A)	; &UU+7E4A;
       ))
@@ -11610,18 +11640,18 @@
     (=ucs		. #x7E4B)	; 繋
     (->subsumptive
      ((morohashi-daikanwa	ho 486)
-      (<-simplified@JP
-       ((=jis-x0208@1978    . #x3752)	; &M-27940; [23-50]
-	(=ks-x1001	    . #x4D28)	; &I-K0-4D28; [45-08]
-	(=jis-x0212	    . #x545A)	; &I-JSP-545A; [52-58]
-	(=daikanwa	    . 27940)	; &I-M-27940;
-	))
       (=jis-x0208@1983	  . #x3752)	; &GT-35822; [23-50]
       (=jis-x0208@1990	  . #x3752)	; &I-J90-3752; [23-50]
       (=gt		  . 35822)	; &I-GT-35822;
       (=gt-pj-1		  . #x3752)	; &I-GT-35822; [23-50]
       (=ucs@jis		  . #x7E4B)	; &GT-35822;
       (mojikyo		  . 054094)	; &MCS-6000D34E;
+      (<-simplified@JP/jis
+       ((=jis-x0208@1978    . #x3752)	; &M-27940; [23-50]
+	(=ks-x1001	    . #x4D28)	; &I-K0-4D28; [45-08]
+	(=jis-x0212	    . #x545A)	; &I-JSP-545A; [52-58]
+	(=daikanwa	    . 27940)	; &I-M-27940;
+	))
       )
      ((=ucs@unicode	  . #x7E4B)	; &UU+7E4B;
       ))
@@ -12760,23 +12790,41 @@
   '((ideographic-radical . 120)	; â½·
     (=ucs		. #x7E6D)	; ç¹­
     (=big5		. #xC3B5)	; &I-B-C3B5;
+    (=jef-china3	. #x63A1)	; &I-JC3-63A1;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7E6D)	; ç¹­
+      ))
+    (ideographic-radical . 120)	; â½·
+    (ideographic-strokes . 13)
+    (total-strokes	 . 19)
+    (=ks-x1001		. #x4C36)	; &M-27944; [44-22]
+    (=daikanwa		. 27944)	; &I-M-27944;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7E6D)	; ç¹­
+      ))
+    (ideographic-radical . 120)	; â½·
+    (ideographic-strokes . 13)
+    (total-strokes	 . 19)
+    (=cns11643-1	. #x7860)	; &C1-7860; [88-64]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7E6D)	; ç¹­
+      ))
+    (ideographic-radical . 120)	; â½·
+    (ideographic-strokes . 12)
+    (total-strokes	 . 18)
     (->subsumptive
-     ((ideographic-strokes . 13)
-      (total-strokes	   . 19)
-      (=ks-x1001	  . #x4C36)	; &M-27944; [44-22]
-      (=cns11643-1	  . #x7860)	; &I-C1-7860; [88-64]
-      (=daikanwa	  . 27944)	; &I-M-27944;
-      )
-     ((ideographic-strokes . 12)
-      (total-strokes	   . 18)
-      (=jis-x0208	  . #x4B7A)	; &GT-35928; [43-90]
+     ((=jis-x0208	  . #x4B7A)	; &GT-35928; [43-90]
       (=gt		  . 35928)	; &I-GT-35928;
       (=gt-pj-1		  . #x4B7A)	; &I-GT-35928; [43-90]
       (=ucs@jis		  . #x7E6D)	; &GT-35928;
       )
-     ((ideographic-strokes . 12)
-      (total-strokes	   . 18)
-      (=gb12345		  . #x3C6B)	; &UU+7E6D; [28-75]
+     ((=gb12345		  . #x3C6B)	; &UU+7E6D; [28-75]
       (=ucs@unicode	  . #x7E6D)	; &UU+7E6D;
       ))
     ))
@@ -13824,14 +13872,14 @@
     (total-strokes	 . 20)
     (=ucs		. #x2F970)	; 繅
     (->subsumptive
-     ((<-original
+     ((=daikanwa	  . 28007)	; &M-28007;
+      (<-original
        ((=jis-x0212	    . #x5450)	; &M-27854; [52-48]
 	(=jis-x0213-2-2000  . #x7457)	; &I-JX2-7457; [84-55]
 	(=daikanwa	    . 27854)	; &I-M-27854;
 	))
       (<-original*sources
-       zhengzi-tong daikanwa)
-      (=daikanwa	  . 28007)	; &M-28007;
+       zhengzitong daikanwa)
       )
      ((=cns11643-4	  . #x6426)	; &C4-6426; [68-06]
       (=ucs@iso		  . #x2F970)	; &C4-6426;
diff --git a/lisp/utf-2000/Ideograph-R121-Jar.el b/lisp/utf-2000/Ideograph-R121-Jar.el
index e171543..3e7f7c3 100644
--- a/lisp/utf-2000/Ideograph-R121-Jar.el
+++ b/lisp/utf-2000/Ideograph-R121-Jar.el
@@ -3,10 +3,6 @@
   '((ideographic-radical . 121)	; ⽸
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6625)	; &GT-36314; [70-05]
-      (=ks-x1001	  . #x4E38)	; &I-K0-4E38; [46-24]
-      ))
     (shinjigen-1	. 6223)
     (shinjigen-2	. 6223)
     (=ucs		. #x7F36)	; 缶
@@ -19,6 +15,10 @@
     (=gt-k		. 01582)	; &I-GT-K01582;
     (=gt-pj-1		. #x344C)	; &I-GT-36221; [20-44]
     (=daikanwa		. 28108)	; &I-M-28108;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6625)	; &GT-36314; [70-05]
+      (=ks-x1001	  . #x4E38)	; &I-K0-4E38; [46-24]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -28,11 +28,11 @@
     (ideographic-radical . 121)	; ⽸
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x7F36)	; 缶
-      ))
     (=gt-k		. 01231)	; &GT-K01231;
     (=gt-pj-k1		. #x385C)	; &GT-K01231; [24-60]
+    (<-formed@component
+     ((=ucs		  . #x7F36)	; 缶
+      ))
     ))
 (define-char
   '((ideographic-radical . 121)	; ⽸
@@ -194,12 +194,12 @@
     (ideographic-radical . 121)	; ⽸
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x4343)	; 䍃
-      ))
     (=gt		. 36228)	; &GT-36228;
     (=gt-k		. 06075)	; &I-GT-K06075;
     (=gt-pj-9		. #x7230)	; &GT-36228; [82-16]
+    (<-formed@component
+     ((=ucs		  . #x4343)	; 䍃
+      ))
     ))
 (define-char
   '((ideographic-radical . 121)	; ⽸
@@ -425,14 +425,14 @@
     (ideographic-radical . 121)	; ⽸
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
-    (<-original
-     ((=daikanwa	  . 28119)	; &M-28119;
-      ))
-    (<-original*sources
-     zhengzi-tong daikanwa)
     (=ucs		. #x2F972)	; 𦈨
     (->subsumptive
      ((=daikanwa	  . 28139)	; &M-28139;
+      (<-original
+       ((=daikanwa	    . 28119)	; &M-28119;
+	))
+      (<-original*sources
+       zhengzitong daikanwa)
       )
      ((=cns11643-6	  . #x4C72)	; &C6-4C72; [44-82]
       (=ucs@iso		  . #x2F972)	; &C6-4C72;
diff --git a/lisp/utf-2000/Ideograph-R122-Net.el b/lisp/utf-2000/Ideograph-R122-Net.el
index 950bc40..702dc27 100644
--- a/lisp/utf-2000/Ideograph-R122-Net.el
+++ b/lisp/utf-2000/Ideograph-R122-Net.el
@@ -17,6 +17,11 @@
   '((ideographic-radical . 122)	; â½¹
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
+    (=ucs		. #x7F52)	; 罒
+    (=jis-x0212		. #x5474)	; &I-JSP-5474; [52-84]
+    (=cns11643-4	. #x2221)	; &I-C4-2221; [02-01]
+    (=jis-x0213-2-2000	. #x746A)	; &I-JX2-746A; [84-74]
+    (=daikanwa		. 28200)	; &I-M-28200;
     (<-formed@component/connect-below
      ((=ucs		  . #x7F51)	; 网
       (=daikanwa	  . 28199)	; &I-M-28199;
@@ -29,11 +34,6 @@
       ))
     (<-wrong*sources
      zhengzitong daikanwa)
-    (=ucs		. #x7F52)	; 罒
-    (=jis-x0212		. #x5474)	; &I-JSP-5474; [52-84]
-    (=cns11643-4	. #x2221)	; &I-C4-2221; [02-01]
-    (=jis-x0213-2-2000	. #x746A)	; &I-JX2-746A; [84-74]
-    (=daikanwa		. 28200)	; &I-M-28200;
     ))
 (define-char
   '((<-denotational
@@ -43,10 +43,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EB2)	; ⺲
     (<-identical@component/connect-below
      ((=ucs		  . #x7F52)	; 罒
       ))
-    (=ucs		. #x2EB2)	; ⺲
     ))
 (define-char
   '((ideographic-radical@ucs . 13)	; ⼌
@@ -58,6 +58,21 @@
     (ideographic-radical@cns*sources
      daikanwa cns11643)
     (total-strokes	 . 4)
+    (hanyu-dazidian	1 97 3)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x5182)	; 冂
+      )
+     ((=ucs		  . #x3405)	; 㐅
+      ))
+    (=ucs		. #x5188)	; 冈
+    (=gb2312		. #x3854)	; &I-G0-3854; [24-52]
+    (=cns11643-4	. #x2152)	; &I-C4-2152; [01-50]
+    (=big5-cdp		. #x85BE)	; &I-CDP-85BE;
+    (=daikanwa		. 28201)	; &I-M-28201;
+    (=big5-eten		. #xC8A2)	; &B-C8A2;
     (<-formed@component/connect-below
      ((=ucs		  . #x7F51)	; 网
       (=daikanwa	  . 28199)	; &I-M-28199;
@@ -74,33 +89,12 @@
      ((=ucs		  . #x5CA1)	; 岡
       (=gb12345		  . #x3854)	; 岡 [24-52]
       ))
-    (hanyu-dazidian	1 97 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (=ucs		  . #x2FF4)	; â¿´
-      )
-     ((=ucs		  . #x5182)	; 冂
-      )
-     ((=ucs		  . #x3405)	; 㐅
-      ))
-    (=ucs		. #x5188)	; 冈
-    (=gb2312		. #x3854)	; &I-G0-3854; [24-52]
-    (=cns11643-4	. #x2152)	; &I-C4-2152; [01-50]
-    (=big5-cdp		. #x85BE)	; &I-CDP-85BE;
-    (=daikanwa		. 28201)	; &I-M-28201;
-    (=big5-eten		. #xC8A2)	; &B-C8A2;
     ))
 (define-char
   '((=>daikanwa		. 28201)	; 冈
     (ideographic-radical . 122)	; â½¹
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-formed@component/connect-below
-     ((=ucs		  . #x7F51)	; 网
-      ))
-    (<-same@component/connect-below
-     ((=ucs		  . #x5188)	; 冈
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (=ucs		  . #x2FF4)	; â¿´
@@ -110,6 +104,12 @@
      ((=ucs		  . #x3405)	; 㐅
       ))
     (=ucs		. #x7F53)	; 罓
+    (<-formed@component/connect-below
+     ((=ucs		  . #x7F51)	; 网
+      ))
+    (<-same@component/connect-below
+     ((=ucs		  . #x5188)	; 冈
+      ))
     ))
 (define-char
   '((<-denotational
@@ -122,11 +122,11 @@
     (ideographic-radical . 122)	; â½¹
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=ucs		. #x2EB1)	; ⺱
+    (=ucs@unicode	. #x7F53)	; ⺱
     (<-identical@component/connect-below
      ((=ucs		  . #x7F53)	; 罓
       ))
-    (=ucs		. #x2EB1)	; ⺱
-    (=ucs@unicode	. #x7F53)	; ⺱
     ))
 (define-char
   '((<-denotational
@@ -144,6 +144,9 @@
   '((ideographic-radical . 122)	; â½¹
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=ucs		. #x2626A)	; 𦉪
+    (=cns11643-6	. #x2229)	; &I-C6-2229; [02-09]
+    (=daikanwa		. 28202)	; &I-M-28202;
     (<-formed@component/connect-below
      ((=ucs		  . #x7F51)	; 网
       (=daikanwa	  . 28199)	; &I-M-28199;
@@ -156,9 +159,6 @@
       ))
     (<-wrong*sources
      zhengzitong daikanwa)
-    (=ucs		. #x2626A)	; 𦉪
-    (=cns11643-6	. #x2229)	; &I-C6-2229; [02-09]
-    (=daikanwa		. 28202)	; &I-M-28202;
     ))
 (define-char
   '((<-denotational
@@ -168,13 +168,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EB3)	; ⺳
     (<-formed@component/connect-below
      ((=ucs		  . #x7F51)	; 网
       ))
     (<-same@component/connect-below
      ((=ucs		  . #x2626A)	; 𦉪
       ))
-    (=ucs		. #x2EB3)	; ⺳
     ))
 (define-char
   '((<-denotational
@@ -184,6 +184,7 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EB4)	; ⺴
     (<-formed@component
      ((=ucs		  . #x7F51)	; 网
       ))
@@ -192,7 +193,6 @@
       )
      ((=ucs		  . #x34C1)	; 㓁
       ))
-    (=ucs		. #x2EB4)	; ⺴
     ))
 (define-char
   '((ideographic-radical . 122)	; â½¹
@@ -210,9 +210,6 @@
   '((<-denotational
      ((=ucs		  . #x26273)	; 𦉳
       ))
-    (<-formed@component/connect-below
-     ((=ucs		  . #x26273)	; 𦉳
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
       (=ucs		  . #x2FF5)	; ⿵
@@ -230,21 +227,24 @@
       ))
     (=gt-k		. 02494)	; &GT-K02494;
     (=gt-pj-k1		. #x6162)	; &GT-K02494; [65-66]
+    (<-formed@component/connect-below
+     ((=ucs		  . #x26273)	; 𦉳
+      ))
     ))
 (define-char
   '((ideographic-radical . 122)	; â½¹
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=ucs		. #x2626B)	; 𦉫
+    (=cns11643-6	. #x2228)	; &I-C6-2228; [02-08]
+    (=big5-cdp		. #x87DC)	; &I-CDP-87DC;
+    (=daikanwa		. 28204)	; &I-M-28204;
     (<-formed@component/connect-below
      ((=ucs		  . #x7F51)	; 网
       (=daikanwa	  . 28199)	; &I-M-28199;
       ))
     (<-formed@component/connect-below*sources
      zihui/char-index daikanwa)
-    (=ucs		. #x2626B)	; 𦉫
-    (=cns11643-6	. #x2228)	; &I-C6-2228; [02-08]
-    (=big5-cdp		. #x87DC)	; &I-CDP-87DC;
-    (=daikanwa		. 28204)	; &I-M-28204;
     ))
 (define-char
   '((<-denotational
@@ -254,13 +254,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EB5)	; ⺵
     (<-formed@component/connect-below
      ((=ucs		  . #x7F51)	; 网
       ))
     (<-same@component
      ((=ucs		  . #x2626B)	; 𦉫
       ))
-    (=ucs		. #x2EB5)	; ⺵
     ))
 (define-char
   '((ideographic-radical . 122)	; â½¹
@@ -1527,37 +1527,61 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x262DA)	; 𦋚
-    (=cns11643-6	. #x604B)	; &I-C6-604B; [64-43]
-    (=daikanwa		. 28308)	; &I-M-28308;
+    (->subsumptive
+     ((=daikanwa	  . 28308)	; &M-28308;
+      )
+     ((=cns11643-6	  . #x604B)	; &C6-604B; [64-43]
+      (=ucs@iso		  . #x262DA)	; &C6-604B;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 122)	; â½¹
+  '((=>ucs		. #x262D9)	; 𦋙
+    (ideographic-radical . 122)	; â½¹
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=daikanwa		. 28309)	; &M-28309;
+    ))
+(define-char
+  '((=>daikanwa		. 28309)	; &M-28309;
+    (ideographic-radical . 122)	; â½¹
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x262D9)	; 𦋙
-    (=cns11643-6	. #x604A)	; &I-C6-604A; [64-42]
-    (=daikanwa		. 28309)	; &I-M-28309;
+    (->subsumptive
+     ((=ucs@iso		  . #x262D9)	; &U-000262D9;
+      )
+     ((=cns11643-6	  . #x604A)	; &C6-604A; [64-42]
+      ))
     ))
 (define-char
   '((ideographic-radical . 122)	; â½¹
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x262D7)	; 𦋗
-    (=cns11643-6	. #x6048)	; &I-C6-6048; [64-40]
-    (=daikanwa		. 28310)	; &I-M-28310;
+    (->subsumptive
+     ((=daikanwa	  . 28310)	; &M-28310;
+      )
+     ((=cns11643-6	  . #x6048)	; &C6-6048; [64-40]
+      (=ucs@iso		  . #x262D7)	; &C6-6048;
+      ))
     ))
 (define-char
   '((ideographic-radical . 122)	; â½¹
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x262D8)	; 𦋘
-    (=cns11643-6	. #x6049)	; &I-C6-6049; [64-41]
-    (=daikanwa		. 28311)	; &I-M-28311;
+    (->subsumptive
+     ((=daikanwa	  . 28311)	; &M-28311;
+      (=ucs@iso		  . #x262D8)	; &M-28311;
+      )
+     ((=cns11643-6	  . #x6049)	; &C6-6049; [64-41]
+      ))
     ))
 (define-char
   '((ideographic-radical . 122)	; â½¹
     (=ucs		. #x7F72)	; ç½²
     (=big5		. #xB870)	; &I-B-B870;
+    (=jis-x0208@1997	. #x3D70)	; ç½² [29-80]
     ))
 (define-char
   '((<-denotational
@@ -1567,10 +1591,6 @@
     (ideographic-radical . 122)	; â½¹
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA5A)	; 署
-      (=jis-x0213-1-2000  . #x7A3A)	; &I-JX1-7A3A; [90-26]
-      ))
     (=jis-x0208		. #x3D70)	; &GT-36432; [29-80]
     (=gb2312		. #x4A70)	; &I-G0-4A70; [42-80]
     (=cns11643-1	. #x6577)	; &I-C1-6577; [69-87]
@@ -1579,6 +1599,10 @@
     (=gt-pj-1		. #x3D70)	; &I-GT-36432; [29-80]
     (=ucs@unicode	. #x7F72)	; &GT-36432;
     (mojikyo		. 050357)	; &MCS-6000C4B5;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA5A)	; 署
+      (=jis-x0213-1-2000  . #x7A3A)	; &I-JX1-7A3A; [90-26]
+      ))
     ))
 (define-char
   '((ideographic-radical . 122)	; â½¹
@@ -1597,6 +1621,7 @@
 (define-char
   '((ideographic-radical . 122)	; â½¹
     (ideographic-strokes . 9)
+    (total-strokes	 . 14)
     (=daikanwa		. 28313)	; &M-28313;
     ))
 (define-char
@@ -1604,9 +1629,24 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
     (=ucs		. #x262DE)	; 𦋞
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x262DE)	; 𦋞
+      ))
+    (ideographic-radical . 122)	; â½¹
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=daikanwa		. 28314)	; &M-28314;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x262DE)	; 𦋞
+      ))
+    (ideographic-radical . 122)	; â½¹
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
     (->subsumptive
-     ((=daikanwa	  . 28314)	; &M-28314;
-      )
      ((=ucs@iso		  . #x262DE)	; &U-000262DE;
       )
      ((=cns11643-5	  . #x485B)	; &C5-485B; [40-59]
diff --git a/lisp/utf-2000/Ideograph-R123-Sheep.el b/lisp/utf-2000/Ideograph-R123-Sheep.el
index 3479629..1ac9e5a 100644
--- a/lisp/utf-2000/Ideograph-R123-Sheep.el
+++ b/lisp/utf-2000/Ideograph-R123-Sheep.el
@@ -35,9 +35,6 @@
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
-    (<-s/female
-     ((=ucs		  . #x7F8A)	; 羊
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -49,6 +46,9 @@
       ))
     (=ucs		. #x2EB8)	; ⺸
     (=cbeta		. 06151)	; &I-CB06151;
+    (<-s/female
+     ((=ucs		  . #x7F8A)	; 羊
+      ))
     (->mistakable
      ((=ucs		  . #x8289)	; 芉
       ))
@@ -67,52 +67,65 @@
   '((ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
+    (sound@ja/on/name	. "jin")
+    (=ucs		. #x2634C)	; 𦍌
+    (=cns11643-4	. #x232C)	; &I-C4-232C; [03-12]
+    (=jis-x0213-2-2000	. #x7472)	; &I-JX2-7472; [84-82]
+    (=daikanwa		. 28427)	; &I-M-28427;
     (<-wrong
      ((=ucs		  . #x22189)	; 𢆉
       (=daikanwa	  . 09166)	; &I-M-09166;
       ))
     (<-wrong*sources
      zihui-bei daikanwa)
-    (sound@ja/on/name	. "jin")
-    (=ucs		. #x2634C)	; 𦍌
-    (=cns11643-4	. #x232C)	; &I-C4-232C; [03-12]
-    (=jis-x0213-2-2000	. #x7472)	; &I-JX2-7472; [84-82]
-    (=daikanwa		. 28427)	; &I-M-28427;
     (->mistakable
      ((name		  . "CJK RADICAL RAM")
       (=ucs		  . #x2EB7)	; ⺷
       ))
     ))
 (define-char
-  '((=>ucs		. #x2EB6)	; ⺶
+  '((name		. "CJK RADICAL SHEEP")
+    (general-category	symbol other) ; Informative Category
+    (bidi-category	. "ON")
+    (mirrored		. nil)
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
-    (<-formed@component/connect-right
+    (=ucs		. #x2EB6)	; ⺶
+    (<-formed@component
      ((=ucs		  . #x7F8A)	; 羊
       ))
+    ))
+(define-char
+  '((=>ucs		. #x2EB6)	; ⺶
+    (ideographic-radical . 123)	; ⽺
+    (ideographic-strokes . 0)
+    (total-strokes	 . 6)
     (=gt-k		. 01701)	; &GT-K01701;
     (=gt-pj-k1		. #x3443)	; &GT-K01701; [20-35]
+    (<-formed@component/connect-right
+     ((=ucs		  . #x7F8A)	; 羊
+      ))
     ))
 (define-char
   '((=>ucs		. #x2EB6)	; ⺶
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
+    (=big5-cdp		. #x8970)	; &CDP-8970;
     (<-formed@component
      ((=ucs		  . #x7F8A)	; 羊
       ))
-    (=big5-cdp		. #x8970)	; &CDP-8970;
     ))
 (define-char
   '((=>ucs		. #x2EB6)	; ⺶
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
+    (=big5-cdp		. #x8CCC)	; &CDP-8CCC;
     (<-formed@component
      ((=ucs		  . #x7F8A)	; 羊
       ))
-    (=big5-cdp		. #x8CCC)	; &CDP-8CCC;
     ))
 (define-char
   '((name		. "CJK RADICAL RAM")
@@ -122,14 +135,14 @@
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
+    (=ucs		. #x2EB7)	; ⺷
+    (=big5-cdp		. #x8B4E)	; &I-CDP-8B4E;
     (<-formed@component/connect-below
      ((=ucs		  . #x7F8A)	; 羊
       ))
     (<-s/male
      ((=ucs		  . #x7F8A)	; 羊
       ))
-    (=ucs		. #x2EB7)	; ⺷
-    (=big5-cdp		. #x8B4E)	; &I-CDP-8B4E;
     (->mistakable
      ((=ucs		  . #x2634C)	; 𦍌
       ))
@@ -138,33 +151,50 @@
   '((ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
+    (=ucs		. #x8288)	; 芈
+    (=gb2312		. #x5842)	; &I-G0-5842; [56-34]
     (<-unknown
      ((=ucs		  . #x2634B)	; 𦍋
       )
-     ((=daikanwa	  . 28428)	; &I-M-28428;
+     ((=jis-x0212	  . #x5526)	; &M-28428; [53-06]
+      (=daikanwa	  . 28428)	; &I-M-28428;
       ))
-    (=ucs		. #x8288)	; 芈
-    (=gb2312		. #x5842)	; &I-G0-5842; [56-34]
     ))
 (define-char
   '((ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 1)
     (total-strokes	 . 8)
     (=ucs		. #x7F8B)	; 羋
-    (=jis-x0212		. #x5526)	; &I-JSP-5526; [53-06]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7F8B)	; 羋
+      ))
+    (ideographic-radical . 123)	; ⽺
+    (ideographic-strokes . 1)
+    (total-strokes	 . 8)
+    (=jis-x0212		. #x5526)	; &M-28428; [53-06]
     (=big5		. #xAACB)	; &I-B-AACB;
     (=daikanwa		. 28428)	; &I-M-28428;
+    (=ucs@jis		. #x7F8B)	; &M-28428;
     ))
 (define-char
-  '((=>ucs		. #x7F8B)	; 羋
-    (morohashi-daikanwa	28428 0 2)
+  '((<-denotational
+     ((=ucs		  . #x7F8B)	; 羋
+      ))
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 1)
     (total-strokes	 . 8)
     (=cns11643-1	. #x4F2E)	; &C1-4F2E; [47-14]
     ))
 (define-char
-  '((=>ucs		. #x7F8C)	; 羌
+  '((ideographic-radical . 123)	; ⽺
+    (=ucs		. #x7F8C)	; 羌
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7F8C)	; 羌
+      ))
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 2)
     (total-strokes	 . 8)
@@ -180,12 +210,14 @@
     (=ucs@jis		. #x7F8C)	; &GT-36602;
     ))
 (define-char
-  '((morohashi-daikanwa	28429 0 2)
+  '((<-denotational
+     ((=ucs		  . #x7F8C)	; 羌
+      ))
     (ideographic-radical . 123)	; ⽺
-    (ideographic-strokes . 2)
-    (total-strokes	 . 8)
-    (=ucs		. #x7F8C)	; 羌
-    (=gb2312		. #x473C)	; &I-G0-473C; [39-28]
+    (ideographic-strokes . 1)
+    (total-strokes	 . 7)
+    (=gb2312		. #x473C)	; &G0-473C; [39-28]
+    (=ucs@unicode	. #x7F8C)	; &G0-473C;
     ))
 (define-char
   '((ideographic-radical . 123)	; ⽺
@@ -687,6 +719,21 @@
     (=ucs@jis		. #x517B)	; &JX2-7474;
     ))
 (define-char
+  '((ideographic-radical@ucs . 85)	; ⽔
+    (ideographic-strokes@ucs . 6)
+    (ideographic-radical@ucs*sources
+     jis/x0213@2000 ucs)
+    (ideographic-radical@misc . 123)	; ⽺
+    (ideographic-strokes@misc . 4)
+    (ideographic-radical@misc*sources
+     jis/x0213@2000)
+    (total-strokes	 . 10)
+    (sound@ja/kun/name	"suke" "tugu" "yosi")
+    (sound@ja/on/name	"syAu" "yAu")
+    (=ucs		. #x23D0E)	; 𣴎
+    (=jis-x0213-2-2000	. #x7475)	; &I-JX2-7475; [84-85]
+    ))
+(define-char
   '((=>ucs		. #x2635B)	; 𦍛
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 5)
diff --git a/lisp/utf-2000/Ideograph-R124-Feather.el b/lisp/utf-2000/Ideograph-R124-Feather.el
index bccf3d2..8c3c79c 100644
--- a/lisp/utf-2000/Ideograph-R124-Feather.el
+++ b/lisp/utf-2000/Ideograph-R124-Feather.el
@@ -39,12 +39,12 @@
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
-    (<-ideographic-component-forms
+    (=gt-k		. 01762)	; &GT-K01762;
+    (=gt-pj-k1		. #x322B)	; &GT-K01762; [18-11]
+    (<-same@component/connect-below
      ((=ks-x1001	  . #x6962)	; &GT-36832; [73-66]
       (=daikanwa	  . 28614)	; &I-M-28614;
       ))
-    (=gt-k		. 01762)	; &GT-K01762;
-    (=gt-pj-k1		. #x322B)	; &GT-K01762; [18-11]
     ))
 (define-char
   '((<-denotational
@@ -433,7 +433,15 @@
     (=cns11643-5	. #x2F60)	; &I-C5-2F60; [15-64]
     ))
 (define-char
-  '((=>ucs		. #x26407)	; 𦐇
+  '((ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 4)
+    (total-strokes	 . 10)
+    (=ucs		. #x26407)	; 𦐇
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x26407)	; 𦐇
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
@@ -450,8 +458,9 @@
     (=daikanwa		. 28634)	; &M-28634;
     ))
 (define-char
-  '((=>ucs		. #x26407)	; 𦐇
-    (morohashi-daikanwa	28634 0 2)
+  '((<-denotational
+     ((=ucs		  . #x26407)	; 𦐇
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
@@ -459,16 +468,18 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((name*		  . "ideographic component hood")
-      (=big5-cdp	  . #x8A78)	; &CDP-8A78;
+     ((=ucs		  . #x65E5)	; 日
       )
      ((=ucs		  . #x7FBD)	; ç¾½
       ))
-    (=big5-cdp		. #x8ACB)	; &CDP-8ACB;
-    (mojikyo		. 074841)	; &MCS-60012459;
+    (=cns11643-4	. #x2F31)	; &C4-2F31; [15-17]
+    (=ucs@iso		. #x26407)	; &C4-2F31;
+    (mojikyo		. 074842)	; &MCS-6001245A;
     ))
 (define-char
-  '((morohashi-daikanwa	28634 0 3)
+  '((<-denotational
+     ((=ucs		  . #x26407)	; 𦐇
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
@@ -476,13 +487,13 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs		  . #x65E5)	; 日
+     ((name*		  . "ideographic component hood")
+      (=big5-cdp	  . #x8A78)	; &CDP-8A78;
       )
      ((=ucs		  . #x7FBD)	; ç¾½
       ))
-    (=ucs		. #x26407)	; 𦐇
-    (=cns11643-4	. #x2F31)	; &I-C4-2F31; [15-17]
-    (mojikyo		. 074842)	; &MCS-6001245A;
+    (=big5-cdp		. #x8ACB)	; &CDP-8ACB;
+    (mojikyo		. 074841)	; &MCS-60012459;
     ))
 (define-char
   '((ideographic-radical . 124)	; â½»
@@ -2714,7 +2725,8 @@
 	(=gb2312	    . #x5370)	; &I-G0-5370; [51-80]
 	(=cns11643-1	    . #x4851)	; &I-C1-4851; [40-49]
 	)
-       ((=ucs@unicode	    . #x5352)	; &UU+5352;
+       ((=gb2312	    . #x5764)	; &C1-4C35; [55-68]
+	(=cns11643-1	    . #x4C35)	; &I-C1-4C35; [44-21]
 	))
       (=cns11643-1	  . #x6A49)	; &C1-6A49; [74-41]
       ))
@@ -4039,11 +4051,6 @@
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x344D)	; &GT-37164; [20-45]
-      (=ks-x1001	  . #x7957)	; &I-K0-7957; [89-55]
-      (=daikanwa	  . 28780)	; &I-M-28780;
-      ))
     (=gb2312		. #x3A32)	; &GT-37165; [26-18]
     (=jis-x0208@1983	. #x344D)	; &I-J83-344D; [20-45]
     (=jis-x0208@1990	. #x344D)	; &I-J90-344D; [20-45]
@@ -4051,6 +4058,11 @@
     (=gt		. 37165)	; &I-GT-37165;
     (=gt-pj-1		. #x344D)	; &I-GT-37165; [20-45]
     (=ucs@unicode	. #x7FF0)	; &GT-37165;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x344D)	; &GT-37164; [20-45]
+      (=ks-x1001	  . #x7957)	; &I-K0-7957; [89-55]
+      (=daikanwa	  . 28780)	; &I-M-28780;
+      ))
     ))
 (define-char
   '((=>ucs		. #x26475)	; 𦑵
@@ -4572,6 +4584,7 @@
 (define-char
   '((ideographic-radical . 124)	; â½»
     (=ucs		. #x7FFC)	; 翼
+    (=big5		. #xC16C)	; &I-B-C16C;
     ))
 (define-char
   '((<-denotational
@@ -4582,17 +4595,17 @@
     (total-strokes	 . 17)
     (->subsumptive
      ((morohashi-daikanwa	28801 1)
-      (<-same
-       ((=daikanwa	    . 28818)	; &M-28818;
-	))
-      (<-same*sources
-       daikanwa)
       (=jis-x0208@1978	  . #x4D63)	; &GT-37225; [45-67]
       (=gb2312		  . #x526D)	; &I-G0-526D; [50-77]
       (=jis-x0208@1983	  . #x4D63)	; &I-J83-4D63; [45-67]
       (=gt		  . 37225)	; &I-GT-37225;
       (=gt-pj-1		  . #x4D63)	; &I-GT-37225; [45-67]
       (=ucs@unicode	  . #x7FFC)	; &GT-37225;
+      (<-same
+       ((=daikanwa	    . 28818)	; &M-28818;
+	))
+      (<-same*sources
+       daikanwa)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -4886,39 +4899,83 @@
     (=cns11643-5	. #x5D4E)	; &I-C5-5D4E; [61-46]
     ))
 (define-char
-  '((=>ucs		. #x4397)	; 䎗
+  '((ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 12)
+    (total-strokes	 . 18)
+    (=ucs		. #x4397)	; 䎗
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4397)	; 䎗
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
-    (=daikanwa		. 28812)	; &M-28812;
+    (->subsumptive
+     ((=daikanwa	  . 28812)	; &M-28812;
+      )
+     ((=gt		  . 37235)	; &GT-37235;
+      (=gt-pj-6		  . #x3470)	; &GT-37235; [20-80]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	28812 0 2)
+  '((<-denotational
+     ((=ucs		  . #x4397)	; 䎗
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
-    (=ucs		. #x4397)	; 䎗
-    (=cns11643-3	. #x5860)	; &I-C3-5860; [56-64]
+    (->subsumptive
+     ((=gt		  . 37237)	; &GT-37237;
+      (=gt-pj-10	  . #x3054)	; &GT-37237; [16-52]
+      )
+     ((=cns11643-3	  . #x5860)	; &C3-5860; [56-64]
+      (=ucs@unicode	  . #x4397)	; &C3-5860;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 12)
+    (total-strokes	 . 18)
+    (=ucs		. #x26493)	; 𦒓
     ))
 (define-char
-  '((=>ucs		. #x26493)	; 𦒓
+  '((<-denotational
+     ((=ucs		  . #x26493)	; 𦒓
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
-    (=gt		. 37238)	; &GT-37238;
-    (=gt-pj-10		. #x3055)	; &GT-37238; [16-53]
+    (=gt		. 37236)	; &GT-37236;
+    (=gt-pj-6		. #x3471)	; &GT-37236; [20-81]
     (=daikanwa		. 28813)	; &I-M-28813;
     ))
 (define-char
-  '((morohashi-daikanwa	28813 0 2)
+  '((<-denotational
+     ((=ucs		  . #x26493)	; 𦒓
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
-    (=ucs		. #x26493)	; 𦒓
-    (=cns11643-7	. #x416F)	; &I-C7-416F; [33-79]
+    (->subsumptive
+     ((=gt		  . 37238)	; &GT-37238;
+      (=gt-pj-10	  . #x3055)	; &GT-37238; [16-53]
+      (=ucs@iso		  . #x26493)	; &GT-37238;
+      )
+     ((=cns11643-7	  . #x416F)	; &C7-416F; [33-79]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 12)
+    (total-strokes	 . 18)
+    (=ucs		. #x7FFB)	; ç¿»
+    (=big5		. #xC2BD)	; &I-B-C2BD;
     ))
 (define-char
-  '((=>ucs		. #x7FFB)	; ç¿»
+  '((<-denotational
+     ((=ucs		  . #x7FFB)	; ç¿»
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
@@ -4931,34 +4988,37 @@
      ((=ks-x1001	  . #x6962)	; &GT-36832; [73-66]
       (=daikanwa	  . 28614)	; &I-M-28614;
       ))
-    (=big5		. #xC2BD)	; &GT-37249;
-    (=gt		. 37249)	; &I-GT-37249;
-    (=gt-pj-6		. #x3472)	; &I-GT-37249; [20-82]
+    (=gt		. 37249)	; &GT-37249;
+    (=gt-pj-6		. #x3472)	; &GT-37249; [20-82]
     (=daikanwa		. 28814)	; &I-M-28814;
     ))
 (define-char
-  '((morohashi-daikanwa	28814 0 2)
+  '((<-denotational
+     ((=ucs		  . #x7FFB)	; ç¿»
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x98DC)	; 飜
-      (=jis-x0208	  . #x664C)	; &I-J90-664C; [70-44]
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x756A)	; 番
       )
-     ((=ucs		  . #x7FBD)	; ç¾½
+     ((=jis-x0208	  . #x3129)	; &GT-36833; [17-09]
+      (=gb2312		  . #x5370)	; &I-G0-5370; [51-80]
+      (=cns11643-1	  . #x4851)	; &I-C1-4851; [40-49]
       ))
-    (=ucs		. #x7FFB)	; ç¿»
-    (=jis-x0208		. #x4B5D)	; &I-J90-4B5D; [43-61]
+    (=jis-x0208		. #x4B5D)	; &GT-37250; [43-61]
     (=gb2312		. #x372D)	; &I-G0-372D; [23-13]
     (=cns11643-1	. #x7729)	; &I-C1-7729; [87-09]
     (=gt		. 37250)	; &I-GT-37250;
     (=gt-pj-1		. #x4B5D)	; &I-GT-37250; [43-61]
+    (=ucs@unicode	. #x7FFB)	; &GT-37250;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x98DC)	; 飜
+      (=jis-x0208	  . #x664C)	; &I-J90-664C; [70-44]
+      ))
     ))
 (define-char
   '((=>ucs		. #x26491)	; 𦒑
@@ -5006,20 +5066,39 @@
     (=cns11643-3	. #x585F)	; &I-C3-585F; [56-63]
     ))
 (define-char
-  '((=>ucs		. #x7FFC)	; 翼
+  '((<-denotational
+     ((=ucs		  . #x7FFC)	; 翼
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=gt-k		  . 01762)	; &GT-K01762;
+      )
+     ((=ucs		  . #x2F938)	; 異
+      ))
     (=daikanwa		. 28818)	; &M-28818;
     ))
 (define-char
-  '((=>ucs		. #x7FFC)	; 翼
-    (morohashi-daikanwa	28818 0 1)
+  '((<-denotational
+     ((=ucs		  . #x7FFC)	; 翼
+      ))
+    (=>daikanwa		. 28818)	; &M-28818;
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 11)
     (total-strokes	 . 17)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=gt-k		  . 01762)	; &GT-K01762;
+      )
+     ((=ucs		  . #x7570)	; 異
+      ))
     (=ks-x1001		. #x6C4F)	; &K0-6C4F; [76-47]
-    (=big5		. #xC16C)	; &I-B-C16C;
     (=jef-china3	. #x60A9)	; &I-JC3-60A9;
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R125-Old.el b/lisp/utf-2000/Ideograph-R125-Old.el
index e97a617..128fcf9 100644
--- a/lisp/utf-2000/Ideograph-R125-Old.el
+++ b/lisp/utf-2000/Ideograph-R125-Old.el
@@ -28,24 +28,24 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EB9)	; ⺹
     (<-identical@component
      ((=ucs		  . #x8002)	; 耂
       ))
-    (=ucs		. #x2EB9)	; ⺹
     ))
 (define-char
   '((ideographic-radical . 125)	; â½¼
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-formed@component/connect-below
-     ((=ucs		  . #x8001)	; 老
-      ))
     (=ucs		. #x8002)	; 耂
     (=jis-x0213-2-2000	. #x7522)	; &I-JX2-7522; [85-02]
     (=big5-cdp		. #x8B52)	; &I-CDP-8B52;
     (=gt		. 37304)	; &I-GT-37304;
     (=gt-pj-9		. #x4E52)	; &I-GT-37304; [46-50]
     (=jef-china3	. #x72FC)	; &I-JC3-72FC;
+    (<-formed@component/connect-below
+     ((=ucs		  . #x8001)	; 老
+      ))
     ))
 (define-char
   '((ideographic-radical . 125)	; â½¼
@@ -191,10 +191,6 @@
     (ideographic-radical . 125)	; â½¼
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA5B)	; 者
-      (=jis-x0213-1-2000  . #x7A44)	; &I-JX1-7A44; [90-36]
-      ))
     (shinjigen-1	. 6342)
     (shinjigen-2	. 6342)
     (=jis-x0208		. #x3C54)	; &GT-37308; [28-52]
@@ -205,6 +201,10 @@
     (=gt-pj-1		. #x3C54)	; &I-GT-37308; [28-52]
     (=daikanwa		. 28852)	; &I-M-28852;
     (=ucs@unicode	. #x8005)	; &GT-37308;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA5B)	; 者
+      (=jis-x0213-1-2000  . #x7A44)	; &I-JX1-7A44; [90-36]
+      ))
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R128-Ear.el b/lisp/utf-2000/Ideograph-R128-Ear.el
index a99dee7..4ae7bd4 100644
--- a/lisp/utf-2000/Ideograph-R128-Ear.el
+++ b/lisp/utf-2000/Ideograph-R128-Ear.el
@@ -1557,7 +1557,11 @@
     (total-strokes	 . 14)
     (=ucs		. #x805F)	; 聟
     (->subsumptive
-     ((<-vulgar
+     ((shinjigen-1	  . 1705)
+      (=gt		  . 37686)	; &GT-37686;
+      (=gt-pj-1		  . #x665D)	; &GT-37686; [70-61]
+      (=daikanwa	  . 29106)	; &I-M-29106;
+      (<-vulgar
        ((shinjigen-1	    . 1704)
 	(=jis-x0208	    . #x5466)	; &GT-07170; [52-70]
 	(=ks-x1001	    . #x5F6B)	; &I-K0-5F6B; [63-75]
@@ -1565,10 +1569,6 @@
 	))
       (<-vulgar*sources
        goonruiju daikanwa shinjigen-1)
-      (shinjigen-1	  . 1705)
-      (=gt		  . 37686)	; &GT-37686;
-      (=gt-pj-1		  . #x665D)	; &GT-37686; [70-61]
-      (=daikanwa	  . 29106)	; &I-M-29106;
       )
      ((shinjigen-2	  . 1705)
       (=jis-x0208@1990	  . #x665D)	; &J90-665D; [70-61]
@@ -1603,23 +1603,24 @@
     (->subsumptive
      ((=daikanwa	  . 29109)	; &M-29109;
       )
-     ((<-vulgar
+     ((shinjigen-1	  . 6392)
+      (shinjigen-2	  . 6392)
+      (=cns11643-3	  . #x4925)	; &C3-4925; [41-05]
+      (<-vulgar
        ((shinjigen-1	    . 6393)
 	(=cns11643-1	    . #x7479)	; &C1-7479; [84-89]
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 6392)
-      (shinjigen-2	  . 6392)
-      (=cns11643-3	  . #x4925)	; &C3-4925; [41-05]
       )
-     ((<-simplified@JP
-       ((=jis-x0208@1990    . #x6662)	; &I-J90-6662; [70-66]
-	))
-      (=jis-x0208@1990	  . #x416F)	; &GT-37689; [33-79]
+     ((=jis-x0208@1990	  . #x416F)	; &GT-37689; [33-79]
       (=gt		  . 37689)	; &I-GT-37689;
       (=gt-pj-1		  . #x416F)	; &I-GT-37689; [33-79]
       (=ucs@jis		  . #x8061)	; &GT-37689;
+      (<-simplified@JP/misc
+       ((=ks-x1001	    . #x7546)	; &GT-37761; [85-38]
+	(=jis-x0208@1990    . #x6662)	; &I-J90-6662; [70-66]
+	))
       )
      ((=jis-x0208@1978	  . #x416F)	; &J83-416F; [33-79]
       (=jis-x0208@1983	  . #x416F)	; &I-J83-416F; [33-79]
@@ -2500,11 +2501,11 @@
     (ideographic-radical . 128)	; ⽿
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
-    (<-simplified@JP
-     ((=jis-x0208@1990	  . #x6660)	; &J90-6660; [70-64]
-      ))
     (=jis-x0208@1978	. #x6660)	; &J83-6660; [70-64]
     (=jis-x0208@1983	. #x6660)	; &I-J83-6660; [70-64]
+    (<-simplified@JP/jis
+     ((=jis-x0208@1990	  . #x6660)	; &J90-6660; [70-64]
+      ))
     ))
 (define-char
   '((ideographic-radical . 128)	; ⽿
@@ -2581,14 +2582,14 @@
       (=daikanwa	  . 29173)	; &I-M-29173;
       (=ucs@unicode	  . #x8074)	; &M-29173;
       )
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6665)	; &GT-37822; [70-69]
-	(=daikanwa	    . 29211)	; &I-M-29211;
-	))
-      (=jis-x0208@1990	  . #x4430)	; &GT-37765; [36-16]
+     ((=jis-x0208@1990	  . #x4430)	; &GT-37765; [36-16]
       (=gt		  . 37765)	; &I-GT-37765;
       (=gt-pj-1		  . #x4430)	; &I-GT-37765; [36-16]
       (=ucs@jis		  . #x8074)	; &GT-37765;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6665)	; &GT-37822; [70-69]
+	(=daikanwa	    . 29211)	; &I-M-29211;
+	))
       )
      ((=cns11643-3	  . #x5622)	; &C3-5622; [54-02]
       ))
diff --git a/lisp/utf-2000/Ideograph-R129-Brush.el b/lisp/utf-2000/Ideograph-R129-Brush.el
index a9d0db0..c08f65a 100644
--- a/lisp/utf-2000/Ideograph-R129-Brush.el
+++ b/lisp/utf-2000/Ideograph-R129-Brush.el
@@ -48,13 +48,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EBA)	; ⺺
     (<-formed@component
      ((=ucs		  . #x807F)	; 聿
       ))
     (<-identical@component
      ((=ucs		  . #x8080)	; 肀
       ))
-    (=ucs		. #x2EBA)	; ⺺
     ))
 (define-char
   '((ideographic-radical . 129)	; ⾀
@@ -138,16 +138,16 @@
     (=ucs		. #x7C9B)	; 粛
     (->subsumptive
      ((morohashi-daikanwa	29223 1)
-      (<-simplified@JP/Jouyou
-       ((=ucs		    . #x8085)	; 肅
-	(=jis-x0208	    . #x6669)	; &I-J90-6669; [70-73]
-	))
       (=jis-x0208	  . #x3D4D)	; &GT-37838; [29-45]
       (=gt		  . 37838)	; &I-GT-37838;
       (=gt-k		  . 07787)	; &I-GT-K07787;
       (=gt-pj-1		  . #x3D4D)	; &I-GT-37838; [29-45]
       (=ucs@unicode	  . #x7C9B)	; &GT-37838;
       (mojikyo		  . 050367)	; &MCS-6000C4BF;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x8085)	; 肅
+	(=jis-x0208	    . #x6669)	; &I-J90-6669; [70-73]
+	))
       )
      ((=cns11643-3	  . #x383E)	; &CDP-88C9; [24-30]
       (=big5-cdp	  . #x88C9)	; &I-CDP-88C9;
@@ -250,15 +250,15 @@
     (ideographic-radical . 129)	; ⾀
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (<-simplified@JP
-     ((=ks-x1001	  . #x705C)	; &GT-37849; [80-60]
-      (=cns11643-1	  . #x6A4E)	; &I-C1-6A4E; [74-46]
-      (=daikanwa	  . 29228)	; &I-M-29228;
-      ))
     (=jis-x0208		. #x4825)	; &GT-37852; [40-05]
     (=gt		. 37852)	; &I-GT-37852;
     (=gt-pj-1		. #x4825)	; &I-GT-37852; [40-05]
     (=ucs@jis		. #x8087)	; &GT-37852;
+    (<-simplified@JP/misc
+     ((=ks-x1001	  . #x705C)	; &GT-37849; [80-60]
+      (=cns11643-1	  . #x6A4E)	; &I-C1-6A4E; [74-46]
+      (=daikanwa	  . 29228)	; &I-M-29228;
+      ))
     ))
 (define-char
   '((ideographic-radical . 129)	; ⾀
diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el
index 5cc1e02..3a9efe7 100644
--- a/lisp/utf-2000/Ideograph-R130-Meat.el
+++ b/lisp/utf-2000/Ideograph-R130-Meat.el
@@ -23,31 +23,31 @@
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=ucs		. #x2EBC)	; ⺼
     (<-formed@component/connect-right
      ((=ucs		  . #x8089)	; 肉
       ))
-    (=ucs		. #x2EBC)	; ⺼
     (->subsumptive
-     ((<-formed@component/connect-right
+     ((=gt		  . 37857)	; &GT-37857;
+      (=gt-pj-6		  . #x3879)	; &GT-37857; [24-89]
+      (=daikanwa	  . 29237)	; &I-M-29237;
+      (<-formed@component/connect-right
        ((=ucs		    . #x8089)	; 肉
 	(=daikanwa	    . 29236)	; &I-M-29236;
 	))
       (<-formed@component/connect-right*sources
        zihui/char-index zhengzitong daikanwa)
-      (=gt		  . 37857)	; &GT-37857;
-      (=gt-pj-6		  . #x3879)	; &GT-37857; [24-89]
-      (=daikanwa	  . 29237)	; &I-M-29237;
       )
      ((=ucs@unicode	  . #x2EBC)	; &UU+2EBC;
       )
      ((=big5-cdp	  . #x8A73)	; &CDP-8A73;
       )
-     ((<-formed@component/connect-above
-       ((=ucs		    . #x8089)	; 肉
-	))
-      (=big5-cdp	  . #x8958)	; &CDP-8958;
+     ((=big5-cdp	  . #x8958)	; &CDP-8958;
       (=gt-k		  . 00417)	; &I-GT-K00417;
       (=gt-pj-k1	  . #x377D)	; &CDP-8958; [23-93]
+      (<-formed@component/connect-above
+       ((=ucs		    . #x8089)	; 肉
+	))
       ))
     ))
 (define-char
@@ -58,10 +58,10 @@
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=big5-cdp		. #x88F0)	; &CDP-88F0;
     (<-formed@component
      ((=ucs		  . #x8089)	; 肉
       ))
-    (=big5-cdp		. #x88F0)	; &CDP-88F0;
     ))
 (define-char
   '((ideographic-radical . 130)	; ⾁
@@ -2193,58 +2193,49 @@
   '((ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (hanyu-dazidian	3 2056 5)
     (=ucs		. #x2666B)	; 𦙫
-    (=daikanwa		. 29353)	; &I-M-29353;
-    (=hanziku-6		. #xA77C)	; &I-HZK06-A77C;
-    ))
-(define-char
-  '((=>ucs		. #x2666B)	; 𦙫
-    (morohashi-daikanwa	29353 0 0)
-    (ideographic-radical . 130)	; ⾁
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (=cns11643-4	. #x2B2D)	; &C4-2B2D; [11-13]
+    (->subsumptive
+     ((hanyu-dazidian	  3 2056 5)
+      (=daikanwa	  . 29353)	; &M-29353;
+      (=hanziku-6	  . #xA77C)	; &I-HZK06-A77C;
+      (=ucs@iso		  . #x2666B)	; &M-29353;
+      )
+     ((=cns11643-4	  . #x2B2D)	; &C4-2B2D; [11-13]
+      ))
     ))
 (define-char
   '((ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x673C)	; &GT-38740; [71-28]
-      (=ks-x1001	  . #x5345)	; &I-K0-5345; [51-37]
-      (=daikanwa	  . 29933)	; &I-M-29933;
-      ))
-    (shinjigen-2	. 6461)
     (=ucs		. #x80C6)	; 胆
-    (=jis-x0208		. #x4340)	; &I-J90-4340; [35-32]
-    (=gb2312		. #x3528)	; &I-G0-3528; [21-08]
-    (=gt		. 38021)	; &I-GT-38021;
-    (=gt-pj-1		. #x4340)	; &I-GT-38021; [35-32]
-    (=daikanwa		. 29354)	; &I-M-29354;
-    ))
-(define-char
-  '((=>ucs		. #x80C6)	; 胆
-    (morohashi-daikanwa	29354 0 0)
-    (ideographic-radical . 130)	; ⾁
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (=cns11643-3	. #x2E66)	; &C3-2E66; [14-70]
+    (->subsumptive
+     ((shinjigen-2	  . 6461)
+      (=jis-x0208	  . #x4340)	; &GT-38021; [35-32]
+      (=gb2312		  . #x3528)	; &I-G0-3528; [21-08]
+      (=gt		  . 38021)	; &I-GT-38021;
+      (=gt-pj-1		  . #x4340)	; &I-GT-38021; [35-32]
+      (=daikanwa	  . 29354)	; &I-M-29354;
+      (=ucs@unicode	  . #x80C6)	; &GT-38021;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x673C)	; &GT-38740; [71-28]
+	(=ks-x1001	    . #x5345)	; &I-K0-5345; [51-37]
+	(=daikanwa	    . 29933)	; &I-M-29933;
+	))
+      )
+     ((=cns11643-3	  . #x2E66)	; &C3-2E66; [14-70]
+      ))
     ))
 (define-char
   '((ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x43DF)	; 䏟
-    (=daikanwa		. 29355)	; &I-M-29355;
-    ))
-(define-char
-  '((=>ucs		. #x43DF)	; 䏟
-    (morohashi-daikanwa	29355 0 0)
-    (ideographic-radical . 130)	; ⾁
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (=cns11643-4	. #x2B2F)	; &C4-2B2F; [11-15]
+    (->subsumptive
+     ((=daikanwa	  . 29355)	; &M-29355;
+      (=ucs@unicode	  . #x43DF)	; &M-29355;
+      )
+     ((=cns11643-4	  . #x2B2F)	; &C4-2B2F; [11-15]
+      ))
     ))
 (define-char
   '((ideographic-radical . 130)	; ⾁
@@ -4113,6 +4104,7 @@
 (define-char
   '((<-denotational
      ((=big5		  . #xAFE2)	; &B-AFE2;
+      (=jis-x0208@1997	  . #x6726)	; &B-AFE2; [71-06]
       ))
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 6)
@@ -4880,17 +4872,24 @@
     (=cns11643-5	. #x2F68)	; &C5-2F68; [15-72]
     ))
 (define-char
-  '((ideographic-	(:radical	74 ; ⽉
-			 :strokes	6
-			 :sources	(cns-11643))
-			(:radical	130 ; ⾁
-			 :strokes	6
-			 :sources	(ucs)))
+  '((ideographic-radical@ucs . 130)	; ⾁
+    (ideographic-strokes@ucs . 6)
+    (ideographic-radical@cns . 74)	; ⽉
+    (ideographic-strokes@cns . 6)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 10)
-    (hanyu-dazidian	3 2067 2)
     (=ucs		. #x266B9)	; 𦚹
-    (=cns11643-5	. #x2E24)	; &I-C5-2E24; [14-04]
-    (=hanziku-6		. #xA9C1)	; &I-HZK06-A9C1;
+    (->subsumptive
+     ((ideographic-radical . 74)	; ⽉
+      (ideographic-strokes . 6)
+      (=daikanwa	  . 14357)	; &M-14357;
+      )
+     ((hanyu-dazidian	  3 2067 2)
+      (=cns11643-5	  . #x2E24)	; &HZK06-A9C1; [14-04]
+      (=hanziku-6	  . #xA9C1)	; &I-HZK06-A9C1;
+      (=ucs@iso		  . #x266B9)	; &HZK06-A9C1;
+      ))
     ))
 (define-char
   '((ideographic-radical . 130)	; ⾁
@@ -6155,16 +6154,16 @@
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x672A)	; &GT-38441; [71-10]
-      (=ks-x1001	  . #x5260)	; &I-K0-5260; [50-64]
-      (=daikanwa	  . 29681)	; &I-M-29681;
-      ))
     (=ucs		. #x8133)	; 脳
     (=jis-x0208		. #x473E)	; &I-J90-473E; [39-30]
     (=gt		. 38218)	; &I-GT-38218;
     (=gt-pj-1		. #x473E)	; &I-GT-38218; [39-30]
     (mojikyo		. 050373)	; &MCS-6000C4C5;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x672A)	; &GT-38441; [71-10]
+      (=ks-x1001	  . #x5260)	; &I-K0-5260; [50-64]
+      (=daikanwa	  . 29681)	; &I-M-29681;
+      ))
     ))
 (define-char
   '((ideographic-radical . 130)	; ⾁
@@ -6601,6 +6600,7 @@
 (define-char
   '((<-denotational
      ((=big5		  . #xAFE2)	; &B-AFE2;
+      (=jis-x0208@1997	  . #x6726)	; &B-AFE2; [71-06]
       ))
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 8)
@@ -8114,7 +8114,14 @@
     (total-strokes	 . 13)
     (=ucs		. #x815F)	; 腟
     (->subsumptive
-     ((<-vulgar
+     ((shinjigen-1	  . 6557)
+      (shinjigen-2	  . 6557)
+      (=jis-x0208	  . #x6735)	; &GT-38427; [71-21]
+      (=gt		  . 38427)	; &I-GT-38427;
+      (=gt-pj-1		  . #x6735)	; &I-GT-38427; [71-21]
+      (=daikanwa	  . 29667)	; &I-M-29667;
+      (=ucs@jis		  . #x815F)	; &GT-38427;
+      (<-vulgar
        ((shinjigen-1	    . 6556)
 	(=jis-x0208	    . #x6734)	; &GT-38594; [71-20]
 	(=ks-x1001	    . #x7273)	; &I-K0-7273; [82-83]
@@ -8122,13 +8129,6 @@
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 6557)
-      (shinjigen-2	  . 6557)
-      (=jis-x0208	  . #x6735)	; &GT-38427; [71-21]
-      (=gt		  . 38427)	; &I-GT-38427;
-      (=gt-pj-1		  . #x6735)	; &I-GT-38427; [71-21]
-      (=daikanwa	  . 29667)	; &I-M-29667;
-      (=ucs@jis		  . #x815F)	; &GT-38427;
       )
      ((=ucs@unicode	  . #x815F)	; &UU+815F;
       )
@@ -8236,67 +8236,73 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x8163)	; 腣
-    (=daikanwa		. 29673)	; &I-M-29673;
-    ))
-(define-char
-  '((=>ucs		. #x8163)	; 腣
-    (morohashi-daikanwa	29673 0 0)
-    (ideographic-radical . 130)	; ⾁
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=cns11643-3	. #x4375)	; &C3-4375; [35-85]
+    (->subsumptive
+     ((=daikanwa	  . 29673)	; &M-29673;
+      )
+     ((=ucs@unicode	  . #x8163)	; &UU+8163;
+      )
+     ((=cns11643-3	  . #x4375)	; &C3-4375; [35-85]
+      ))
     ))
 (define-char
   '((ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x440F)	; 䐏
-    (=daikanwa		. 29674)	; &I-M-29674;
-    ))
-(define-char
-  '((=>ucs		. #x440F)	; 䐏
-    (morohashi-daikanwa	29674 0 0)
-    (ideographic-radical . 130)	; ⾁
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=cns11643-3	. #x4378)	; &C3-4378; [35-88]
+    (->subsumptive
+     ((=daikanwa	  . 29674)	; &M-29674;
+      )
+     ((=ucs@unicode	  . #x440F)	; &UU+440F;
+      )
+     ((=cns11643-3	  . #x4378)	; &C3-4378; [35-88]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x26760)	; 𦝠
-    (ideographic-radical . 130)	; ⾁
+  '((ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=daikanwa		. 29675)	; &M-29675;
+    (=ucs		. #x26760)	; 𦝠
+    (->subsumptive
+     ((=daikanwa	  . 29675)	; &M-29675;
+      )
+     ((=cns11643-5	  . #x4227)	; &C5-4227; [34-07]
+      )
+     ((=ucs@iso		  . #x26760)	; &U-00026760;
+      )
+     ((=big5-cdp	  . #x8ADA)	; &CDP-8ADA;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	29675 0 0)
-    (ideographic-radical . 130)	; ⾁
+  '((=>daikanwa		. 29675)	; &M-29675;
+    (ideographic-radical@ucs . 74)	; ⽉
+    (ideographic-radical@misc . 130)	; ⾁
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs		. #x26760)	; 𦝠
+    (=ucs		. #x23386)	; 𣎆
+    (<-same
+     ((=ucs		  . #x26760)	; 𦝠
+      ))
     ))
 (define-char
-  '((=>ucs		. #x26760)	; 𦝠
-    (morohashi-daikanwa	29675 0 1)
+  '((<-denotational
+     ((=ucs		  . #x26760)	; 𦝠
+      ))
     (ideographic-radical . 130)	; ⾁
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=cns11643-5	. #x4227)	; &C5-4227; [34-07]
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=cbeta		. 12237)	; &CB12237;
     ))
 (define-char
   '((ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x4410)	; 䐐
-    (=daikanwa		. 29676)	; &I-M-29676;
-    ))
-(define-char
-  '((=>ucs		. #x4410)	; 䐐
-    (morohashi-daikanwa	29676 0 0)
-    (ideographic-radical . 130)	; ⾁
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=cns11643-4	. #x402A)	; &C4-402A; [32-10]
+    (->subsumptive
+     ((=daikanwa	  . 29676)	; &M-29676;
+      (=ucs@unicode	  . #x4410)	; &M-29676;
+      )
+     ((=cns11643-4	  . #x402A)	; &C4-402A; [32-10]
+      ))
     ))
 (define-char
   '((ideographic-radical . 130)	; ⾁
@@ -11716,7 +11722,15 @@
     (=cns11643-7	. #x2738)	; &C7-2738; [07-24]
     ))
 (define-char
-  '((=>ucs		. #x81A4)	; 膤
+  '((ideographic-radical . 130)	; ⾁
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x81A4)	; 膤
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x81A4)	; 膤
+      ))
     (morohashi-daikanwa	ho 247)
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 11)
@@ -11728,16 +11742,15 @@
     (mojikyo		. 054669)	; &MCS-6000D58D;
     ))
 (define-char
-  '((morohashi-daikanwa	ho 247 1)
+  '((<-denotational
+     ((=ucs		  . #x81A4)	; 膤
+      ))
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (<-same
-     ((=jis-x0208	  . #x6733)	; &GT-38614; [71-19]
-      ))
-    (=ucs		. #x81A4)	; 膤
-    (=gt		. 38615)	; &I-GT-38615;
-    (=gt-pj-11		. #x3628)	; &I-GT-38615; [22-08]
+    (=gt		. 38615)	; &GT-38615;
+    (=gt-pj-11		. #x3628)	; &GT-38615; [22-08]
+    (=ucs@unicode	. #x81A4)	; &GT-38615;
     (mojikyo		. 055481)	; &MCS-6000D8B9;
     ))
 (define-char
@@ -14160,15 +14173,15 @@
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6747)	; &GT-38865; [71-39]
-      (=ks-x1001	  . #x6D74)	; &I-K0-6D74; [77-84]
-      ))
     (=ucs		. #x81D3)	; 臓
     (=jis-x0208		. #x4221)	; &I-J90-4221; [34-01]
     (=gt		. 38786)	; &I-GT-38786;
     (=gt-pj-1		. #x4221)	; &I-GT-38786; [34-01]
     (mojikyo		. 050379)	; &MCS-6000C4CB;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6747)	; &GT-38865; [71-39]
+      (=ks-x1001	  . #x6D74)	; &I-K0-6D74; [77-84]
+      ))
     ))
 (define-char
   '((ideographic-radical . 130)	; ⾁
diff --git a/lisp/utf-2000/Ideograph-R132-Self.el b/lisp/utf-2000/Ideograph-R132-Self.el
index bb87852..05c3b72 100644
--- a/lisp/utf-2000/Ideograph-R132-Self.el
+++ b/lisp/utf-2000/Ideograph-R132-Self.el
@@ -94,10 +94,6 @@
     (ideographic-radical . 132)	; ⾃
     (ideographic-strokes . 3)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA5C)	; 臭
-      (=jis-x0213-1-2000  . #x7A58)	; &I-JX1-7A58; [90-56]
-      ))
     (=jis-x0208		. #x3D2D)	; &GT-38944; [29-13]
     (=gt		. 38944)	; &I-GT-38944;
     (=gt-k		. 05097)	; &I-GT-K05097;
@@ -105,12 +101,18 @@
     (=jef-china3	. #x60E3)	; &I-JC3-60E3;
     (=ucs@jis		. #x81ED)	; &GT-38944;
     (mojikyo		. 050380)	; &MCS-6000C4CC;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA5C)	; 臭
+      (=jis-x0213-1-2000  . #x7A58)	; &I-JX1-7A58; [90-56]
+      ))
     ))
 (define-char
   '((ideographic-radical . 132)	; ⾃
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
-    (=daikanwa		. 30104)	; &M-30104;
+    (=ucs		. #x26901)	; 𦤁
+    (=daikanwa		. 30104)	; &I-M-30104;
+    (=hanziku-8		. #xCDCE)	; &I-HZK08-CDCE;
     ))
 (define-char
   '((ideographic-radical . 132)	; ⾃
diff --git a/lisp/utf-2000/Ideograph-R133-Arrive.el b/lisp/utf-2000/Ideograph-R133-Arrive.el
index 7308e7a..c8399f7 100644
--- a/lisp/utf-2000/Ideograph-R133-Arrive.el
+++ b/lisp/utf-2000/Ideograph-R133-Arrive.el
@@ -212,11 +212,19 @@
   '((ideographic-radical . 133)	; ⾄
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
+    (shinjigen-1	. 951)
     (=ucs		. #x4453)	; 䑓
     (=cns11643-3	. #x4424)	; &I-C3-4424; [36-04]
     (=jis-x0213-1-2000	. #x7A59)	; &I-JX1-7A59; [90-57]
     (=daikanwa		. 30158)	; &I-M-30158;
     (=jef-china3	. #x60EA)	; &I-JC3-60EA;
+    (<-vulgar
+     ((shinjigen-1	  . 950)
+      (=ucs		  . #x81FA)	; 臺
+      (=jis-x0208	  . #x674A)	; &I-J90-674A; [71-42]
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 133)	; ⾄
@@ -240,6 +248,7 @@
   '((ideographic-radical . 133)	; ⾄
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (shinjigen-1	. 950)
     (shinjigen-2	. 950)
     (=ucs		. #x81FA)	; 臺
     (=jis-x0208		. #x674A)	; &I-J90-674A; [71-42]
diff --git a/lisp/utf-2000/Ideograph-R134-Mortar.el b/lisp/utf-2000/Ideograph-R134-Mortar.el
index 2008678..3859c33 100644
--- a/lisp/utf-2000/Ideograph-R134-Mortar.el
+++ b/lisp/utf-2000/Ideograph-R134-Mortar.el
@@ -115,10 +115,10 @@
   '((ideographic-radical . 134)	; ⾅
     (ideographic-strokes . 2)
     (total-strokes	 . 8)
+    (=cbeta		. 07105)	; &CB07105;
     (<-unknown
      ((=ucs		  . #x81FD)	; 臽
       ))
-    (=cbeta		. 07105)	; &CB07105;
     ))
 (define-char
   '((ideographic-radical . 134)	; ⾅
@@ -164,6 +164,10 @@
   '((ideographic-radical . 134)	; ⾅
     (ideographic-strokes . 3)
     (total-strokes	 . 10)
+    (=ucs		. #x2695B)	; 𦥛
+    (=cns11643-6	. #x3B3B)	; &I-C6-3B3B; [27-27]
+    (=big5-cdp		. #x8570)	; &I-CDP-8570;
+    (=daikanwa		. 30182)	; &I-M-30182;
     (<-wrong
      ((=jis-x0212	  . #x566C)	; &M-30180; [54-76]
       (=cns11643-2	  . #x2D2B)	; &I-C2-2D2B; [13-11]
@@ -172,10 +176,6 @@
       ))
     (<-wrong*sources
      zhonghua-dazidian daikanwa)
-    (=ucs		. #x2695B)	; 𦥛
-    (=cns11643-6	. #x3B3B)	; &I-C6-3B3B; [27-27]
-    (=big5-cdp		. #x8570)	; &I-CDP-8570;
-    (=daikanwa		. 30182)	; &I-M-30182;
     ))
 (define-char
   '((ideographic-radical . 134)	; ⾅
@@ -1307,6 +1307,7 @@
      ((=ucs		  . #x820B)	; 舋
       ))
     (ideographic-radical . 134)	; ⾅
+    (=big5		. #xF4B5)	; &B-F4B5;
     (->subsumptive
      ((ideographic-strokes . 12)
       (total-strokes	   . 19)
@@ -1330,8 +1331,7 @@
 	)
        ((=ucs		    . #x4E14)	; 且
 	))
-      (=big5		  . #xF4B5)	; &B-F4B5;
-      (=ucs@unicode	  . #x820B)	; &B-F4B5;
+      (=ucs@unicode	  . #x820B)	; &UU+820B;
       ))
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R135-Tongue.el b/lisp/utf-2000/Ideograph-R135-Tongue.el
index c330a83..b2a97ab 100644
--- a/lisp/utf-2000/Ideograph-R135-Tongue.el
+++ b/lisp/utf-2000/Ideograph-R135-Tongue.el
@@ -18,7 +18,10 @@
       (=ucs@unicode	  . #x820C)	; &GT-39171;
       (mojikyo		  . 030277)	; &MCS-60007645;
       )
-     ((<-original
+     ((shinjigen-1	  . 6629)
+      (=cns11643-1	  . #x485F)	; &C1-485F; [40-63]
+      (mojikyo		  . 075115)	; &MCS-6001256B;
+      (<-original
        ((shinjigen-1	    . 6628)
 	(=jis-x0208	    . #x4065)	; &GT-39171; [32-69]
 	(=gb2312	    . #x4960)	; &I-G0-4960; [41-64]
@@ -27,9 +30,6 @@
 	))
       (<-original*sources
        shinjigen-1)
-      (shinjigen-1	  . 6629)
-      (=cns11643-1	  . #x485F)	; &C1-485F; [40-63]
-      (mojikyo		  . 075115)	; &MCS-6001256B;
       ))
     ))
 (define-char
@@ -456,21 +456,21 @@
     (total-strokes	 . 13)
     (=ucs		. #x2F98D)	; 辞
     (->subsumptive
-     ((<-vulgar@jiyun
+     ((=daikanwa	  . 30307)	; &M-30307;
+      (<-vulgar@jiyun
        ((=jis-x0212	    . #x6130)	; &M-38649; [65-16]
 	(=jis-x0213-2-2000  . #x7967)	; &I-JX2-7967; [89-71]
 	(=daikanwa	    . 38649)	; &I-M-38649;
 	))
       (<-vulgar@jiyun*sources
        daikanwa)
-      (<-vulgar@zhengzi-tong
+      (<-vulgar@zhengzitong
        ((=jis-x0208	    . #x6D66)	; &GT-51611; [77-70]
 	(=ks-x1001	    . #x5E76)	; &I-K0-5E76; [62-86]
 	(=daikanwa	    . 38671)	; &I-M-38671;
 	))
-      (<-vulgar@zhengzi-tong*sources
+      (<-vulgar@zhengzitong*sources
        daikanwa)
-      (=daikanwa	  . 30307)	; &M-30307;
       (->identical
        ((=jis-x0208	    . #x3C2D)	; &GT-51568; [28-13]
 	(=daikanwa	    . 38638)	; &I-M-38638;
diff --git a/lisp/utf-2000/Ideograph-R137-Boat.el b/lisp/utf-2000/Ideograph-R137-Boat.el
index 3f3249b..e25161b 100644
--- a/lisp/utf-2000/Ideograph-R137-Boat.el
+++ b/lisp/utf-2000/Ideograph-R137-Boat.el
@@ -19,35 +19,57 @@
   '((ideographic-radical . 137)	; ⾈
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x821F)	; 舟
-      ))
     (=gt-k		. 00606)	; &GT-K00606;
     (=gt-pj-k1		. #x3973)	; &GT-K00606; [25-83]
+    (<-formed@component
+     ((=ucs		  . #x821F)	; 舟
+      ))
     ))
 (define-char
   '((ideographic-radical . 137)	; ⾈
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x821F)	; 舟
-      ))
     (=gt-k		. 00607)	; &GT-K00607;
     (=gt-pj-k1		. #x3821)	; &GT-K00607; [24-01]
+    (<-formed@component
+     ((=ucs		  . #x821F)	; 舟
+      ))
     ))
 (define-char
   '((ideographic-radical . 137)	; ⾈
     (ideographic-strokes . 1)
     (total-strokes	 . 7)
     (=ucs		. #x26A07)	; 𦨇
-    (=cns11643-5	. #x2474)	; &I-C5-2474; [04-84]
-    (=daikanwa		. 30351)	; &I-M-30351;
+    (->subsumptive
+     ((=daikanwa	  . 30351)	; &M-30351;
+      )
+     ((=cns11643-5	  . #x2474)	; &C5-2474; [04-84]
+      (=ucs@iso		  . #x26A07)	; &C5-2474;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 137)	; ⾈
-    (ideographic-strokes . 1)
+  '((ideographic-radical@ucs . 4)	; ⼃
+    (ideographic-strokes@ucs . 5)
+    (ideographic-radical@daikanwa . 137)	; ⾈
+    (ideographic-strokes@daikanwa . 1)
     (total-strokes	 . 6)
-    (=daikanwa		. 30352)	; &M-30352;
+    (=ucs		. #x200A8)	; 𠂨
+    (->subsumptive
+     ((hanyu-dazidian	  1 38 12)
+      (=daikanwa	  . 30352)	; &M-30352;
+      (=hanziku-1	  . #xABE2)	; &I-HZK01-ABE2;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E3F)	; 丿
+	)
+       ((=ucs		    . #x518A)	; 冊
+	))
+      (=cns11643-6	  . #x2343)	; &C6-2343; [03-35]
+      (=ucs@iso		  . #x200A8)	; &C6-2343;
+      ))
     ))
 (define-char
   '((ideographic-radical . 137)	; ⾈
@@ -592,14 +614,15 @@
     (ideographic-radical . 137)	; ⾈
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x6764)	; &GT-39314; [71-68]
-      ))
     (=jis-x0208@1983	. #x6764)	; &GT-39313; [71-68]
     (=jis-x0208@1990	. #x6764)	; &I-J90-6764; [71-68]
     (=gt		. 39313)	; &I-GT-39313;
     (=gt-pj-1		. #x6764)	; &I-GT-39313; [71-68]
+    (=jef-china3	. #x60FE)	; &I-JC3-60FE;
     (=ucs@jis		. #x822E)	; &GT-39313;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x6764)	; &GT-39314; [71-68]
+      ))
     ))
 (define-char
   '((ideographic-radical . 137)	; ⾈
diff --git a/lisp/utf-2000/Ideograph-R138-Stopping.el b/lisp/utf-2000/Ideograph-R138-Stopping.el
index f60e47f..9acd436 100644
--- a/lisp/utf-2000/Ideograph-R138-Stopping.el
+++ b/lisp/utf-2000/Ideograph-R138-Stopping.el
@@ -17,6 +17,15 @@
     ))
 (define-char
   '((ideographic-radical . 138)	; ⾉
+    (ideographic-strokes . 0)
+    (total-strokes	 . 5)
+    (=big5-cdp		. #x8B7C)	; &CDP-8B7C;
+    (<-simplified@component
+     ((=ucs		  . #x826E)	; 艮
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 138)	; ⾉
     (ideographic-strokes . 1)
     (total-strokes	 . 7)
     (=ucs		. #x826F)	; 良
@@ -40,18 +49,13 @@
   '((ideographic-radical . 138)	; ⾉
     (ideographic-strokes . 1)
     (total-strokes	 . 6)
-    (<-ideographic-component-forms
-     ((=jis-x0208	  . #x4E49)	; &GT-39586; [46-41]
-      (=ks-x1001	  . #x555E)	; &I-K0-555E; [53-62]
-      (=daikanwa	  . 30597)	; &I-M-30597;
-      ))
-    (<-simplified
+    (=big5-cdp		. #x8C42)	; &CDP-8C42;
+    (mojikyo		. 075143)	; &MCS-60012587;
+    (<-simplified@component
      ((=jis-x0208	  . #x4E49)	; &GT-39586; [46-41]
       (=ks-x1001	  . #x555E)	; &I-K0-555E; [53-62]
       (=daikanwa	  . 30597)	; &I-M-30597;
       ))
-    (=big5-cdp		. #x8C42)	; &CDP-8C42;
-    (mojikyo		. 075143)	; &MCS-60012587;
     ))
 (define-char
   '((ideographic-radical . 138)	; ⾉
diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el
index 2920a05..4308e91 100644
--- a/lisp/utf-2000/Ideograph-R140-Grass.el
+++ b/lisp/utf-2000/Ideograph-R140-Grass.el
@@ -3,10 +3,6 @@
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
-    (<-Zhouwen
-     ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA5E")
-      (=ucs		  . #xFA5E)	; 艹
-      ))
     (=ucs		. #x8278)	; 艸
     (=jis-x0208		. #x6767)	; &I-J90-6767; [71-71]
     (=ks-x1001		. #x752C)	; &I-K0-752C; [85-12]
@@ -17,14 +13,18 @@
     (=gt-k		. 01736)	; &I-GT-K01736;
     (=gt-pj-1		. #x6767)	; &I-GT-39704; [71-71]
     (=daikanwa		. 30638)	; &I-M-30638;
+    (<-Zhouwen
+     ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA5E")
+      (=ucs		  . #xFA5E)	; 艹
+      ))
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 0)
+    (=ucs		. #x8279)	; 艹
     (<-formed@component
      ((=ucs		  . #x8278)	; 艸
       ))
-    (=ucs		. #x8279)	; 艹
     ))
 (define-char
   '((<-denotational
@@ -35,12 +35,6 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-formed@component/connect-below
-     ((=ucs		  . #x8278)	; 艸
-      (=daikanwa	  . 30638)	; &I-M-30638;
-      ))
-    (<-formed@component/connect-below*sources
-     zihui/char-index daikanwa)
     (=ucs		. #xFA5E)	; 艹
     (=cns11643-4	. #x2153)	; &I-C4-2153; [01-51]
     (=jis-x0213-2-2000	. #x7575)	; &I-JX2-7575; [85-85]
@@ -50,6 +44,12 @@
     (=gt-pj-6		. #x4664)	; &I-GT-39643; [38-68]
     (=daikanwa		. 30639)	; &I-M-30639;
     (=ucs@cns		. #x8279)	; 艹
+    (<-formed@component/connect-below
+     ((=ucs		  . #x8278)	; 艸
+      (=daikanwa	  . 30638)	; &I-M-30638;
+      ))
+    (<-formed@component/connect-below*sources
+     zihui/char-index daikanwa)
     (->Zhouwen
      ((=ucs		  . #x8278)	; 艸
       (=daikanwa	  . 30638)	; &I-M-30638;
@@ -90,11 +90,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EBF)	; ⺿
     (<-identical@component
      ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA5E")
       (=ucs		  . #xFA5E)	; 艹
       ))
-    (=ucs		. #x2EBF)	; ⺿
     ))
 (define-char
   '((<-denotational
@@ -123,11 +123,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC0)	; ⻀
     (<-identical@component
      ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA5D")
       (=ucs		  . #xFA5D)	; 艹
       ))
-    (=ucs		. #x2EC0)	; ⻀
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -676,9 +676,6 @@
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (<-simplified@component
-     ((=big5-cdp	  . #x8BE3)	; &CDP-8BE3;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -690,6 +687,9 @@
       ))
     (=gt-k		. 01418)	; &GT-K01418;
     (=gt-pj-k1		. #x413C)	; &GT-K01418; [33-28]
+    (<-simplified@component
+     ((=big5-cdp	  . #x8BE3)	; &CDP-8BE3;
+      ))
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -963,9 +963,6 @@
       (=cns11643-1	  . #x4B43)	; &C1-4B43; [43-35]
       )
      ((total-strokes	   . 6)
-      (<-simplified@JP
-       ((=daikanwa	    . 30674)	; &M-30674;
-	))
       (=gb2312		  . #x4956)	; &GT-39694; [41-54]
       (=jis-x0208@1983	  . #x6769)	; &I-J83-6769; [71-73]
       (=jis-x0208@1990	  . #x6769)	; &I-J90-6769; [71-73]
@@ -973,6 +970,13 @@
       (=gt-k		  . 01738)	; &I-GT-K01738;
       (=gt-pj-1		  . #x6769)	; &I-GT-39694; [71-73]
       (=ucs@unicode	  . #x828D)	; &GT-39694;
+      (<-simplified@JP/jis
+       ((=jis-x0208@1978    . #x6769)	; &J78-6769; [71-73]
+	(=ks-x1001	    . #x6D4B)	; &I-K0-6D4B; [77-43]
+	))
+      (<-simplified@JP/misc
+       ((=daikanwa	    . 30674)	; &M-30674;
+	))
       ))
     ))
 (define-char
@@ -1182,7 +1186,13 @@
     (=ucs		. #x8294)	; 芔
     (=big5		. #xD06A)	; &I-B-D06A;
     (->subsumptive
-     ((<-original
+     ((shinjigen-1	  . 817)
+      (=jis-x0212	  . #x5738)	; &M-30685; [55-24]
+      (=cns11643-2	  . #x2D2D)	; &I-C2-2D2D; [13-13]
+      (=daikanwa	  . 30685)	; &I-M-30685;
+      (=jef-china3	  . #x45C1)	; &I-JC3-45C1;
+      (=ucs@jis		  . #x8294)	; &M-30685;
+      (<-original
        ((shinjigen-1	    . 816)
 	(=ucs		    . #x5349)	; 卉
 	(=jis-x0208	    . #x5243)	; &I-J90-5243; [50-35]
@@ -1196,12 +1206,6 @@
 	))
       (<-same*sources
        shuowen zihui daikanwa)
-      (shinjigen-1	  . 817)
-      (=jis-x0212	  . #x5738)	; &M-30685; [55-24]
-      (=cns11643-2	  . #x2D2D)	; &I-C2-2D2D; [13-13]
-      (=daikanwa	  . 30685)	; &I-M-30685;
-      (=jef-china3	  . #x45C1)	; &I-JC3-45C1;
-      (=ucs@jis		  . #x8294)	; &M-30685;
       )
      ((=ucs@unicode	  . #x8294)	; &UU+8294;
       ))
@@ -2335,10 +2339,6 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x693A)	; &GT-43244; [73-26]
-      (=ks-x1001	  . #x675D)	; &I-K0-675D; [71-61]
-      ))
     (=ucs		. #x82B8)	; 芸
     (=jis-x0208		. #x375D)	; &I-J90-375D; [23-61]
     (=gb2312		. #x5C3F)	; &I-G0-5C3F; [60-31]
@@ -2348,6 +2348,10 @@
     (=gt-k		. 02535)	; &I-GT-K02535;
     (=gt-pj-1		. #x375D)	; &I-GT-39751; [23-61]
     (mojikyo		. 050390)	; &MCS-6000C4D6;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x693A)	; &GT-43244; [73-26]
+      (=ks-x1001	  . #x675D)	; &I-K0-675D; [71-61]
+      ))
     ))
 (define-char
   '((=>ucs		. #x82B9)	; 芹
@@ -3106,16 +3110,20 @@
       (=cns11643-1	  . #x533F)	; &C1-533F; [51-31]
       )
      ((total-strokes	   . 8)
-      (<-simplified@JP
-       ((=daikanwa	    . 30776)	; &M-30776;
-	))
       (=gb2312		  . #x5C5B)	; &GT-39928; [60-59]
       (=jis-x0208@1983	  . #x6772)	; &I-J83-6772; [71-82]
       (=ks-x1001	  . #x667E)	; &I-K0-667E; [70-94]
       (=jis-x0208@1990	  . #x6772)	; &I-J90-6772; [71-82]
       (=gt		  . 39928)	; &I-GT-39928;
       (=gt-pj-1		  . #x6772)	; &I-GT-39928; [71-82]
+      (=jef-china3	  . #x63A5)	; &I-JC3-63A5;
       (=ucs@unicode	  . #x82D2)	; &GT-39928;
+      (<-simplified@JP/jis
+       ((=jis-x0208@1978    . #x6772)	; &J78-6772; [71-82]
+	))
+      (<-simplified@JP/misc
+       ((=daikanwa	    . 30776)	; &M-30776;
+	))
       ))
     ))
 (define-char
@@ -4955,16 +4963,16 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x8396)	; 莖
-      (=jis-x0208	  . #x6833)	; &I-J90-6833; [72-19]
-      ))
     (=jis-x0208		. #x3754)	; &GT-39875; [23-52]
     (=gt		. 39875)	; &I-GT-39875;
     (=gt-k		. 03686)	; &I-GT-K03686;
     (=gt-pj-1		. #x3754)	; &I-GT-39875; [23-52]
     (=ucs@jis		. #x830E)	; &GT-39875;
     (mojikyo		. 050397)	; &MCS-6000C4DD;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x8396)	; 莖
+      (=jis-x0208	  . #x6833)	; &I-J90-6833; [72-19]
+      ))
     ))
 (define-char
   '((=>ucs		. #x830E)	; 茎
@@ -5608,16 +5616,16 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x838A)	; 莊
-      (=jis-x0208	  . #x6837)	; &I-J90-6837; [72-23]
-      ))
     (shinjigen-2	. 6791)
     (=ucs		. #x8358)	; 荘
     (=jis-x0208		. #x4171)	; &I-J90-4171; [33-81]
     (=gt		. 40138)	; &I-GT-40138;
     (=gt-k		. 05129)	; &I-GT-K05129;
     (=gt-pj-1		. #x4171)	; &I-GT-40138; [33-81]
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x838A)	; 莊
+      (=jis-x0208	  . #x6837)	; &I-J90-6837; [72-23]
+      ))
     ))
 (define-char
   '((=>ucs		. #x8324)	; 茤
@@ -6010,7 +6018,14 @@
     (mojikyo		. 055526)	; &MCS-6000D8E6;
     ))
 (define-char
-  '((=>ucs		. #x8332)	; 茲
+  '((ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 6)
+    (=ucs		. #x8332)	; 茲
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8332)	; 茲
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
@@ -6018,16 +6033,18 @@
     (=daikanwa		. 30911)	; &I-M-30911;
     ))
 (define-char
-  '((morohashi-daikanwa	30911 0 1)
+  '((<-denotational
+     ((=ucs		  . #x8332)	; 茲
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=ucs		. #x8332)	; 茲
-    (=jis-x0208		. #x6824)	; &I-J90-6824; [72-04]
+    (=jis-x0208		. #x6824)	; &GT-40113; [72-04]
     (=big5		. #xAFF7)	; &I-B-AFF7;
     (=gt		. 40113)	; &I-GT-40113;
     (=gt-k		. 05287)	; &I-GT-K05287;
     (=gt-pj-1		. #x6824)	; &I-GT-40113; [72-04]
+    (=ucs@unicode	. #x8332)	; &GT-40113;
     (mojikyo		. 055525)	; &MCS-6000D8E5;
     ))
 (define-char
@@ -6573,7 +6590,14 @@
     (=cns11643-4	. #x2F60)	; &I-C4-2F60; [15-64]
     ))
 (define-char
-  '((=>ucs		. #x8345)	; 荅
+  '((ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 6)
+    (=ucs		. #x8345)	; 荅
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8345)	; 荅
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
@@ -6581,17 +6605,19 @@
     (=daikanwa		. 30937)	; &I-M-30937;
     ))
 (define-char
-  '((morohashi-daikanwa	30937 0 1)
+  '((<-denotational
+     ((=ucs		  . #x8345)	; 荅
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=ucs		. #x8345)	; 荅
-    (=jis-x0208		. #x6829)	; &I-J90-6829; [72-09]
+    (=jis-x0208		. #x6829)	; &GT-40184; [72-09]
     (=iso-ir165		. #x7E3E)	; &I-EGB-7E3E; [94-30]
     (=big5		. #xD3AF)	; &I-B-D3AF;
     (=gt		. 40184)	; &I-GT-40184;
     (=gt-k		. 05336)	; &I-GT-K05336;
     (=gt-pj-1		. #x6829)	; &I-GT-40184; [72-09]
+    (=ucs@unicode	. #x8345)	; &GT-40184;
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -6630,6 +6656,7 @@
 (define-char
   '((<-denotational
      ((=big5		  . #xAFF0)	; &B-AFF0;
+      (=jis-x0208@1997	  . #x3755)	; &B-AFF0; [23-53]
       ))
     (ideographic-radical . 140)	; ⾋
     (=ucs		. #x8346)	; 荆
@@ -6659,6 +6686,7 @@
 (define-char
   '((<-denotational
      ((=big5		  . #xAFF0)	; &B-AFF0;
+      (=jis-x0208@1997	  . #x3755)	; &B-AFF0; [23-53]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
@@ -7808,6 +7836,7 @@
      ((total-strokes	   . 11)
       (=cns11643-2	  . #x3869)	; &M-30994; [24-73]
       (=daikanwa	  . 30994)	; &I-M-30994;
+      (=jef-china3	  . #x70E6)	; &I-JC3-70E6;
       )
      ((total-strokes	   . 11)
       (mojikyo		  . 030994)	; &MCS-60007912;
@@ -7824,15 +7853,18 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-simplified@JP
-     ((=cns11643-2	  . #x3869)	; &M-30994; [24-73]
-      (=daikanwa	  . 30994)	; &I-M-30994;
-      ))
     (=jis-x0208@1983	. #x683B)	; &GT-40433; [72-27]
     (=jis-x0208@1990	. #x683B)	; &I-J90-683B; [72-27]
     (=gt		. 40433)	; &I-GT-40433;
     (=gt-pj-1		. #x683B)	; &I-GT-40433; [72-27]
     (=ucs@jis		. #x8375)	; &GT-40433;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x683B)	; &J78-683B; [72-27]
+      ))
+    (<-simplified@JP/misc
+     ((=cns11643-2	  . #x3869)	; &M-30994; [24-73]
+      (=daikanwa	  . 30994)	; &I-M-30994;
+      ))
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -7899,13 +7931,36 @@
 (define-char
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 7)
-    (total-strokes	 . 11)
     (=ucs		. #x44C6)	; 䓆
-    (=cns11643-4	. #x3469)	; &I-C4-3469; [20-73]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x44C6)	; 䓆
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=cns11643-4	. #x3469)	; &M-30999; [20-73]
     (=daikanwa		. 30999)	; &I-M-30999;
     ))
 (define-char
-  '((=>ucs		. #x8377)	; 荷
+  '((<-denotational
+     ((=ucs		  . #x44C6)	; 䓆
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=ucs@unicode	. #x44C6)	; &UU+44C6;
+    ))
+(define-char
+  '((ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 7)
+    (=ucs		. #x8377)	; 荷
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8377)	; 荷
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
@@ -7913,18 +7968,21 @@
     (=daikanwa		. 31000)	; &I-M-31000;
     ))
 (define-char
-  '((morohashi-daikanwa	31000 1)
+  '((<-denotational
+     ((=ucs		  . #x8377)	; 荷
+      ))
+    (morohashi-daikanwa	31000 1)
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=ucs		. #x8377)	; 荷
-    (=jis-x0208		. #x3259)	; &I-J90-3259; [18-57]
+    (=jis-x0208		. #x3259)	; &GT-40271; [18-57]
     (=gb2312		. #x3A49)	; &I-G0-3A49; [26-41]
     (=ks-x1001		. #x7943)	; &I-K0-7943; [89-35]
     (=big5		. #xB2FC)	; &I-B-B2FC;
     (=gt		. 40271)	; &I-GT-40271;
     (=gt-k		. 06384)	; &I-GT-K06384;
     (=gt-pj-1		. #x3259)	; &I-GT-40271; [18-57]
+    (=ucs@unicode	. #x8377)	; &GT-40271;
     (mojikyo		. 050401)	; &MCS-6000C4E1;
     ))
 (define-char
@@ -11338,39 +11396,26 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 30 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=ucs		  . #x4E1A)	; 业
-      )
-     ((=ucs		  . #x4491)	; 䒑
-      )
-     ((=ucs		  . #x592B)	; 夫
-      ))
     (=ucs		. #x83D0)	; 菐
-    (=jis-x0212		. #x583A)	; &I-JSP-583A; [56-26]
-    (=jis-x0213-2-2000	. #x763C)	; &I-JX2-763C; [86-28]
-    (=big5-cdp		. #x8D48)	; &I-CDP-8D48;
-    (=daikanwa		. 31164)	; &I-M-31164;
-    ))
-(define-char
-  '((=>ucs		. #x83D0)	; 菐
-    (morohashi-daikanwa	31164 0 0)
-    (ideographic-radical . 140)	; ⾋
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=ucs		  . #x4E1A)	; 业
-      )
-     ((=ucs		  . #x4491)	; 䒑
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(=ucs		    . #x2FF3)	; ⿳
+	)
+       ((=ucs		    . #x4E1A)	; 业
+	)
+       ((=ucs		    . #x4491)	; 䒑
+	)
+       ((=ucs		    . #x592B)	; 夫
+	))
+      (=jis-x0212	  . #x583A)	; &CDP-8D48; [56-26]
+      (=jis-x0213-2-2000  . #x763C)	; &I-JX2-763C; [86-28]
+      (=big5-cdp	  . #x8D48)	; &I-CDP-8D48;
+      (=daikanwa	  . 31164)	; &I-M-31164;
+      (=ucs@unicode	  . #x83D0)	; &CDP-8D48;
       )
-     ((=ucs		  . #x592B)	; 夫
+     ((=cns11643-5	  . #x3B6F)	; &C5-3B6F; [27-79]
       ))
-    (=cns11643-5	. #x3B6F)	; &C5-3B6F; [27-79]
     ))
 (define-char
   '((=>ucs		. #x44D7)	; 䓗
@@ -13493,10 +13538,6 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-simplified@JP
-     ((=cns11643-1	  . #x6162)	; &M-31262; [65-66]
-      (=daikanwa	  . 31262)	; &I-M-31262;
-      ))
     (hanyu-dazidian	5 3217 3)
     (=ucs		. #x83B1)	; 莱
     (=gb2312		. #x4033)	; &I-G0-4033; [32-19]
@@ -13505,6 +13546,16 @@
     (=gt		. 40545)	; &I-GT-40545;
     (=gt-pj-1		. #x4D69)	; &I-GT-40545; [45-73]
     (=hanziku-8		. #xF073)	; &I-HZK08-F073;
+    (<-simplified@JP/jis
+     ((=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-2000  . #x7B26)	; &I-JX1-7B26; [91-06]
+      ))
+    (<-simplified@JP/misc
+     ((=cns11643-1	  . #x6162)	; &M-31262; [65-66]
+      (=daikanwa	  . 31262)	; &I-M-31262;
+      ))
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -14271,10 +14322,6 @@
     (ideographic-strokes . 8)
     (->subsumptive
      ((total-strokes	   . 11)
-      (<-simplified@JP/Jouyou
-       ((=ks-x1001	    . #x6E4A)	; &JX1-7B27; [78-42]
-	(=jis-x0213-1-2000  . #x7B27)	; &I-JX1-7B27; [91-07]
-	))
       (shinjigen-2	  . 6863)
       (=jis-x0208	  . #x4378)	; &GT-40802; [35-88]
       (=gb2312		  . #x5678)	; &I-G0-5678; [54-88]
@@ -14284,6 +14331,10 @@
       (=gt-pj-1		  . #x4378)	; &I-GT-40802; [35-88]
       (=daikanwa	  . 31302)	; &I-M-31302;
       (=ucs@unicode	  . #x8457)	; &GT-40802;
+      (<-simplified@JP/Jouyou
+       ((=ks-x1001	    . #x6E4A)	; &JX1-7B27; [78-42]
+	(=jis-x0213-1-2000  . #x7B27)	; &I-JX1-7B27; [91-07]
+	))
       )
      ((total-strokes	   . 12)
       (=cns11643-1	  . #x6161)	; &C1-6161; [65-65]
@@ -14636,12 +14687,12 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (->subsumptive
-     ((<-original
+     ((=daikanwa	  . 31322)	; &M-31322;
+      (<-original
        ((=daikanwa	    . 30940)	; &M-30940;
 	))
       (<-original*sources
-       zhengzi-tong daikanwa)
-      (=daikanwa	  . 31322)	; &M-31322;
+       zhengzitong daikanwa)
       )
      ((=cns11643-3	  . #x3E57)	; &C3-3E57; [30-55]
       ))
@@ -15124,11 +15175,11 @@
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=ucs		. #x26C85)	; 𦲅
+    (=cns11643-6	. #x4D6E)	; &I-C6-4D6E; [45-78]
     (<-unknown
      ((=daikanwa	  . 31234)	; &M-31234;
       ))
-    (=ucs		. #x26C85)	; 𦲅
-    (=cns11643-6	. #x4D6E)	; &I-C6-4D6E; [45-78]
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -16904,15 +16955,20 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified@JP
-     ((=daikanwa	  . 31420)	; &M-31420;
-      ))
     (=jis-x0208@1983	. #x336B)	; &GT-40592; [19-75]
     (=jis-x0208@1990	. #x336B)	; &I-J90-336B; [19-75]
     (=gt		. 40592)	; &I-GT-40592;
     (=gt-k		. 07731)	; &I-GT-K07731;
     (=gt-pj-1		. #x336B)	; &I-GT-40592; [19-75]
     (=ucs@jis		. #x845B)	; &GT-40592;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x336B)	; &J78-336B; [19-75]
+      (=gb2312		  . #x3870)	; &I-G0-3870; [24-80]
+      (=ks-x1001	  . #x4A67)	; &I-K0-4A67; [42-71]
+      ))
+    (<-simplified@JP/misc
+     ((=daikanwa	  . 31420)	; &M-31420;
+      ))
     ))
 (define-char
   '((=>ucs		. #x845C)	; 葜
@@ -19002,6 +19058,7 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 31525)	; &M-31525;
     (<-formed
      ((=jis-x0208	  . #x6D6B)	; &GT-51909; [77-75]
       (=daikanwa	  . 38781)	; &I-M-38781;
@@ -19014,7 +19071,6 @@
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 31525)	; &M-31525;
     ))
 (define-char
   '((<-denotational
@@ -19390,11 +19446,11 @@
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=ucs		. #x26D1F)	; 𦴟
+    (=cns11643-6	. #x5766)	; &I-C6-5766; [55-70]
     (<-unknown
      ((=gt		  . 41366)	; &GT-41366;
       ))
-    (=ucs		. #x26D1F)	; 𦴟
-    (=cns11643-6	. #x5766)	; &I-C6-5766; [55-70]
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -23464,9 +23520,6 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (<-simplified@JP
-     ((=daikanwa	  . 31720)	; &M-31720;
-      ))
     (=gb2312		. #x456E)	; &GT-41746; [37-78]
     (=jis-x0208@1983	. #x4B29)	; &I-J83-4B29; [43-09]
     (=jis-x0208@1990	. #x4B29)	; &I-J90-4B29; [43-09]
@@ -23474,6 +23527,13 @@
     (=gt-k		. 10268)	; &I-GT-K10268;
     (=gt-pj-1		. #x4B29)	; &I-GT-41746; [43-09]
     (=ucs@unicode	. #x84EC)	; &GT-41746;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x4B29)	; &J78-4B29; [43-09]
+      (=ks-x1001	  . #x5C6F)	; &I-K0-5C6F; [60-79]
+      ))
+    (<-simplified@JP/misc
+     ((=daikanwa	  . 31720)	; &M-31720;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -23545,9 +23605,6 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (<-simplified@JP
-     ((=daikanwa	  . 31722)	; &M-31722;
-      ))
     (=jis-x0208@1983	. #x4F21)	; &GT-41795; [47-01]
     (=jis-x0208@1990	. #x4F21)	; &I-J90-4F21; [47-01]
     (=gb12345		. #x412B)	; &GT-41795; [33-11]
@@ -23556,6 +23613,13 @@
     (=gt-pj-1		. #x4F21)	; &I-GT-41795; [47-01]
     (=jef-china3	. #x63A3)	; &I-JC3-63A3;
     (=ucs@unicode	. #x84EE)	; &GT-41795;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x4F21)	; &J78-4F21; [47-01]
+      (=ks-x1001	  . #x5625)	; &I-K0-5625; [54-05]
+      ))
+    (<-simplified@JP/misc
+     ((=daikanwa	  . 31722)	; &M-31722;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -25592,14 +25656,20 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (<-simplified@JP
-     ((=daikanwa	  . 31820)	; &M-31820;
-      ))
     (=jis-x0208@1983	. #x3E55)	; &GT-41587; [30-53]
     (=jis-x0208@1990	. #x3E55)	; &I-J90-3E55; [30-53]
     (=gt		. 41587)	; &I-GT-41587;
     (=gt-pj-1		. #x3E55)	; &I-GT-41587; [30-53]
     (=ucs@jis		. #x848B)	; &GT-41587;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x3E55)	; &JX1-7B36; [30-53]
+      (=ks-x1001	  . #x6D78)	; &I-K0-6D78; [77-88]
+      (=jis-x0212	  . #x5936)	; &I-JSP-5936; [57-22]
+      (=jis-x0213-1-2000  . #x7B36)	; &I-JX1-7B36; [91-22]
+      ))
+    (<-simplified@JP/misc
+     ((=daikanwa	  . 31820)	; &M-31820;
+      ))
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -26614,10 +26684,6 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x85CF)	; 藏
-      (=jis-x0208	  . #x6936)	; &I-J90-6936; [73-22]
-      ))
     (hanyu-dazidian	5 3277 4)
     (=ucs		. #x8535)	; 蔵
     (=jis-x0208		. #x4222)	; &I-J90-4222; [34-02]
@@ -26626,6 +26692,10 @@
     (=gt-pj-1		. #x4222)	; &I-GT-42057; [34-02]
     (=hanziku-9		. #xA6E3)	; &I-HZK09-A6E3;
     (mojikyo		. 050418)	; &MCS-6000C4F2;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x85CF)	; 藏
+      (=jis-x0208	  . #x6936)	; &I-J90-6936; [73-22]
+      ))
     ))
 (define-char
   '((=>ucs		. #x8535)	; 蔵
@@ -28330,13 +28400,6 @@
       (=daikanwa	  . 31970)	; &I-M-31970;
       )
      ((total-strokes	   . 15)
-      (<-vulgar
-       ((shinjigen-1	    . 6886)
-	(=jis-x0208	    . #x6855)	; &GT-40986; [72-53]
-	(=gb2312	    . #x5D60)	; &I-G0-5D60; [61-64]
-	))
-      (<-vulgar*sources
-       shinjigen-1)
       (hanyu-dazidian	  5 3291 3)
       (shinjigen-1	  . 6887)
       (=jis-x0208	  . #x6856)	; &GT-42222; [72-54]
@@ -28344,6 +28407,13 @@
       (=gt-pj-1		  . #x6856)	; &I-GT-42222; [72-54]
       (=hanziku-9	  . #xA9CB)	; &I-HZK09-A9CB;
       (=ucs@unicode	  . #x855A)	; &GT-42222;
+      (<-vulgar
+       ((shinjigen-1	    . 6886)
+	(=jis-x0208	    . #x6855)	; &GT-40986; [72-53]
+	(=gb2312	    . #x5D60)	; &I-G0-5D60; [61-64]
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       ))
     ))
 (define-char
@@ -31614,81 +31684,91 @@
     (=ucs		. #x85A7)	; 薧
     ))
 (define-char
-  '((=>ucs		. #x85A8)	; 薨
-    (ideographic-radical . 140)	; ⾋
+  '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
-    (total-strokes	 . 17)
-    (=daikanwa		. 32147)	; &M-32147;
+    (=ucs		. #x85A8)	; 薨
+    (=big5		. #xC1A9)	; &I-B-C1A9;
     ))
 (define-char
-  '((=>ucs		. #x85A8)	; 薨
-    (morohashi-daikanwa	32147 0 0)
+  '((<-denotational
+     ((=ucs		  . #x85A8)	; 薨
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (=cns11643-1	. #x7533)	; &C1-7533; [85-19]
+    (->subsumptive
+     ((=daikanwa	  . 32147)	; &M-32147;
+      )
+     ((=cns11643-1	  . #x7533)	; &C1-7533; [85-19]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	32147 0 2)
+  '((<-denotational
+     ((=ucs		  . #x85A8)	; 薨
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs		. #x85A8)	; 薨
-    (=jis-x0208		. #x692A)	; &I-J90-692A; [73-10]
+    (=jis-x0208		. #x692A)	; &GT-42689; [73-10]
     (=gb2312		. #x5E30)	; &I-G0-5E30; [62-16]
     (=ks-x1001		. #x7D3C)	; &I-K0-7D3C; [93-28]
     (=gt		. 42689)	; &I-GT-42689;
     (=gt-pj-1		. #x692A)	; &I-GT-42689; [73-10]
+    (=ucs@unicode	. #x85A8)	; &GT-42689;
     (mojikyo		. 055637)	; &MCS-6000D955;
     ))
 (define-char
-  '((=>ucs		. #x85A8)	; 薨
-    (morohashi-daikanwa	32147 0 3)
-    (ideographic-radical . 140)	; ⾋
+  '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=big5		. #xC1A9)	; &B-C1A9;
+    (=ucs		. #x85AA)	; 薪
+    (=big5		. #xC17E)	; &I-B-C17E;
     ))
 (define-char
-  '((=>ucs		. #x85AA)	; 薪
+  '((<-denotational
+     ((=ucs		  . #x85AA)	; 薪
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (=cns11643-1	. #x752A)	; &M-32149; [85-10]
-    (=daikanwa		. 32149)	; &I-M-32149;
-    ))
-(define-char
-  '((=>ucs		. #x85AA)	; 薪
-    (morohashi-daikanwa	32149 1)
-    (ideographic-radical . 140)	; ⾋
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=jis-x0208		. #x3F45)	; &GT-42749; [31-37]
-    (=ks-x1001		. #x636F)	; &I-K0-636F; [67-79]
-    (=big5		. #xC17E)	; &I-B-C17E;
-    (=gt		. 42749)	; &I-GT-42749;
-    (=gt-pj-1		. #x3F45)	; &I-GT-42749; [31-37]
-    (=ucs@jis		. #x85AA)	; &GT-42749;
-    (mojikyo		. 050422)	; &MCS-6000C4F6;
+    (->subsumptive
+     ((=daikanwa	  . 32149)	; &M-32149;
+      )
+     ((=cns11643-1	  . #x752A)	; &C1-752A; [85-10]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	32149 1 1)
+  '((<-denotational
+     ((=ucs		  . #x85AA)	; 薪
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs		. #x85AA)	; 薪
-    (=gb2312		. #x503D)	; &I-G0-503D; [48-29]
-    (mojikyo		. 050422)	; &MCS-6000C4F6;
+    (->subsumptive
+     ((morohashi-daikanwa	32149 1)
+      (=jis-x0208	  . #x3F45)	; &GT-42749; [31-37]
+      (=ks-x1001	  . #x636F)	; &I-K0-636F; [67-79]
+      (=gt		  . 42749)	; &I-GT-42749;
+      (=gt-pj-1		  . #x3F45)	; &I-GT-42749; [31-37]
+      (=ucs@jis		  . #x85AA)	; &GT-42749;
+      (mojikyo		  . 050422)	; &MCS-6000C4F6;
+      )
+     ((=gb2312		  . #x503D)	; &G0-503D; [48-29]
+      (=ucs@unicode	  . #x85AA)	; &G0-503D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (hanyu-dazidian	5 3302 14)
     (=ucs		. #x26F50)	; 𦽐
-    (=cns11643-4	. #x5841)	; &I-C4-5841; [56-33]
-    (=daikanwa		. 32150)	; &I-M-32150;
-    (=hanziku-9		. #xABFC)	; &I-HZK09-ABFC;
+    (->subsumptive
+     ((=daikanwa	  . 32150)	; &M-32150;
+      )
+     ((hanyu-dazidian	  5 3302 14)
+      (=cns11643-4	  . #x5841)	; &HZK09-ABFC; [56-33]
+      (=hanziku-9	  . #xABFC)	; &I-HZK09-ABFC;
+      (=ucs@iso		  . #x26F50)	; &HZK09-ABFC;
+      ))
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -31920,7 +32000,15 @@
     (=daikanwa		. 32172)	; &I-M-32172;
     ))
 (define-char
-  '((=>ucs		. #x85AB)	; 薫
+  '((ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 13)
+    (total-strokes	 . 17)
+    (=ucs		. #x85AB)	; 薫
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x85AB)	; 薫
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
@@ -31928,20 +32016,22 @@
     (=daikanwa		. 32173)	; &I-M-32173;
     ))
 (define-char
-  '((morohashi-daikanwa	32173 0 1)
+  '((<-denotational
+     ((=ucs		  . #x85AB)	; 薫
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x85B0)	; 薰
-      (=jis-x0213-1-2000  . #x7B40)	; &I-JX1-7B40; [91-32]
-      ))
     (shinjigen-1	. 7008)
     (shinjigen-2	. 7007)
-    (=ucs		. #x85AB)	; 薫
-    (=jis-x0208		. #x3730)	; &I-J90-3730; [23-16]
+    (=jis-x0208		. #x3730)	; &GT-42657; [23-16]
     (=gt		. 42657)	; &I-GT-42657;
     (=gt-pj-1		. #x3730)	; &I-GT-42657; [23-16]
+    (=ucs@unicode	. #x85AB)	; &GT-42657;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x85B0)	; 薰
+      (=jis-x0213-1-2000  . #x7B40)	; &I-JX1-7B40; [91-32]
+      ))
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -32076,27 +32166,35 @@
     (=daikanwa		. 32188)	; &M-32188;
     ))
 (define-char
-  '((morohashi-daikanwa	32188 1)
+  '((ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 13)
+    (=ucs		. #x85AC)	; 薬
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x85AC)	; 薬
+      ))
+    (morohashi-daikanwa	32188 1)
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
+    (=jis-x0208		. #x4C74)	; &GT-42895; [44-84]
+    (=gt		. 42895)	; &I-GT-42895;
+    (=gt-pj-1		. #x4C74)	; &I-GT-42895; [44-84]
+    (=ucs@unicode	. #x85AC)	; &GT-42895;
+    (mojikyo		. 050423)	; &MCS-6000C4F7;
     (<-simplified@JP/Jouyou
      ((=ucs		  . #x85E5)	; 藥
       (=jis-x0208	  . #x693B)	; &I-J90-693B; [73-27]
       ))
-    (=ucs		. #x85AC)	; 薬
-    (=jis-x0208		. #x4C74)	; &I-J90-4C74; [44-84]
-    (=gt		. 42895)	; &I-GT-42895;
-    (=gt-pj-1		. #x4C74)	; &I-GT-42895; [44-84]
-    (mojikyo		. 050423)	; &MCS-6000C4F7;
     ))
 (define-char
-  '((=>ucs		. #x85AC)	; 薬
-    (morohashi-daikanwa	32188 1 1)
+  '((<-denotational
+     ((=ucs		  . #x85AC)	; 薬
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (->mojikyo		. 050423)	; 薬
     (=cns11643-3	. #x5630)	; &C3-5630; [54-16]
     ))
 (define-char
@@ -32182,9 +32280,6 @@
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (<-simplified@JP
-     ((=daikanwa	  . 32348)	; &M-32348;
-      ))
     (hanyu-dazidian	5 3306 7)
     (=ucs		. #x85AE)	; 薮
     (=jis-x0208@1978	. #x692E)	; &I-J78-692E; [73-14]
@@ -32194,6 +32289,15 @@
     (=gt		. 42782)	; &I-GT-42782;
     (=gt-pj-1		. #x4C79)	; &I-GT-42782; [44-89]
     (=hanziku-9		. #xACD8)	; &I-HZK09-ACD8;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x4C79)	; &GT-43318; [44-89]
+      (=jis-x0208@1983	  . #x692E)	; &I-J83-692E; [73-14]
+      (=ks-x1001	  . #x623F)	; &I-K0-623F; [66-31]
+      (=jis-x0208@1990	  . #x692E)	; &I-J90-692E; [73-14]
+      ))
+    (<-simplified@JP/misc
+     ((=daikanwa	  . 32348)	; &M-32348;
+      ))
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -32291,8 +32395,15 @@
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (=cns11643-7	. #x423B)	; &M-32190; [34-27]
-    (=daikanwa		. 32190)	; &I-M-32190;
+    (=ucs		. #x26F2D)	; 𦼭
+    (->subsumptive
+     ((=daikanwa	  . 32190)	; &M-32190;
+      )
+     ((hanyu-dazidian	  5 3311 4)
+      (=cns11643-7	  . #x423B)	; &HZK09-ADD8; [34-27]
+      (=hanziku-9	  . #xADD8)	; &I-HZK09-ADD8;
+      (=ucs@iso		  . #x26F2D)	; &HZK09-ADD8;
+      ))
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -32310,7 +32421,8 @@
       (=daikanwa	  . 32191)	; &M-32191;
       )
      ((total-strokes	   . 17)
-      (=ks-x1001	  . #x6023)	; &K0-6023; [64-03]
+      (=jis-x0208@1978	  . #x3D72)	; &J78-3D72; [29-82]
+      (=ks-x1001	  . #x6023)	; &I-K0-6023; [64-03]
       ))
     ))
 (define-char
@@ -32324,15 +32436,19 @@
       (=cns11643-1	  . #x7530)	; &C1-7530; [85-16]
       )
      ((total-strokes	   . 16)
-      (<-simplified@JP
-       ((=daikanwa	    . 32191)	; &M-32191;
-	))
       (=gb2312		  . #x4A6D)	; &GT-42730; [42-77]
       (=jis-x0208@1983	  . #x3D72)	; &I-J83-3D72; [29-82]
       (=jis-x0208@1990	  . #x3D72)	; &I-J90-3D72; [29-82]
       (=gt		  . 42730)	; &I-GT-42730;
       (=gt-pj-1		  . #x3D72)	; &I-GT-42730; [29-82]
       (=ucs@unicode	  . #x85AF)	; &GT-42730;
+      (<-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;
+	))
       ))
     ))
 (define-char
@@ -36342,13 +36458,13 @@
     (=ucs		. #x8602)	; 蘂
     (->subsumptive
      ((total-strokes	   . 20)
+      (=daikanwa	  . 32410)	; &M-32410;
       (<-vulgar
        ((=cns11643-1	    . #x717E)	; &M-31939; [81-94]
 	(=daikanwa	    . 31939)	; &I-M-31939;
 	))
       (<-vulgar*sources
-       zhengzi-tong daikanwa)
-      (=daikanwa	  . 32410)	; &M-32410;
+       zhengzitong daikanwa)
       )
      ((total-strokes	   . 20)
       (=cns11643-3	  . #x5C78)	; &C3-5C78; [60-88]
@@ -37242,25 +37358,28 @@
     (=ucs		. #x27163)	; 𧅣
     ))
 (define-char
-  '((=>ucs		. #x862D)	; 蘭
-    (morohashi-daikanwa	32477 2)
-    (ideographic-radical . 140)	; ⾋
-    (ideographic-strokes . 16)
-    (total-strokes	 . 19)
-    (=jis-x0208		. #x4D76)	; &GT-43607; [45-86]
-    (=gt		. 43607)	; &I-GT-43607;
-    (=gt-pj-1		. #x4D76)	; &I-GT-43607; [45-86]
-    (=ucs@jis		. #x862D)	; &GT-43607;
-    (mojikyo		. 050429)	; &MCS-6000C4FD;
+  '((ideographic-radical . 140)	; ⾋
+    (=ucs		. #x862D)	; 蘭
     ))
 (define-char
-  '((=>ucs		. #x862D)	; 蘭
-    (morohashi-daikanwa	32477 2 1)
+  '((<-denotational
+     ((=ucs		  . #x862D)	; 蘭
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 16)
-    (total-strokes	 . 20)
-    (=gt		. 43786)	; &GT-43786;
-    (=gt-pj-10		. #x6F6E)	; &GT-43786; [79-78]
+    (->subsumptive
+     ((morohashi-daikanwa	32477 2)
+      (total-strokes	   . 19)
+      (=jis-x0208	  . #x4D76)	; &GT-43607; [45-86]
+      (=gt		  . 43607)	; &I-GT-43607;
+      (=gt-pj-1		  . #x4D76)	; &I-GT-43607; [45-86]
+      (=ucs@jis		  . #x862D)	; &GT-43607;
+      (mojikyo		  . 050429)	; &MCS-6000C4FD;
+      )
+     ((total-strokes	   . 20)
+      (=gt		  . 43786)	; &GT-43786;
+      (=gt-pj-10	  . #x6F6E)	; &GT-43786; [79-78]
+      ))
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -37273,9 +37392,7 @@
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
-    (=ucs		. #x4572)	; 䕲
-    (=cns11643-4	. #x6436)	; &I-C4-6436; [68-22]
-    (=daikanwa		. 49656)	; &I-M-49656;
+    (=daikanwa		. 49656)	; &M-49656;
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -37307,6 +37424,29 @@
 (define-char
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 16)
+    (=ucs		. #x4572)	; 䕲
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4572)	; 䕲
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (=ucs@unicode	. #x4572)	; &UU+4572;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4572)	; 䕲
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=cns11643-4	. #x6436)	; &C4-6436; [68-22]
+    ))
+(define-char
+  '((ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (hanyu-dazidian	5 3229 8)
     (=ucs		. #x841A)	; 萚
@@ -38199,41 +38339,48 @@
     (=cns11643-5	. #x6D49)	; &I-C5-6D49; [77-41]
     ))
 (define-char
-  '((=>ucs		. #x862D)	; 蘭
+  '((<-denotational
+     ((=big5		  . #xC4F5)	; &B-C4F5;
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=daikanwa		. 32519)	; &M-32519;
+    (->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
-  '((=>ucs		. #x862D)	; 蘭
-    (morohashi-daikanwa	32519 0 0)
+  '((<-denotational
+     ((=ucs		  . #x862D)	; 蘭
+      ))
     (ideographic-radical . 140)	; ⾋
-    (ideographic-strokes . 17)
-    (total-strokes	 . 21)
-    (=cns11643-1	. #x7B22)	; &GT-43909; [91-02]
-    (=gt		. 43909)	; &I-GT-43909;
-    (=gt-pj-6		. #x5C23)	; &I-GT-43909; [60-03]
+    (=big5		. #xC4F5)	; &B-C4F5;
     ))
 (define-char
-  '((=>ucs		. #x862D)	; 蘭
-    (morohashi-daikanwa	32519 0 1)
+  '((<-denotational
+     ((=big5		  . #xC4F5)	; &B-C4F5;
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
     (=jef-china3	. #x62F6)	; &JC3-62F6;
     ))
 (define-char
-  '((morohashi-daikanwa	32519 0 2)
+  '((<-denotational
+     ((=big5		  . #xC4F5)	; &B-C4F5;
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
-    (=ucs		. #x862D)	; 蘭
-    (=ks-x1001		. #x5535)	; &I-K0-5535; [53-21]
-    (=gb12345		. #x403C)	; 蘭 [32-28]
-    (=big5		. #xC4F5)	; &I-B-C4F5;
+    (=ks-x1001		. #x5535)	; &GT-43788; [53-21]
+    (=gb12345		. #x403C)	; &GT-43788; [32-28]
     (=gt		. 43788)	; &I-GT-43788;
     (=gt-pj-10		. #x7028)	; &I-GT-43788; [80-08]
+    (=ucs@unicode	. #x862D)	; &GT-43788;
     ))
 (define-char
   '((=>ucs		. #x862E)	; 蘮
@@ -41646,12 +41793,6 @@
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
-    (hanyu-dazidian	5 3311 4)
-    (=ucs		. #x26F2D)	; 𦼭
-    (=hanziku-9		. #xADD8)	; &I-HZK09-ADD8;
-    ))
-(define-char
-  '((ideographic-radical . 140)	; ⾋
     (hanyu-dazidian	5 3299 16)
     (=ucs		. #x26F2E)	; 𦼮
     (=hanziku-9		. #xAB7C)	; &I-HZK09-AB7C;
diff --git a/lisp/utf-2000/Ideograph-R141-Tiger.el b/lisp/utf-2000/Ideograph-R141-Tiger.el
index 985a17c..77d7d34 100644
--- a/lisp/utf-2000/Ideograph-R141-Tiger.el
+++ b/lisp/utf-2000/Ideograph-R141-Tiger.el
@@ -53,10 +53,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC1)	; ⻁
     (<-identical@component
      ((=ucs		  . #x864E)	; 虎
       ))
-    (=ucs		. #x2EC1)	; ⻁
     ))
 (define-char
   '((<-denotational
@@ -641,18 +641,18 @@
     (total-strokes	 . 11)
     (=ucs		. #x865A)	; 虚
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=ks-x1001	    . #x7A48)	; &M-32709; [90-40]
-	(=jis-x0213-1-2000  . #x7B4E)	; &I-JX1-7B4E; [91-46]
-	(=daikanwa	    . 32709)	; &I-M-32709;
-	))
-      (=jis-x0208	  . #x3575)	; &GT-44199; [21-85]
+     ((=jis-x0208	  . #x3575)	; &GT-44199; [21-85]
       (=gb2312		  . #x5069)	; &I-G0-5069; [48-73]
       (=gt		  . 44199)	; &I-GT-44199;
       (=gt-k		  . 07745)	; &I-GT-K07745;
       (=gt-pj-1		  . #x3575)	; &I-GT-44199; [21-85]
       (=daikanwa	  . 32708)	; &I-M-32708;
       (=ucs@unicode	  . #x865A)	; &GT-44199;
+      (<-simplified@JP/Jouyou
+       ((=ks-x1001	    . #x7A48)	; &M-32709; [90-40]
+	(=jis-x0213-1-2000  . #x7B4E)	; &I-JX1-7B4E; [91-46]
+	(=daikanwa	    . 32709)	; &I-M-32709;
+	))
       )
      ((=cns11643-3	  . #x3861)	; &C3-3861; [24-65]
       ))
@@ -683,27 +683,32 @@
   '((<-denotational
      ((=ucs		  . #x865C)	; 虜
       ))
+    (name		. "CJK COMPATIBILITY IDEOGRAPH-F936")
+    (=>ucs*		. #x865C)	; 虜
+    (=>ucs@cns		. #x865C)	; &C1-663F;
     (=>ucs@jis		. #xF936)	; &M-32710;
     (ideographic-radical . 141)	; ⾌
+    (=ucs		. #xF936)	; 虜
     (->subsumptive
      ((ideographic-strokes . 6)
       (total-strokes	   . 12)
       (=jis-x0213-1-2000  . #x7B4F)	; &M-32710; [91-47]
       (=daikanwa	  . 32710)	; &I-M-32710;
-      (=jef-china3	  . #x63AB)	; &I-JC3-63AB;
       (=ucs@jis		  . #xF936)	; &M-32710;
       (->subsumptive
        ((=ks-x1001	    . #x5657)	; &K0-5657; [54-55]
 	(=ucs@ks	    . #x865C)	; &K0-5657;
 	)
-       ((name		    . "CJK COMPATIBILITY IDEOGRAPH-F936")
-	(=>ucs*		    . #x865C)	; 虜
-	(=ucs		    . #xF936)	; 虜
-	(=ks-x1001	    . #x5249)	; &I-K0-5249; [50-41]
+       ((=ks-x1001	    . #x5249)	; &K0-5249; [50-41]
+	(=ucs@ks	    . #xF936)	; &K0-5249;
 	))
       )
      ((ideographic-strokes . 7)
       (total-strokes	   . 13)
+      (=jef-china3	  . #x63AB)	; &JC3-63AB;
+      )
+     ((ideographic-strokes . 7)
+      (total-strokes	   . 13)
       (=cns11643-1	  . #x663F)	; &C1-663F; [70-31]
       (=ucs@cns		  . #x865C)	; &C1-663F;
       ))
@@ -713,28 +718,58 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
     (=ucs		. #x4590)	; 䖐
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4590)	; 䖐
+      ))
+    (ideographic-radical . 141)	; ⾌
+    (ideographic-strokes . 6)
+    (total-strokes	 . 12)
     (->subsumptive
      ((=daikanwa	  . 32711)	; &M-32711;
       )
      ((=cns11643-5	  . #x3B70)	; &C5-3B70; [27-80]
-      )
-     ((=ucs@unicode	  . #x4590)	; &UU+4590;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x4590)	; 䖐
+      ))
+    (ideographic-radical . 141)	; ⾌
+    (ideographic-strokes . 6)
+    (total-strokes	 . 12)
+    (=ucs@unicode	. #x4590)	; &UU+4590;
+    ))
+(define-char
   '((ideographic-radical . 141)	; ⾌
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
     (=ucs		. #x4591)	; 䖑
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4591)	; 䖑
+      ))
+    (ideographic-radical . 141)	; ⾌
+    (ideographic-strokes . 6)
+    (total-strokes	 . 12)
     (->subsumptive
      ((=daikanwa	  . 32712)	; &M-32712;
       )
      ((=cns11643-3	  . #x3E60)	; &C3-3E60; [30-64]
-      )
-     ((=ucs@unicode	  . #x4591)	; &UU+4591;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x4591)	; 䖑
+      ))
+    (ideographic-radical . 141)	; ⾌
+    (ideographic-strokes . 6)
+    (total-strokes	 . 12)
+    (=ucs@unicode	. #x4591)	; &UU+4591;
+    ))
+(define-char
   '((ideographic-radical . 141)	; ⾌
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
@@ -859,18 +894,15 @@
   '((<-denotational
      ((=ucs		  . #x865C)	; 虜
       ))
+    (=>ucs*		. #x865C)	; 虜
     (=>ucs@gb		. #x865C)	; &GT-44235;
-    (=>ucs@cns		. #x2F9B4)	; 虜
     (=>ucs@jis		. #x865C)	; &GT-44235;
     (ideographic-radical . 141)	; ⾌
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
+    (=ucs		. #x2F9B4)	; 虜
     (->subsumptive
      ((morohashi-daikanwa	32720 1)
-      (<-simplified@JP/Jouyou
-       ((=jis-x0213-1-2000  . #x7B4F)	; &M-32710; [91-47]
-	(=daikanwa	    . 32710)	; &I-M-32710;
-	))
       (=jis-x0208	  . #x4E3A)	; &GT-44235; [46-26]
       (=gb12345		  . #x4232)	; &GT-44235; [34-18]
       (=gt		  . 44235)	; &I-GT-44235;
@@ -878,10 +910,13 @@
       (=gt-pj-1		  . #x4E3A)	; &I-GT-44235; [46-26]
       (=ucs@unicode	  . #x865C)	; &GT-44235;
       (mojikyo		  . 050431)	; &MCS-6000C4FF;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0213-1-2000  . #x7B4F)	; &M-32710; [91-47]
+	(=daikanwa	    . 32710)	; &I-M-32710;
+	))
       )
-     ((=>ucs*		  . #x865C)	; 虜
-      (=ucs		  . #x2F9B4)	; 虜
-      (=cns11643-4	  . #x404F)	; &I-C4-404F; [32-47]
+     ((=cns11643-4	  . #x404F)	; &C4-404F; [32-47]
+      (=ucs@iso		  . #x2F9B4)	; &C4-404F;
       ))
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R142-Insect.el b/lisp/utf-2000/Ideograph-R142-Insect.el
index 232034d..4718abb 100644
--- a/lisp/utf-2000/Ideograph-R142-Insect.el
+++ b/lisp/utf-2000/Ideograph-R142-Insect.el
@@ -3,10 +3,6 @@
   '((ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x87F2)	; 蟲
-      (=jis-x0208	  . #x6A35)	; &I-J90-6A35; [74-21]
-      ))
     (shinjigen-2	. 7101)
     (=ucs		. #x866B)	; 虫
     (=jis-x0208		. #x436E)	; &I-J90-436E; [35-78]
@@ -17,6 +13,10 @@
     (=gt-k		. 01671)	; &I-GT-K01671;
     (=gt-pj-1		. #x436E)	; &I-GT-44325; [35-78]
     (=daikanwa		. 32804)	; &I-M-32804;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x87F2)	; 蟲
+      (=jis-x0208	  . #x6A35)	; &I-J90-6A35; [74-21]
+      ))
     ))
 (define-char
   '((ideographic-radical . 142)	; ⾍
@@ -832,17 +832,17 @@
     (=ucs		. #x8695)	; 蚕
     (=big5		. #xD3C9)	; &I-B-D3C9;
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=ks-x1001	    . #x6D59)	; &J90-6A44; [77-57]
-	(=jis-x0208@1990    . #x6A44)	; &I-J90-6A44; [74-36]
-	))
-      (shinjigen-2	  . 7120)
+     ((shinjigen-2	  . 7120)
       (=jis-x0208	  . #x3B3D)	; &GT-44395; [27-29]
       (=gt		  . 44395)	; &I-GT-44395;
       (=gt-k		  . 06444)	; &I-GT-K06444;
       (=gt-pj-1		  . #x3B3D)	; &I-GT-44395; [27-29]
       (=daikanwa	  . 32869)	; &I-M-32869;
       (=ucs@jis		  . #x8695)	; &GT-44395;
+      (<-simplified@JP/Jouyou
+       ((=ks-x1001	    . #x6D59)	; &J90-6A44; [77-57]
+	(=jis-x0208@1990    . #x6A44)	; &I-J90-6A44; [74-36]
+	))
       )
      ((=gb2312		  . #x324F)	; &C2-326B; [18-47]
       (=cns11643-2	  . #x326B)	; &I-C2-326B; [18-75]
@@ -2036,7 +2036,10 @@
     (total-strokes	 . 11)
     (=ucs		. #x2726E)	; 𧉮
     (->subsumptive
-     ((<-vulgar
+     ((shinjigen-1	  . 7140)
+      (=daikanwa	  . 32965)	; &M-32965;
+      (=ucs@iso		  . #x2726E)	; &M-32965;
+      (<-vulgar
        ((shinjigen-1	    . 7138)
 	(=jis-x0208	    . #x3C58)	; &GT-44469; [28-56]
 	(=ks-x1001	    . #x5E6F)	; &I-K0-5E6F; [62-79]
@@ -2044,9 +2047,6 @@
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 7140)
-      (=daikanwa	  . 32965)	; &M-32965;
-      (=ucs@iso		  . #x2726E)	; &M-32965;
       )
      ((=cns11643-6	  . #x4449)	; &C6-4449; [36-41]
       ))
@@ -2213,17 +2213,17 @@
   '((ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 5)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6A25)	; &GT-45046; [74-05]
-      (=ks-x1001	  . #x7B2B)	; &I-K0-7B2B; [91-11]
-      (=daikanwa	  . 33434)	; &I-M-33434;
-      ))
     (shinjigen-2	. 7136)
     (=ucs		. #x86CD)	; 蛍
     (=jis-x0208		. #x3756)	; &I-J90-3756; [23-54]
     (=gt		. 44456)	; &I-GT-44456;
     (=gt-pj-1		. #x3756)	; &I-GT-44456; [23-54]
     (=daikanwa		. 32983)	; &I-M-32983;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6A25)	; &GT-45046; [74-05]
+      (=ks-x1001	  . #x7B2B)	; &I-K0-7B2B; [91-11]
+      (=daikanwa	  . 33434)	; &I-M-33434;
+      ))
     ))
 (define-char
   '((ideographic-radical . 142)	; ⾍
@@ -2333,18 +2333,18 @@
     (total-strokes	 . 12)
     (=ucs		. #x86D5)	; 蛕
     (->subsumptive
-     ((<-original
+     ((shinjigen-1	  . 7154)
+      (=jis-x0212	  . #x5A65)	; &M-32991; [58-69]
+      (=jis-x0213-2-2000  . #x774B)	; &I-JX2-774B; [87-43]
+      (=daikanwa	  . 32991)	; &I-M-32991;
+      (=ucs@unicode	  . #x86D5)	; &M-32991;
+      (<-original
        ((shinjigen-1	    . 7153)
 	(=ucs		    . #x86D4)	; 蛔
 	(=jis-x0208	    . #x695C)	; &I-J90-695C; [73-60]
 	))
       (<-original*sources
        shinjigen-1)
-      (shinjigen-1	  . 7154)
-      (=jis-x0212	  . #x5A65)	; &M-32991; [58-69]
-      (=jis-x0213-2-2000  . #x774B)	; &I-JX2-774B; [87-43]
-      (=daikanwa	  . 32991)	; &I-M-32991;
-      (=ucs@unicode	  . #x86D5)	; &M-32991;
       )
      ((=cns11643-3	  . #x3E62)	; &C3-3E62; [30-66]
       ))
@@ -2948,41 +2948,41 @@
     (=daikanwa		. 33043)	; &I-M-33043;
     ))
 (define-char
-  '((=>ucs		. #x86EE)	; 蛮
-    (ideographic-radical . 142)	; ⾍
+  '((ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6A47)	; &GT-45760; [74-39]
-      (=ks-x1001	  . #x5841)	; &I-K0-5841; [56-33]
-      (=daikanwa	  . 33914)	; &I-M-33914;
+    (=ucs		. #x86EE)	; 蛮
+    (->subsumptive
+     ((shinjigen-1	  . 7166)
+      (shinjigen-2	  . 7166)
+      (=jis-x0208	  . #x485A)	; &GT-44597; [40-58]
+      (=gt		  . 44597)	; &I-GT-44597;
+      (=gt-k		  . 09128)	; &I-GT-K09128;
+      (=gt-pj-1		  . #x485A)	; &I-GT-44597; [40-58]
+      (=daikanwa	  . 33044)	; &I-M-33044;
+      (=ucs@jis		  . #x86EE)	; &GT-44597;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6A47)	; &GT-45760; [74-39]
+	(=ks-x1001	    . #x5841)	; &I-K0-5841; [56-33]
+	(=daikanwa	    . 33914)	; &I-M-33914;
+	))
+      )
+     ((=cns11643-3	  . #x3E68)	; &C3-3E68; [30-72]
+      )
+     ((=gb2312		  . #x4279)	; &G0-4279; [34-89]
+      (=ucs@unicode	  . #x86EE)	; &G0-4279;
       ))
-    (shinjigen-2	. 7166)
-    (=jis-x0208		. #x485A)	; &GT-44597; [40-58]
-    (=gt		. 44597)	; &I-GT-44597;
-    (=gt-k		. 09128)	; &I-GT-K09128;
-    (=gt-pj-1		. #x485A)	; &I-GT-44597; [40-58]
-    (=daikanwa		. 33044)	; &I-M-33044;
-    (=ucs@jis		. #x86EE)	; &GT-44597;
-    ))
-(define-char
-  '((=>ucs		. #x86EE)	; 蛮
-    (morohashi-daikanwa	33044 0 0)
-    (ideographic-radical . 142)	; ⾍
-    (ideographic-strokes . 6)
-    (total-strokes	 . 12)
-    (=cns11643-3	. #x3E68)	; &C3-3E68; [30-72]
     ))
 (define-char
-  '((morohashi-daikanwa	33044 0 1)
-    (ideographic-radical . 142)	; ⾍
+  '((ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
-    (=ucs		. #x86EE)	; 蛮
-    (=gb2312		. #x4279)	; &I-G0-4279; [34-89]
+    (=ucs		. #x272A5)	; 𧊥
     ))
 (define-char
-  '((=>ucs		. #x272A5)	; 𧊥
+  '((<-denotational
+     ((=ucs		  . #x272A5)	; 𧊥
+      ))
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
@@ -2990,11 +2990,13 @@
     (=daikanwa		. 33045)	; &I-M-33045;
     ))
 (define-char
-  '((morohashi-daikanwa	33045 0 0)
+  '((<-denotational
+     ((=ucs		  . #x272A5)	; 𧊥
+      ))
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
-    (=ucs		. #x272A5)	; 𧊥
+    (=ucs@iso		. #x272A5)	; &U-000272A5;
     ))
 (define-char
   '((ideographic-radical . 142)	; ⾍
@@ -3512,6 +3514,11 @@
   '((ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
+    (shinjigen-1	. 7174)
+    (=ucs		. #x45B8)	; 䖸
+    (=cns11643-3	. #x444B)	; &I-C3-444B; [36-43]
+    (=jis-x0213-2-2000	. #x774F)	; &I-JX2-774F; [87-47]
+    (=daikanwa		. 33083)	; &I-M-33083;
     (<-formed
      ((shinjigen-1	  . 7173)
       (=ucs		  . #x86FE)	; 蛾
@@ -3519,31 +3526,26 @@
       ))
     (<-formed*sources
      shinjigen-1)
-    (shinjigen-1	. 7174)
-    (=ucs		. #x45B8)	; 䖸
-    (=cns11643-3	. #x444B)	; &I-C3-444B; [36-43]
-    (=jis-x0213-2-2000	. #x774F)	; &I-JX2-774F; [87-47]
-    (=daikanwa		. 33083)	; &I-M-33083;
     ))
 (define-char
   '((=>ucs		. #x45B9)	; 䖹
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
+    (=daikanwa		. 33084)	; &M-33084;
     (<-unknown
      ((=ucs		  . #x45B9)	; 䖹
       ))
-    (=daikanwa		. 33084)	; &M-33084;
     ))
 (define-char
   '((=>daikanwa		. 33084)	; &M-33084;
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (=ucs		. #x45B9)	; 䖹
     (<-unknown
      ((=daikanwa	  . 33084)	; &M-33084;
       ))
-    (=ucs		. #x45B9)	; 䖹
     (->subsumptive
      ((=ucs@unicode	  . #x45B9)	; &UU+45B9;
       )
@@ -5947,16 +5949,16 @@
     (->subsumptive
      ((=cns11643-1	  . #x6A73)	; &C1-6A73; [74-83]
       )
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x3F2A)	; &M-33264; [31-10]
-	(=ks-x1001	    . #x635A)	; &I-K0-635A; [67-58]
-	(=daikanwa	    . 33264)	; &I-M-33264;
-	))
-      (=jis-x0208@1983	  . #x3F2A)	; &GT-44785; [31-10]
+     ((=jis-x0208@1983	  . #x3F2A)	; &GT-44785; [31-10]
       (=jis-x0208@1990	  . #x3F2A)	; &I-J90-3F2A; [31-10]
       (=gt		  . 44785)	; &I-GT-44785;
       (=gt-pj-1		  . #x3F2A)	; &I-GT-44785; [31-10]
       (=ucs@jis		  . #x8755)	; &GT-44785;
+      (<-simplified@JP/jis
+       ((=jis-x0208@1978    . #x3F2A)	; &M-33264; [31-10]
+	(=ks-x1001	    . #x635A)	; &I-K0-635A; [67-58]
+	(=daikanwa	    . 33264)	; &I-M-33264;
+	))
       )
      ((=gb12345		  . #x4A34)	; &UU+8755; [42-20]
       (=ucs@unicode	  . #x8755)	; &UU+8755;
@@ -7144,17 +7146,17 @@
   '((ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
-    (<-simplified@JP
-     ((=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]
-      ))
     (=ucs		. #x877F)	; 蝿
     (=jis-x0208@1978	. #x6A24)	; &I-J78-6A24; [74-04]
     (=jis-x0208@1983	. #x4768)	; &I-J83-4768; [39-72]
     (=jis-x0208@1990	. #x4768)	; &I-J90-4768; [39-72]
     (=gt		. 45000)	; &I-GT-45000;
     (=gt-pj-1		. #x4768)	; &I-GT-45000; [39-72]
+    (<-simplified@JP/jis
+     ((=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]
+      ))
     ))
 (define-char
   '((ideographic-radical . 142)	; ⾍
@@ -7710,9 +7712,6 @@
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
-    (<-same
-     ((=ucs		  . #x2F9BB)	; 蝹
-      ))
     (=ucs		. #x2F9BB)	; 蝹
     (=cns11643-4	. #x4D33)	; &I-C4-4D33; [45-19]
     (=ucs@unicode	. #x8779)	; 蝹
@@ -10348,13 +10347,13 @@
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
+    (=ucs		. #x2F9C0)	; 蟡
+    (=cns11643-7	. #x425F)	; &I-C7-425F; [34-63]
+    (=daikanwa		. 33594)	; &I-M-33594;
     (<-formed
      ((=jis-x0208	  . #x6D7B)	; &GT-52182; [77-91]
       (=daikanwa	  . 38949)	; &I-M-38949;
       ))
-    (=ucs		. #x2F9C0)	; 蟡
-    (=cns11643-7	. #x425F)	; &I-C7-425F; [34-63]
-    (=daikanwa		. 33594)	; &I-M-33594;
     ))
 (define-char
   '((<-denotational
@@ -10743,16 +10742,16 @@
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
-    (<-simplified@JP
-     ((=ucs		  . #x87EC)	; 蟬
-      (=jis-x0208@1978	  . #x4066)	; &I-J78-4066; [32-70]
-      (=jis-x0213-1-2000  . #x7B62)	; &I-JX1-7B62; [91-66]
-      ))
     (=jis-x0208@1983	. #x4066)	; &GT-44946; [32-70]
     (=jis-x0208@1990	. #x4066)	; &I-J90-4066; [32-70]
     (=gt		. 44946)	; &I-GT-44946;
     (=gt-pj-1		. #x4066)	; &I-GT-44946; [32-70]
     (=ucs@jis		. #x8749)	; &GT-44946;
+    (<-simplified@JP/jis
+     ((=ucs		  . #x87EC)	; 蟬
+      (=jis-x0208@1978	  . #x4066)	; &I-J78-4066; [32-70]
+      (=jis-x0213-1-2000  . #x7B62)	; &I-JX1-7B62; [91-66]
+      ))
     ))
 (define-char
   '((ideographic-radical . 142)	; ⾍
@@ -11239,10 +11238,10 @@
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
+    (=jef-china3	. #x63C0)	; &JC3-63C0;
     (<-unknown
      ((=ucs		  . #x8803)	; 蠃
       ))
-    (=jef-china3	. #x63C0)	; &JC3-63C0;
     ))
 (define-char
   '((ideographic-radical . 142)	; ⾍
@@ -12848,18 +12847,18 @@
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (<-simplified@JP
+    (=ucs		. #x874B)	; 蝋
+    (=jis-x0208@1983	. #x4F39)	; &I-J83-4F39; [47-25]
+    (=jis-x0208@1990	. #x4F39)	; &I-J90-4F39; [47-25]
+    (=gt		. 44863)	; &I-GT-44863;
+    (=gt-pj-1		. #x4F39)	; &I-GT-44863; [47-25]
+    (<-simplified@JP/jis
      ((=jis-x0208@1978	  . #x4F39)	; &M-33786; [47-25]
       (=ks-x1001	  . #x5545)	; &I-K0-5545; [53-37]
       (=jis-x0212	  . #x5B78)	; &I-JSP-5B78; [59-88]
       (=jis-x0213-1-2000  . #x7B67)	; &I-JX1-7B67; [91-71]
       (=daikanwa	  . 33786)	; &I-M-33786;
       ))
-    (=ucs		. #x874B)	; 蝋
-    (=jis-x0208@1983	. #x4F39)	; &I-J83-4F39; [47-25]
-    (=jis-x0208@1990	. #x4F39)	; &I-J90-4F39; [47-25]
-    (=gt		. 44863)	; &I-GT-44863;
-    (=gt-pj-1		. #x4F39)	; &I-GT-44863; [47-25]
     ))
 (define-char
   '((<-denotational
@@ -13057,10 +13056,6 @@
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 5)
     (total-strokes	 . 11)
-    (<-simplified@JP
-     ((=cns11643-1	  . #x7B24)	; &M-33799; [91-04]
-      (=daikanwa	  . 33799)	; &I-M-33799;
-      ))
     (=ucs		. #x86CE)	; 蛎
     (=jis-x0208@1978	. #x695A)	; &I-J78-695A; [73-58]
     (=gb2312		. #x7243)	; &I-G0-7243; [82-35]
@@ -13068,6 +13063,16 @@
     (=jis-x0208@1990	. #x3342)	; &I-J90-3342; [19-34]
     (=gt		. 44523)	; &I-GT-44523;
     (=gt-pj-1		. #x3342)	; &I-GT-44523; [19-34]
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x3342)	; &GT-45572; [19-34]
+      (=jis-x0208@1983	  . #x695A)	; &I-J83-695A; [73-58]
+      (=ks-x1001	  . #x556E)	; &I-K0-556E; [53-78]
+      (=jis-x0208@1990	  . #x695A)	; &I-J90-695A; [73-58]
+      ))
+    (<-simplified@JP/misc
+     ((=cns11643-1	  . #x7B24)	; &M-33799; [91-04]
+      (=daikanwa	  . 33799)	; &I-M-33799;
+      ))
     ))
 (define-char
   '((ideographic-radical . 142)	; ⾍
diff --git a/lisp/utf-2000/Ideograph-R144-Walk-Enclosure.el b/lisp/utf-2000/Ideograph-R144-Walk-Enclosure.el
index 9c5d1ef..b8f5dea 100644
--- a/lisp/utf-2000/Ideograph-R144-Walk-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R144-Walk-Enclosure.el
@@ -197,18 +197,17 @@
     (total-strokes	 . 11)
     (=big5		. #xB34E)	; &B-B34E;
     (->subsumptive
-     ((<-formed
-       ((=ks-x1001	    . #x627B)	; &M-38803; [66-91]
-	(=daikanwa	    . 38803)	; &I-M-38803;
-	))
-      (shinjigen-1	  . 7325)
+     ((shinjigen-1	  . 7325)
       (=ks-x1001	  . #x627A)	; &M-34046; [66-90]
       (=daikanwa	  . 34046)	; &I-M-34046;
       (=jef-china3	  . #x63E7)	; &I-JC3-63E7;
       (mojikyo		  . 034046)	; &MCS-600084FE;
+      (<-formed
+       ((=ks-x1001	    . #x627B)	; &M-38803; [66-91]
+	(=daikanwa	    . 38803)	; &I-M-38803;
+	))
       )
-     ((shinjigen-1	  . 7325)
-      (=cns11643-1	  . #x5D34)	; &C1-5D34; [61-20]
+     ((=cns11643-1	  . #x5D34)	; &C1-5D34; [61-20]
       ))
     ))
 (define-char
@@ -549,27 +548,29 @@
       )
      ((ideographic-strokes . 10)
       (total-strokes	   . 16)
+      (shinjigen-1	  . 7331)
       (=jis-x0208@1978	  . #x3152)	; &J83-3152; [17-50]
       (=jis-x0208@1983	  . #x3152)	; &I-J83-3152; [17-50]
       (mojikyo		  . 054025)	; &MCS-6000D309;
       )
      ((ideographic-strokes . 10)
       (total-strokes	   . 16)
-      (<-simplified@JP/Jouyou
-       ((=ucs		    . #x885E)	; 衞
-	(=jis-x0208	    . #x6A4C)	; &I-J90-6A4C; [74-44]
-	))
       (=ks-x1001	  . #x6A5B)	; &GT-45951; [74-59]
       (=jis-x0208@1990	  . #x3152)	; &I-J90-3152; [17-50]
       (=gt		  . 45951)	; &I-GT-45951;
       (=gt-pj-1		  . #x3152)	; &I-GT-45951; [17-50]
       (=ucs@jis		  . #x885B)	; &GT-45951;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x885E)	; 衞
+	(=jis-x0208	    . #x6A4C)	; &I-J90-6A4C; [74-44]
+	))
       ))
     ))
 (define-char
   '((ideographic-radical . 144)	; ⾏
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
+    (shinjigen-1	. 7332)
     (shinjigen-2	. 7332)
     (=ucs		. #x885E)	; 衞
     (=jis-x0208		. #x6A4C)	; &I-J90-6A4C; [74-44]
diff --git a/lisp/utf-2000/Ideograph-R145-Clothes.el b/lisp/utf-2000/Ideograph-R145-Clothes.el
index 150f05d..cc3494d 100644
--- a/lisp/utf-2000/Ideograph-R145-Clothes.el
+++ b/lisp/utf-2000/Ideograph-R145-Clothes.el
@@ -36,23 +36,23 @@
   '((ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
+    (=ucs		. #x8864)	; 衤
     (<-formed@component/connect-right
      ((=ucs		  . #x8863)	; è¡£
       ))
-    (=ucs		. #x8864)	; 衤
     (->subsumptive
-     ((<-formed@component/connect-right
+     ((=jis-x0212	  . #x5C33)	; &M-34092; [60-19]
+      (=jis-x0213-2-2000  . #x7828)	; &I-JX2-7828; [88-08]
+      (=daikanwa	  . 34092)	; &I-M-34092;
+      (=jef-china3	  . #x63F0)	; &I-JC3-63F0;
+      (=ucs@jis		  . #x8864)	; &M-34092;
+      (<-formed@component/connect-right
        ((=jis-x0208	    . #x3061)	; &GT-45972; [16-65]
 	(=ks-x1001	    . #x6B7D)	; &I-K0-6B7D; [75-93]
 	(=daikanwa	    . 34091)	; &I-M-34091;
 	))
       (<-formed@component/connect-right*sources
        daikanwa)
-      (=jis-x0212	  . #x5C33)	; &M-34092; [60-19]
-      (=jis-x0213-2-2000  . #x7828)	; &I-JX2-7828; [88-08]
-      (=daikanwa	  . 34092)	; &I-M-34092;
-      (=jef-china3	  . #x63F0)	; &I-JC3-63F0;
-      (=ucs@jis		  . #x8864)	; &M-34092;
       )
      ((=gb2312		  . #x7142)	; &CDP-8BB1; [81-34]
       (=big5-cdp	  . #x8BB1)	; &I-CDP-8BB1;
@@ -68,10 +68,10 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (total-strokes	 . 5)
+    (=ucs		. #x2EC2)	; ⻂
     (<-identical@component/connect-right
      ((=ucs		  . #x8864)	; 衤
       ))
-    (=ucs		. #x2EC2)	; ⻂
     ))
 (define-char
   '((=>ucs		. #x27608)	; 𧘈
@@ -94,16 +94,16 @@
     (total-strokes	 . 8)
     (=ucs		. #x461A)	; 䘚
     (->subsumptive
-     ((<-original
+     ((shinjigen-1	  . 823)
+      (=daikanwa	  . 34094)	; &M-34094;
+      (<-original
        ((shinjigen-1	    . 823)
 	(=jis-x0208	    . #x4234)	; &GT-03504; [34-20]
 	(=ks-x1001	    . #x706F)	; &I-K0-706F; [80-79]
 	(=daikanwa	    . 02740)	; &I-M-02740;
 	))
       (<-original*sources
-       zhengzi-tong daikanwa shinjigen-1)
-      (shinjigen-1	  . 823)
-      (=daikanwa	  . 34094)	; &M-34094;
+       zhengzitong daikanwa shinjigen-1)
       )
      ((=cns11643-3	  . #x2A6E)	; &C3-2A6E; [10-78]
       (=ucs@unicode	  . #x461A)	; &C3-2A6E;
@@ -2100,11 +2100,11 @@
   '((ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 5)
     (total-strokes	 . 11)
+    (=ucs		. #x88AF)	; 袯
+    (=iso-ir165		. #x2C5D)	; &I-EGB-2C5D; [12-61]
     (<-simplified@CN
      ((=ucs		  . #x894F)	; 襏
       ))
-    (=ucs		. #x88AF)	; 袯
-    (=iso-ir165		. #x2C5D)	; &I-EGB-2C5D; [12-61]
     ))
 (define-char
   '((ideographic-radical . 145)	; ⾐
@@ -2859,29 +2859,26 @@
     (=ucs		. #x88C4)	; 裄
     ))
 (define-char
-  '((=>ucs		. #x88C5)	; 装
-    (morohashi-daikanwa	34283 1)
-    (ideographic-radical . 145)	; ⾐
-    (ideographic-strokes . 6)
-    (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6A66)	; &GT-46296; [74-70]
-      (=ks-x1001	  . #x6D7B)	; &I-K0-6D7B; [77-91]
-      (=daikanwa	  . 34321)	; &I-M-34321;
-      ))
-    (=jis-x0208		. #x4175)	; &GT-46217; [33-85]
-    (=gt		. 46217)	; &I-GT-46217;
-    (=gt-pj-1		. #x4175)	; &I-GT-46217; [33-85]
-    (=ucs@jis		. #x88C5)	; &GT-46217;
-    ))
-(define-char
-  '((morohashi-daikanwa	34283 1 0)
-    (ideographic-radical . 145)	; ⾐
+  '((ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
     (=ucs		. #x88C5)	; 装
-    (=gb2312		. #x5730)	; &I-G0-5730; [55-16]
-    (mojikyo		. 050442)	; &MCS-6000C50A;
+    (->subsumptive
+     ((morohashi-daikanwa	34283 1)
+      (=jis-x0208	  . #x4175)	; &GT-46217; [33-85]
+      (=gt		  . 46217)	; &I-GT-46217;
+      (=gt-pj-1		  . #x4175)	; &I-GT-46217; [33-85]
+      (=ucs@jis		  . #x88C5)	; &GT-46217;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6A66)	; &GT-46296; [74-70]
+	(=ks-x1001	    . #x6D7B)	; &I-K0-6D7B; [77-91]
+	(=daikanwa	    . 34321)	; &I-M-34321;
+	))
+      )
+     ((=gb2312		  . #x5730)	; &G0-5730; [55-16]
+      (=ucs@unicode	  . #x88C5)	; &G0-5730;
+      (mojikyo		  . 050442)	; &MCS-6000C50A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 145)	; ⾐
@@ -5230,149 +5227,152 @@
     (=daikanwa		. 34433)	; &I-M-34433;
     ))
 (define-char
-  '((=>ucs		. #x276DA)	; 𧛚
-    (ideographic-radical . 145)	; ⾐
+  '((ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
-    (=daikanwa		. 34434)	; &M-34434;
+    (=ucs		. #x276DA)	; 𧛚
+    (->subsumptive
+     ((=daikanwa	  . 34434)	; &M-34434;
+      )
+     ((=cns11643-5	  . #x5067)	; &C5-5067; [48-71]
+      (=ucs@iso		  . #x276DA)	; &C5-5067;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	34434 0 0)
-    (ideographic-radical . 145)	; ⾐
-    (ideographic-strokes . 9)
-    (total-strokes	 . 15)
-    (=ucs		. #x276DA)	; 𧛚
-    (=cns11643-5	. #x5067)	; &I-C5-5067; [48-71]
+  '((ideographic-radical . 145)	; ⾐
+    (=ucs		. #x8910)	; 褐
     ))
 (define-char
-  '((=>ucs*		. #x8910)	; 褐
-    (=>ucs@gb		. #x8910)	; 褐
-    (=>ucs@cns		. #x8910)	; 褐
+  '((<-denotational
+     ((=ucs		  . #x8910)	; 褐
+      ))
+    (=>ucs*		. #x8910)	; 褐
+    (=>ucs@gb		. #x8910)	; &C1-6E6E;
+    (=>ucs@cns		. #x8910)	; &C1-6E6E;
+    (=>ucs@ks		. #x8910)	; &M-34435;
     (ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #xFA60)	; ï© 
-    (=ks-x1001		. #x4A68)	; &I-K0-4A68; [42-72]
-    (=jis-x0213-1-2000	. #x7B6F)	; &I-JX1-7B6F; [91-79]
     (=big5		. #xBDC5)	; &I-B-BDC5;
-    (=daikanwa		. 34435)	; &I-M-34435;
-    (=ucs@ks		. #x8910)	; ï© 
+    (=jef-china3	. #x63EE)	; &I-JC3-63EE;
     (=ucs@big5		. #x8910)	; ï© 
+    (->subsumptive
+     ((=ks-x1001	  . #x4A68)	; &M-34435; [42-72]
+      (=jis-x0213-1-2000  . #x7B6F)	; &I-JX1-7B6F; [91-79]
+      (=daikanwa	  . 34435)	; &I-M-34435;
+      (=ucs@unicode	  . #xFA60)	; &M-34435;
+      (=ucs@ks		  . #x8910)	; &M-34435;
+      )
+     ((=gb2312		  . #x3A56)	; &C1-6E6E; [26-54]
+      (=cns11643-1	  . #x6E6E)	; &I-C1-6E6E; [78-78]
+      (=ucs@unicode	  . #x8910)	; &C1-6E6E;
+      ))
     ))
 (define-char
-  '((=>ucs@jis		. #xFA60)	; ï© 
-    (morohashi-daikanwa	34435 0 0)
-    (ideographic-radical . 145)	; ⾐
-    (ideographic-strokes . 9)
-    (total-strokes	 . 15)
-    (=ucs		. #x8910)	; 褐
-    (=gb2312		. #x3A56)	; &I-G0-3A56; [26-54]
-    (=cns11643-1	. #x6E6E)	; &I-C1-6E6E; [78-78]
-    ))
-(define-char
-  '((=>ucs		. #x8910)	; 褐
-    (morohashi-daikanwa	34435 0 5)
+  '((<-denotational
+     ((=ucs		  . #x8910)	; 褐
+      ))
     (ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA60)	; ï© 
-      (=jis-x0213-1-2000  . #x7B6F)	; &I-JX1-7B6F; [91-79]
-      ))
     (=jis-x0208		. #x336C)	; &GT-46248; [19-76]
     (=gt		. 46248)	; &I-GT-46248;
     (=gt-k		. 10184)	; &I-GT-K10184;
     (=gt-pj-1		. #x336C)	; &I-GT-46248; [19-76]
     (=ucs@jis		. #x8910)	; &GT-46248;
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x4A68)	; &M-34435; [42-72]
+      (=jis-x0213-1-2000  . #x7B6F)	; &I-JX1-7B6F; [91-79]
+      (=daikanwa	  . 34435)	; &I-M-34435;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x8911)	; 褑
-    (ideographic-radical . 145)	; ⾐
-    (ideographic-strokes . 9)
-    (total-strokes	 . 15)
-    (=big5		. #xE7CB)	; &M-34436;
-    (=daikanwa		. 34436)	; &I-M-34436;
-    ))
-(define-char
-  '((morohashi-daikanwa	34436 0 2)
-    (ideographic-radical . 145)	; ⾐
+  '((ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x8911)	; 褑
-    (=cns11643-2	. #x5434)	; &I-C2-5434; [52-20]
+    (=big5		. #xE7CB)	; &I-B-E7CB;
     ))
 (define-char
-  '((=>ucs		. #x8912)	; 褒
-    (ideographic-radical . 145)	; ⾐
-    (ideographic-strokes . 9)
-    (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6A71)	; &GT-46623; [74-81]
-      (=daikanwa	  . 34552)	; &I-M-34552;
+  '((<-denotational
+     ((=ucs		  . #x8911)	; 褑
       ))
-    (shinjigen-2	. 7428)
-    (=jis-x0208		. #x4B2B)	; &GT-46475; [43-11]
-    (=ks-x1001		. #x7866)	; &I-K0-7866; [88-70]
-    (=big5		. #xBDC7)	; &I-B-BDC7;
-    (=gt		. 46475)	; &I-GT-46475;
-    (=gt-pj-1		. #x4B2B)	; &I-GT-46475; [43-11]
-    (=daikanwa		. 34437)	; &I-M-34437;
-    (=ucs@jis		. #x8912)	; &GT-46475;
-    ))
-(define-char
-  '((=>ucs		. #x8912)	; 褒
-    (morohashi-daikanwa	34437 0 0)
     (ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
-    (=cns11643-1	. #x6E70)	; &C1-6E70; [78-80]
+    (=daikanwa		. 34436)	; &M-34436;
     ))
 (define-char
-  '((morohashi-daikanwa	34437 0 1)
+  '((<-denotational
+     ((=ucs		  . #x8911)	; 褑
+      ))
     (ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
-    (=ucs		. #x8912)	; 褒
-    (=gb2312		. #x307D)	; &I-G0-307D; [16-93]
+    (=cns11643-2	. #x5434)	; &C2-5434; [52-20]
+    (=ucs@unicode	. #x8911)	; &C2-5434;
     ))
 (define-char
-  '((=>ucs		. #x8913)	; 褓
-    (ideographic-radical . 145)	; ⾐
+  '((ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
-    (shinjigen-2	. 7426)
-    (=jis-x0208		. #x6A70)	; &GT-46409; [74-80]
-    (=ks-x1001		. #x5C4E)	; &I-K0-5C4E; [60-46]
-    (=big5		. #xBDC8)	; &I-B-BDC8;
-    (=gt		. 46409)	; &I-GT-46409;
-    (=gt-pj-1		. #x6A70)	; &I-GT-46409; [74-80]
-    (=daikanwa		. 34438)	; &I-M-34438;
-    (=ucs@jis		. #x8913)	; &GT-46409;
+    (=ucs		. #x8912)	; 褒
+    (=big5		. #xBDC7)	; &I-B-BDC7;
+    (->subsumptive
+     ((shinjigen-1	  . 7428)
+      (shinjigen-2	  . 7428)
+      (=jis-x0208	  . #x4B2B)	; &GT-46475; [43-11]
+      (=ks-x1001	  . #x7866)	; &I-K0-7866; [88-70]
+      (=gt		  . 46475)	; &I-GT-46475;
+      (=gt-pj-1		  . #x4B2B)	; &I-GT-46475; [43-11]
+      (=daikanwa	  . 34437)	; &I-M-34437;
+      (=ucs@jis		  . #x8912)	; &GT-46475;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6A71)	; &GT-46623; [74-81]
+	(=daikanwa	    . 34552)	; &I-M-34552;
+	))
+      )
+     ((=cns11643-1	  . #x6E70)	; &C1-6E70; [78-80]
+      )
+     ((=gb2312		  . #x307D)	; &G0-307D; [16-93]
+      (=ucs@unicode	  . #x8912)	; &G0-307D;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	34438 0 0)
-    (ideographic-radical . 145)	; ⾐
+  '((ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x8913)	; 褓
-    (=gb2312		. #x7159)	; &I-G0-7159; [81-57]
-    ))
-(define-char
-  '((=>ucs		. #x8913)	; 褓
-    (morohashi-daikanwa	34438 0 1)
-    (ideographic-radical . 145)	; ⾐
-    (ideographic-strokes . 9)
-    (total-strokes	 . 15)
-    (=cns11643-1	. #x6E71)	; &C1-6E71; [78-81]
+    (=big5		. #xBDC8)	; &I-B-BDC8;
+    (->subsumptive
+     ((shinjigen-1	  . 7426)
+      (shinjigen-2	  . 7426)
+      (=jis-x0208	  . #x6A70)	; &GT-46409; [74-80]
+      (=ks-x1001	  . #x5C4E)	; &I-K0-5C4E; [60-46]
+      (=gt		  . 46409)	; &I-GT-46409;
+      (=gt-pj-1		  . #x6A70)	; &I-GT-46409; [74-80]
+      (=daikanwa	  . 34438)	; &I-M-34438;
+      (=ucs@jis		  . #x8913)	; &GT-46409;
+      )
+     ((=gb2312		  . #x7159)	; &G0-7159; [81-57]
+      (=ucs@unicode	  . #x8913)	; &G0-7159;
+      )
+     ((=cns11643-1	  . #x6E71)	; &C1-6E71; [78-81]
+      ))
     ))
 (define-char
   '((ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x8914)	; 褔
-    (=cns11643-2	. #x542D)	; &I-C2-542D; [52-13]
     (=big5		. #xE7C4)	; &I-B-E7C4;
-    (=daikanwa		. 34439)	; &I-M-34439;
+    (->subsumptive
+     ((=daikanwa	  . 34439)	; &M-34439;
+      )
+     ((=cns11643-2	  . #x542D)	; &C2-542D; [52-13]
+      (=ucs@unicode	  . #x8914)	; &C2-542D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 145)	; ⾐
@@ -7218,44 +7218,56 @@
     (=cns11643-5	. #x5E3C)	; &I-C5-5E3C; [62-28]
     ))
 (define-char
-  '((=>ucs		. #x8944)	; 襄
-    (ideographic-radical . 145)	; ⾐
+  '((ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 11)
     (total-strokes	 . 17)
-    (shinjigen-2	. 7441)
-    (=jis-x0208		. #x6A77)	; &GT-46582; [74-87]
-    (=ks-x1001		. #x6551)	; &I-K0-6551; [69-49]
+    (=ucs		. #x8944)	; 襄
     (=big5		. #xC1B8)	; &I-B-C1B8;
-    (=gt		. 46582)	; &I-GT-46582;
-    (=gt-pj-1		. #x6A77)	; &I-GT-46582; [74-87]
-    (=daikanwa		. 34556)	; &I-M-34556;
-    (=ucs@jis		. #x8944)	; &GT-46582;
-    (=ucs@ks		. #x8944)	; &GT-46582;
-    (=ucs@big5		. #x8944)	; &GT-46582;
+    (->subsumptive
+     ((shinjigen-2	  . 7441)
+      (=jis-x0208	  . #x6A77)	; &GT-46582; [74-87]
+      (=ks-x1001	  . #x6551)	; &I-K0-6551; [69-49]
+      (=gt		  . 46582)	; &I-GT-46582;
+      (=gt-pj-1		  . #x6A77)	; &I-GT-46582; [74-87]
+      (=daikanwa	  . 34556)	; &I-M-34556;
+      (=ucs@jis		  . #x8944)	; &GT-46582;
+      (=ucs@ks		  . #x8944)	; &GT-46582;
+      )
+     ((=gb2312		  . #x4F65)	; &C1-7543; [47-69]
+      (=cns11643-1	  . #x7543)	; &I-C1-7543; [85-35]
+      (=ucs@unicode	  . #x8944)	; &C1-7543;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	34556 0 0)
-    (ideographic-radical . 145)	; ⾐
-    (ideographic-strokes . 11)
-    (total-strokes	 . 17)
-    (=ucs		. #x8944)	; 襄
-    (=gb2312		. #x4F65)	; &I-G0-4F65; [47-69]
-    (=cns11643-1	. #x7543)	; &I-C1-7543; [85-35]
+  '((ideographic-radical . 145)	; ⾐
+    (=ucs		. #x465C)	; 䙜
     ))
 (define-char
-  '((=>ucs		. #x465C)	; 䙜
+  '((<-denotational
+     ((=ucs		  . #x465C)	; 䙜
+      ))
     (ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 11)
     (total-strokes	 . 17)
     (=daikanwa		. 34557)	; &M-34557;
     ))
 (define-char
-  '((morohashi-daikanwa	34557 0 2)
+  '((<-denotational
+     ((=ucs		  . #x465C)	; 䙜
+      ))
+    (ideographic-radical . 145)	; ⾐
+    (ideographic-strokes . 10)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x465C)	; &UU+465C;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x465C)	; 䙜
+      ))
     (ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 11)
     (total-strokes	 . 17)
-    (=ucs		. #x465C)	; 䙜
-    (=cns11643-4	. #x5865)	; &I-C4-5865; [56-69]
+    (=cns11643-4	. #x5865)	; &C4-5865; [56-69]
     ))
 (define-char
   '((ideographic-radical . 145)	; ⾐
@@ -8220,16 +8232,17 @@
     (ideographic-radical . 145)	; ⾐
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
+    (=jef-china3	. #x63EF)	; &JC3-63EF;
     (->subsumptive
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x3228)	; &M-34629; [18-08]
-	(=daikanwa	    . 34629)	; &I-M-34629;
-	))
-      (=jis-x0208@1983	  . #x3228)	; &GT-46563; [18-08]
+     ((=jis-x0208@1983	  . #x3228)	; &GT-46563; [18-08]
       (=jis-x0208@1990	  . #x3228)	; &I-J90-3228; [18-08]
       (=gt		  . 46563)	; &I-GT-46563;
       (=gt-pj-1		  . #x3228)	; &I-GT-46563; [18-08]
       (=ucs@jis		  . #x8956)	; &GT-46563;
+      (<-simplified@JP/jis
+       ((=jis-x0208@1978    . #x3228)	; &M-34629; [18-08]
+	(=daikanwa	    . 34629)	; &I-M-34629;
+	))
       )
      ((=gb12345		  . #x3040)	; &UU+8956; [16-32]
       (=ucs@unicode	  . #x8956)	; &UU+8956;
diff --git a/lisp/utf-2000/Ideograph-R146-West.el b/lisp/utf-2000/Ideograph-R146-West.el
index a334677..f59feed 100644
--- a/lisp/utf-2000/Ideograph-R146-West.el
+++ b/lisp/utf-2000/Ideograph-R146-West.el
@@ -41,10 +41,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC4)	; ⻄
     (<-identical@component
      ((=ucs		  . #x897F)	; 西
       ))
-    (=ucs		. #x2EC4)	; ⻄
     ))
 (define-char
   '((<-denotational
@@ -54,19 +54,19 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-identical@component
+    (=ucs		. #x2EC3)	; ⻃
+    (<-identical@component/connect-below
      ((=ucs		  . #x8980)	; 覀
       ))
-    (=ucs		. #x2EC3)	; ⻃
     ))
 (define-char
   '((ideographic-radical . 146)	; ⾑
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
+    (=ucs		. #x8980)	; 覀
     (<-formed@component
      ((=ucs		  . #x897F)	; 西
       ))
-    (=ucs		. #x8980)	; 覀
     (->subsumptive
      ((=big5-cdp	  . #x8BD5)	; &CDP-8BD5;
       )
@@ -520,48 +520,50 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x8987)	; 覇
-    (ideographic-radical . 146)	; ⾑
-    (ideographic-strokes . 13)
-    (total-strokes	 . 19)
-    (=gt		. 46843)	; &GT-46843;
-    (=gt-pj-6		. #x7254)	; &GT-46843; [82-52]
-    (=daikanwa		. 34790)	; &I-M-34790;
-    ))
-(define-char
-  '((=>ucs		. #x8987)	; 覇
-    (morohashi-daikanwa	34790 0 0)
-    (ideographic-radical . 146)	; ⾑
+  '((ideographic-radical . 146)	; ⾑
     (ideographic-strokes . 13)
     (total-strokes	 . 19)
-    (=cns11643-3	. #x5B2F)	; &GT-46845; [59-15]
-    (=gt		. 46845)	; &I-GT-46845;
-    (=gt-pj-11		. #x3E23)	; &I-GT-46845; [30-03]
-    (=jef-china3	. #x64BB)	; &I-JC3-64BB;
+    (=ucs		. #x8987)	; 覇
     ))
 (define-char
-  '((=>ucs		. #x8987)	; 覇
-    (morohashi-daikanwa	34790 0 3)
+  '((<-denotational
+     ((=ucs		  . #x8987)	; 覇
+      ))
     (ideographic-radical . 146)	; ⾑
     (ideographic-strokes . 13)
     (total-strokes	 . 19)
-    (=gt		. 46846)	; &GT-46846;
-    (=gt-pj-11		. #x3E44)	; &GT-46846; [30-36]
+    (->subsumptive
+     ((=gt		  . 46843)	; &GT-46843;
+      (=gt-pj-6		  . #x7254)	; &GT-46843; [82-52]
+      (=daikanwa	  . 34790)	; &I-M-34790;
+      )
+     ((=cns11643-3	  . #x5B2F)	; &GT-46845; [59-15]
+      (=gt		  . 46845)	; &I-GT-46845;
+      (=gt-pj-11	  . #x3E23)	; &I-GT-46845; [30-03]
+      (=jef-china3	  . #x64BB)	; &I-JC3-64BB;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	34790 0 4)
+  '((<-denotational
+     ((=ucs		  . #x8987)	; 覇
+      ))
     (ideographic-radical . 146)	; ⾑
     (ideographic-strokes . 13)
     (total-strokes	 . 19)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9738)	; 霸
-      (=jis-x0208	  . #x5B31)	; &I-J90-5B31; [59-17]
+    (->subsumptive
+     ((=gt		  . 46846)	; &GT-46846;
+      (=gt-pj-11	  . #x3E44)	; &GT-46846; [30-36]
+      )
+     ((=jis-x0208	  . #x4746)	; &GT-46844; [39-38]
+      (=ks-x1001	  . #x782E)	; &I-K0-782E; [88-14]
+      (=gt		  . 46844)	; &I-GT-46844;
+      (=gt-pj-1		  . #x4746)	; &I-GT-46844; [39-38]
+      (=ucs@unicode	  . #x8987)	; &GT-46844;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x9738)	; 霸
+	(=jis-x0208	    . #x5B31)	; &I-J90-5B31; [59-17]
+	))
       ))
-    (=ucs		. #x8987)	; 覇
-    (=jis-x0208		. #x4746)	; &I-J90-4746; [39-38]
-    (=ks-x1001		. #x782E)	; &I-K0-782E; [88-14]
-    (=gt		. 46844)	; &I-GT-46844;
-    (=gt-pj-1		. #x4746)	; &I-GT-46844; [39-38]
     ))
 (define-char
   '((ideographic-radical . 146)	; ⾑
diff --git a/lisp/utf-2000/Ideograph-R147-See.el b/lisp/utf-2000/Ideograph-R147-See.el
index 20171f1..0cc83e8 100644
--- a/lisp/utf-2000/Ideograph-R147-See.el
+++ b/lisp/utf-2000/Ideograph-R147-See.el
@@ -23,22 +23,22 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC5)	; ⻅
+    (=big5-cdp		. #x89A1)	; &I-CDP-89A1;
     (<-identical@component
      ((=ucs		  . #x89C1)	; 见
       ))
-    (=ucs		. #x2EC5)	; ⻅
-    (=big5-cdp		. #x89A1)	; &I-CDP-89A1;
     ))
 (define-char
   '((ideographic-radical . 147)	; ⾒
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=ucs		. #x89C1)	; 见
+    (=gb2312		. #x3C7B)	; &I-G0-3C7B; [28-91]
     (<-simplified@CN
      ((=ucs		  . #x898B)	; 見
       (=gb12345		  . #x3C7B)	; 見 [28-91]
       ))
-    (=ucs		. #x89C1)	; 见
-    (=gb2312		. #x3C7B)	; &I-G0-3C7B; [28-91]
     ))
 (define-char
   '((ideographic-radical . 147)	; ⾒
@@ -437,14 +437,14 @@
     (total-strokes	 . 12)
     (->subsumptive
      ((morohashi-daikanwa	34827 1)
-      (<-simplified@JP/Jouyou
-       ((=ucs		    . #xFA61)	; ï©¡
-	(=jis-x0213-1-2000  . #x7B79)	; &I-JX1-7B79; [91-89]
-	))
       (=jis-x0208	  . #x3B6B)	; &GT-46874; [27-75]
       (=gt		  . 46874)	; &I-GT-46874;
       (=gt-pj-1		  . #x3B6B)	; &I-GT-46874; [27-75]
       (=ucs@jis		  . #x8996)	; &GT-46874;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #xFA61)	; ï©¡
+	(=jis-x0213-1-2000  . #x7B79)	; &I-JX1-7B79; [91-89]
+	))
       )
      ((=cns11643-1	  . #x617E)	; &C1-617E; [65-94]
       (=gb12345		  . #x4A53)	; &C1-617E; [42-51]
@@ -666,10 +666,6 @@
   '((ideographic-radical . 147)	; ⾒
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x89BA)	; 覺
-      (=jis-x0208	  . #x6B34)	; &I-J90-6B34; [75-20]
-      ))
     (shinjigen-2	. 7489)
     (=ucs		. #x899A)	; 覚
     (=jis-x0208		. #x3350)	; &I-J90-3350; [19-48]
@@ -678,6 +674,10 @@
     (=gt-k		. 09008)	; &I-GT-K09008;
     (=gt-pj-1		. #x3350)	; &I-GT-46887; [19-48]
     (=daikanwa		. 34846)	; &I-M-34846;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x89BA)	; 覺
+      (=jis-x0208	  . #x6B34)	; &I-J90-6B34; [75-20]
+      ))
     ))
 (define-char
   '((ideographic-radical . 147)	; ⾒
@@ -1602,19 +1602,19 @@
     (total-strokes	 . 16)
     (=ucs		. #x89A7)	; 覧
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6B35)	; &GT-47078; [75-21]
-	(=ks-x1001	    . #x5542)	; &I-K0-5542; [53-34]
-	(=cns11643-1	    . #x7B2A)	; &I-C1-7B2A; [91-10]
-	(=daikanwa	    . 34977)	; &I-M-34977;
-	))
-      (shinjigen-2	  . 7500)
+     ((shinjigen-2	  . 7500)
       (=jis-x0208	  . #x4D77)	; &GT-47010; [45-87]
       (=cns11643-3	  . #x5266)	; &I-C3-5266; [50-70]
       (=gt		  . 47010)	; &I-GT-47010;
       (=gt-pj-1		  . #x4D77)	; &I-GT-47010; [45-87]
       (=daikanwa	  . 34928)	; &I-M-34928;
       (=ucs@jis		  . #x89A7)	; &GT-47010;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6B35)	; &GT-47078; [75-21]
+	(=ks-x1001	    . #x5542)	; &I-K0-5542; [53-34]
+	(=cns11643-1	    . #x7B2A)	; &I-C1-7B2A; [91-10]
+	(=daikanwa	    . 34977)	; &I-M-34977;
+	))
       )
      ((=ucs@unicode	  . #x89A7)	; &UU+89A7;
       ))
@@ -1740,6 +1740,10 @@
     (ideographic-radical . 147)	; ⾒
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
+    (=jis-x0208@1978	. #x6B32)	; &GT-47018; [75-18]
+    (=gt		. 47018)	; &I-GT-47018;
+    (=gt-pj-6		. #x737B)	; &I-GT-47018; [83-91]
+    (=daikanwa		. 34937)	; &I-M-34937;
     (<-formed
      ((=jis-x0208	  . #x6D70)	; &GT-51977; [77-80]
       (=ks-x1001	  . #x7D31)	; &I-K0-7D31; [93-17]
@@ -1752,10 +1756,6 @@
       ))
     (<-same*sources
      jiyun database)
-    (=jis-x0208@1978	. #x6B32)	; &GT-47018; [75-18]
-    (=gt		. 47018)	; &I-GT-47018;
-    (=gt-pj-6		. #x737B)	; &I-GT-47018; [83-91]
-    (=daikanwa		. 34937)	; &I-M-34937;
     ))
 (define-char
   '((<-denotational
@@ -1981,16 +1981,16 @@
     (total-strokes	 . 18)
     (=ucs		. #x89B3)	; 観
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6B37)	; &GT-47088; [75-23]
-	(=ks-x1001	    . #x4E3A)	; &I-K0-4E3A; [46-26]
-	))
-      (shinjigen-2	  . 7502)
+     ((shinjigen-2	  . 7502)
       (=jis-x0208	  . #x3451)	; &GT-47032; [20-49]
       (=gt		  . 47032)	; &I-GT-47032;
       (=gt-pj-1		  . #x3451)	; &I-GT-47032; [20-49]
       (=daikanwa	  . 34955)	; &I-M-34955;
       (=ucs@jis		  . #x89B3)	; &GT-47032;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6B37)	; &GT-47088; [75-23]
+	(=ks-x1001	    . #x4E3A)	; &I-K0-4E3A; [46-26]
+	))
       )
      ((=cns11643-3	  . #x5921)	; &C3-5921; [57-01]
       (=ucs@unicode	  . #x89B3)	; &C3-5921;
diff --git a/lisp/utf-2000/Ideograph-R148-Horn.el b/lisp/utf-2000/Ideograph-R148-Horn.el
index 8e40034..de82855 100644
--- a/lisp/utf-2000/Ideograph-R148-Horn.el
+++ b/lisp/utf-2000/Ideograph-R148-Horn.el
@@ -31,10 +31,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC6)	; ⻆
     (<-identical@component
      ((=ucs		  . #x89D2)	; 角
       ))
-    (=ucs		. #x2EC6)	; ⻆
     ))
 (define-char
   '((<-denotational
@@ -79,11 +79,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC7)	; ⻇
     (<-identical@component
      ((=gt		  . 47108)	; &GT-47108;
       (=daikanwa	  . 35005)	; &I-M-35005;
       ))
-    (=ucs		. #x2EC7)	; ⻇
     ))
 (define-char
   '((ideographic-radical . 148)	; ⾓
@@ -1151,12 +1151,6 @@
     (ideographic-radical . 148)	; ⾓
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6B3D)	; &GT-47320; [75-29]
-      (=ks-x1001	  . #x753A)	; &I-K0-753A; [85-26]
-      (=cns11643-1	  . #x7A3D)	; &I-C1-7A3D; [90-29]
-      (=daikanwa	  . 35181)	; &I-M-35181;
-      ))
     (shinjigen-2	. 7519)
     (=jis-x0208		. #x3F28)	; &GT-47183; [31-08]
     (=cns11643-2	. #x474A)	; &I-C2-474A; [39-42]
@@ -1165,6 +1159,12 @@
     (=gt-pj-1		. #x3F28)	; &I-GT-47183; [31-08]
     (=daikanwa		. 35070)	; &I-M-35070;
     (=ucs@jis		. #x89E6)	; &GT-47183;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6B3D)	; &GT-47320; [75-29]
+      (=ks-x1001	  . #x753A)	; &I-K0-753A; [85-26]
+      (=cns11643-1	  . #x7A3D)	; &I-C1-7A3D; [90-29]
+      (=daikanwa	  . 35181)	; &I-M-35181;
+      ))
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R149-Speech.el b/lisp/utf-2000/Ideograph-R149-Speech.el
index f50020d..30ba01a 100644
--- a/lisp/utf-2000/Ideograph-R149-Speech.el
+++ b/lisp/utf-2000/Ideograph-R149-Speech.el
@@ -27,12 +27,12 @@
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
+    (=ucs		. #x8A01)	; 訁
+    (=gb12345		. #x5A25)	; 訁 [58-05]
     (<-identical@component
      ((=gb2312		  . #x5154)	; &C1-4B46; [49-52]
       (=cns11643-1	  . #x4B46)	; &I-C1-4B46; [43-38]
       ))
-    (=ucs		. #x8A01)	; 訁
-    (=gb12345		. #x5A25)	; 訁 [58-05]
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
@@ -93,15 +93,18 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC8)	; ⻈
     (<-identical@component/connect-right
      ((=ucs		  . #x8BA0)	; è® 
       ))
-    (=ucs		. #x2EC8)	; ⻈
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
+    (=ucs		. #x8BA0)	; è® 
+    (=gb2312		. #x5A25)	; &I-G0-5A25; [58-05]
+    (=big5-cdp		. #x8963)	; &I-CDP-8963;
     (<-simplified@CN
      ((=ucs		  . #x8A01)	; 訁
       (=gb12345		  . #x5A25)	; 訁 [58-05]
@@ -110,9 +113,6 @@
      ((=gb2312		  . #x5154)	; &C1-4B46; [49-52]
       (=cns11643-1	  . #x4B46)	; &I-C1-4B46; [43-38]
       ))
-    (=ucs		. #x8BA0)	; è® 
-    (=gb2312		. #x5A25)	; &I-G0-5A25; [58-05]
-    (=big5-cdp		. #x8963)	; &I-CDP-8963;
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
@@ -1923,43 +1923,37 @@
     (=daikanwa		. 35319)	; &I-M-35319;
     ))
 (define-char
-  '((=>ucs		. #x8A2E)	; 訮
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 4)
-    (total-strokes	 . 11)
-    (=daikanwa		. 35324)	; &M-35324;
-    ))
-(define-char
-  '((morohashi-daikanwa	35324 0 0)
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
     (=ucs		. #x8A2E)	; 訮
-    (=cns11643-4	. #x353D)	; &I-C4-353D; [21-29]
-    ))
-(define-char
-  '((=>ucs		. #x8A33)	; 訳
-    (morohashi-daikanwa	35324 1)
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 4)
-    (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6C23)	; &GT-48361; [76-03]
-      (=ks-x1001	  . #x663B)	; &I-K0-663B; [70-27]
-      (=daikanwa	  . 36023)	; &I-M-36023;
+    (->subsumptive
+     ((=daikanwa	  . 35324)	; &M-35324;
+      )
+     ((=cns11643-4	  . #x353D)	; &C4-353D; [21-29]
+      (=ucs@unicode	  . #x8A2E)	; &C4-353D;
       ))
-    (=jis-x0208		. #x4C75)	; &GT-47469; [44-85]
-    (=gt		. 47469)	; &I-GT-47469;
-    (=gt-pj-1		. #x4C75)	; &I-GT-47469; [44-85]
-    (=ucs@jis		. #x8A33)	; &GT-47469;
-    (mojikyo		. 050452)	; &MCS-6000C514;
     ))
 (define-char
-  '((morohashi-daikanwa	35324 1 0)
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
     (=ucs		. #x8A33)	; 訳
+    (->subsumptive
+     ((morohashi-daikanwa	35324 1)
+      (=jis-x0208	  . #x4C75)	; &GT-47469; [44-85]
+      (=gt		  . 47469)	; &I-GT-47469;
+      (=gt-pj-1		  . #x4C75)	; &I-GT-47469; [44-85]
+      (=ucs@jis		  . #x8A33)	; &GT-47469;
+      (mojikyo		  . 050452)	; &MCS-6000C514;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6C23)	; &GT-48361; [76-03]
+	(=ks-x1001	    . #x663B)	; &I-K0-663B; [70-27]
+	(=daikanwa	    . 36023)	; &I-M-36023;
+	))
+      )
+     ((=ucs@unicode	  . #x8A33)	; &UU+8A33;
+      ))
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
@@ -2312,29 +2306,27 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x8A3C)	; 証
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 5)
-    (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6B7A)	; &GT-48248; [75-90]
-      (=ks-x1001	  . #x717B)	; &I-K0-717B; [81-91]
-      (=daikanwa	  . 35946)	; &I-M-35946;
-      ))
-    (shinjigen-2	. 7580)
-    (=jis-x0208		. #x3E5A)	; &GT-47522; [30-58]
-    (=gt		. 47522)	; &I-GT-47522;
-    (=gt-pj-1		. #x3E5A)	; &I-GT-47522; [30-58]
-    (=daikanwa		. 35341)	; &I-M-35341;
-    (=ucs@jis		. #x8A3C)	; &GT-47522;
-    ))
-(define-char
-  '((morohashi-daikanwa	35341 0 1)
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
     (=ucs		. #x8A3C)	; 証
-    (=cns11643-1	. #x6225)	; &I-C1-6225; [66-05]
+    (->subsumptive
+     ((shinjigen-1	  . 7580)
+      (shinjigen-2	  . 7580)
+      (=jis-x0208	  . #x3E5A)	; &GT-47522; [30-58]
+      (=gt		  . 47522)	; &I-GT-47522;
+      (=gt-pj-1		  . #x3E5A)	; &I-GT-47522; [30-58]
+      (=daikanwa	  . 35341)	; &I-M-35341;
+      (=ucs@jis		  . #x8A3C)	; &GT-47522;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6B7A)	; &GT-48248; [75-90]
+	(=ks-x1001	    . #x717B)	; &I-K0-717B; [81-91]
+	(=daikanwa	    . 35946)	; &I-M-35946;
+	))
+      )
+     ((=cns11643-1	  . #x6225)	; &C1-6225; [66-05]
+      (=ucs@unicode	  . #x8A3C)	; &C1-6225;
+      ))
     ))
 (define-char
   '((=>ucs		. #x2799D)	; 𧦝
@@ -4894,52 +4886,47 @@
     (=daikanwa		. 35497)	; &I-M-35497;
     ))
 (define-char
-  '((=>ucs		. #x8AA0)	; 誠
-    (morohashi-daikanwa	35497 1)
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 6)
-    (total-strokes	 . 13)
-    (=jis-x0208		. #x403F)	; &GT-47633; [32-31]
-    (=ks-x1001		. #x6124)	; &I-K0-6124; [65-04]
-    (=gt		. 47633)	; &I-GT-47633;
-    (=gt-pj-1		. #x403F)	; &I-GT-47633; [32-31]
-    (=ucs@jis		. #x8AA0)	; &GT-47633;
-    ))
-(define-char
-  '((morohashi-daikanwa	35497 1 0)
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
     (=ucs		. #x8AA0)	; 誠
-    (=cns11643-1	. #x6662)	; &I-C1-6662; [70-66]
-    (=gb12345		. #x334F)	; 誠 [19-47]
-    (mojikyo		. 050453)	; &MCS-6000C515;
-    ))
-(define-char
-  '((=>ucs		. #x8A89)	; 誉
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 6)
-    (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6C25)	; &GT-48362; [76-05]
-      (=ks-x1001	  . #x6762)	; &I-K0-6762; [71-66]
-      (=daikanwa	  . 36066)	; &I-M-36066;
+    (->subsumptive
+     ((morohashi-daikanwa	35497 1)
+      (=jis-x0208	  . #x403F)	; &GT-47633; [32-31]
+      (=ks-x1001	  . #x6124)	; &I-K0-6124; [65-04]
+      (=gt		  . 47633)	; &I-GT-47633;
+      (=gt-pj-1		  . #x403F)	; &I-GT-47633; [32-31]
+      (=ucs@jis		  . #x8AA0)	; &GT-47633;
+      (mojikyo		  . 050453)	; &MCS-6000C515;
+      )
+     ((=cns11643-1	  . #x6662)	; &C1-6662; [70-66]
+      (=gb12345		  . #x334F)	; &C1-6662; [19-47]
+      (=ucs@unicode	  . #x8AA0)	; &C1-6662;
       ))
-    (shinjigen-2	. 7625)
-    (=jis-x0208		. #x4D40)	; &GT-47665; [45-32]
-    (=gt		. 47665)	; &I-GT-47665;
-    (=gt-k		. 10279)	; &I-GT-K10279;
-    (=gt-pj-1		. #x4D40)	; &I-GT-47665; [45-32]
-    (=daikanwa		. 35498)	; &I-M-35498;
-    (=ucs@jis		. #x8A89)	; &GT-47665;
     ))
 (define-char
-  '((morohashi-daikanwa	35498 0 1)
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
     (=ucs		. #x8A89)	; 誉
-    (=gb2312		. #x537E)	; &I-G0-537E; [51-94]
+    (->subsumptive
+     ((shinjigen-1	  . 7625)
+      (shinjigen-2	  . 7625)
+      (=jis-x0208	  . #x4D40)	; &GT-47665; [45-32]
+      (=gt		  . 47665)	; &I-GT-47665;
+      (=gt-k		  . 10279)	; &I-GT-K10279;
+      (=gt-pj-1		  . #x4D40)	; &I-GT-47665; [45-32]
+      (=daikanwa	  . 35498)	; &I-M-35498;
+      (=ucs@jis		  . #x8A89)	; &GT-47665;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6C25)	; &GT-48362; [76-05]
+	(=ks-x1001	    . #x6762)	; &I-K0-6762; [71-66]
+	(=daikanwa	    . 36066)	; &I-M-36066;
+	))
+      )
+     ((=gb2312		  . #x537E)	; &G0-537E; [51-94]
+      (=ucs@unicode	  . #x8A89)	; &G0-537E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
@@ -5589,52 +5576,81 @@
     (=cns11643-4	. #x473E)	; &C4-473E; [39-30]
     ))
 (define-char
-  '((=>ucs		. #x8A98)	; 誘
+  '((ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 14)
+    (=ucs		. #x46E2)	; 䛢
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x46E2)	; 䛢
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 7)
     (total-strokes	 . 14)
-    (shinjigen-2	. 7652)
-    (=jis-x0208		. #x4D36)	; &GT-47768; [45-22]
-    (=ks-x1001		. #x6B2F)	; &I-K0-6B2F; [75-15]
-    (=gt		. 47768)	; &I-GT-47768;
-    (=gt-pj-1		. #x4D36)	; &I-GT-47768; [45-22]
-    (=daikanwa		. 35525)	; &I-M-35525;
-    (=ucs@jis		. #x8A98)	; &GT-47768;
+    (->subsumptive
+     ((=daikanwa	  . 35524)	; &M-35524;
+      )
+     ((=cns11643-4	  . #x4746)	; &C4-4746; [39-38]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	35525 0 1)
+  '((<-denotational
+     ((=ucs		  . #x46E2)	; 䛢
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 7)
     (total-strokes	 . 14)
-    (=ucs		. #x8A98)	; 誘
-    (=cns11643-1	. #x6B2C)	; &I-C1-6B2C; [75-12]
-    (=gb12345		. #x5355)	; 誘 [51-53]
+    (=ucs@unicode	. #x46E2)	; &UU+46E2;
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 7)
     (total-strokes	 . 14)
-    (=ucs		. #x8A99)	; 誙
-    (=jis-x0212		. #x5D78)	; &I-JSP-5D78; [61-88]
-    (=cns11643-2	. #x4E33)	; &I-C2-4E33; [46-19]
-    (=daikanwa		. 35526)	; &I-M-35526;
+    (=ucs		. #x8A98)	; 誘
+    (->subsumptive
+     ((shinjigen-1	  . 7652)
+      (shinjigen-2	  . 7652)
+      (=jis-x0208	  . #x4D36)	; &GT-47768; [45-22]
+      (=ks-x1001	  . #x6B2F)	; &I-K0-6B2F; [75-15]
+      (=gt		  . 47768)	; &I-GT-47768;
+      (=gt-pj-1		  . #x4D36)	; &I-GT-47768; [45-22]
+      (=daikanwa	  . 35525)	; &I-M-35525;
+      (=ucs@jis		  . #x8A98)	; &GT-47768;
+      )
+     ((=gb12345		  . #x5355)	; &UU+8A98; [51-53]
+      (=ucs@unicode	  . #x8A98)	; &UU+8A98;
+      )
+     ((=cns11643-1	  . #x6B2C)	; &C1-6B2C; [75-12]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x279FB)	; 𧧻
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 7)
     (total-strokes	 . 14)
-    (=daikanwa		. 35527)	; &M-35527;
+    (=ucs		. #x8A99)	; 誙
+    (->subsumptive
+     ((=jis-x0212	  . #x5D78)	; &M-35526; [61-88]
+      (=daikanwa	  . 35526)	; &I-M-35526;
+      (=ucs@jis		  . #x8A99)	; &M-35526;
+      )
+     ((=cns11643-2	  . #x4E33)	; &C2-4E33; [46-19]
+      (=ucs@unicode	  . #x8A99)	; &C2-4E33;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	35527 0 0)
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 7)
     (total-strokes	 . 14)
-    (hanyu-dazidian	6 3978 3)
     (=ucs		. #x279FB)	; 𧧻
-    (=cns11643-4	. #x4748)	; &I-C4-4748; [39-40]
-    (=hanziku-10	. #xE558)	; &I-HZK10-E558;
+    (->subsumptive
+     ((=daikanwa	  . 35527)	; &M-35527;
+      )
+     ((hanyu-dazidian	  6 3978 3)
+      (=cns11643-4	  . #x4748)	; &HZK10-E558; [39-40]
+      (=hanziku-10	  . #xE558)	; &I-HZK10-E558;
+      (=ucs@iso		  . #x279FB)	; &HZK10-E558;
+      ))
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
@@ -6073,18 +6089,18 @@
     (=ucs		. #x8AAC)	; 説
     (->subsumptive
      ((morohashi-daikanwa	35556 1)
-      (<-same
-       ((=ks-x1001	    . #x6063)	; &GT-47736; [64-67]
-	(=daikanwa	    . 35556)	; &I-M-35556;
-	))
-      (<-same*sources
-       daikanwa)
       (=jis-x0208	  . #x4062)	; &GT-47737; [32-66]
       (=gt		  . 47737)	; &I-GT-47737;
       (=gt-k		  . 11142)	; &I-GT-K11142;
       (=gt-pj-1		  . #x4062)	; &I-GT-47737; [32-66]
       (=ucs@jis		  . #x8AAC)	; &GT-47737;
       (mojikyo		  . 050456)	; &MCS-6000C518;
+      (<-same
+       ((=ks-x1001	    . #x6063)	; &GT-47736; [64-67]
+	(=daikanwa	    . 35556)	; &I-M-35556;
+	))
+      (<-same*sources
+       daikanwa)
       )
      ((=cns11643-3	  . #x4966)	; &C3-4966; [41-70]
       (=gb12345		  . #x4B35)	; &C3-4966; [43-21]
@@ -6320,51 +6336,38 @@
     (=daikanwa		. 35576)	; &I-M-35576;
     ))
 (define-char
-  '((=>ucs		. #x46E8)	; 䛨
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 7)
-    (total-strokes	 . 14)
-    (=daikanwa		. 35580)	; &M-35580;
-    ))
-(define-char
-  '((morohashi-daikanwa	35580 0 0)
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 7)
     (total-strokes	 . 14)
     (=ucs		. #x46E8)	; 䛨
-    (=cns11643-3	. #x495D)	; &I-C3-495D; [41-61]
-    ))
-(define-char
-  '((=>ucs		. #x8AAD)	; 読
-    (morohashi-daikanwa	35580 1)
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 7)
-    (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6C26)	; &GT-48448; [76-06]
-      (=ks-x1001	  . #x5441)	; &I-K0-5441; [52-33]
-      (=daikanwa	  . 36088)	; &I-M-36088;
+    (->subsumptive
+     ((=daikanwa	  . 35580)	; &M-35580;
+      )
+     ((=cns11643-3	  . #x495D)	; &C3-495D; [41-61]
+      (=ucs@unicode	  . #x46E8)	; &C3-495D;
       ))
-    (=jis-x0208		. #x4649)	; &GT-47754; [38-41]
-    (=gt		. 47754)	; &I-GT-47754;
-    (=gt-k		. 11159)	; &I-GT-K11159;
-    (=gt-pj-1		. #x4649)	; &I-GT-47754; [38-41]
-    (=ucs@jis		. #x8AAD)	; &GT-47754;
-    (mojikyo		. 050457)	; &MCS-6000C519;
-    ))
-(define-char
-  '((morohashi-daikanwa	35580 1 0)
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 7)
-    (total-strokes	 . 14)
-    (=ucs		. #x8AAD)	; 読
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 7)
     (total-strokes	 . 14)
-    (=ucs		. #x46E2)	; 䛢
-    (=cns11643-4	. #x4746)	; &I-C4-4746; [39-38]
+    (=ucs		. #x8AAD)	; 読
+    (->subsumptive
+     ((morohashi-daikanwa	35580 1)
+      (=jis-x0208	  . #x4649)	; &GT-47754; [38-41]
+      (=gt		  . 47754)	; &I-GT-47754;
+      (=gt-k		  . 11159)	; &I-GT-K11159;
+      (=gt-pj-1		  . #x4649)	; &I-GT-47754; [38-41]
+      (=ucs@jis		  . #x8AAD)	; &GT-47754;
+      (mojikyo		  . 050457)	; &MCS-6000C519;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6C26)	; &GT-48448; [76-06]
+	(=ks-x1001	    . #x5441)	; &I-K0-5441; [52-33]
+	(=daikanwa	    . 36088)	; &I-M-36088;
+	))
+      )
+     ((=ucs@unicode	  . #x8AAD)	; &UU+8AAD;
+      ))
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
@@ -6372,15 +6375,13 @@
     (total-strokes	 . 14)
     (->mojikyo		. 050036)	; &MCS-6000C374;
     (=ucs		. #x8AAE)	; 誮
-    ))
-(define-char
-  '((=>ucs		. #x8AAE)	; 誮
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 7)
-    (total-strokes	 . 14)
-    (=jis-x0212		. #x5D7C)	; &JX2-785D; [61-92]
-    (=jis-x0213-2-2000	. #x785D)	; &I-JX2-785D; [88-61]
-    (=ucs@jis		. #x8AAE)	; &JX2-785D;
+    (->subsumptive
+     ((=jis-x0212	  . #x5D7C)	; &JX2-785D; [61-92]
+      (=jis-x0213-2-2000  . #x785D)	; &I-JX2-785D; [88-61]
+      (=ucs@jis		  . #x8AAE)	; &JX2-785D;
+      )
+     ((=ucs@unicode	  . #x8AAE)	; &UU+8AAE;
+      ))
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
@@ -8085,15 +8086,17 @@
     (=daikanwa		. 35690)	; &I-M-35690;
     ))
 (define-char
-  '((=>ucs		. #x8B01)	; 謁
+  '((ideographic-radical . 149)	; ⾔
+    (=ucs		. #x8B01)	; 謁
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8B01)	; 謁
+      ))
     (morohashi-daikanwa	35690 1)
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA62)	; ï©¢
-      (=jis-x0213-1-2000  . #x7C2F)	; &I-JX1-7C2F; [92-15]
-      ))
     (=jis-x0208		. #x315A)	; &GT-47779; [17-58]
     (=gt		. 47779)	; &I-GT-47779;
     (=gt-k		. 11891)	; &I-GT-K11891;
@@ -8101,48 +8104,54 @@
     (=cbeta		. 05919)	; &I-CB05919;
     (=ucs@jis		. #x8B01)	; &GT-47779;
     (mojikyo		. 050460)	; &MCS-6000C51C;
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x6457)	; &M-35757; [68-55]
+      (=jis-x0213-1-2000  . #x7C2F)	; &I-JX1-7C2F; [92-15]
+      (=daikanwa	  . 35757)	; &I-M-35757;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x46F8)	; 䛸
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 8)
-    (total-strokes	 . 15)
-    (=daikanwa		. 35691)	; &M-35691;
-    ))
-(define-char
-  '((morohashi-daikanwa	35691 0 0)
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
     (=ucs		. #x46F8)	; 䛸
-    (=cns11643-3	. #x4E71)	; &I-C3-4E71; [46-81]
+    (->subsumptive
+     ((=daikanwa	  . 35691)	; &M-35691;
+      )
+     ((=cns11643-3	  . #x4E71)	; &C3-4E71; [46-81]
+      (=ucs@unicode	  . #x46F8)	; &C3-4E71;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x8AF8)	; 諸
-    (morohashi-daikanwa	35691 1)
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x3D74)	; &J97-3D74; [29-84]
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA22")
-      (=ucs		  . #xFA22)	; 諸
-      (=jis-x0213-1-2000  . #x7C2E)	; &I-JX1-7C2E; [92-14]
+    (=ucs		. #x8AF8)	; 諸
+    (->subsumptive
+     ((morohashi-daikanwa	35691 1)
+      (=jis-x0208	  . #x3D74)	; &GT-47831; [29-84]
+      (=gt		  . 47831)	; &I-GT-47831;
+      (=gt-k		  . 11911)	; &I-GT-K11911;
+      (=gt-pj-1		  . #x3D74)	; &I-GT-47831; [29-84]
+      (=ucs@jis		  . #x8AF8)	; &GT-47831;
+      (mojikyo		  . 050461)	; &MCS-6000C51D;
+      (<-simplified@JP/Jouyou
+       ((name		    . "CJK COMPATIBILITY IDEOGRAPH-FA22")
+	(=ucs		    . #xFA22)	; 諸
+	(=jis-x0213-1-2000  . #x7C2E)	; &I-JX1-7C2E; [92-14]
+	))
+      )
+     ((=cns11643-1	  . #x6E7A)	; &C1-6E7A; [78-90]
+      (=gb12345		  . #x566E)	; &C1-6E7A; [54-78]
+      (=ucs@unicode	  . #x8AF8)	; &C1-6E7A;
       ))
-    (=jis-x0208		. #x3D74)	; &GT-47831; [29-84]
-    (=gt		. 47831)	; &I-GT-47831;
-    (=gt-k		. 11911)	; &I-GT-K11911;
-    (=gt-pj-1		. #x3D74)	; &I-GT-47831; [29-84]
-    (=ucs@jis		. #x8AF8)	; &GT-47831;
-    (mojikyo		. 050461)	; &MCS-6000C51D;
     ))
 (define-char
-  '((morohashi-daikanwa	35691 1 0)
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 8)
-    (total-strokes	 . 15)
-    (=ucs		. #x8AF8)	; 諸
-    (=cns11643-1	. #x6E7A)	; &I-C1-6E7A; [78-90]
-    (=gb12345		. #x566E)	; 諸 [54-78]
+  '((ideographic-radical . 149)	; ⾔
+    (=jis-x0208@1997	. #x3D74)	; &J97-3D74; [29-84]
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
@@ -9251,7 +9260,10 @@
     (=daikanwa		. 35742)	; &I-M-35742;
     ))
 (define-char
-  '((name		. "CJK COMPATIBILITY IDEOGRAPH-FA22")
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x3D74)	; &J97-3D74; [29-84]
+      ))
+    (name		. "CJK COMPATIBILITY IDEOGRAPH-FA22")
     (=>ucs*		. #x8AF8)	; 諸
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 9)
@@ -9466,56 +9478,62 @@
     (=cns11643-2	. #x5A5A)	; &C2-5A5A; [58-58]
     ))
 (define-char
-  '((=>ucs		. #x8B00)	; 謀
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
-    (shinjigen-2	. 7705)
-    (=jis-x0208		. #x4B45)	; &GT-48010; [43-37]
-    (=ks-x1001		. #x5947)	; &I-K0-5947; [57-39]
-    (=gt		. 48010)	; &I-GT-48010;
-    (=gt-pj-1		. #x4B45)	; &I-GT-48010; [43-37]
-    (=daikanwa		. 35756)	; &I-M-35756;
-    (=ucs@jis		. #x8B00)	; &GT-48010;
+    (=ucs		. #x46FD)	; 䛽
+    (->subsumptive
+     ((=daikanwa	  . 35755)	; &M-35755;
+      )
+     ((=ucs@unicode	  . #x46FD)	; &UU+46FD;
+      )
+     ((=cns11643-4	  . #x536B)	; &C4-536B; [51-75]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	35756 0 0)
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
     (=ucs		. #x8B00)	; 謀
-    (=gb12345		. #x4431)	; 謀 [36-17]
-    ))
-(define-char
-  '((=>ucs		. #x8B00)	; 謀
-    (morohashi-daikanwa	35756 0 1)
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 9)
-    (total-strokes	 . 16)
-    (=cns11643-1	. #x723B)	; &C1-723B; [82-27]
+    (->subsumptive
+     ((shinjigen-2	  . 7705)
+      (=jis-x0208	  . #x4B45)	; &GT-48010; [43-37]
+      (=ks-x1001	  . #x5947)	; &I-K0-5947; [57-39]
+      (=gt		  . 48010)	; &I-GT-48010;
+      (=gt-pj-1		  . #x4B45)	; &I-GT-48010; [43-37]
+      (=daikanwa	  . 35756)	; &I-M-35756;
+      (=ucs@jis		  . #x8B00)	; &GT-48010;
+      )
+     ((=gb12345		  . #x4431)	; &UU+8B00; [36-17]
+      (=ucs@unicode	  . #x8B00)	; &UU+8B00;
+      )
+     ((=cns11643-1	  . #x723B)	; &C1-723B; [82-27]
+      ))
     ))
 (define-char
-  '((=>ucs*		. #x8B01)	; 謁
-    (=>ucs@gb		. #x8B01)	; 謁
-    (=>ucs@cns		. #x8B01)	; 謁
+  '((<-denotational
+     ((=ucs		  . #x8B01)	; 謁
+      ))
+    (=>ucs*		. #x8B01)	; 謁
+    (=>ucs@gb		. #x8B01)	; &C1-7240;
+    (=>ucs@cns		. #x8B01)	; &C1-7240;
+    (=>ucs@jis		. #xFA62)	; &M-35757;
+    (=>ucs@ks		. #x8B01)	; &M-35757;
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
     (=ucs		. #xFA62)	; ï©¢
-    (=ks-x1001		. #x6457)	; &I-K0-6457; [68-55]
-    (=jis-x0213-1-2000	. #x7C2F)	; &I-JX1-7C2F; [92-15]
-    (=daikanwa		. 35757)	; &I-M-35757;
-    (=ucs@ks		. #x8B01)	; ï©¢
-    ))
-(define-char
-  '((=>ucs@jis		. #xFA62)	; ï©¢
-    (morohashi-daikanwa	35757 0 0)
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 9)
-    (total-strokes	 . 16)
-    (=ucs		. #x8B01)	; 謁
-    (=cns11643-1	. #x7240)	; &I-C1-7240; [82-32]
-    (=gb12345		. #x5A4B)	; 謁 [58-43]
+    (->subsumptive
+     ((=ks-x1001	  . #x6457)	; &M-35757; [68-55]
+      (=jis-x0213-1-2000  . #x7C2F)	; &I-JX1-7C2F; [92-15]
+      (=daikanwa	  . 35757)	; &I-M-35757;
+      (=ucs@unicode	  . #xFA62)	; &M-35757;
+      (=ucs@ks		  . #x8B01)	; &M-35757;
+      )
+     ((=cns11643-1	  . #x7240)	; &C1-7240; [82-32]
+      (=gb12345		  . #x5A4B)	; &C1-7240; [58-43]
+      (=ucs@unicode	  . #x8B01)	; &C1-7240;
+      ))
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
@@ -9756,36 +9774,37 @@
     (=daikanwa		. 35779)	; &I-M-35779;
     ))
 (define-char
-  '((=>ucs		. #x8B21)	; 謡
+  '((ideographic-radical . 149)	; ⾔
+    (=ucs		. #x8B21)	; 謡
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8B21)	; 謡
+      ))
     (morohashi-daikanwa	35779 1)
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6B6F)	; &GT-48112; [75-79]
-      (=ks-x1001	  . #x692A)	; &I-K0-692A; [73-10]
-      (=daikanwa	  . 35832)	; &I-M-35832;
-      ))
     (=jis-x0208		. #x4D58)	; &GT-48016; [45-56]
     (=gt		. 48016)	; &I-GT-48016;
     (=gt-pj-1		. #x4D58)	; &I-GT-48016; [45-56]
     (=ucs@jis		. #x8B21)	; &GT-48016;
     (mojikyo		. 050465)	; &MCS-6000C521;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6B6F)	; &GT-48112; [75-79]
+      (=ks-x1001	  . #x692A)	; &I-K0-692A; [73-10]
+      (=daikanwa	  . 35832)	; &I-M-35832;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	35779 1 5)
+  '((<-denotational
+     ((=ucs		  . #x8B21)	; 謡
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
-    (=ucs		. #x8B21)	; 謡
-    (=gb12345		. #x5225)	; 謡 [50-05]
-    ))
-(define-char
-  '((ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 9)
-    (total-strokes	 . 16)
-    (=ucs		. #x46FD)	; 䛽
-    (=cns11643-4	. #x536B)	; &I-C4-536B; [51-75]
+    (=gb12345		. #x5225)	; &UU+8B21; [50-05]
+    (=ucs@unicode	. #x8B21)	; &UU+8B21;
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
@@ -9950,7 +9969,28 @@
     (=cns11643-7	. #x3346)	; &C7-3346; [19-38]
     ))
 (define-char
-  '((=>ucs		. #x8B04)	; 謄
+  '((ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 17)
+    (=ucs		. #x4701)	; 䜁
+    (->subsumptive
+     ((=daikanwa	  . 35774)	; &M-35774;
+      )
+     ((=ucs@unicode	  . #x4701)	; &UU+4701;
+      )
+     ((=cns11643-3	  . #x564C)	; &C3-564C; [54-44]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 17)
+    (=ucs		. #x8B04)	; 謄
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8B04)	; 謄
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
@@ -9962,36 +10002,41 @@
     (mojikyo		. 035780)	; &MCS-60008BC4;
     ))
 (define-char
-  '((=>ucs		. #x8B04)	; 謄
-    (morohashi-daikanwa	35780 1)
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 10)
-    (total-strokes	 . 17)
-    (=jis-x0208		. #x4625)	; &GT-48094; [38-05]
-    (=gt		. 48094)	; &I-GT-48094;
-    (=gt-pj-1		. #x4625)	; &I-GT-48094; [38-05]
-    (=ucs@jis		. #x8B04)	; &GT-48094;
-    ))
-(define-char
-  '((morohashi-daikanwa	35780 1 0)
+  '((<-denotational
+     ((=ucs		  . #x8B04)	; 謄
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
-    (=ucs		. #x8B04)	; 謄
-    (=cns11643-1	. #x754E)	; &I-C1-754E; [85-46]
-    (=gb12345		. #x4C5C)	; 謄 [44-60]
-    (mojikyo		. 050466)	; &MCS-6000C522;
+    (->subsumptive
+     ((morohashi-daikanwa	35780 1)
+      (=jis-x0208	  . #x4625)	; &GT-48094; [38-05]
+      (=gt		  . 48094)	; &I-GT-48094;
+      (=gt-pj-1		  . #x4625)	; &I-GT-48094; [38-05]
+      (=ucs@jis		  . #x8B04)	; &GT-48094;
+      (mojikyo		  . 050466)	; &MCS-6000C522;
+      )
+     ((=cns11643-1	  . #x754E)	; &C1-754E; [85-46]
+      (=gb12345		  . #x4C5C)	; &C1-754E; [44-60]
+      (=ucs@unicode	  . #x8B04)	; &C1-754E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
     (=ucs		. #x8B05)	; 謅
-    (=jis-x0212		. #x5E38)	; &I-JSP-5E38; [62-24]
-    (=cns11643-2	. #x5F50)	; &I-C2-5F50; [63-48]
-    (=jis-x0213-2-2000	. #x7865)	; &I-JX2-7865; [88-69]
-    (=gb12345		. #x565F)	; 謅 [54-63]
-    (=daikanwa		. 35781)	; &I-M-35781;
+    (->subsumptive
+     ((=jis-x0212	  . #x5E38)	; &M-35781; [62-24]
+      (=jis-x0213-2-2000  . #x7865)	; &I-JX2-7865; [88-69]
+      (=daikanwa	  . 35781)	; &I-M-35781;
+      (=ucs@jis		  . #x8B05)	; &M-35781;
+      )
+     ((=gb12345		  . #x565F)	; &UU+8B05; [54-63]
+      (=ucs@unicode	  . #x8B05)	; &UU+8B05;
+      )
+     ((=cns11643-2	  . #x5F50)	; &C2-5F50; [63-48]
+      ))
     ))
 (define-char
   '((=>ucs		. #x27A98)	; 𧪘
@@ -11073,74 +11118,87 @@
     (=daikanwa		. 35849)	; &I-M-35849;
     ))
 (define-char
-  '((=>ucs		. #x8B0A)	; 謊
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 10)
-    (total-strokes	 . 17)
-    (=daikanwa		. 35850)	; &M-35850;
-    (=jef-china3	. #x65C1)	; &I-JC3-65C1;
-    (mojikyo		. 035850)	; &MCS-60008C0A;
+  '((ideographic-radical . 149)	; ⾔
+    (=ucs		. #x8B0A)	; 謊
     ))
 (define-char
-  '((=>ucs		. #x8B0A)	; 謊
-    (morohashi-daikanwa	35850 0 0)
+  '((<-denotational
+     ((=ucs		  . #x8B0A)	; 謊
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
-    (=cns11643-1	. #x754B)	; &C1-754B; [85-43]
+    (->subsumptive
+     ((=daikanwa	  . 35850)	; &M-35850;
+      (=jef-china3	  . #x65C1)	; &I-JC3-65C1;
+      (mojikyo		  . 035850)	; &MCS-60008C0A;
+      )
+     ((=cns11643-1	  . #x754B)	; &C1-754B; [85-43]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x8B0A)	; 謊
-    (morohashi-daikanwa	35850 0 1)
+  '((<-denotational
+     ((=ucs		  . #x8B0A)	; 謊
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
-    (=jis-x0212		. #x5E3F)	; &JX2-7864; [62-31]
-    (=jis-x0213-2-2000	. #x7864)	; &I-JX2-7864; [88-68]
-    (=ucs@jis		. #x8B0A)	; &JX2-7864;
-    (mojikyo		. 056409)	; &MCS-6000DC59;
+    (->subsumptive
+     ((=jis-x0212	  . #x5E3F)	; &JX2-7864; [62-31]
+      (=jis-x0213-2-2000  . #x7864)	; &I-JX2-7864; [88-68]
+      (=ucs@jis		  . #x8B0A)	; &JX2-7864;
+      (mojikyo		  . 056409)	; &MCS-6000DC59;
+      )
+     ((=gb12345		  . #x3B51)	; &UU+8B0A; [27-49]
+      (=ucs@unicode	  . #x8B0A)	; &UU+8B0A;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	35850 0 2)
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 9)
-    (total-strokes	 . 16)
-    (=ucs		. #x8B0A)	; 謊
-    (=gb12345		. #x3B51)	; 謊 [27-49]
+  '((ideographic-radical . 149)	; ⾔
+    (=ucs		. #x8B39)	; 謹
     ))
 (define-char
-  '((=>ucs		. #x8B39)	; 謹
+  '((<-denotational
+     ((=ucs		  . #x8B39)	; 謹
+      ))
     (morohashi-daikanwa	35850 1)
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA63)	; ï©£
-      (=jis-x0213-1-2000  . #x7C30)	; &I-JX1-7C30; [92-16]
-      ))
     (=jis-x0208		. #x3660)	; &GT-48040; [22-64]
     (=gt		. 48040)	; &I-GT-48040;
     (=gt-pj-1		. #x3660)	; &I-GT-48040; [22-64]
     (=ucs@jis		. #x8B39)	; &GT-48040;
     (mojikyo		. 050468)	; &MCS-6000C524;
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x504D)	; &M-35900; [48-45]
+      (=jis-x0213-1-2000  . #x7C30)	; &I-JX1-7C30; [92-16]
+      (=daikanwa	  . 35900)	; &I-M-35900;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x4700)	; 䜀
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
-    (=daikanwa		. 49724)	; &M-49724;
+    (=ucs		. #x4700)	; 䜀
     ))
 (define-char
-  '((morohashi-daikanwa	49724 0 0)
+  '((<-denotational
+     ((=ucs		  . #x4700)	; 䜀
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
-    (=ucs		. #x4700)	; 䜀
+    (->subsumptive
+     ((=daikanwa	  . 49724)	; &M-49724;
+      )
+     ((=ucs@unicode	  . #x4700)	; &UU+4700;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x4700)	; 䜀
-    (morohashi-daikanwa	49724 0 3)
+  '((<-denotational
+     ((=ucs		  . #x4700)	; 䜀
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
@@ -11150,13 +11208,6 @@
   '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
-    (=ucs		. #x4701)	; 䜁
-    (=cns11643-3	. #x564C)	; &I-C3-564C; [54-44]
-    ))
-(define-char
-  '((ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 10)
-    (total-strokes	 . 17)
     (=ucs		. #x4702)	; 䜂
     (=cns11643-5	. #x5E55)	; &I-C5-5E55; [62-53]
     ))
@@ -11588,16 +11639,16 @@
      ((=gb12345		  . #x437D)	; &UU+8B2C; [35-93]
       (=ucs@unicode	  . #x8B2C)	; &UU+8B2C;
       )
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x4935)	; &GT-48190; [41-21]
-	(=ks-x1001	    . #x573D)	; &I-K0-573D; [55-29]
-	(=daikanwa	    . 35872)	; &I-M-35872;
-	))
-      (=jis-x0208@1983	  . #x4935)	; &GT-48191; [41-21]
+     ((=jis-x0208@1983	  . #x4935)	; &GT-48191; [41-21]
       (=jis-x0208@1990	  . #x4935)	; &I-J90-4935; [41-21]
       (=gt		  . 48191)	; &I-GT-48191;
       (=gt-pj-1		  . #x4935)	; &I-GT-48191; [41-21]
       (=ucs@jis		  . #x8B2C)	; &GT-48191;
+      (<-simplified@JP/jis
+       ((=jis-x0208@1978    . #x4935)	; &GT-48190; [41-21]
+	(=ks-x1001	    . #x573D)	; &I-K0-573D; [55-29]
+	(=daikanwa	    . 35872)	; &I-M-35872;
+	))
       )
      ((=cns11643-1	  . #x7740)	; &C1-7740; [87-32]
       ))
@@ -12051,43 +12102,42 @@
     (=daikanwa		. 35898)	; &I-M-35898;
     ))
 (define-char
-  '((=>ucs		. #x470A)	; 䜊
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 11)
-    (total-strokes	 . 18)
-    (=daikanwa		. 35899)	; &M-35899;
-    ))
-(define-char
-  '((morohashi-daikanwa	35899 0 0)
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 11)
     (total-strokes	 . 18)
     (=ucs		. #x470A)	; 䜊
-    (=cns11643-3	. #x5927)	; &I-C3-5927; [57-07]
+    (->subsumptive
+     ((=daikanwa	  . 35899)	; &M-35899;
+      )
+     ((=cns11643-3	  . #x5927)	; &C3-5927; [57-07]
+      (=ucs@unicode	  . #x470A)	; &C3-5927;
+      ))
     ))
 (define-char
-  '((=>ucs*		. #x8B39)	; 謹
-    (=>ucs@gb		. #x8B39)	; 謹
-    (=>ucs@cns		. #x8B39)	; 謹
+  '((<-denotational
+     ((=ucs		  . #x8B39)	; 謹
+      ))
+    (=>ucs*		. #x8B39)	; 謹
+    (=>ucs@gb		. #x8B39)	; &C1-773F;
+    (=>ucs@cns		. #x8B39)	; &C1-773F;
+    (=>ucs@jis		. #xFA63)	; &M-35900;
+    (=>ucs@ks		. #x8B39)	; &M-35900;
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 11)
     (total-strokes	 . 18)
     (=ucs		. #xFA63)	; ï©£
-    (=ks-x1001		. #x504D)	; &I-K0-504D; [48-45]
-    (=jis-x0213-1-2000	. #x7C30)	; &I-JX1-7C30; [92-16]
-    (=daikanwa		. 35900)	; &I-M-35900;
-    (=jef-china3	. #x65C4)	; &I-JC3-65C4;
-    (=ucs@ks		. #x8B39)	; ï©£
-    ))
-(define-char
-  '((=>ucs@jis		. #xFA63)	; ï©£
-    (morohashi-daikanwa	35900 0 0)
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 11)
-    (total-strokes	 . 18)
-    (=ucs		. #x8B39)	; 謹
-    (=cns11643-1	. #x773F)	; &I-C1-773F; [87-31]
-    (=gb12345		. #x3D77)	; 謹 [29-87]
+    (->subsumptive
+     ((=ks-x1001	  . #x504D)	; &M-35900; [48-45]
+      (=jis-x0213-1-2000  . #x7C30)	; &I-JX1-7C30; [92-16]
+      (=daikanwa	  . 35900)	; &I-M-35900;
+      (=jef-china3	  . #x65C4)	; &I-JC3-65C4;
+      (=ucs@unicode	  . #xFA63)	; &M-35900;
+      (=ucs@ks		  . #x8B39)	; &M-35900;
+      )
+     ((=cns11643-1	  . #x773F)	; &C1-773F; [87-31]
+      (=gb12345		  . #x3D77)	; &C1-773F; [29-87]
+      (=ucs@unicode	  . #x8B39)	; &C1-773F;
+      ))
     ))
 (define-char
   '((=>ucs		. #x8B3A)	; 謺
@@ -12740,10 +12790,10 @@
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
-    (<-ideographic-component-forms
+    (=ucs		. #x9FBB)	; é¾»
+    (<-identical@component/connect-below
      ((=ucs		  . #x470C)	; 䜌
       ))
-    (=ucs		. #x9FBB)	; é¾»
     ))
 (define-char
   '((=>ucs		. #x27B06)	; 𧬆
@@ -13005,89 +13055,123 @@
     (=gb12345		. #x3C25)	; 譏 [28-05]
     ))
 (define-char
-  '((=>ucs		. #x8B50)	; 譐
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
-    (=daikanwa		. 35959)	; &M-35959;
+    (=ucs		. #x8B50)	; 譐
     ))
 (define-char
-  '((morohashi-daikanwa	35959 0 2)
+  '((<-denotational
+     ((=ucs		  . #x8B50)	; 譐
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
-    (=ucs		. #x8B50)	; 譐
-    (=cns11643-2	. #x6723)	; &I-C2-6723; [71-03]
+    (=daikanwa		. 35959)	; &M-35959;
     ))
 (define-char
-  '((=>ucs		. #x8B51)	; 譑
+  '((<-denotational
+     ((=ucs		  . #x8B50)	; 譐
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
-    (=jis-x0213-2-2000	. #x786C)	; &M-35961; [88-76]
-    (=daikanwa		. 35961)	; &I-M-35961;
-    (=ucs@jis		. #x8B51)	; &M-35961;
+    (->subsumptive
+     ((=cns11643-2	  . #x6723)	; &C2-6723; [71-03]
+      )
+     ((=ucs@unicode	  . #x8B50)	; &UU+8B50;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	35961 0 0)
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
-    (=ucs		. #x8B51)	; 譑
-    (=cns11643-2	. #x672C)	; &I-C2-672C; [71-12]
+    (=ucs		. #x27B0B)	; 𧬋
+    (->subsumptive
+     ((=daikanwa	  . 35960)	; &M-35960;
+      )
+     ((hanyu-dazidian	  6 4022 1)
+      (=hanziku-10	  . #xEE51)	; &HZK10-EE51;
+      )
+     ((=cns11643-5	  . #x694E)	; &C5-694E; [73-46]
+      (=ucs@iso		  . #x27B0B)	; &C5-694E;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x8B52)	; 譒
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
-    (=jis-x0212		. #x5E4A)	; &M-35962; [62-42]
-    (=daikanwa		. 35962)	; &I-M-35962;
-    (=jef-china3	. #x65C6)	; &I-JC3-65C6;
-    (=ucs@jis		. #x8B52)	; &M-35962;
+    (=ucs		. #x8B51)	; 譑
+    (->subsumptive
+     ((=jis-x0213-2-2000  . #x786C)	; &M-35961; [88-76]
+      (=daikanwa	  . 35961)	; &I-M-35961;
+      (=ucs@jis		  . #x8B51)	; &M-35961;
+      )
+     ((=ucs@unicode	  . #x8B51)	; &UU+8B51;
+      )
+     ((=cns11643-2	  . #x672C)	; &C2-672C; [71-12]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	35962 0 0)
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
     (=ucs		. #x8B52)	; 譒
-    (=cns11643-2	. #x672E)	; &I-C2-672E; [71-14]
+    (->subsumptive
+     ((=jis-x0212	  . #x5E4A)	; &M-35962; [62-42]
+      (=daikanwa	  . 35962)	; &I-M-35962;
+      (=jef-china3	  . #x65C6)	; &I-JC3-65C6;
+      (=ucs@jis		  . #x8B52)	; &M-35962;
+      )
+     ((=ucs@unicode	  . #x8B52)	; &UU+8B52;
+      )
+     ((=cns11643-2	  . #x672E)	; &C2-672E; [71-14]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x27B0C)	; 𧬌
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
-    (=daikanwa		. 35963)	; &M-35963;
+    (=ucs		. #x27B0C)	; 𧬌
     ))
 (define-char
-  '((morohashi-daikanwa	35963 0 0)
+  '((<-denotational
+     ((=ucs		  . #x27B0C)	; 𧬌
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
-    (hanyu-dazidian	6 4018 15)
-    (=ucs		. #x27B0C)	; 𧬌
-    (=cns11643-4	. #x613F)	; &I-C4-613F; [65-31]
-    (=hanziku-10	. #xED7C)	; &I-HZK10-ED7C;
+    (->subsumptive
+     ((=daikanwa	  . 35963)	; &M-35963;
+      )
+     ((hanyu-dazidian	  6 4018 15)
+      (=hanziku-10	  . #xED7C)	; &HZK10-ED7C;
+      (=ucs@iso		  . #x27B0C)	; &HZK10-ED7C;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x8B53)	; 譓
+  '((<-denotational
+     ((=ucs		  . #x27B0C)	; 𧬌
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
-    (=jis-x0212		. #x5E4B)	; &M-35964; [62-43]
-    (=daikanwa		. 35964)	; &I-M-35964;
-    (=jef-china3	. #x65C7)	; &I-JC3-65C7;
-    (=ucs@jis		. #x8B53)	; &M-35964;
+    (=cns11643-4	. #x613F)	; &C4-613F; [65-31]
     ))
 (define-char
-  '((morohashi-daikanwa	35964 0 0)
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
     (=ucs		. #x8B53)	; 譓
-    (=cns11643-2	. #x6727)	; &I-C2-6727; [71-07]
+    (->subsumptive
+     ((=jis-x0212	  . #x5E4B)	; &M-35964; [62-43]
+      (=daikanwa	  . 35964)	; &I-M-35964;
+      (=jef-china3	  . #x65C7)	; &I-JC3-65C7;
+      (=ucs@jis		  . #x8B53)	; &M-35964;
+      )
+     ((=cns11643-2	  . #x6727)	; &C2-6727; [71-07]
+      (=ucs@unicode	  . #x8B53)	; &C2-6727;
+      ))
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
@@ -13534,83 +13618,178 @@
   '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
-    (=ucs		. #x27B0B)	; 𧬋
-    (=cns11643-5	. #x694E)	; &I-C5-694E; [73-46]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=jis-x0208	  . #x3840)	; &GT-47348; [24-32]
+      (=ks-x1001	  . #x656B)	; &I-K0-656B; [69-75]
+      (=daikanwa	  . 35205)	; &I-M-35205;
+      )
+     ((=jis-x0212	  . #x583A)	; &CDP-8D48; [56-26]
+      (=jis-x0213-2-2000  . #x763C)	; &I-JX2-763C; [86-28]
+      (=daikanwa	  . 31164)	; &I-M-31164;
+      ))
+    (sources		bos=A2003-10165-00011 bos=A2003-00594-00003)
+    (=ruimoku-v6	. #xE01F)	; &RUI6-E01F;
     ))
 (define-char
-  '((=>ucs		. #x27B0B)	; 𧬋
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 19)
-    (hanyu-dazidian	6 4022 1)
-    (=hanziku-10	. #xEE51)	; &HZK10-EE51;
+  '((ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 20)
+    (=ucs		. #x8B4D)	; 譍
+    (->subsumptive
+     ((=jis-x0212	  . #x5E4E)	; &M-35991; [62-46]
+      (=daikanwa	  . 35991)	; &I-M-35991;
+      (=ucs@jis		  . #x8B4D)	; &M-35991;
+      )
+     ((=cns11643-3	  . #x5D33)	; &C3-5D33; [61-19]
+      (=ucs@unicode	  . #x8B4D)	; &C3-5D33;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x8B4D)	; 譍
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 13)
     (total-strokes	 . 20)
-    (=jis-x0212		. #x5E4E)	; &M-35991; [62-46]
-    (=daikanwa		. 35991)	; &I-M-35991;
-    (=ucs@jis		. #x8B4D)	; &M-35991;
+    (=ucs		. #x27B12)	; 𧬒
     ))
 (define-char
-  '((morohashi-daikanwa	35991 0 1)
+  '((<-denotational
+     ((=ucs		  . #x27B12)	; 𧬒
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 13)
     (total-strokes	 . 20)
-    (=ucs		. #x8B4D)	; 譍
-    (=cns11643-3	. #x5D33)	; &I-C3-5D33; [61-19]
+    (->subsumptive
+     ((morohashi-daikanwa	35991 1)
+      (=gt		  . 48359)	; &GT-48359;
+      (=gt-pj-7		  . #x3A24)	; &GT-48359; [26-04]
+      (mojikyo		  . 050470)	; &MCS-6000C526;
+      )
+     ((=cns11643-7	  . #x5033)	; &C7-5033; [48-19]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	35991 1)
+  '((<-denotational
+     ((=ucs		  . #x27B12)	; 𧬒
+      ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 13)
     (total-strokes	 . 20)
-    (=cns11643-7	. #x5033)	; &C7-5033; [48-19]
-    (mojikyo		. 050470)	; &MCS-6000C526;
+    (hanyu-dazidian	6 4023 14)
+    (=hanziku-10	. #xEE7E)	; &HZK10-EE7E;
+    (=ucs@iso		. #x27B12)	; &HZK10-EE7E;
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 13)
     (total-strokes	 . 20)
     (=ucs		. #x8B5D)	; 譝
-    (=cns11643-2	. #x697C)	; &I-C2-697C; [73-92]
-    (=daikanwa		. 35992)	; &I-M-35992;
+    (->subsumptive
+     ((=daikanwa	  . 35992)	; &M-35992;
+      )
+     ((=cns11643-2	  . #x697C)	; &C2-697C; [73-92]
+      )
+     ((=ucs@unicode	  . #x8B5D)	; &UU+8B5D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
+    (=ucs		. #x4712)	; 䜒
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4712)	; 䜒
+      ))
+    (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 13)
     (total-strokes	 . 20)
-    (=ucs		. #x4712)	; 䜒
-    (=cns11643-4	. #x644E)	; &I-C4-644E; [68-46]
-    (=daikanwa		. 35993)	; &I-M-35993;
+    (->subsumptive
+     ((=daikanwa	  . 35993)	; &M-35993;
+      )
+     ((=cns11643-4	  . #x644E)	; &C4-644E; [68-46]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4712)	; 䜒
+      ))
+    (ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 19)
+    (=ucs@unicode	. #x4712)	; &UU+4712;
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 13)
     (total-strokes	 . 20)
     (=ucs		. #x8B5E)	; 譞
-    (=jis-x0212		. #x5E4F)	; &I-JSP-5E4F; [62-47]
-    (=cns11643-4	. #x644D)	; &I-C4-644D; [68-45]
-    (=jis-x0213-2-2000	. #x786D)	; &I-JX2-786D; [88-77]
-    (=daikanwa		. 35994)	; &I-M-35994;
+    (->subsumptive
+     ((=jis-x0212	  . #x5E4F)	; &M-35994; [62-47]
+      (=jis-x0213-2-2000  . #x786D)	; &I-JX2-786D; [88-77]
+      (=daikanwa	  . 35994)	; &I-M-35994;
+      (=ucs@jis		  . #x8B5E)	; &M-35994;
+      )
+     ((=cns11643-4	  . #x644D)	; &C4-644D; [68-45]
+      (=ucs@unicode	  . #x8B5E)	; &C4-644D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
+    (=ucs		. #x4713)	; 䜓
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4713)	; 䜓
+      ))
+    (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 13)
     (total-strokes	 . 20)
-    (=ucs		. #x4713)	; 䜓
-    (=cns11643-3	. #x5D2D)	; &I-C3-5D2D; [61-13]
-    (=daikanwa		. 35995)	; &I-M-35995;
+    (->subsumptive
+     ((=daikanwa	  . 35995)	; &M-35995;
+      )
+     ((=cns11643-3	  . #x5D2D)	; &C3-5D2D; [61-13]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4713)	; 䜓
+      ))
+    (ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 19)
+    (=ucs@unicode	. #x4713)	; &UU+4713;
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
+    (=ucs		. #x4714)	; 䜔
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4714)	; 䜔
+      ))
+    (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 13)
     (total-strokes	 . 20)
-    (=ucs		. #x4714)	; 䜔
-    (=cns11643-7	. #x5031)	; &I-C7-5031; [48-17]
-    (=daikanwa		. 35996)	; &I-M-35996;
+    (=daikanwa		. 35996)	; &M-35996;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4714)	; 䜔
+      ))
+    (ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 19)
+    (=ucs@unicode	. #x4714)	; &UU+4714;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4714)	; 䜔
+      ))
+    (ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 20)
+    (=cns11643-7	. #x5031)	; &C7-5031; [48-17]
     ))
 (define-char
   '((=>ucs		. #x27B27)	; 𧬧
@@ -14222,28 +14401,25 @@
     (=cns11643-7	. #x502D)	; &C7-502D; [48-13]
     ))
 (define-char
-  '((=>ucs		. #x8B72)	; è­²
-    (morohashi-daikanwa	36037 1)
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 20)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6C2A)	; &GT-48504; [76-10]
-      (=ks-x1001	  . #x6553)	; &I-K0-6553; [69-51]
-      (=daikanwa	  . 36139)	; &I-M-36139;
-      ))
-    (=jis-x0208		. #x3E79)	; &GT-48336; [30-89]
-    (=gt		. 48336)	; &I-GT-48336;
-    (=gt-pj-1		. #x3E79)	; &I-GT-48336; [30-89]
-    (=ucs@jis		. #x8B72)	; &GT-48336;
-    (mojikyo		. 050471)	; &MCS-6000C527;
-    ))
-(define-char
-  '((morohashi-daikanwa	36037 1 0)
-    (ideographic-radical . 149)	; ⾔
+  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 13)
     (total-strokes	 . 20)
     (=ucs		. #x8B72)	; è­²
+    (->subsumptive
+     ((morohashi-daikanwa	36037 1)
+      (=jis-x0208	  . #x3E79)	; &GT-48336; [30-89]
+      (=gt		  . 48336)	; &I-GT-48336;
+      (=gt-pj-1		  . #x3E79)	; &I-GT-48336; [30-89]
+      (=ucs@jis		  . #x8B72)	; &GT-48336;
+      (mojikyo		  . 050471)	; &MCS-6000C527;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6C2A)	; &GT-48504; [76-10]
+	(=ks-x1001	    . #x6553)	; &I-K0-6553; [69-51]
+	(=daikanwa	    . 36139)	; &I-M-36139;
+	))
+      )
+     ((=ucs@unicode	  . #x8B72)	; &UU+8B72;
+      ))
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
@@ -17633,12 +17809,6 @@
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
-    (hanyu-dazidian	6 4023 14)
-    (=ucs		. #x27B12)	; 𧬒
-    (=hanziku-10	. #xEE7E)	; &I-HZK10-EE7E;
-    ))
-(define-char
-  '((ideographic-radical . 149)	; ⾔
     (hanyu-dazidian	6 4018 3)
     (=ucs		. #x27B13)	; 𧬓
     (=hanziku-10	. #xED70)	; &I-HZK10-ED70;
diff --git a/lisp/utf-2000/Ideograph-R151-Bean.el b/lisp/utf-2000/Ideograph-R151-Bean.el
index 608588e..ba108ee 100644
--- a/lisp/utf-2000/Ideograph-R151-Bean.el
+++ b/lisp/utf-2000/Ideograph-R151-Bean.el
@@ -22,11 +22,11 @@
     (ideographic-radical . 151)	; ⾖
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x8C46)	; 豆
-      ))
     (=gt-k		. 02620)	; &GT-K02620;
     (=gt-pj-k1		. #x3459)	; &GT-K02620; [20-57]
+    (<-formed@component/connect-right
+     ((=ucs		  . #x8C46)	; 豆
+      ))
     ))
 (define-char
   '((ideographic-radical . 151)	; ⾖
@@ -171,6 +171,11 @@
   '((ideographic-radical . 151)	; ⾖
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
+    (shinjigen-1	. 7810)
+    (=ucs		. #x27BE1)	; 𧯡
+    (=cns11643-5	. #x3C3E)	; &I-C5-3C3E; [28-30]
+    (=daikanwa		. 36256)	; &I-M-36256;
+    (=cbeta		. 03349)	; &I-CB03349;
     (<-original
      ((shinjigen-1	  . 7809)
       (=jis-x0208	  . #x6C32)	; &GT-48666; [76-18]
@@ -179,11 +184,6 @@
       ))
     (<-original*sources
      shinjigen-1)
-    (shinjigen-1	. 7810)
-    (=ucs		. #x27BE1)	; 𧯡
-    (=cns11643-5	. #x3C3E)	; &I-C5-3C3E; [28-30]
-    (=daikanwa		. 36256)	; &I-M-36256;
-    (=cbeta		. 03349)	; &I-CB03349;
     ))
 (define-char
   '((ideographic-radical . 151)	; ⾖
@@ -236,10 +236,6 @@
   '((ideographic-radical . 151)	; ⾖
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x8C50)	; 豐
-      (=jis-x0208	  . #x6C34)	; &I-J90-6C34; [76-20]
-      ))
     (shinjigen-2	. 7807)
     (=ucs		. #x8C4A)	; 豊
     (=jis-x0208		. #x4B2D)	; &I-J90-4B2D; [43-13]
@@ -250,6 +246,10 @@
     (=gt-k		. 10269)	; &I-GT-K10269;
     (=gt-pj-1		. #x4B2D)	; &I-GT-48656; [43-13]
     (=daikanwa		. 36263)	; &I-M-36263;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x8C50)	; 豐
+      (=jis-x0208	  . #x6C34)	; &I-J90-6C34; [76-20]
+      ))
     ))
 (define-char
   '((ideographic-radical . 151)	; ⾖
diff --git a/lisp/utf-2000/Ideograph-R152-Pig.el b/lisp/utf-2000/Ideograph-R152-Pig.el
index 7ffb063..f775d7f 100644
--- a/lisp/utf-2000/Ideograph-R152-Pig.el
+++ b/lisp/utf-2000/Ideograph-R152-Pig.el
@@ -1016,15 +1016,22 @@
   '((ideographic-radical . 152)	; ⾗
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
-    (shinjigen-2	. 68)
     (=ucs		. #x8C6B)	; 豫
-    (=jis-x0208		. #x502E)	; &I-J90-502E; [48-14]
-    (=gb2312		. #x5425)	; &I-G0-5425; [52-05]
-    (=ks-x1001		. #x6763)	; &I-K0-6763; [71-67]
-    (=cns11643-1	. #x7247)	; &I-C1-7247; [82-39]
-    (=gt		. 48859)	; &I-GT-48859;
-    (=gt-pj-1		. #x502E)	; &I-GT-48859; [48-14]
-    (=daikanwa		. 36425)	; &I-M-36425;
+    (->subsumptive
+     ((shinjigen-2	  . 68)
+      (=jis-x0208	  . #x502E)	; &GT-48859; [48-14]
+      (=ks-x1001	  . #x6763)	; &I-K0-6763; [71-67]
+      (=gt		  . 48859)	; &I-GT-48859;
+      (=gt-pj-1		  . #x502E)	; &I-GT-48859; [48-14]
+      (=daikanwa	  . 36425)	; &I-M-36425;
+      (=ucs@jis		  . #x8C6B)	; &GT-48859;
+      )
+     ((=gb2312		  . #x5425)	; &G0-5425; [52-05]
+      (=ucs@unicode	  . #x8C6B)	; &G0-5425;
+      )
+     ((shinjigen-1	  . 68)
+      (=cns11643-1	  . #x7247)	; &C1-7247; [82-39]
+      ))
     ))
 (define-char
   '((ideographic-radical . 152)	; ⾗
diff --git a/lisp/utf-2000/Ideograph-R154-Shell.el b/lisp/utf-2000/Ideograph-R154-Shell.el
index 1978d00..d63ec85 100644
--- a/lisp/utf-2000/Ideograph-R154-Shell.el
+++ b/lisp/utf-2000/Ideograph-R154-Shell.el
@@ -23,23 +23,23 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC9)	; ⻉
     (<-identical@component
      ((=ucs		  . #x8D1D)	; 贝
       ))
-    (=ucs		. #x2EC9)	; ⻉
     ))
 (define-char
   '((ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-simplified@CN
-     ((=ucs		  . #x8C9D)	; 貝
-      (=gb12345		  . #x3134)	; 貝 [17-20]
-      ))
     (hanyu-dazidian	6 3622 2)
     (=ucs		. #x8D1D)	; 贝
     (=gb2312		. #x3134)	; &I-G0-3134; [17-20]
     (=big5-cdp		. #x895D)	; &I-CDP-895D;
+    (<-simplified@CN
+     ((=ucs		  . #x8C9D)	; 貝
+      (=gb12345		  . #x3134)	; 貝 [17-20]
+      ))
     ))
 (define-char
   '((=>ucs		. #x27D24)	; 𧴤
@@ -74,6 +74,12 @@
   '((ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 2)
     (total-strokes	 . 9)
+    (hanyu-dazidian	6 3624 4)
+    (shinjigen-1	. 1081)
+    (=ucs		. #x8C9F)	; 貟
+    (=cns11643-3	. #x2F2E)	; &I-C3-2F2E; [15-14]
+    (=daikanwa		. 36659)	; &I-M-36659;
+    (=hanziku-9		. #xF057)	; &I-HZK09-F057;
     (<-vulgar
      ((shinjigen-1	  . 1080)
       (=ucs		  . #x54E1)	; 員
@@ -81,15 +87,17 @@
       ))
     (<-vulgar*sources
      shinjigen-1)
-    (hanyu-dazidian	6 3624 4)
-    (shinjigen-1	. 1081)
-    (=ucs		. #x8C9F)	; 貟
-    (=cns11643-3	. #x2F2E)	; &I-C3-2F2E; [15-14]
-    (=daikanwa		. 36659)	; &I-M-36659;
-    (=hanziku-9		. #xF057)	; &I-HZK09-F057;
     ))
 (define-char
-  '((=>ucs		. #x8CA0)	; è² 
+  '((ideographic-radical . 154)	; ⾙
+    (ideographic-strokes . 2)
+    (total-strokes	 . 9)
+    (=ucs		. #x8CA0)	; è² 
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8CA0)	; è² 
+      ))
     (ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 2)
     (total-strokes	 . 9)
@@ -97,17 +105,19 @@
     (=daikanwa		. 36660)	; &I-M-36660;
     ))
 (define-char
-  '((morohashi-daikanwa	36660 0 1)
+  '((<-denotational
+     ((=ucs		  . #x8CA0)	; è² 
+      ))
     (ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 2)
     (total-strokes	 . 9)
-    (=ucs		. #x8CA0)	; è² 
-    (=jis-x0208		. #x4969)	; &I-J90-4969; [41-73]
+    (=jis-x0208		. #x4969)	; &GT-49123; [41-73]
     (=cns11643-1	. #x5357)	; &I-C1-5357; [51-55]
-    (=gb12345		. #x383A)	; è²  [24-26]
+    (=gb12345		. #x383A)	; &GT-49123; [24-26]
     (=gt		. 49123)	; &I-GT-49123;
     (=gt-k		. 05173)	; &I-GT-K05173;
     (=gt-pj-1		. #x4969)	; &I-GT-49123; [41-73]
+    (=ucs@unicode	. #x8CA0)	; &GT-49123;
     ))
 (define-char
   '((ideographic-radical . 154)	; ⾙
@@ -410,27 +420,24 @@
     (=gb12345		. #x3737)	; 販 [23-23]
     ))
 (define-char
-  '((=>ucs		. #x8CAA)	; 貪
-    (ideographic-radical . 154)	; ⾙
-    (ideographic-strokes . 4)
-    (total-strokes	 . 11)
-    (shinjigen-2	. 7865)
-    (=jis-x0208		. #x6C45)	; &GT-49150; [76-37]
-    (=ks-x1001		. #x7731)	; &I-K0-7731; [87-17]
-    (=cns11643-1	. #x5D4D)	; &I-C1-5D4D; [61-45]
-    (=gt		. 49150)	; &I-GT-49150;
-    (=gt-k		. 07982)	; &I-GT-K07982;
-    (=gt-pj-1		. #x6C45)	; &I-GT-49150; [76-37]
-    (=daikanwa		. 36680)	; &I-M-36680;
-    (=ucs@jis		. #x8CAA)	; &GT-49150;
-    ))
-(define-char
-  '((morohashi-daikanwa	36680 0 1)
-    (ideographic-radical . 154)	; ⾙
+  '((ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
     (=ucs		. #x8CAA)	; 貪
-    (=gb12345		. #x4C30)	; 貪 [44-16]
+    (->subsumptive
+     ((shinjigen-2	  . 7865)
+      (=jis-x0208	  . #x6C45)	; &GT-49150; [76-37]
+      (=ks-x1001	  . #x7731)	; &I-K0-7731; [87-17]
+      (=cns11643-1	  . #x5D4D)	; &I-C1-5D4D; [61-45]
+      (=gt		  . 49150)	; &I-GT-49150;
+      (=gt-k		  . 07982)	; &I-GT-K07982;
+      (=gt-pj-1		  . #x6C45)	; &I-GT-49150; [76-37]
+      (=daikanwa	  . 36680)	; &I-M-36680;
+      (=ucs@jis		  . #x8CAA)	; &GT-49150;
+      )
+     ((=gb12345		  . #x4C30)	; &UU+8CAA; [44-16]
+      (=ucs@unicode	  . #x8CAA)	; &UU+8CAA;
+      ))
     ))
 (define-char
   '((ideographic-radical . 154)	; ⾙
@@ -1089,23 +1096,39 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
     (=ucs		. #x476F)	; 䝯
-    (=cns11643-4	. #x3B43)	; &I-C4-3B43; [27-35]
-    (=daikanwa		. 36726)	; &I-M-36726;
+    (->subsumptive
+     ((=daikanwa	  . 36726)	; &M-36726;
+      (=jef-china3	  . #x66A2)	; &I-JC3-66A2;
+      (=ucs@unicode	  . #x476F)	; &M-36726;
+      )
+     ((=cns11643-4	  . #x3B43)	; &C4-3B43; [27-35]
+      ))
     ))
 (define-char
-  '((ideographic-radical . 154)	; ⾙
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x6C4C)	; &J97-6C4C; [76-44]
+      ))
+    (ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
-    (shinjigen-2	. 7890)
     (=ucs		. #x8CC1)	; 賁
-    (=jis-x0208		. #x6C4C)	; &I-J90-6C4C; [76-44]
-    (=ks-x1001		. #x5D53)	; &I-K0-5D53; [61-51]
-    (=cns11643-1	. #x6235)	; &I-C1-6235; [66-21]
-    (=gb12345		. #x6A5A)	; 賁 [74-58]
-    (=gt		. 49201)	; &I-GT-49201;
-    (=gt-k		. 09235)	; &I-GT-K09235;
-    (=gt-pj-1		. #x6C4C)	; &I-GT-49201; [76-44]
-    (=daikanwa		. 36727)	; &I-M-36727;
+    (->subsumptive
+     ((shinjigen-2	  . 7890)
+      (=jis-x0208	  . #x6C4C)	; &GT-49201; [76-44]
+      (=ks-x1001	  . #x5D53)	; &I-K0-5D53; [61-51]
+      (=gb12345		  . #x6A5A)	; &GT-49201; [74-58]
+      (=gt		  . 49201)	; &I-GT-49201;
+      (=gt-k		  . 09235)	; &I-GT-K09235;
+      (=gt-pj-1		  . #x6C4C)	; &I-GT-49201; [76-44]
+      (=daikanwa	  . 36727)	; &I-M-36727;
+      (=ucs@unicode	  . #x8CC1)	; &GT-49201;
+      )
+     ((=cns11643-1	  . #x6235)	; &C1-6235; [66-21]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 154)	; ⾙
+    (=jis-x0208@1997	. #x6C4C)	; &J97-6C4C; [76-44]
     ))
 (define-char
   '((ideographic-radical . 154)	; ⾙
@@ -1266,7 +1289,10 @@
     (=hanziku-9		. #xF2C4)	; &I-HZK09-F2C4;
     ))
 (define-char
-  '((ideographic-radical . 154)	; ⾙
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x6C4C)	; &J97-6C4C; [76-44]
+      ))
+    (ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
     (=cns11643-6	. #x585C)	; &M-36737; [56-60]
@@ -1694,18 +1720,18 @@
   '((ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
-    (<-simplified@JP
-     ((=ucs		  . #x8CE4)	; 賤
-      (=jis-x0208@1978	  . #x4128)	; &I-J78-4128; [33-08]
-      (=jis-x0208@1983	  . #x6C4D)	; &I-J83-6C4D; [76-45]
-      (=jis-x0208@1990	  . #x6C4D)	; &I-J90-6C4D; [76-45]
-      ))
     (=ucs		. #x8CCE)	; 賎
     (=jis-x0208@1978	. #x6C4D)	; &I-J78-6C4D; [76-45]
     (=jis-x0208@1983	. #x4128)	; &I-J83-4128; [33-08]
     (=jis-x0208@1990	. #x4128)	; &I-J90-4128; [33-08]
     (=gt		. 49239)	; &I-GT-49239;
     (=gt-pj-1		. #x4128)	; &I-GT-49239; [33-08]
+    (<-simplified@JP/jis
+     ((=ucs		  . #x8CE4)	; 賤
+      (=jis-x0208@1978	  . #x4128)	; &I-J78-4128; [33-08]
+      (=jis-x0208@1983	  . #x6C4D)	; &I-J83-6C4D; [76-45]
+      (=jis-x0208@1990	  . #x6C4D)	; &I-J90-6C4D; [76-45]
+      ))
     ))
 (define-char
   '((ideographic-radical . 154)	; ⾙
@@ -1995,33 +2021,30 @@
     (ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x5E39)	; &M-36788; [62-25]
-      (=jis-x0213-1-2000  . #x7C38)	; &I-JX1-7C38; [92-24]
-      (=daikanwa	  . 36788)	; &I-M-36788;
-      ))
     (=jis-x0208		. #x4950)	; &GT-49334; [41-48]
     (=gt		. 49334)	; &I-GT-49334;
     (=gt-k		. 11943)	; &I-GT-K11943;
     (=gt-pj-1		. #x4950)	; &I-GT-49334; [41-48]
     (=ucs@jis		. #x8CD3)	; &GT-49334;
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x5E39)	; &M-36788; [62-25]
+      (=jis-x0213-1-2000  . #x7C38)	; &I-JX1-7C38; [92-24]
+      (=daikanwa	  . 36788)	; &I-M-36788;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x8CD4)	; 賔
-    (ideographic-radical . 154)	; ⾙
-    (ideographic-strokes . 7)
-    (total-strokes	 . 14)
-    (=daikanwa		. 36789)	; &M-36789;
-    ))
-(define-char
-  '((morohashi-daikanwa	36789 0 0)
-    (ideographic-radical . 154)	; ⾙
+  '((ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 7)
     (total-strokes	 . 14)
-    (hanyu-dazidian	6 3644 1)
     (=ucs		. #x8CD4)	; 賔
-    (=cns11643-3	. #x4972)	; &I-C3-4972; [41-82]
-    (=hanziku-9		. #xF460)	; &I-HZK09-F460;
+    (->subsumptive
+     ((=daikanwa	  . 36789)	; &M-36789;
+      )
+     ((hanyu-dazidian	  6 3644 1)
+      (=cns11643-3	  . #x4972)	; &HZK09-F460; [41-82]
+      (=hanziku-9	  . #xF460)	; &I-HZK09-F460;
+      (=ucs@unicode	  . #x8CD4)	; &HZK09-F460;
+      ))
     ))
 (define-char
   '((ideographic-radical . 154)	; ⾙
@@ -2583,16 +2606,13 @@
   '((ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
-    (=daikanwa		. 36839)	; &M-36839;
+    (=ucs		. #x27DA9)	; 𧶩
+    (=daikanwa		. 36839)	; &I-M-36839;
     ))
 (define-char
   '((ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x8D0A)	; 贊
-      (=jis-x0208	  . #x6C55)	; &I-J90-6C55; [76-53]
-      ))
     (hanyu-dazidian	6 3645 5)
     (shinjigen-2	. 7898)
     (=ucs		. #x8CDB)	; 賛
@@ -2603,6 +2623,10 @@
     (=gt-pj-1		. #x3B3F)	; &I-GT-49306; [27-31]
     (=daikanwa		. 36841)	; &I-M-36841;
     (=hanziku-9		. #xF4A6)	; &I-HZK09-F4A6;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x8D0A)	; 贊
+      (=jis-x0208	  . #x6C55)	; &I-J90-6C55; [76-53]
+      ))
     ))
 (define-char
   '((ideographic-radical . 154)	; ⾙
@@ -3277,17 +3301,17 @@
     (ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
+    (<-simplified@JP/misc
+     ((=gt		  . 49385)	; &GT-49385;
+      (=daikanwa	  . 36885)	; &I-M-36885;
+      ))
     (->subsumptive
      ((=jis-x0208@1978	  . #x3958)	; &J83-3958; [25-56]
       (=jis-x0208@1983	  . #x3958)	; &I-J83-3958; [25-56]
       (=gb12345		  . #x393A)	; &J83-3958; [25-26]
       (=ucs@unicode	  . #x8CFC)	; &J83-3958;
       )
-     ((<-simplified@JP
-       ((=gt		    . 49385)	; &GT-49385;
-	(=daikanwa	    . 36885)	; &I-M-36885;
-	))
-      (=ks-x1001	  . #x4F45)	; &GT-49386; [47-37]
+     ((=ks-x1001	  . #x4F45)	; &GT-49386; [47-37]
       (=jis-x0208@1990	  . #x3958)	; &I-J90-3958; [25-56]
       (=cns11643-1	  . #x7555)	; &I-C1-7555; [85-53]
       (=gt		  . 49386)	; &I-GT-49386;
@@ -3719,20 +3743,27 @@
     (=daikanwa		. 36920)	; &I-M-36920;
     ))
 (define-char
-  '((=>ucs		. #x8D08)	; 贈
+  '((ideographic-radical . 154)	; ⾙
+    (=ucs		. #x8D08)	; 贈
+    (=jis-x0208@1997	. #x4223)	; 贈 [34-03]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8D08)	; 贈
+      ))
     (morohashi-daikanwa	36920 1)
     (ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 11)
     (total-strokes	 . 18)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA65)	; ï©¥
-      (=jis-x0213-1-2000  . #x7C3D)	; &I-JX1-7C3D; [92-29]
-      ))
     (=jis-x0208		. #x4223)	; &GT-49426; [34-03]
     (=gt		. 49426)	; &I-GT-49426;
     (=gt-pj-1		. #x4223)	; &I-GT-49426; [34-03]
     (=ucs@jis		. #x8D08)	; &GT-49426;
     (mojikyo		. 050478)	; &MCS-6000C52E;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA65)	; ï©¥
+      (=jis-x0213-1-2000  . #x7C3D)	; &I-JX1-7C3D; [92-29]
+      ))
     ))
 (define-char
   '((ideographic-radical . 154)	; ⾙
@@ -3844,23 +3875,31 @@
     (=daikanwa		. 36927)	; &I-M-36927;
     ))
 (define-char
-  '((=>ucs*		. #x8D08)	; 贈
+  '((<-denotational
+     ((=ucs		  . #x8D08)	; 贈
+      ))
+    (=>ucs*		. #x8D08)	; 贈
     (ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 12)
     (=ucs		. #xFA65)	; ï©¥
     (=ks-x1001		. #x717C)	; &I-K0-717C; [81-92]
     (=jis-x0213-1-2000	. #x7C3D)	; &I-JX1-7C3D; [92-29]
     (=daikanwa		. 36929)	; &I-M-36929;
+    (=jef-china3	. #x66AF)	; &I-JC3-66AF;
     (=ucs@ks		. #x8D08)	; ï©¥
     ))
 (define-char
-  '((morohashi-daikanwa	36929 0 2)
+  '((<-denotational
+     ((=ucs		  . #x8D08)	; 贈
+      ))
+    (=>ucs@jis		. #xFA65)	; ï©¥
+    (=>daikanwa		. 36929)	; ï©¥
     (ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
-    (=ucs		. #x8D08)	; 贈
-    (=cns11643-1	. #x7925)	; &I-C1-7925; [89-05]
-    (=gb12345		. #x5479)	; 贈 [52-89]
+    (=cns11643-1	. #x7925)	; &C1-7925; [89-05]
+    (=gb12345		. #x5479)	; &C1-7925; [52-89]
+    (=ucs@unicode	. #x8D08)	; &C1-7925;
     ))
 (define-char
   '((ideographic-radical . 154)	; ⾙
diff --git a/lisp/utf-2000/Ideograph-R156-Run.el b/lisp/utf-2000/Ideograph-R156-Run.el
index 2648cb2..cc2c359 100644
--- a/lisp/utf-2000/Ideograph-R156-Run.el
+++ b/lisp/utf-2000/Ideograph-R156-Run.el
@@ -19,31 +19,31 @@
     (ideographic-radical . 156)	; ⾛
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
-    (<-simplified
-     ((=ucs		  . #x8D70)	; èµ°
-      (=daikanwa	  . 37034)	; &I-M-37034;
-      ))
-    (<-simplified*sources
-     daikanwa)
     (=ucs		. #x8D71)	; èµ±
     (=jis-x0208		. #x6C61)	; &I-J90-6C61; [76-65]
     (=cns11643-3	. #x243A)	; &I-C3-243A; [04-26]
     (=gt		. 49581)	; &I-GT-49581;
     (=gt-pj-1		. #x6C61)	; &I-GT-49581; [76-65]
     (mojikyo		. 050479)	; &MCS-6000C52F;
+    (<-simplified
+     ((=ucs		  . #x8D70)	; èµ°
+      (=daikanwa	  . 37034)	; &I-M-37034;
+      ))
+    (<-simplified*sources
+     daikanwa)
     ))
 (define-char
   '((ideographic-radical . 156)	; ⾛
     (ideographic-strokes . 0)
     (total-strokes	 . 8)
+    (=cns11643-6	. #x2E32)	; &M-37035; [14-18]
+    (=daikanwa		. 37035)	; &I-M-37035;
     (<-original
      ((=ucs		  . #x8D70)	; èµ°
       (=daikanwa	  . 37034)	; &I-M-37034;
       ))
     (<-original*sources
      kangxi daikanwa)
-    (=cns11643-6	. #x2E32)	; &M-37035; [14-18]
-    (=daikanwa		. 37035)	; &I-M-37035;
     ))
 (define-char
   '((ideographic-radical . 156)	; ⾛
@@ -614,6 +614,9 @@
   '((ideographic-radical . 156)	; ⾛
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
+    (=ucs		. #x27EBA)	; 𧺺
+    (=cns11643-6	. #x4F34)	; &I-C6-4F34; [47-20]
+    (=daikanwa		. 37091)	; &I-M-37091;
     (<-formed
      ((=daikanwa	  . 38736)	; &M-38736;
       ))
@@ -633,9 +636,6 @@
       ))
     (<-same@s2*sources
      zihui daikanwa)
-    (=ucs		. #x27EBA)	; 𧺺
-    (=cns11643-6	. #x4F34)	; &I-C6-4F34; [47-20]
-    (=daikanwa		. 37091)	; &I-M-37091;
     ))
 (define-char
   '((ideographic-radical . 156)	; ⾛
@@ -1276,27 +1276,36 @@
   '((ideographic-radical . 156)	; ⾛
     (ideographic-strokes . 7)
     (total-strokes	 . 14)
-    (<-formed
-     ((=ks-x1001	  . #x7762)	; &M-38876; [87-66]
-      (=daikanwa	  . 38876)	; &I-M-38876;
-      ))
-    (<-same
-     ((=ks-x1001	  . #x7762)	; &M-38876; [87-66]
-      (=daikanwa	  . 38876)	; &I-M-38876;
-      ))
-    (<-same*sources
-     jiyun daikanwa)
     (=ucs		. #x47AC)	; 䞬
-    (=cns11643-6	. #x6275)	; &I-C6-6275; [66-85]
-    (=daikanwa		. 37155)	; &I-M-37155;
+    (->subsumptive
+     ((=daikanwa	  . 37155)	; &M-37155;
+      (=ucs@unicode	  . #x47AC)	; &M-37155;
+      (<-formed
+       ((=ks-x1001	    . #x7762)	; &M-38876; [87-66]
+	(=daikanwa	    . 38876)	; &I-M-38876;
+	))
+      (<-same
+       ((=ks-x1001	    . #x7762)	; &M-38876; [87-66]
+	(=daikanwa	    . 38876)	; &I-M-38876;
+	))
+      (<-same*sources
+       jiyun daikanwa)
+      )
+     ((=cns11643-6	  . #x6275)	; &C6-6275; [66-85]
+      ))
     ))
 (define-char
   '((ideographic-radical . 156)	; ⾛
     (ideographic-strokes . 7)
     (total-strokes	 . 14)
     (=ucs		. #x27EF1)	; 𧻱
-    (=cns11643-5	. #x4A2C)	; &I-C5-4A2C; [42-12]
-    (=daikanwa		. 37156)	; &I-M-37156;
+    (->subsumptive
+     ((=daikanwa	  . 37156)	; &M-37156;
+      )
+     ((=cns11643-5	  . #x4A2C)	; &C5-4A2C; [42-12]
+      )
+     ((=ucs@iso		  . #x27EF1)	; &U-00027EF1;
+      ))
     ))
 (define-char
   '((ideographic-radical . 156)	; ⾛
@@ -1677,6 +1686,10 @@
   '((ideographic-radical . 156)	; ⾛
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
+    (=ucs		. #x8DA0)	; 趠
+    (=jis-x0212		. #x5F54)	; &I-JSP-5F54; [63-52]
+    (=cns11643-2	. #x5458)	; &I-C2-5458; [52-56]
+    (=daikanwa		. 37192)	; &I-M-37192;
     (<-formed
      ((=jis-x0212	  . #x6158)	; &M-38947; [65-56]
       (=daikanwa	  . 38947)	; &I-M-38947;
@@ -1687,10 +1700,6 @@
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=ucs		. #x8DA0)	; 趠
-    (=jis-x0212		. #x5F54)	; &I-JSP-5F54; [63-52]
-    (=cns11643-2	. #x5458)	; &I-C2-5458; [52-56]
-    (=daikanwa		. 37192)	; &I-M-37192;
     ))
 (define-char
   '((ideographic-radical . 156)	; ⾛
diff --git a/lisp/utf-2000/Ideograph-R157-Foot.el b/lisp/utf-2000/Ideograph-R157-Foot.el
index e60075c..28827fa 100644
--- a/lisp/utf-2000/Ideograph-R157-Foot.el
+++ b/lisp/utf-2000/Ideograph-R157-Foot.el
@@ -1669,12 +1669,23 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
     (=ucs		. #x8DF1)	; è·±
-    (=jis-x0212		. #x5F70)	; &I-JSP-5F70; [63-80]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8DF1)	; è·±
+      ))
+    (ideographic-radical . 157)	; ⾜
+    (ideographic-strokes . 6)
+    (total-strokes	 . 13)
+    (=jis-x0212		. #x5F70)	; &M-37529; [63-80]
     (=daikanwa		. 37529)	; &I-M-37529;
+    (=jef-china3	. #x66CF)	; &I-JC3-66CF;
+    (=ucs@unicode	. #x8DF1)	; &M-37529;
     ))
 (define-char
-  '((=>ucs		. #x8DF1)	; è·±
-    (morohashi-daikanwa	37529 0 1)
+  '((<-denotational
+     ((=ucs		  . #x8DF1)	; è·±
+      ))
     (ideographic-radical . 157)	; ⾜
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
@@ -1702,14 +1713,14 @@
     (total-strokes	 . 13)
     (=ucs		. #x8DF3)	; è·³
     (->subsumptive
-     ((<-formed
-       ((=ks-x1001	    . #x5431)	; &M-38845; [52-17]
-	(=daikanwa	    . 38845)	; &I-M-38845;
-	))
-      (shinjigen-2	  . 8008)
+     ((shinjigen-2	  . 8008)
       (=jis-x0208@1978	  . #x4437)	; &M-37533; [36-23]
       (=jis-x0208@1983	  . #x4437)	; &I-J83-4437; [36-23]
       (=daikanwa	  . 37533)	; &I-M-37533;
+      (<-formed
+       ((=ks-x1001	    . #x5431)	; &M-38845; [52-17]
+	(=daikanwa	    . 38845)	; &I-M-38845;
+	))
       )
      ((=gb2312		  . #x4C78)	; &GT-50163; [44-88]
       (=ks-x1001	  . #x542F)	; &I-K0-542F; [52-15]
@@ -1801,33 +1812,47 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
     (=ucs		. #x8DF4)	; è·´
-    (=jis-x0212		. #x5F72)	; &I-JSP-5F72; [63-82]
-    (=cns11643-2	. #x4779)	; &I-C2-4779; [39-89]
-    (=daikanwa		. 37547)	; &I-M-37547;
+    (->subsumptive
+     ((=jis-x0212	  . #x5F72)	; &M-37547; [63-82]
+      (=daikanwa	  . 37547)	; &I-M-37547;
+      (=ucs@jis		  . #x8DF4)	; &M-37547;
+      )
+     ((=ucs@unicode	  . #x8DF4)	; &UU+8DF4;
+      )
+     ((=cns11643-2	  . #x4779)	; &C2-4779; [39-89]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 157)	; ⾜
+    (=ucs		. #x8DF5)	; è·µ
     ))
 (define-char
-  '((=>ucs		. #x8DF5)	; è·µ
+  '((<-denotational
+     ((=ucs		  . #x8DF5)	; è·µ
+      ))
     (morohashi-daikanwa	37547 1)
     (ideographic-radical . 157)	; ⾜
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x8E10)	; 踐
-      (=jis-x0208	  . #x6C78)	; &I-J90-6C78; [76-88]
-      ))
     (=jis-x0208		. #x4129)	; &GT-50154; [33-09]
     (=gt		. 50154)	; &I-GT-50154;
     (=gt-pj-1		. #x4129)	; &I-GT-50154; [33-09]
     (=ucs@jis		. #x8DF5)	; &GT-50154;
     (mojikyo		. 050481)	; &MCS-6000C531;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x8E10)	; 踐
+      (=jis-x0208	  . #x6C78)	; &I-J90-6C78; [76-88]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	37547 1 6)
+  '((<-denotational
+     ((=ucs		  . #x8DF5)	; è·µ
+      ))
     (ideographic-radical . 157)	; ⾜
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
-    (=ucs		. #x8DF5)	; è·µ
-    (=gb2312		. #x3C79)	; &I-G0-3C79; [28-89]
+    (=gb2312		. #x3C79)	; &G0-3C79; [28-89]
+    (=ucs@unicode	. #x8DF5)	; &G0-3C79;
     (mojikyo		. 052337)	; &MCS-6000CC71;
     ))
 (define-char
@@ -2098,7 +2123,8 @@
     (total-strokes	 . 14)
     (=ucs		. #x28048)	; 𨁈
     (->subsumptive
-     ((<-formed
+     ((=daikanwa	  . 37565)	; &M-37565;
+      (<-formed
        ((=jis-x0212	    . #x613E)	; &M-38755; [65-30]
 	(=daikanwa	    . 38755)	; &I-M-38755;
 	)
@@ -2115,7 +2141,6 @@
 	))
       (<-same@p2*sources
        jiyun daikanwa)
-      (=daikanwa	  . 37565)	; &M-37565;
       )
      ((=cns11643-6	  . #x6277)	; &C6-6277; [66-87]
       (=ucs@iso		  . #x28048)	; &C6-6277;
@@ -2126,8 +2151,12 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 14)
     (=ucs		. #x47F5)	; 䟵
-    (=cns11643-4	. #x475E)	; &I-C4-475E; [39-62]
-    (=daikanwa		. 37566)	; &I-M-37566;
+    (->subsumptive
+     ((=daikanwa	  . 37566)	; &M-37566;
+      (=ucs@unicode	  . #x47F5)	; &M-37566;
+      )
+     ((=cns11643-4	  . #x475E)	; &C4-475E; [39-62]
+      ))
     ))
 (define-char
   '((ideographic-radical . 157)	; ⾜
@@ -2142,9 +2171,15 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 14)
     (=ucs		. #x8E04)	; 踄
-    (=jis-x0212		. #x5F75)	; &I-JSP-5F75; [63-85]
-    (=cns11643-2	. #x4E4B)	; &I-C2-4E4B; [46-43]
-    (=daikanwa		. 37568)	; &I-M-37568;
+    (->subsumptive
+     ((=jis-x0212	  . #x5F75)	; &M-37568; [63-85]
+      (=daikanwa	  . 37568)	; &I-M-37568;
+      (=jef-china3	  . #x66D0)	; &I-JC3-66D0;
+      (=ucs@jis		  . #x8E04)	; &M-37568;
+      )
+     ((=cns11643-2	  . #x4E4B)	; &C2-4E4B; [46-43]
+      (=ucs@unicode	  . #x8E04)	; &C2-4E4B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 157)	; ⾜
@@ -2946,6 +2981,9 @@
     (ideographic-radical . 157)	; ⾜
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
+    (=ucs		. #x2F9DC)	; 跰
+    (=cns11643-7	. #x2944)	; &I-C7-2944; [09-36]
+    (=daikanwa		. 37638)	; &I-M-37638;
     (<-formed
      ((=jis-x0212	  . #x6155)	; &M-38929; [65-53]
       (=daikanwa	  . 38929)	; &I-M-38929;
@@ -2956,17 +2994,18 @@
       ))
     (<-same@p1+p2*sources
      jiyun daikanwa)
-    (=ucs		. #x2F9DC)	; 跰
-    (=cns11643-7	. #x2944)	; &I-C7-2944; [09-36]
-    (=daikanwa		. 37638)	; &I-M-37638;
     ))
 (define-char
   '((ideographic-radical . 157)	; ⾜
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
     (=ucs		. #x4808)	; 䠈
-    (=cns11643-4	. #x4D78)	; &I-C4-4D78; [45-88]
-    (=daikanwa		. 37639)	; &I-M-37639;
+    (->subsumptive
+     ((=daikanwa	  . 37639)	; &M-37639;
+      (=ucs@unicode	  . #x4808)	; &M-37639;
+      )
+     ((=cns11643-4	  . #x4D78)	; &C4-4D78; [45-88]
+      ))
     ))
 (define-char
   '((ideographic-radical . 157)	; ⾜
@@ -3111,22 +3150,26 @@
   '((ideographic-radical . 157)	; ⾜
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
-    (<-formed
-     ((=ks-x1001	  . #x7277)	; &M-38800; [82-87]
-      (=daikanwa	  . 38800)	; &I-M-38800;
-      ))
-    (<-same
-     ((=ks-x1001	  . #x7277)	; &M-38800; [82-87]
-      (=daikanwa	  . 38800)	; &I-M-38800;
-      ))
-    (<-same*sources
-     jiyun daikanwa)
     (=ucs		. #x8E22)	; 踢
-    (=gb2312		. #x4C5F)	; &I-G0-4C5F; [44-63]
-    (=jis-x0212		. #x5F7E)	; &I-JSP-5F7E; [63-94]
-    (=cns11643-1	. #x6F3B)	; &I-C1-6F3B; [79-27]
-    (=jis-x0213-2-2000	. #x7946)	; &I-JX2-7946; [89-38]
-    (=daikanwa		. 37648)	; &I-M-37648;
+    (->subsumptive
+     ((=gb2312		  . #x4C5F)	; &M-37648; [44-63]
+      (=jis-x0212	  . #x5F7E)	; &I-JSP-5F7E; [63-94]
+      (=jis-x0213-2-2000  . #x7946)	; &I-JX2-7946; [89-38]
+      (=daikanwa	  . 37648)	; &I-M-37648;
+      (=ucs@unicode	  . #x8E22)	; &M-37648;
+      (<-formed
+       ((=ks-x1001	    . #x7277)	; &M-38800; [82-87]
+	(=daikanwa	    . 38800)	; &I-M-38800;
+	))
+      (<-same
+       ((=ks-x1001	    . #x7277)	; &M-38800; [82-87]
+	(=daikanwa	    . 38800)	; &I-M-38800;
+	))
+      (<-same*sources
+       jiyun daikanwa)
+      )
+     ((=cns11643-1	  . #x6F3B)	; &C1-6F3B; [79-27]
+      ))
     ))
 (define-char
   '((ideographic-radical . 157)	; ⾜
diff --git a/lisp/utf-2000/Ideograph-R159-Cart.el b/lisp/utf-2000/Ideograph-R159-Cart.el
index 5310506..5ccaffe 100644
--- a/lisp/utf-2000/Ideograph-R159-Cart.el
+++ b/lisp/utf-2000/Ideograph-R159-Cart.el
@@ -23,23 +23,23 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ECB)	; ⻋
+    (=big5-cdp		. #x8967)	; &I-CDP-8967;
     (<-identical@component
      ((=ucs		  . #x8F66)	; 车
       ))
-    (=ucs		. #x2ECB)	; ⻋
-    (=big5-cdp		. #x8967)	; &I-CDP-8967;
     ))
 (define-char
   '((ideographic-radical . 159)	; ⾞
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=ucs		. #x8F66)	; 车
+    (=gb2312		. #x3335)	; &I-G0-3335; [19-21]
+    (=jef-china3	. #x81C7)	; &I-JC3-81C7;
     (<-simplified@CN
      ((=ucs		  . #x8ECA)	; 車
       (=gb12345		  . #x3335)	; 車 [19-21]
       ))
-    (=ucs		. #x8F66)	; 车
-    (=gb2312		. #x3335)	; &I-G0-3335; [19-21]
-    (=jef-china3	. #x81C7)	; &I-JC3-81C7;
     ))
 (define-char
   '((ideographic-radical . 159)	; ⾞
@@ -61,12 +61,12 @@
   '((ideographic-radical . 159)	; ⾞
     (ideographic-strokes . 1)
     (total-strokes	 . 5)
+    (=ucs		. #x8F67)	; 轧
+    (=gb2312		. #x547E)	; &I-G0-547E; [52-94]
     (<-simplified@CN
      ((=ucs		  . #x8ECB)	; 軋
       (=gb12345		  . #x547E)	; 軋 [52-94]
       ))
-    (=ucs		. #x8F67)	; 轧
-    (=gb2312		. #x547E)	; &I-G0-547E; [52-94]
     ))
 (define-char
   '((ideographic-radical . 159)	; ⾞
@@ -644,7 +644,15 @@
     (=daikanwa		. 38233)	; &I-M-38233;
     ))
 (define-char
-  '((=>ucs		. #x484E)	; 䡎
+  '((ideographic-radical . 159)	; ⾞
+    (ideographic-strokes . 4)
+    (total-strokes	 . 11)
+    (=ucs		. #x484E)	; 䡎
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x484E)	; 䡎
+      ))
     (ideographic-radical . 159)	; ⾞
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
@@ -653,36 +661,39 @@
     (mojikyo		. 038234)	; &MCS-6000955A;
     ))
 (define-char
-  '((=>ucs		. #x484E)	; 䡎
-    (morohashi-daikanwa	38234 0 1)
+  '((<-denotational
+     ((=ucs		  . #x484E)	; 䡎
+      ))
     (ideographic-radical . 159)	; ⾞
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
-    (=jis-x0213-2-2000	. #x795C)	; &JX2-795C; [89-60]
-    (=ucs@jis		. #x484E)	; &JX2-795C;
-    (mojikyo		. 079777)	; &MCS-600137A1;
+    (=ucs@unicode	. #x484E)	; &UU+484E;
     ))
 (define-char
-  '((morohashi-daikanwa	38234 0 2)
+  '((<-denotational
+     ((=ucs		  . #x484E)	; 䡎
+      ))
     (ideographic-radical . 159)	; ⾞
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
-    (=ucs		. #x484E)	; 䡎
+    (=jis-x0213-2-2000	. #x795C)	; &JX2-795C; [89-60]
+    (=ucs@jis		. #x484E)	; &JX2-795C;
+    (mojikyo		. 079777)	; &MCS-600137A1;
     ))
 (define-char
   '((morohashi-daikanwa	38234 1)
     (ideographic-radical . 159)	; ⾞
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x8F49)	; 轉
-      (=jis-x0208	  . #x6D5B)	; &I-J90-6D5B; [77-59]
-      ))
     (=ucs		. #x8EE2)	; 転
     (=jis-x0208		. #x453E)	; &I-J90-453E; [37-30]
     (=gt		. 51038)	; &I-GT-51038;
     (=gt-pj-1		. #x453E)	; &I-GT-51038; [37-30]
     (mojikyo		. 050483)	; &MCS-6000C533;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x8F49)	; 轉
+      (=jis-x0208	  . #x6D5B)	; &I-J90-6D5B; [77-59]
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	ho 594)
@@ -846,24 +857,38 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
     (=ucs		. #x8EEE)	; è»®
-    (=jis-x0212		. #x605E)	; &I-JSP-605E; [64-62]
-    (=cns11643-2	. #x4067)	; &I-C2-4067; [32-71]
-    (=daikanwa		. 38248)	; &I-M-38248;
+    (->subsumptive
+     ((=jis-x0212	  . #x605E)	; &M-38248; [64-62]
+      (=daikanwa	  . 38248)	; &I-M-38248;
+      (=ucs@unicode	  . #x8EEE)	; &M-38248;
+      )
+     ((=cns11643-2	  . #x4067)	; &C2-4067; [32-71]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 159)	; ⾞
+    (ideographic-strokes . 5)
+    (total-strokes	 . 12)
+    (=ucs		. #x8EEF)	; 軯
     ))
 (define-char
-  '((=>ucs		. #x8EEF)	; 軯
+  '((<-denotational
+     ((=ucs		  . #x8EEF)	; 軯
+      ))
     (ideographic-radical . 159)	; ⾞
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
     (=daikanwa		. 38249)	; &M-38249;
     ))
 (define-char
-  '((morohashi-daikanwa	38249 0 2)
+  '((<-denotational
+     ((=ucs		  . #x8EEF)	; 軯
+      ))
     (ideographic-radical . 159)	; ⾞
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
-    (=ucs		. #x8EEF)	; 軯
-    (=cns11643-2	. #x4062)	; &I-C2-4062; [32-66]
+    (=cns11643-2	. #x4062)	; &C2-4062; [32-66]
+    (=ucs@unicode	. #x8EEF)	; &C2-4062;
     ))
 (define-char
   '((ideographic-radical . 159)	; ⾞
@@ -871,18 +896,18 @@
     (total-strokes	 . 12)
     (=ucs		. #x8EF0)	; è»°
     (->subsumptive
-     ((<-vulgar
+     ((shinjigen-1	  . 8155)
+      (=jis-x0212	  . #x605F)	; &M-38250; [64-63]
+      (=daikanwa	  . 38250)	; &I-M-38250;
+      (=cbeta		  . 03212)	; &I-CB03212;
+      (=ucs@unicode	  . #x8EF0)	; &M-38250;
+      (<-vulgar
        ((shinjigen-1	    . 8154)
 	(=ks-x1001	    . #x5B54)	; &GT-51245; [59-52]
 	(=jis-x0208@1990    . #x475A)	; &I-J90-475A; [39-58]
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 8155)
-      (=jis-x0212	  . #x605F)	; &M-38250; [64-63]
-      (=daikanwa	  . 38250)	; &I-M-38250;
-      (=cbeta		  . 03212)	; &I-CB03212;
-      (=ucs@unicode	  . #x8EF0)	; &M-38250;
       )
      ((=cns11643-4	  . #x3B55)	; &C4-3B55; [27-53]
       ))
@@ -1158,10 +1183,6 @@
   '((ideographic-radical . 159)	; ⾞
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x8F15)	; 輕
-      (=jis-x0208	  . #x6D4B)	; &I-J90-6D4B; [77-43]
-      ))
     (shinjigen-2	. 8126)
     (=ucs		. #x8EFD)	; 軽
     (=jis-x0208		. #x375A)	; &I-J90-375A; [23-58]
@@ -1169,6 +1190,10 @@
     (=gt		. 51067)	; &I-GT-51067;
     (=gt-pj-1		. #x375A)	; &I-GT-51067; [23-58]
     (=daikanwa		. 38281)	; &I-M-38281;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x8F15)	; 輕
+      (=jis-x0208	  . #x6D4B)	; &I-J90-6D4B; [77-43]
+      ))
     ))
 (define-char
   '((ideographic-radical . 159)	; ⾞
diff --git a/lisp/utf-2000/Ideograph-R160-Bitter.el b/lisp/utf-2000/Ideograph-R160-Bitter.el
index a5cfee3..3baa51d 100644
--- a/lisp/utf-2000/Ideograph-R160-Bitter.el
+++ b/lisp/utf-2000/Ideograph-R160-Bitter.el
@@ -27,11 +27,13 @@
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x8F9B)	; 辛
-      ))
     (=gt-k		. 02585)	; &GT-K02585;
     (=gt-pj-k1		. #x3D69)	; &GT-K02585; [29-73]
+    (<-formed@component/connect-right
+     ((=jis-x0208	  . #x3F49)	; &GT-51557; [31-41]
+      (=ks-x1001	  . #x6374)	; &I-K0-6374; [67-84]
+      (=daikanwa	  . 38630)	; &I-M-38630;
+      ))
     ))
 (define-char
   '((=>ucs		. #x2840B)	; 𨐋
@@ -39,13 +41,13 @@
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
+    (=gt		. 51556)	; &GT-51556;
+    (=gt-pj-7		. #x5451)	; &GT-51556; [52-49]
     (<-same
      ((=daikanwa	  . 25722)	; &M-25722;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=gt		. 51556)	; &GT-51556;
-    (=gt-pj-7		. #x5451)	; &GT-51556; [52-49]
     ))
 (define-char
   '((=>daikanwa		38630 1)	; 𨐋
@@ -239,7 +241,13 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
     (->subsumptive
-     ((<-simplified@JP/Jouyou
+     ((shinjigen-2	  . 8199)
+      (=jis-x0208	  . #x3C2D)	; &GT-51568; [28-13]
+      (=gt		  . 51568)	; &I-GT-51568;
+      (=gt-pj-1		  . #x3C2D)	; &I-GT-51568; [28-13]
+      (=daikanwa	  . 38638)	; &I-M-38638;
+      (=ucs@jis		  . #x8F9E)	; &GT-51568;
+      (<-simplified@JP/Jouyou
        ((=jis-x0208	    . #x6D66)	; &GT-51611; [77-70]
 	(=ks-x1001	    . #x5E76)	; &I-K0-5E76; [62-86]
 	(=daikanwa	    . 38671)	; &I-M-38671;
@@ -251,19 +259,13 @@
 	))
       (<-vulgar@jiyun*sources
        jiyun daikanwa)
-      (<-vulgar@zhengzi-tong
+      (<-vulgar@zhengzitong
        ((=jis-x0208	    . #x6D66)	; &GT-51611; [77-70]
 	(=ks-x1001	    . #x5E76)	; &I-K0-5E76; [62-86]
 	(=daikanwa	    . 38671)	; &I-M-38671;
 	))
-      (<-vulgar@zhengzi-tong*sources
-       zhengzi-tong daikanwa)
-      (shinjigen-2	  . 8199)
-      (=jis-x0208	  . #x3C2D)	; &GT-51568; [28-13]
-      (=gt		  . 51568)	; &I-GT-51568;
-      (=gt-pj-1		  . #x3C2D)	; &I-GT-51568; [28-13]
-      (=daikanwa	  . 38638)	; &I-M-38638;
-      (=ucs@jis		  . #x8F9E)	; &GT-51568;
+      (<-vulgar@zhengzitong*sources
+       zhengzitong daikanwa)
       )
      ((=gb2312		  . #x3447)	; &C3-4477; [20-39]
       (=cns11643-3	  . #x4477)	; &I-C3-4477; [36-87]
@@ -271,21 +273,18 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x28414)	; 𨐔
-    (ideographic-radical . 160)	; ⾟
-    (ideographic-strokes . 6)
-    (total-strokes	 . 13)
-    (=daikanwa		. 38639)	; &M-38639;
-    ))
-(define-char
-  '((morohashi-daikanwa	38639 0 0)
-    (ideographic-radical . 160)	; ⾟
+  '((ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
-    (hanyu-dazidian	6 4037 6)
     (=ucs		. #x28414)	; 𨐔
-    (=cns11643-4	. #x412E)	; &I-C4-412E; [33-14]
-    (=hanziku-10	. #xF15F)	; &I-HZK10-F15F;
+    (->subsumptive
+     ((=daikanwa	  . 38639)	; &M-38639;
+      )
+     ((hanyu-dazidian	  6 4037 6)
+      (=cns11643-4	  . #x412E)	; &HZK10-F15F; [33-14]
+      (=hanziku-10	  . #xF15F)	; &I-HZK10-F15F;
+      (=ucs@iso		  . #x28414)	; &HZK10-F15F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 160)	; ⾟
@@ -315,11 +314,7 @@
     (total-strokes	 . 13)
     (=ucs		. #x8F9F)	; 辟
     (->subsumptive
-     ((<-formed
-       ((=ks-x1001	    . #x792D)	; &M-39163; [89-13]
-	(=daikanwa	    . 39163)	; &I-M-39163;
-	))
-      (shinjigen-1	  . 8202)
+     ((shinjigen-1	  . 8202)
       (shinjigen-2	  . 8202)
       (=jis-x0208	  . #x6D64)	; &GT-51571; [77-68]
       (=gt		  . 51571)	; &I-GT-51571;
@@ -327,6 +322,10 @@
       (=gt-pj-1		  . #x6D64)	; &I-GT-51571; [77-68]
       (=daikanwa	  . 38642)	; &I-M-38642;
       (=ucs@jis		  . #x8F9F)	; &GT-51571;
+      (<-formed
+       ((=ks-x1001	    . #x792D)	; &M-39163; [89-13]
+	(=daikanwa	    . 39163)	; &I-M-39163;
+	))
       )
      ((=gb2312		  . #x3159)	; &C1-6728; [17-57]
       (=cns11643-1	  . #x6728)	; &I-C1-6728; [71-08]
diff --git a/lisp/utf-2000/Ideograph-R161-Morning.el b/lisp/utf-2000/Ideograph-R161-Morning.el
index fdbaf2a..ed21b51 100644
--- a/lisp/utf-2000/Ideograph-R161-Morning.el
+++ b/lisp/utf-2000/Ideograph-R161-Morning.el
@@ -40,14 +40,32 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 10)
     (=ucs		. #x8FB1)	; è¾±
-    (=jis-x0208		. #x3F2B)	; &I-J90-3F2B; [31-11]
-    (=gb2312		. #x4868)	; &I-G0-4868; [40-72]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8FB1)	; è¾±
+      ))
+    (ideographic-radical . 161)	; â¾ 
+    (ideographic-strokes . 3)
+    (total-strokes	 . 10)
+    (=jis-x0208		. #x3F2B)	; &GT-51624; [31-11]
     (=ks-x1001		. #x6934)	; &I-K0-6934; [73-20]
-    (=cns11643-1	. #x5849)	; &I-C1-5849; [56-41]
     (=gt		. 51624)	; &I-GT-51624;
     (=gt-k		. 06472)	; &I-GT-K06472;
     (=gt-pj-1		. #x3F2B)	; &I-GT-51624; [31-11]
     (=daikanwa		. 38686)	; &I-M-38686;
+    (=ucs@jis		. #x8FB1)	; &GT-51624;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8FB1)	; è¾±
+      ))
+    (ideographic-radical . 161)	; â¾ 
+    (ideographic-strokes . 3)
+    (total-strokes	 . 10)
+    (=gb2312		. #x4868)	; &C1-5849; [40-72]
+    (=cns11643-1	. #x5849)	; &I-C1-5849; [56-41]
+    (=ucs@unicode	. #x8FB1)	; &C1-5849;
     ))
 (define-char
   '((ideographic-radical . 161)	; â¾ 
diff --git a/lisp/utf-2000/Ideograph-R162-Walk.el b/lisp/utf-2000/Ideograph-R162-Walk.el
index f108821..5dea866 100644
--- a/lisp/utf-2000/Ideograph-R162-Walk.el
+++ b/lisp/utf-2000/Ideograph-R162-Walk.el
@@ -3,6 +3,14 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
+    (=ucs		. #x8FB5)	; è¾µ
+    (=jis-x0212		. #x6133)	; &I-JSP-6133; [65-19]
+    (=iso-ir165		. #x7E6E)	; &I-EGB-7E6E; [94-78]
+    (=cns11643-3	. #x272F)	; &I-C3-272F; [07-15]
+    (=jis-x0213-1-2000	. #x7C53)	; &I-JX1-7C53; [92-51]
+    (=big5-cdp		. #x8A74)	; &I-CDP-8A74;
+    (=daikanwa		. 38700)	; &I-M-38700;
+    (=jef-china3	. #x67A4)	; &I-JC3-67A4;
     (<-same
      ((name		  . "CJK RADICAL WALK ONE")
       (=ucs		  . #x2ECD)	; ⻍
@@ -15,19 +23,13 @@
       ))
     (<-synonyms*sources
      yili-zhu gongyang-zhuan jingdian-shiwen daikanwa)
-    (=ucs		. #x8FB5)	; è¾µ
-    (=jis-x0212		. #x6133)	; &I-JSP-6133; [65-19]
-    (=iso-ir165		. #x7E6E)	; &I-EGB-7E6E; [94-78]
-    (=cns11643-3	. #x272F)	; &I-C3-272F; [07-15]
-    (=jis-x0213-1-2000	. #x7C53)	; &I-JX1-7C53; [92-51]
-    (=big5-cdp		. #x8A74)	; &I-CDP-8A74;
-    (=daikanwa		. 38700)	; &I-M-38700;
-    (=jef-china3	. #x67A4)	; &I-JC3-67A4;
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
+    (=cns11643-6	. #x233B)	; &M-38701; [03-27]
+    (=daikanwa		. 38701)	; &I-M-38701;
     (<-same
      ((=jis-x0208	  . #x4737)	; &GT-00166; [39-23]
       (=ks-x1001	  . #x717D)	; &I-K0-717D; [81-93]
@@ -35,8 +37,6 @@
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=cns11643-6	. #x233B)	; &M-38701; [03-27]
-    (=daikanwa		. 38701)	; &I-M-38701;
     ))
 (define-char
   '((<-denotational
@@ -49,12 +49,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-formed@component
-     ((=ucs		  . #x8FB5)	; è¾µ
-      (=daikanwa	  . 38700)	; &I-M-38700;
-      ))
-    (<-formed@component*sources
-     zihui-jianzi daikanwa)
     (=ucs		. #x2ECD)	; ⻍
     (=jis-x0212		. #x6134)	; &I-JSP-6134; [65-20]
     (=jis-x0213-2-2000	. #x796A)	; &I-JX2-796A; [89-74]
@@ -63,15 +57,21 @@
     (=gt-pj-7		. #x5530)	; &I-GT-51643; [53-16]
     (=daikanwa		. 38702)	; &I-M-38702;
     (=ucs@jis		. #x8FB6)	; ⻍
+    (<-formed@component
+     ((=ucs		  . #x8FB5)	; è¾µ
+      (=daikanwa	  . 38700)	; &I-M-38700;
+      ))
+    (<-formed@component*sources
+     zihui-jianzi daikanwa)
     ))
 (define-char
   '((=>daikanwa		. 38702)	; ⻍
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 0)
+    (=ucs		. #x8FB6)	; 辶
     (<-formed@component
      ((=ucs		  . #x8FB5)	; è¾µ
       ))
-    (=ucs		. #x8FB6)	; 辶
     ))
 (define-char
   '((<-denotational
@@ -84,14 +84,14 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-simplified@component
-     ((name		  . "CJK RADICAL WALK ONE")
-      (=ucs		  . #x2ECD)	; ⻍
-      ))
     (=ucs		. #x2ECE)	; ⻎
     (=cns11643-4	. #x2154)	; &I-C4-2154; [01-52]
     (=big5-cdp		. #x8AF7)	; &I-CDP-8AF7;
     (=ucs@cns		. #x8FB6)	; ⻎
+    (<-simplified@component
+     ((name		  . "CJK RADICAL WALK ONE")
+      (=ucs		  . #x2ECD)	; ⻍
+      ))
     ))
 (define-char
   '((<-denotational
@@ -101,16 +101,16 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
-    (<-simplified@component
-     ((name		  . "CJK RADICAL WALK ONE")
-      (=ucs		  . #x2ECD)	; ⻍
-      ))
     (=ucs		. #xFA66)	; 辶
     (=gb2312		. #x6541)	; &I-G0-6541; [69-33]
     (=jis-x0213-2-2000	. #x7969)	; &I-JX2-7969; [89-73]
     (=jef-china3	. #x67A3)	; &I-JC3-67A3;
     (=ucs@unicode	. #x8FB6)	; 辶
     (=ucs@jis		. #xFA66)	; 辶
+    (<-simplified@component
+     ((name		  . "CJK RADICAL WALK ONE")
+      (=ucs		  . #x2ECD)	; ⻍
+      ))
     ))
 (define-char
   '((<-denotational
@@ -120,6 +120,8 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ECC)	; ⻌
+    (=big5-cdp		. #x8966)	; &I-CDP-8966;
     (<-identical@component
      ((=ucs		  . #xFA66)	; 辶
       ))
@@ -127,8 +129,6 @@
      ((name		  . "CJK RADICAL WALK ONE")
       (=ucs		  . #x2ECD)	; ⻍
       ))
-    (=ucs		. #x2ECC)	; ⻌
-    (=big5-cdp		. #x8966)	; &I-CDP-8966;
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -171,13 +171,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
+    (=daikanwa		. 38704)	; &M-38704;
     (<-ancient
      ((=ucs		  . #x8ECC)	; 軌
       (=daikanwa	  . 38176)	; &I-M-38176;
       ))
     (<-ancient*sources
      yupian daikanwa)
-    (=daikanwa		. 38704)	; &M-38704;
     ))
 (define-char
   '((<-denotational
@@ -209,15 +209,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
+    (=jis-x0212		. #x6135)	; &M-38705; [65-21]
+    (=daikanwa		. 38705)	; &I-M-38705;
+    (=ucs@jis		. #x8FB8)	; &M-38705;
     (<-same
      ((=ucs		  . #x209DF)	; 𠧟
       (=daikanwa	  . 02799)	; &I-M-02799;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=jis-x0212		. #x6135)	; &M-38705; [65-21]
-    (=daikanwa		. 38705)	; &I-M-38705;
-    (=ucs@jis		. #x8FB8)	; &M-38705;
     ))
 (define-char
   '((<-denotational
@@ -249,13 +249,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
+    (=daikanwa		. 38706)	; &M-38706;
     (<-same
      ((=jis-x0208@1978	  . #x4B78)	; &M-38724; [43-88]
       (=daikanwa	  . 38724)	; &I-M-38724;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 38706)	; &M-38706;
     ))
 (define-char
   '((<-denotational
@@ -287,12 +287,12 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
+    (=daikanwa		. 38707)	; &M-38707;
     (<-same
      ((=daikanwa	  . 44151)	; &M-44151;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 38707)	; &M-38707;
     ))
 (define-char
   '((<-denotational
@@ -330,6 +330,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
+    (=daikanwa		. 38709)	; &M-38709;
     (<-vulgar
      ((=jis-x0208	  . #x6E34)	; &GT-52803; [78-20]
       (=ks-x1001	  . #x5C2B)	; &I-K0-5C2B; [60-11]
@@ -337,7 +338,6 @@
       ))
     (<-vulgar*sources
      songyuanyilai-suzipu daikanwa)
-    (=daikanwa		. 38709)	; &M-38709;
     ))
 (define-char
   '((<-denotational
@@ -370,6 +370,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
+    (=daikanwa		. 38710)	; &M-38710;
     (<-simplified@JP
      ((=jis-x0208	  . #x6E34)	; &GT-52803; [78-20]
       (=ks-x1001	  . #x5C2B)	; &I-K0-5C2B; [60-11]
@@ -377,7 +378,6 @@
       ))
     (<-simplified@JP*sources
      daikanwa)
-    (=daikanwa		. 38710)	; &M-38710;
     ))
 (define-char
   '((<-denotational
@@ -387,6 +387,11 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
+    (=jis-x0208		. #x4A55)	; &GT-51654; [42-53]
+    (=gt		. 51654)	; &I-GT-51654;
+    (=gt-k		. 00998)	; &I-GT-K00998;
+    (=gt-pj-1		. #x4A55)	; &I-GT-51654; [42-53]
+    (=ucs@unicode	. #x8FBA)	; &GT-51654;
     (<-simplified@JP/Jouyou
      ((=jis-x0208	  . #x6E34)	; &GT-52803; [78-20]
       (=ks-x1001	  . #x5C2B)	; &I-K0-5C2B; [60-11]
@@ -394,11 +399,6 @@
       ))
     (<-simplified@JP/Jouyou*sources
      JP/Jouyou daikanwa)
-    (=jis-x0208		. #x4A55)	; &GT-51654; [42-53]
-    (=gt		. 51654)	; &I-GT-51654;
-    (=gt-k		. 00998)	; &I-GT-K00998;
-    (=gt-pj-1		. #x4A55)	; &I-GT-51654; [42-53]
-    (=ucs@unicode	. #x8FBA)	; &GT-51654;
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -478,13 +478,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=daikanwa		. 38713)	; &M-38713;
     (<-ancient
      ((=ucs		  . #x64AB)	; 撫
       (=daikanwa	  . 12743)	; &I-M-12743;
       ))
     (<-ancient*sources
      shuowen daikanwa)
-    (=daikanwa		. 38713)	; &M-38713;
     ))
 (define-char
   '((<-denotational
@@ -516,13 +516,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=daikanwa		. 38714)	; &M-38714;
     (<-original
      ((=ucs		  . #x5F92)	; 徒
       (=daikanwa	  . 10121)	; &I-M-10121;
       ))
     (<-original*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38714)	; &M-38714;
     ))
 (define-char
   '((<-denotational
@@ -546,14 +546,14 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 10)
+    (=ucs		. #x28461)	; 𨑡
+    (=cns11643-6	. #x3C4B)	; &I-C6-3C4B; [28-43]
+    (=daikanwa		. 38715)	; &I-M-38715;
     (<-original
      ((=daikanwa	  . 38714)	; &M-38714;
       ))
     (<-original*sources
      zihui-bu daikanwa)
-    (=ucs		. #x28461)	; 𨑡
-    (=cns11643-6	. #x3C4B)	; &I-C6-3C4B; [28-43]
-    (=daikanwa		. 38715)	; &I-M-38715;
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -567,13 +567,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=daikanwa		. 38716)	; &M-38716;
     (<-same
      ((=ks-x1001	  . #x6B34)	; &M-38994; [75-20]
       (=daikanwa	  . 38994)	; &I-M-38994;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 38716)	; &M-38716;
     ))
 (define-char
   '((<-denotational
@@ -605,6 +605,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=jis-x0212		. #x6136)	; &M-38717; [65-22]
+    (=daikanwa		. 38717)	; &I-M-38717;
+    (=ucs@jis		. #x8FBE)	; &M-38717;
     (<-formed
      ((=ks-x1001	  . #x5339)	; &M-39011; [51-25]
       (=daikanwa	  . 39011)	; &I-M-39011;
@@ -619,9 +622,6 @@
       ))
     (<-same*sources
      shuowen jiyun daikanwa)
-    (=jis-x0212		. #x6136)	; &M-38717; [65-22]
-    (=daikanwa		. 38717)	; &I-M-38717;
-    (=ucs@jis		. #x8FBE)	; &M-38717;
     ))
 (define-char
   '((<-denotational
@@ -694,13 +694,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=daikanwa		. 38719)	; &M-38719;
     (<-synonyms
      ((=ucs		  . #x5176)	; 其
       (=daikanwa	  . 01472)	; &I-M-01472;
       ))
     (<-synonyms*sources
      jingzhuanshici daikanwa)
-    (=daikanwa		. 38719)	; &M-38719;
     ))
 (define-char
   '((<-denotational
@@ -732,15 +732,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=jis-x0212		. #x6137)	; &M-38720; [65-23]
+    (=daikanwa		. 38720)	; &I-M-38720;
+    (=ucs@jis		. #x8FC0)	; &M-38720;
     (<-synonyms
      ((=ucs		  . #x5E72)	; å¹²
       (=daikanwa	  . 09165)	; &I-M-09165;
       ))
     (<-synonyms*sources
      shuowen shuowen-zhu daikanwa)
-    (=jis-x0212		. #x6137)	; &M-38720; [65-23]
-    (=daikanwa		. 38720)	; &I-M-38720;
-    (=ucs@jis		. #x8FC0)	; &M-38720;
     ))
 (define-char
   '((<-denotational
@@ -773,15 +773,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=jis-x0212		. #x6138)	; &M-38721; [65-24]
+    (=jis-x0213-2-2000	. #x796C)	; &I-JX2-796C; [89-76]
+    (=daikanwa		. 38721)	; &I-M-38721;
+    (=ucs@jis		. #x8FC1)	; &M-38721;
     (<-vulgar
      ((=daikanwa	  . 39123)	; &M-39123;
       ))
     (<-vulgar*sources
      zhengzitong daikanwa)
-    (=jis-x0212		. #x6138)	; &M-38721; [65-24]
-    (=jis-x0213-2-2000	. #x796C)	; &I-JX2-796C; [89-76]
-    (=daikanwa		. 38721)	; &I-M-38721;
-    (=ucs@jis		. #x8FC1)	; &M-38721;
     ))
 (define-char
   '((<-denotational
@@ -815,6 +815,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=jis-x0208@1978	. #x312A)	; &M-38722; [17-10]
+    (=ks-x1001		. #x6966)	; &I-K0-6966; [73-70]
+    (=daikanwa		. 38722)	; &I-M-38722;
     (<-original
      ((=daikanwa	  . 38723)	; &M-38723;
       ))
@@ -826,9 +829,6 @@
       ))
     (<-synonyms*sources
      zhengzitong daikanwa)
-    (=jis-x0208@1978	. #x312A)	; &M-38722; [17-10]
-    (=ks-x1001		. #x6966)	; &I-K0-6966; [73-70]
-    (=daikanwa		. 38722)	; &I-M-38722;
     ))
 (define-char
   '((<-denotational
@@ -866,6 +866,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=daikanwa		. 38723)	; &M-38723;
     (<-original
      ((=jis-x0208@1978	  . #x312A)	; &M-38722; [17-10]
       (=ks-x1001	  . #x6966)	; &I-K0-6966; [73-70]
@@ -873,7 +874,6 @@
       ))
     (<-original*sources
      zhonghua-dazidian daikanwa)
-    (=daikanwa		. 38723)	; &M-38723;
     ))
 (define-char
   '((<-denotational
@@ -949,13 +949,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=daikanwa		. 38725)	; &M-38725;
     (<-ancient
      ((=ucs		  . #x2F9D7)	; 起
       (=daikanwa	  . 37048)	; &I-M-37048;
       ))
     (<-ancient*sources
      yupian daikanwa)
-    (=daikanwa		. 38725)	; &M-38725;
     ))
 (define-char
   '((<-denotational
@@ -981,13 +981,13 @@
     (total-strokes	 . 10)
     (=ucs		. #x28454)	; 𨑔
     (->subsumptive
-     ((<-ancient
+     ((=daikanwa	  . 38726)	; &M-38726;
+      (<-ancient
        ((=ucs		    . #x2F9D7)	; 起
 	(=daikanwa	    . 37048)	; &I-M-37048;
 	))
       (<-ancient*sources
        kangxi daikanwa)
-      (=daikanwa	  . 38726)	; &M-38726;
       )
      ((=cns11643-6	  . #x3C49)	; &C6-3C49; [28-41]
       (=ucs@iso		  . #x28454)	; &C6-3C49;
@@ -1007,14 +1007,14 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (->subsumptive
-     ((<-same
+     ((=daikanwa	  . 38727)	; &M-38727;
+      (=jef-china3	  . #x67A8)	; &I-JC3-67A8;
+      (<-same
        ((=ks-x1001	    . #x615C)	; &M-38897; [65-60]
 	(=daikanwa	    . 38897)	; &I-M-38897;
 	))
       (<-same*sources
        liezi daikanwa)
-      (=daikanwa	  . 38727)	; &M-38727;
-      (=jef-china3	  . #x67A8)	; &I-JC3-67A8;
       )
      ((=gt-k		  . 02586)	; &GT-K02586;
       (=gt-pj-k1	  . #x712F)	; &GT-K02586; [81-15]
@@ -1056,6 +1056,10 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=jis-x0212		. #x6139)	; &M-38728; [65-25]
+    (=jis-x0213-2-2000	. #x796D)	; &I-JX2-796D; [89-77]
+    (=daikanwa		. 38728)	; &I-M-38728;
+    (=ucs@jis		. #x8FC6)	; &M-38728;
     (<-same
      ((=jis-x0212	  . #x6143)	; &M-38785; [65-35]
       (=jis-x0213-1-2000  . #x7C54)	; &I-JX1-7C54; [92-52]
@@ -1063,10 +1067,6 @@
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=jis-x0212		. #x6139)	; &M-38728; [65-25]
-    (=jis-x0213-2-2000	. #x796D)	; &I-JX2-796D; [89-77]
-    (=daikanwa		. 38728)	; &I-M-38728;
-    (=ucs@jis		. #x8FC6)	; &M-38728;
     ))
 (define-char
   '((<-denotational
@@ -1148,13 +1148,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=daikanwa		. 38733)	; &M-38733;
     (<-vulgar
      ((=ks-x1001	  . #x4E26)	; &M-39002; [46-06]
       (=daikanwa	  . 39002)	; &I-M-39002;
       ))
     (<-vulgar*sources
      songyuanyilai-suzipu daikanwa)
-    (=daikanwa		. 38733)	; &M-38733;
     ))
 (define-char
   '((<-denotational
@@ -1163,11 +1163,11 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
+    (=gb2312		. #x397D)	; &G0-397D; [25-93]
+    (=ucs@unicode	. #x8FC7)	; &G0-397D;
     (<-simplified@CN
      ((=gb12345		  . #x397D)	; &UU+904E; [25-93]
       ))
-    (=gb2312		. #x397D)	; &G0-397D; [25-93]
-    (=ucs@unicode	. #x8FC7)	; &G0-397D;
     ))
 (define-char
   '((<-denotational
@@ -1237,15 +1237,15 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
+    (=ucs		. #x28462)	; 𨑢
+    (=cns11643-6	. #x4550)	; &I-C6-4550; [37-48]
+    (=daikanwa		. 38734)	; &I-M-38734;
     (<-same
      ((=ucs		  . #x5F9E)	; 從
       (=daikanwa	  . 10152)	; &I-M-10152;
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=ucs		. #x28462)	; 𨑢
-    (=cns11643-6	. #x4550)	; &I-C6-4550; [37-48]
-    (=daikanwa		. 38734)	; &I-M-38734;
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -1333,6 +1333,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=jis-x0212		. #x613B)	; &M-38737; [65-27]
+    (=daikanwa		. 38737)	; &I-M-38737;
+    (=ucs@jis		. #x8FCB)	; &M-38737;
     (<-same
      ((=daikanwa	  . 38955)	; &M-38955;
       ))
@@ -1344,9 +1347,6 @@
       ))
     (<-synonyms@p2/s4*sources
      shuowen-tongxundingsheng zuoshi-zhuan zuoshi-zhu daikanwa)
-    (=jis-x0212		. #x613B)	; &M-38737; [65-27]
-    (=daikanwa		. 38737)	; &I-M-38737;
-    (=ucs@jis		. #x8FCB)	; &M-38737;
     (->formed
      ((=jis-x0212	  . #x6150)	; &M-38893; [65-48]
       (=daikanwa	  . 38893)	; &I-M-38893;
@@ -1430,13 +1430,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=daikanwa		. 38741)	; &M-38741;
     (<-same
      ((=ucs		  . #x5F90)	; 徐
       (=daikanwa	  . 10110)	; &I-M-10110;
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38741)	; &M-38741;
     ))
 (define-char
   '((<-denotational
@@ -1510,13 +1510,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=daikanwa		. 38745)	; &M-38745;
     (<-synonyms
      ((=ucs		  . #x5F14)	; 弔
       (=daikanwa	  . 09698)	; &I-M-09698;
       ))
     (<-synonyms*sources
      shuowen jiyun daikanwa)
-    (=daikanwa		. 38745)	; &M-38745;
     ))
 (define-char
   '((<-denotational
@@ -1581,6 +1581,10 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=jis-x0212		. #x613C)	; &M-38747; [65-28]
+    (=jis-x0213-2-2000	. #x7970)	; &I-JX2-7970; [89-80]
+    (=daikanwa		. 38747)	; &I-M-38747;
+    (=ucs@jis		. #x8FCD)	; &M-38747;
     (<-same
      ((=jis-x0208	  . #x4656)	; &GT-09854; [38-54]
       (=ks-x1001	  . #x546A)	; &I-K0-546A; [52-74]
@@ -1588,10 +1592,6 @@
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=jis-x0212		. #x613C)	; &M-38747; [65-28]
-    (=jis-x0213-2-2000	. #x7970)	; &I-JX2-7970; [89-80]
-    (=daikanwa		. 38747)	; &I-M-38747;
-    (=ucs@jis		. #x8FCD)	; &M-38747;
     ))
 (define-char
   '((<-denotational
@@ -1664,13 +1664,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=daikanwa		. 38749)	; &M-38749;
     (<-wrong
      ((=jis-x0212	  . #x6136)	; &M-38717; [65-22]
       (=daikanwa	  . 38717)	; &I-M-38717;
       ))
     (<-wrong*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38749)	; &M-38749;
     ))
 (define-char
   '((<-denotational
@@ -1825,13 +1825,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=daikanwa		. 38754)	; &M-38754;
     (<-wrong
      ((=jis-x0212	  . #x6142)	; &M-38783; [65-34]
       (=daikanwa	  . 38783)	; &I-M-38783;
       ))
     (<-wrong*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38754)	; &M-38754;
     ))
 (define-char
   '((<-denotational
@@ -1864,6 +1864,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=jis-x0212		. #x613E)	; &M-38755; [65-30]
+    (=daikanwa		. 38755)	; &I-M-38755;
+    (=ucs@jis		. #x8FD2)	; &M-38755;
     (<-synonyms@p1/s5
      ((=jis-x0208	  . #x5036)	; &GT-00379; [48-22]
       (=ks-x1001	  . #x7971)	; &I-K0-7971; [89-81]
@@ -1871,9 +1874,6 @@
       ))
     (<-synonyms@p1/s5*sources
      zhonghua-dazidian daikanwa)
-    (=jis-x0212		. #x613E)	; &M-38755; [65-30]
-    (=daikanwa		. 38755)	; &I-M-38755;
-    (=ucs@jis		. #x8FD2)	; &M-38755;
     (->formed
      ((=daikanwa	  . 37565)	; &M-37565;
       ))
@@ -1912,6 +1912,10 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=jis-x0212		. #x613F)	; &M-38756; [65-31]
+    (=jis-x0213-2-2000	. #x7971)	; &I-JX2-7971; [89-81]
+    (=daikanwa		. 38756)	; &I-M-38756;
+    (=ucs@jis		. #x8FD3)	; &M-38756;
     (<-same
      ((=daikanwa	  . 35260)	; &M-35260;
       ))
@@ -1923,10 +1927,6 @@
       ))
     (<-synonyms*sources
      shangshu daikanwa)
-    (=jis-x0212		. #x613F)	; &M-38756; [65-31]
-    (=jis-x0213-2-2000	. #x7971)	; &I-JX2-7971; [89-81]
-    (=daikanwa		. 38756)	; &I-M-38756;
-    (=ucs@jis		. #x8FD3)	; &M-38756;
     ))
 (define-char
   '((<-denotational
@@ -1973,6 +1973,8 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=ks-x1001		. #x5A77)	; &M-38758; [58-87]
+    (=daikanwa		. 38758)	; &I-M-38758;
     (<-same
      ((=ucs		  . #x224C9)	; 𢓉
       (=daikanwa	  . 10055)	; &I-M-10055;
@@ -1987,8 +1989,6 @@
       ))
     (<-synonyms*sources
      yunhui daikanwa)
-    (=ks-x1001		. #x5A77)	; &M-38758; [58-87]
-    (=daikanwa		. 38758)	; &I-M-38758;
     ))
 (define-char
   '((<-denotational
@@ -2032,6 +2032,10 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=jis-x0212		. #x6140)	; &M-38759; [65-32]
+    (=jis-x0213-2-2000	. #x7972)	; &I-JX2-7972; [89-82]
+    (=daikanwa		. 38759)	; &I-M-38759;
+    (=ucs@jis		. #x8FD5)	; &M-38759;
     (<-formed
      ((=daikanwa	  . 38894)	; &M-38894;
       ))
@@ -2042,10 +2046,6 @@
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=jis-x0212		. #x6140)	; &M-38759; [65-32]
-    (=jis-x0213-2-2000	. #x7972)	; &I-JX2-7972; [89-82]
-    (=daikanwa		. 38759)	; &I-M-38759;
-    (=ucs@jis		. #x8FD5)	; &M-38759;
     ))
 (define-char
   '((<-denotational
@@ -2078,12 +2078,12 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=daikanwa		. 38760)	; &M-38760;
     (<-synonyms
      ((=daikanwa	  . 38719)	; &M-38719;
       ))
     (<-synonyms*sources
      jiujing-kaoyi daikanwa)
-    (=daikanwa		. 38760)	; &M-38760;
     ))
 (define-char
   '((<-denotational
@@ -2190,13 +2190,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=daikanwa		. 38765)	; &M-38765;
     (<-same
      ((=ucs		  . #x4ECE)	; 从
       (=daikanwa	  . 00362)	; &I-M-00362;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 38765)	; &M-38765;
     ))
 (define-char
   '((<-denotational
@@ -2241,12 +2241,12 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=daikanwa		. 38767)	; &M-38767;
     (<-same
      ((=daikanwa	  . 38727)	; &M-38727;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 38767)	; &M-38767;
     ))
 (define-char
   '((<-denotational
@@ -2278,13 +2278,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=daikanwa		. 38768)	; &M-38768;
     (<-same
      ((=jis-x0208@1978	  . #x4B78)	; &M-38724; [43-88]
       (=daikanwa	  . 38724)	; &I-M-38724;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 38768)	; &M-38768;
     ))
 (define-char
   '((<-denotational
@@ -2317,13 +2317,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=daikanwa		. 38769)	; &M-38769;
     (<-wrong
      ((=jis-x0212	  . #x6136)	; &M-38717; [65-22]
       (=daikanwa	  . 38717)	; &I-M-38717;
       ))
     (<-wrong*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38769)	; &M-38769;
     ))
 (define-char
   '((<-denotational
@@ -2356,13 +2356,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=daikanwa		. 38770)	; &M-38770;
     (<-wrong
      ((=ks-x1001	  . #x625E)	; &M-08684; [66-62]
       (=daikanwa	  . 08684)	; &I-M-08684;
       ))
     (<-wrong*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 38770)	; &M-38770;
     ))
 (define-char
   '((<-denotational
@@ -2394,13 +2394,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=daikanwa		. 38771)	; &M-38771;
     (<-vulgar
      ((=ks-x1001	  . #x7C3D)	; &M-39174; [92-29]
       (=daikanwa	  . 39174)	; &I-M-39174;
       ))
     (<-vulgar*sources
      pianhai daikanwa)
-    (=daikanwa		. 38771)	; &M-38771;
     ))
 (define-char
   '((<-denotational
@@ -2433,6 +2433,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (=daikanwa		. 38772)	; &M-38772;
     (<-vulgar
      ((=jis-x0208@1978	  . #x4767)	; &M-38889; [39-71]
       (=ks-x1001	  . #x6E4F)	; &I-K0-6E4F; [78-47]
@@ -2440,7 +2441,6 @@
       ))
     (<-vulgar*sources
      songyuanyilai-suzipu daikanwa)
-    (=daikanwa		. 38772)	; &M-38772;
     ))
 (define-char
   '((<-denotational
@@ -2557,6 +2557,8 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (shinjigen-1	. 2342)
+    (=daikanwa		. 38776)	; &M-38776;
     (<-formed
      ((shinjigen-1	  . 2341)
       (=ucs		  . #x5F82)	; 徂
@@ -2570,8 +2572,6 @@
       ))
     (<-same*sources
      jiyun daikanwa)
-    (shinjigen-1	. 2342)
-    (=daikanwa		. 38776)	; &M-38776;
     ))
 (define-char
   '((<-denotational
@@ -2604,16 +2604,16 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=jis-x0212		. #x6141)	; &M-38777; [65-33]
+    (=jis-x0213-2-2000	. #x7973)	; &I-JX2-7973; [89-83]
+    (=daikanwa		. 38777)	; &I-M-38777;
+    (=ucs@jis		. #x8FE0)	; &M-38777;
     (<-wrong@JP
      ((=jis-x0208@1978	  . #x4B78)	; &M-38724; [43-88]
       (=daikanwa	  . 38724)	; &I-M-38724;
       ))
     (<-wrong@JP*sources
      daikanwa)
-    (=jis-x0212		. #x6141)	; &M-38777; [65-33]
-    (=jis-x0213-2-2000	. #x7973)	; &I-JX2-7973; [89-83]
-    (=daikanwa		. 38777)	; &I-M-38777;
-    (=ucs@jis		. #x8FE0)	; &M-38777;
     ))
 (define-char
   '((<-denotational
@@ -2646,6 +2646,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=daikanwa		. 38778)	; &M-38778;
     (<-same
      ((=jis-x0208	  . #x6E2F)	; &GT-52644; [78-15]
       (=ks-x1001	  . #x7240)	; &I-K0-7240; [82-32]
@@ -2653,7 +2654,6 @@
       ))
     (<-same*sources
      yupian daikanwa)
-    (=daikanwa		. 38778)	; &M-38778;
     ))
 (define-char
   '((<-denotational
@@ -2677,35 +2677,52 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (=ucs		. #x28485)	; 𨒅
-    (->subsumptive
-     ((total-strokes	   . 9)
-      (<-synonyms
-       ((=ucs		    . #x67B3)	; 枳
-	(=daikanwa	    . 14583)	; &I-M-14583;
-	))
-      (<-synonyms*sources
-       shuowen-zhu daikanwa)
-      (=daikanwa	  . 38779)	; &M-38779;
-      )
-     ((total-strokes	   . 9)
-      (=cns11643-5	  . #x2B52)	; &C5-2B52; [11-50]
-      )
-     ((total-strokes	   . 8)
-      (=ucs@iso		  . #x28485)	; &U-00028485;
-      ))
     ))
 (define-char
-  '((ideographic-radical . 162)	; ⾡
+  '((<-denotational
+     ((=ucs		  . #x28485)	; 𨒅
+      ))
+    (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=daikanwa		. 38780)	; &M-38780;
+    (=daikanwa		. 38779)	; &M-38779;
+    (<-synonyms
+     ((=ucs		  . #x67B3)	; 枳
+      (=daikanwa	  . 14583)	; &I-M-14583;
+      ))
+    (<-synonyms*sources
+     shuowen-zhu daikanwa)
     ))
 (define-char
-  '((morohashi-daikanwa	38780 0 2)
+  '((<-denotational
+     ((=ucs		  . #x28485)	; 𨒅
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (=ucs@iso		. #x28485)	; &U-00028485;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x28485)	; 𨒅
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=cns11643-6	. #x345F)	; &C6-345F; [20-63]
+    (=cns11643-5	. #x2B52)	; &C5-2B52; [11-50]
+    ))
+(define-char
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=daikanwa		. 38780)	; &M-38780;
+    ))
+(define-char
+  '((morohashi-daikanwa	38780 0 2)
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=cns11643-6	. #x345F)	; &C6-345F; [20-63]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -2720,6 +2737,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (shinjigen-1	. 8243)
+    (shinjigen-2	. 8243)
+    (=jis-x0208		. #x6D6B)	; &GT-51909; [77-75]
+    (=gt		. 51909)	; &I-GT-51909;
+    (=gt-pj-1		. #x6D6B)	; &I-GT-51909; [77-75]
+    (=daikanwa		. 38781)	; &I-M-38781;
+    (=ucs@jis		. #x8FE2)	; &GT-51909;
     (<-same
      ((=ucs		  . #x8D85)	; 超
       (=daikanwa	  . 37096)	; &I-M-37096;
@@ -2732,13 +2756,6 @@
       ))
     (<-synonyms*sources
      zhonghua-dazidian daikanwa)
-    (shinjigen-1	. 8243)
-    (shinjigen-2	. 8243)
-    (=jis-x0208		. #x6D6B)	; &GT-51909; [77-75]
-    (=gt		. 51909)	; &I-GT-51909;
-    (=gt-pj-1		. #x6D6B)	; &I-GT-51909; [77-75]
-    (=daikanwa		. 38781)	; &I-M-38781;
-    (=ucs@jis		. #x8FE2)	; &GT-51909;
     (->formed
      ((=daikanwa	  . 31525)	; &M-31525;
       ))
@@ -2792,6 +2809,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=jis-x0212		. #x6142)	; &M-38783; [65-34]
+    (=daikanwa		. 38783)	; &I-M-38783;
+    (=ucs@jis		. #x8FE3)	; &M-38783;
     (<-ancient
      ((=jis-x0212	  . #x614A)	; &M-38837; [65-42]
       (=daikanwa	  . 38837)	; &I-M-38837;
@@ -2804,9 +2824,6 @@
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=jis-x0212		. #x6142)	; &M-38783; [65-34]
-    (=daikanwa		. 38783)	; &I-M-38783;
-    (=ucs@jis		. #x8FE3)	; &M-38783;
     ))
 (define-char
   '((<-denotational
@@ -2830,6 +2847,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=daikanwa		. 38784)	; &M-38784;
     (<-same
      ((=jis-x0208	  . #x6E2F)	; &GT-52644; [78-15]
       (=ks-x1001	  . #x7240)	; &I-K0-7240; [82-32]
@@ -2837,7 +2855,6 @@
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 38784)	; &M-38784;
     ))
 (define-char
   '((morohashi-daikanwa	38784 0 2)
@@ -2859,6 +2876,10 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=jis-x0212		. #x6143)	; &M-38785; [65-35]
+    (=jis-x0213-1-2000	. #x7C54)	; &I-JX1-7C54; [92-52]
+    (=daikanwa		. 38785)	; &I-M-38785;
+    (=ucs@jis		. #x8FE4)	; &M-38785;
     (<-formed
      ((=jis-x0212	  . #x6146)	; &M-38804; [65-38]
       (=jis-x0213-2-2000  . #x7974)	; &I-JX2-7974; [89-84]
@@ -2873,10 +2894,6 @@
       ))
     (<-same@p3*sources
      jiyun daikanwa)
-    (=jis-x0212		. #x6143)	; &M-38785; [65-35]
-    (=jis-x0213-1-2000	. #x7C54)	; &I-JX1-7C54; [92-52]
-    (=daikanwa		. 38785)	; &I-M-38785;
-    (=ucs@jis		. #x8FE4)	; &M-38785;
     ))
 (define-char
   '((<-denotational
@@ -2910,12 +2927,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (<-synonyms
-     ((=ucs		  . #x6CC2)	; 泂
-      (=daikanwa	  . 17265)	; &I-M-17265;
-      ))
-    (<-synonyms*sources
-     zhengzitong daikanwa)
     (shinjigen-2	. 8237)
     (=jis-x0208		. #x6D6A)	; &GT-51864; [77-74]
     (=gt		. 51864)	; &I-GT-51864;
@@ -2923,6 +2934,12 @@
     (=gt-pj-1		. #x6D6A)	; &I-GT-51864; [77-74]
     (=daikanwa		. 38786)	; &I-M-38786;
     (=ucs@jis		. #x8FE5)	; &GT-51864;
+    (<-synonyms
+     ((=ucs		  . #x6CC2)	; 泂
+      (=daikanwa	  . 17265)	; &I-M-17265;
+      ))
+    (<-synonyms*sources
+     zhengzitong daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -2955,13 +2972,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=daikanwa		. 38787)	; &M-38787;
     (<-ancient
      ((=ks-x1001	  . #x6244)	; &GT-52349; [66-36]
       (=daikanwa	  . 38985)	; &I-M-38985;
       ))
     (<-ancient*sources
      jiyun daikanwa)
-    (=daikanwa		. 38787)	; &M-38787;
     ))
 (define-char
   '((<-denotational
@@ -3009,6 +3026,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=jis-x0208@1978	. #x3260)	; &M-38789; [18-64]
+    (=ks-x1001		. #x4A3C)	; &I-K0-4A3C; [42-28]
+    (=daikanwa		. 38789)	; &I-M-38789;
     (<-formed
      ((=daikanwa	  . 38987)	; &M-38987;
       )
@@ -3028,9 +3048,6 @@
       ))
     (<-synonyms*sources
      jiyun kangxi daikanwa)
-    (=jis-x0208@1978	. #x3260)	; &M-38789; [18-64]
-    (=ks-x1001		. #x4A3C)	; &I-K0-4A3C; [42-28]
-    (=daikanwa		. 38789)	; &I-M-38789;
     ))
 (define-char
   '((<-denotational
@@ -3069,13 +3086,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=daikanwa		. 38790)	; &M-38790;
     (<-same
      ((=ucs		  . #x9673)	; 陳
       (=daikanwa	  . 41698)	; &I-M-41698;
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38790)	; &M-38790;
     ))
 (define-char
   '((<-denotational
@@ -3176,6 +3193,8 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=jis-x0208@1978	. #x6D6E)	; &M-38793; [77-78]
+    (=daikanwa		. 38793)	; &I-M-38793;
     (<-formed
      ((=jis-x0208@1978	  . #x4676)	; &GT-52751; [38-86]
       (=jis-x0208@1983	  . #x6D6E)	; &I-J83-6D6E; [77-78]
@@ -3190,8 +3209,6 @@
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=jis-x0208@1978	. #x6D6E)	; &M-38793; [77-78]
-    (=daikanwa		. 38793)	; &I-M-38793;
     ))
 (define-char
   '((<-denotational
@@ -3312,6 +3329,8 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (shinjigen-1	. 2340)
+    (=daikanwa		. 38796)	; &M-38796;
     (<-formed
      ((shinjigen-1	  . 2339)
       (=ucs		  . #x5F81)	; 征
@@ -3319,8 +3338,6 @@
       ))
     (<-formed*sources
      shinjigen-1)
-    (shinjigen-1	. 2340)
-    (=daikanwa		. 38796)	; &M-38796;
     (->ancient@r162
      ((=ucs		  . #x5FB0)	; å¾°
       (=daikanwa	  . 10210)	; &I-M-10210;
@@ -3365,14 +3382,14 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=ks-x1001		. #x5A5E)	; &M-38797; [58-62]
+    (=daikanwa		. 38797)	; &I-M-38797;
     (<-synonyms
      ((=ucs		  . #x6540)	; 敀
       (=daikanwa	  . 13154)	; &I-M-13154;
       ))
     (<-synonyms*sources
      guangyun daikanwa)
-    (=ks-x1001		. #x5A5E)	; &M-38797; [58-62]
-    (=daikanwa		. 38797)	; &I-M-38797;
     ))
 (define-char
   '((<-denotational
@@ -3402,49 +3419,76 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (=ucs		. #x2848D)	; 𨒍
-    (->subsumptive
-     ((total-strokes	   . 9)
-      (<-wrong
-       ((=jis-x0212	    . #x6142)	; &M-38783; [65-34]
-	(=daikanwa	    . 38783)	; &I-M-38783;
-	))
-      (<-wrong*sources
-       zhengzitong daikanwa)
-      (=daikanwa	  . 38798)	; &M-38798;
-      )
-     ((total-strokes	   . 9)
-      (=cns11643-5	  . #x2B50)	; &C5-2B50; [11-48]
-      )
-     ((total-strokes	   . 8)
-      (=ucs@iso		  . #x2848D)	; &U-0002848D;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2848D)	; 𨒍
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=daikanwa		. 38798)	; &M-38798;
+    (<-wrong
+     ((=jis-x0212	  . #x6142)	; &M-38783; [65-34]
+      (=daikanwa	  . 38783)	; &I-M-38783;
+      ))
+    (<-wrong*sources
+     zhengzitong daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2848D)	; 𨒍
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (=ucs@iso		. #x2848D)	; &U-0002848D;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2848D)	; 𨒍
       ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=cns11643-5	. #x2B50)	; &C5-2B50; [11-48]
+    ))
+(define-char
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 5)
+    (=ucs		. #x8FEC)	; 迬
     ))
 (define-char
-  '((=>ucs		. #x8FEC)	; 迬
+  '((<-denotational
+     ((=ucs		  . #x8FEC)	; 迬
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=daikanwa		. 38799)	; &M-38799;
     (<-ancient
      ((=daikanwa	  . 10073)	; &M-10073;
       ))
     (<-ancient*sources
      zihui daikanwa)
-    (=daikanwa		. 38799)	; &M-38799;
     ))
 (define-char
-  '((=>ucs		. #x8FEC)	; 迬
-    (morohashi-daikanwa	38799 0 2)
+  '((<-denotational
+     ((=ucs		  . #x8FEC)	; 迬
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (=cns11643-6	. #x3460)	; &C6-3460; [20-64]
+    (total-strokes	 . 8)
+    (=ucs@unicode	. #x8FEC)	; &UU+8FEC;
     ))
 (define-char
-  '((morohashi-daikanwa	38799 0 3)
+  '((<-denotational
+     ((=ucs		  . #x8FEC)	; 迬
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=ucs		. #x8FEC)	; 迬
+    (total-strokes	 . 9)
+    (=cns11643-6	. #x3460)	; &C6-3460; [20-64]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -3459,16 +3503,19 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=ks-x1001		. #x7277)	; &M-38800; [82-87]
+    (=daikanwa		. 38800)	; &I-M-38800;
+    (=jef-china3	. #x67B5)	; &I-JC3-67B5;
     (<-synonyms
      ((=ucs		  . #x39B6)	; 㦶
       (=daikanwa	  . 11588)	; &I-M-11588;
       ))
     (<-synonyms*sources
      maoshi daikanwa)
-    (=ks-x1001		. #x7277)	; &M-38800; [82-87]
-    (=daikanwa		. 38800)	; &I-M-38800;
     (->formed
-     ((=ucs		  . #x8E22)	; 踢
+     ((=gb2312		  . #x4C5F)	; &M-37648; [44-63]
+      (=jis-x0212	  . #x5F7E)	; &I-JSP-5F7E; [63-94]
+      (=jis-x0213-2-2000  . #x7946)	; &I-JX2-7946; [89-38]
       (=daikanwa	  . 37648)	; &I-M-37648;
       ))
     (->formed*sources
@@ -3511,6 +3558,10 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=jis-x0212		. #x6145)	; &M-38801; [65-37]
+    (=jis-x0213-1-2000	. #x7C56)	; &I-JX1-7C56; [92-54]
+    (=daikanwa		. 38801)	; &I-M-38801;
+    (=ucs@jis		. #x8FEE)	; &M-38801;
     (<-synonyms
      ((=ucs		  . #x224D3)	; 𢓓
       (=daikanwa	  . 10064)	; &I-M-10064;
@@ -3524,10 +3575,6 @@
       ))
     (<-vulgar*sources
      shuowen-tongxundingsheng daikanwa)
-    (=jis-x0212		. #x6145)	; &M-38801; [65-37]
-    (=jis-x0213-1-2000	. #x7C56)	; &I-JX1-7C56; [92-54]
-    (=daikanwa		. 38801)	; &I-M-38801;
-    (=ucs@jis		. #x8FEE)	; &M-38801;
     ))
 (define-char
   '((<-denotational
@@ -3549,16 +3596,17 @@
     (=cns11643-2	. #x2D56)	; &C2-2D56; [13-54]
     ))
 (define-char
-  '((=>ucs		. #x8FEF)	; 迯
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 5)
+    (=ucs		. #x8FEF)	; 迯
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8FEF)	; 迯
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (<-vulgar
-     ((=ks-x1001	  . #x5431)	; &M-38845; [52-17]
-      (=daikanwa	  . 38845)	; &I-M-38845;
-      ))
-    (<-vulgar*sources
-     zhengzitong daikanwa shinjigen-1)
     (shinjigen-1	. 8263)
     (shinjigen-2	. 8263)
     (=jis-x0208		. #x6D6D)	; &GT-51920; [77-77]
@@ -3566,21 +3614,30 @@
     (=gt-pj-1		. #x6D6D)	; &I-GT-51920; [77-77]
     (=daikanwa		. 38802)	; &I-M-38802;
     (=ucs@jis		. #x8FEF)	; &GT-51920;
+    (<-vulgar
+     ((=ks-x1001	  . #x5431)	; &M-38845; [52-17]
+      (=daikanwa	  . 38845)	; &I-M-38845;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
-  '((=>ucs		. #x8FEF)	; 迯
-    (morohashi-daikanwa	38802 0 2)
+  '((<-denotational
+     ((=ucs		  . #x8FEF)	; 迯
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (=cns11643-3	. #x2F33)	; &C3-2F33; [15-19]
+    (total-strokes	 . 8)
+    (=ucs@unicode	. #x8FEF)	; &UU+8FEF;
     ))
 (define-char
-  '((morohashi-daikanwa	38802 0 3)
+  '((<-denotational
+     ((=ucs		  . #x8FEF)	; 迯
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=ucs		. #x8FEF)	; 迯
+    (total-strokes	 . 9)
+    (=cns11643-3	. #x2F33)	; &C3-2F33; [15-19]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -3595,14 +3652,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=ks-x1001		. #x627B)	; &M-38803; [66-91]
+    (=daikanwa		. 38803)	; &I-M-38803;
+    (=jef-china3	. #x67B7)	; &I-JC3-67B7;
     (<-ancient
      ((=jis-x0212	  . #x6166)	; &M-39129; [65-70]
       (=daikanwa	  . 39129)	; &I-M-39129;
       ))
     (<-ancient*sources
      erya daikanwa)
-    (=ks-x1001		. #x627B)	; &M-38803; [66-91]
-    (=daikanwa		. 38803)	; &I-M-38803;
     (->Large-Seal
      ((=daikanwa	  . 39049)	; &M-39049;
       ))
@@ -3687,6 +3745,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=daikanwa		. 38805)	; &M-38805;
     (<-ancient
      ((=jis-x0212	  . #x615C)	; &M-38988; [65-60]
       (=jis-x0213-2-2000  . #x797C)	; &I-JX2-797C; [89-92]
@@ -3694,7 +3753,6 @@
       ))
     (<-ancient*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 38805)	; &M-38805;
     ))
 (define-char
   '((morohashi-daikanwa	38805 0 2)
@@ -3707,6 +3765,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=daikanwa		. 38806)	; &M-38806;
     (<-ancient
      ((=jis-x0208	  . #x6D71)	; &GT-51996; [77-81]
       (=ks-x1001	  . #x6E69)	; &I-K0-6E69; [78-73]
@@ -3714,7 +3773,6 @@
       ))
     (<-ancient*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 38806)	; &M-38806;
     ))
 (define-char
   '((morohashi-daikanwa	38806 0 3)
@@ -3759,13 +3817,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=daikanwa		. 38809)	; &M-38809;
     (<-same
      ((=ucs		  . #x27EBC)	; 𧺼
       (=daikanwa	  . 37097)	; &I-M-37097;
       ))
     (<-same*sources
      yupian daikanwa)
-    (=daikanwa		. 38809)	; &M-38809;
     ))
 (define-char
   '((morohashi-daikanwa	38809 0 2)
@@ -3775,34 +3833,52 @@
     (=cns11643-6	. #x3C54)	; &C6-3C54; [28-52]
     ))
 (define-char
-  '((=>ucs		. #x2849A)	; 𨒚
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 5)
+    (=ucs		. #x2849A)	; 𨒚
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2849A)	; 𨒚
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=daikanwa		. 38810)	; &M-38810;
     (<-same
      ((=daikanwa	  . 38776)	; &M-38776;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 38810)	; &M-38810;
     ))
 (define-char
-  '((=>ucs		. #x2849A)	; 𨒚
-    (morohashi-daikanwa	38810 0 2)
+  '((<-denotational
+     ((=ucs		  . #x2849A)	; 𨒚
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (=jef-china3	. #x80BF)	; &JC3-80BF;
+    (=ucs@iso		. #x2849A)	; &JC3-80BF;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2849A)	; 𨒚
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=cns11643-4	. #x2B52)	; &C4-2B52; [11-50]
     ))
 (define-char
-  '((morohashi-daikanwa	38810 0 3)
-    (ideographic-radical . 162)	; ⾡
+  '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=ucs		. #x2849A)	; 𨒚
+    (=ucs		. #x8FF2)	; 迲
     ))
 (define-char
-  '((=>ucs		. #x8FF2)	; 迲
+  '((<-denotational
+     ((=ucs		  . #x8FF2)	; 迲
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
@@ -3810,23 +3886,25 @@
     (=daikanwa		. 38812)	; &I-M-38812;
     ))
 (define-char
-  '((morohashi-daikanwa	38812 0 3)
+  '((<-denotational
+     ((=ucs		  . #x8FF2)	; 迲
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=ucs		. #x8FF2)	; 迲
-    (=gb12345		. #x7D25)	; 迲 [93-05]
+    (=gb12345		. #x7D25)	; &UU+8FF2; [93-05]
+    (=ucs@unicode	. #x8FF2)	; &UU+8FF2;
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (=daikanwa		. 38813)	; &M-38813;
     (<-same
      ((=daikanwa	  . 38745)	; &M-38745;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 38813)	; &M-38813;
     ))
 (define-char
   '((morohashi-daikanwa	38813 0 2)
@@ -3859,12 +3937,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38817)	; &M-38817;
     (<-ancient
      ((=daikanwa	  . 10098)	; &M-10098;
       ))
     (<-ancient*sources
      yupian daikanwa)
-    (=daikanwa		. 38817)	; &M-38817;
     ))
 (define-char
   '((morohashi-daikanwa	38817 0 2)
@@ -3942,6 +4020,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38820)	; &M-38820;
     (<-synonyms
      ((=jis-x0208@1978	  . #x3872)	; &M-00291; [24-82]
       (=jis-x0208@1983	  . #x3872)	; &I-J83-3872; [24-82]
@@ -3950,7 +4029,6 @@
       ))
     (<-synonyms*sources
      jiyun daikanwa)
-    (=daikanwa		. 38820)	; &M-38820;
     ))
 (define-char
   '((<-denotational
@@ -4077,13 +4155,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38824)	; &M-38824;
     (<-same
      ((=jis-x0212	  . #x6142)	; &M-38783; [65-34]
       (=daikanwa	  . 38783)	; &I-M-38783;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 38824)	; &M-38824;
     ))
 (define-char
   '((morohashi-daikanwa	38824 0 2)
@@ -4180,13 +4258,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (<-same
-     ((=jis-x0208	  . #x4057)	; &GT-50150; [32-55]
-      (=ks-x1001	  . #x6E66)	; &I-K0-6E66; [78-70]
-      (=daikanwa	  . 37493)	; &I-M-37493;
-      ))
-    (<-same*sources
-     maoshi daikanwa)
     (shinjigen-2	. 8003)
     (=jis-x0208		. #x6D71)	; &GT-51996; [77-81]
     (=ks-x1001		. #x6E69)	; &I-K0-6E69; [78-73]
@@ -4195,6 +4266,13 @@
     (=gt-pj-1		. #x6D71)	; &I-GT-51996; [77-81]
     (=daikanwa		. 38827)	; &I-M-38827;
     (=ucs@jis		. #x8FF9)	; &GT-51996;
+    (<-same
+     ((=jis-x0208	  . #x4057)	; &GT-50150; [32-55]
+      (=ks-x1001	  . #x6E66)	; &I-K0-6E66; [78-70]
+      (=daikanwa	  . 37493)	; &I-M-37493;
+      ))
+    (<-same*sources
+     maoshi daikanwa)
     (->formed
      ((=daikanwa	  . 39081)	; &M-39081;
       ))
@@ -4232,6 +4310,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38828)	; &M-38828;
     (<-same
      ((=jis-x0208	  . #x6D71)	; &GT-51996; [77-81]
       (=ks-x1001	  . #x6E69)	; &I-K0-6E69; [78-73]
@@ -4239,7 +4318,6 @@
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 38828)	; &M-38828;
     (->mistakable
      ((=ks-x1001	  . #x615C)	; &M-38897; [65-60]
       (=daikanwa	  . 38897)	; &I-M-38897;
@@ -4309,12 +4387,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (<-synonyms
-     ((=ucs		  . #x4E43)	; 乃
-      (=daikanwa	  . 00113)	; &I-M-00113;
-      ))
-    (<-synonyms*sources
-     shuowen-tongxundingsheng erya yupian zhengzitong liezi jingdian-shiwen daikanwa)
     (shinjigen-1	. 8257)
     (shinjigen-2	. 8257)
     (=jis-x0208		. #x6D72)	; &GT-52008; [77-82]
@@ -4323,6 +4395,12 @@
     (=gt-pj-1		. #x6D72)	; &I-GT-52008; [77-82]
     (=daikanwa		. 38831)	; &I-M-38831;
     (=ucs@jis		. #x8FFA)	; &GT-52008;
+    (<-synonyms
+     ((=ucs		  . #x4E43)	; 乃
+      (=daikanwa	  . 00113)	; &I-M-00113;
+      ))
+    (<-synonyms*sources
+     shuowen-tongxundingsheng erya yupian zhengzitong liezi jingdian-shiwen daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -4371,16 +4449,16 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=jis-x0212		. #x6149)	; &M-38833; [65-41]
+    (=jis-x0213-2-2000	. #x7976)	; &I-JX2-7976; [89-86]
+    (=daikanwa		. 38833)	; &I-M-38833;
+    (=ucs@jis		. #x8FFB)	; &M-38833;
     (<-synonyms
      ((=ucs		  . #x79FB)	; 移
       (=daikanwa	  . 25045)	; &I-M-25045;
       ))
     (<-synonyms*sources
      jiyun daikanwa)
-    (=jis-x0212		. #x6149)	; &M-38833; [65-41]
-    (=jis-x0213-2-2000	. #x7976)	; &I-JX2-7976; [89-86]
-    (=daikanwa		. 38833)	; &I-M-38833;
-    (=ucs@jis		. #x8FFB)	; &M-38833;
     ))
 (define-char
   '((<-denotational
@@ -4413,13 +4491,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38834)	; &M-38834;
     (<-wrong
      ((=ucs		  . #x8D8C)	; 趌
       (=daikanwa	  . 37117)	; &I-M-37117;
       ))
     (<-wrong*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38834)	; &M-38834;
     ))
 (define-char
   '((<-denotational
@@ -4474,6 +4552,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=ks-x1001		. #x755A)	; &M-38836; [85-58]
+    (=daikanwa		. 38836)	; &I-M-38836;
+    (=jef-china3	. #x67BA)	; &I-JC3-67BA;
     (<-ancient
      ((=jis-x0208	  . #x6E2E)	; &GT-56259; [78-14]
       (=ks-x1001	  . #x624B)	; &I-K0-624B; [66-43]
@@ -4487,9 +4568,6 @@
       ))
     (<-synonyms@p3-1*sources
      shuowen-tongxundingsheng yili yili-shu daikanwa)
-    (=ks-x1001		. #x755A)	; &M-38836; [85-58]
-    (=daikanwa		. 38836)	; &I-M-38836;
-    (=jef-china3	. #x67BA)	; &I-JC3-67BA;
     ))
 (define-char
   '((<-denotational
@@ -4529,15 +4607,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=jis-x0212		. #x614A)	; &M-38837; [65-42]
+    (=daikanwa		. 38837)	; &I-M-38837;
+    (=ucs@jis		. #x8FFE)	; &M-38837;
     (<-synonyms@s4
      ((=cns11643-1	  . #x6C30)	; &M-03041; [76-16]
       (=daikanwa	  . 03041)	; &I-M-03041;
       ))
     (<-synonyms@s4*sources
      zhengzitong daikanwa)
-    (=jis-x0212		. #x614A)	; &M-38837; [65-42]
-    (=daikanwa		. 38837)	; &I-M-38837;
-    (=ucs@jis		. #x8FFE)	; &M-38837;
     ))
 (define-char
   '((<-denotational
@@ -4603,6 +4681,8 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=ks-x1001		. #x775C)	; &M-38839; [87-60]
+    (=daikanwa		. 38839)	; &I-M-38839;
     (<-same@p2
      ((=jis-x0208	  . #x6A74)	; &GT-46460; [74-84]
       (=ks-x1001	  . #x775B)	; &I-K0-775B; [87-59]
@@ -4610,8 +4690,6 @@
       ))
     (<-same@p2*sources
      zhengzitong daojing daikanwa)
-    (=ks-x1001		. #x775C)	; &M-38839; [87-60]
-    (=daikanwa		. 38839)	; &I-M-38839;
     ))
 (define-char
   '((<-denotational
@@ -4815,15 +4893,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=ks-x1001		. #x5431)	; &M-38845; [52-17]
+    (=daikanwa		. 38845)	; &I-M-38845;
+    (=jef-china3	. #x67BD)	; &I-JC3-67BD;
     (<-synonyms
      ((=ucs		  . #x9676)	; 陶
       (=daikanwa	  . 41705)	; &I-M-41705;
       ))
     (<-synonyms*sources
      xunzi daikanwa)
-    (=ks-x1001		. #x5431)	; &M-38845; [52-17]
-    (=daikanwa		. 38845)	; &I-M-38845;
-    (=jef-china3	. #x67BD)	; &I-JC3-67BD;
     (->formed
      ((=jis-x0208@1978	  . #x4437)	; &M-37533; [36-23]
       (=jis-x0208@1983	  . #x4437)	; &I-J83-4437; [36-23]
@@ -4865,13 +4943,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38846)	; &M-38846;
     (<-ancient
      ((=ks-x1001	  . #x5431)	; &M-38845; [52-17]
       (=daikanwa	  . 38845)	; &I-M-38845;
       ))
     (<-ancient*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 38846)	; &M-38846;
     ))
 (define-char
   '((morohashi-daikanwa	38846 0 2)
@@ -4936,13 +5014,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (<-vulgar
-     ((shinjigen-1	  . 8359)
-      (=jis-x0208@1978	  . #x6E29)	; &M-39031; [78-09]
-      (=daikanwa	  . 39031)	; &I-M-39031;
-      ))
-    (<-vulgar*sources
-     shinjigen-1)
     (shinjigen-1	. 8360)
     (shinjigen-2	. 8361)
     (=jis-x0208		. #x6D70)	; &GT-51977; [77-80]
@@ -4951,6 +5022,13 @@
     (=gt-pj-1		. #x6D70)	; &I-GT-51977; [77-80]
     (=daikanwa		. 38848)	; &I-M-38848;
     (=ucs@jis		. #x9005)	; &GT-51977;
+    (<-vulgar
+     ((shinjigen-1	  . 8359)
+      (=jis-x0208@1978	  . #x6E29)	; &M-39031; [78-09]
+      (=daikanwa	  . 39031)	; &I-M-39031;
+      ))
+    (<-vulgar*sources
+     shinjigen-1)
     (->formed
      ((=jis-x0208@1978	  . #x6B32)	; &GT-47018; [75-18]
       (=daikanwa	  . 34937)	; &I-M-34937;
@@ -4990,14 +5068,14 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=ks-x1001		. #x663D)	; &M-38849; [70-29]
+    (=daikanwa		. 38849)	; &I-M-38849;
     (<-synonyms
      ((=ucs		  . #x65A5)	; 斥
       (=daikanwa	  . 13535)	; &I-M-13535;
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng jiyun zhouli zhouli-zhu daikanwa)
-    (=ks-x1001		. #x663D)	; &M-38849; [70-29]
-    (=daikanwa		. 38849)	; &I-M-38849;
     ))
 (define-char
   '((<-denotational
@@ -5028,13 +5106,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38850)	; &M-38850;
     (<-same
      ((=gb2312		  . #x3B56)	; &M-10577; [27-54]
       (=daikanwa	  . 10577)	; &I-M-10577;
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38850)	; &M-38850;
     ))
 (define-char
   '((morohashi-daikanwa	38850 0 2)
@@ -5047,13 +5125,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38851)	; &M-38851;
     (<-same
      ((=jis-x0212	  . #x5F50)	; &GT-49688; [63-48]
       (=daikanwa	  . 37133)	; &I-M-37133;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 38851)	; &M-38851;
     ))
 (define-char
   '((morohashi-daikanwa	38851 0 2)
@@ -5067,6 +5145,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38852)	; &M-38852;
     (<-ancient
      ((=jis-x0208	  . #x5E62)	; &GT-22881; [62-66]
       (=ks-x1001	  . #x6A7D)	; &I-K0-6A7D; [74-93]
@@ -5074,7 +5153,6 @@
       ))
     (<-ancient*sources
      shuowen daikanwa)
-    (=daikanwa		. 38852)	; &M-38852;
     ))
 (define-char
   '((=>ucs		. #x284B0)	; 𨒰
@@ -5095,13 +5173,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38853)	; &M-38853;
     (<-ancient
      ((=ks-x1001	  . #x7063)	; &M-38898; [80-67]
       (=daikanwa	  . 38898)	; &I-M-38898;
       ))
     (<-ancient*sources
      jiyun pianhai-leibian daikanwa)
-    (=daikanwa		. 38853)	; &M-38853;
     ))
 (define-char
   '((morohashi-daikanwa	38853 0 2)
@@ -5130,12 +5208,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38855)	; &M-38855;
     (<-same
      ((=daikanwa	  . 39123)	; &M-39123;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 38855)	; &M-38855;
     ))
 (define-char
   '((morohashi-daikanwa	38855 0 2)
@@ -5171,6 +5249,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38857)	; &M-38857;
     (<-same
      ((=jis-x0208@1978	  . #x446D)	; &M-09337; [36-77]
       (=jis-x0208@1983	  . #x446D)	; &I-J83-446D; [36-77]
@@ -5179,7 +5258,6 @@
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 38857)	; &M-38857;
     ))
 (define-char
   '((morohashi-daikanwa	38857 0 2)
@@ -5189,25 +5267,41 @@
     (=cns11643-6	. #x3C4E)	; &C6-3C4E; [28-46]
     ))
 (define-char
-  '((=>daikanwa		. 38858)	; &M-38858;
-    (ideographic-radical . 162)	; ⾡
+  '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (=ucs		. #x284C1)	; 𨓁
-    (->subsumptive
-     ((total-strokes	   . 10)
-      (<-same
-       ((=daikanwa	    . 39055)	; &M-39055;
-	))
-      (<-same*sources
-       jiyun daikanwa)
-      (=daikanwa	  . 38858)	; &M-38858;
-      )
-     ((total-strokes	   . 10)
-      (=cns11643-5	  . #x305C)	; &C5-305C; [16-60]
-      )
-     ((total-strokes	   . 9)
-      (=ucs@iso		  . #x284C1)	; &U-000284C1;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x284C1)	; 𨓁
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=daikanwa		. 38858)	; &M-38858;
+    (<-same
+     ((=daikanwa	  . 39055)	; &M-39055;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x284C1)	; 𨓁
       ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (=ucs@iso		. #x284C1)	; &U-000284C1;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x284C1)	; 𨓁
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=cns11643-5	. #x305C)	; &C5-305C; [16-60]
     ))
 (define-char
   '((=>daikanwa		. 38859)	; &M-38859;
@@ -5249,13 +5343,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38861)	; &M-38861;
     (<-same
      ((=jis-x0212	  . #x6142)	; &M-38783; [65-34]
       (=daikanwa	  . 38783)	; &I-M-38783;
       ))
     (<-same*sources
      kangxi daikanwa)
-    (=daikanwa		. 38861)	; &M-38861;
     ))
 (define-char
   '((morohashi-daikanwa	38861 0 2)
@@ -5268,6 +5362,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38862)	; &M-38862;
     (<-same
      ((=jis-x0208	  . #x4234)	; &GT-03504; [34-20]
       (=ks-x1001	  . #x706F)	; &I-K0-706F; [80-79]
@@ -5275,7 +5370,6 @@
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 38862)	; &M-38862;
     ))
 (define-char
   '((morohashi-daikanwa	38862 0 2)
@@ -5288,13 +5382,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=daikanwa		. 38863)	; &M-38863;
     (<-same
      ((=ks-x1001	  . #x5A3B)	; &M-38825; [58-27]
       (=daikanwa	  . 38825)	; &I-M-38825;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 38863)	; &M-38863;
     ))
 (define-char
   '((morohashi-daikanwa	38863 0 2)
@@ -5318,13 +5412,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (<-vulgar
-     ((shinjigen-1	  . 8311)
-      (=jis-x0212	  . #x6155)	; &M-38929; [65-53]
-      (=daikanwa	  . 38929)	; &I-M-38929;
-      ))
-    (<-vulgar*sources
-     zhengzitong daikanwa shinjigen-1)
     (shinjigen-1	. 8312)
     (shinjigen-2	. 8312)
     (=jis-x0208		. #x6D7E)	; &GT-52041; [77-94]
@@ -5332,6 +5419,13 @@
     (=gt-pj-1		. #x6D7E)	; &I-GT-52041; [77-94]
     (=daikanwa		. 38867)	; &I-M-38867;
     (=ucs@jis		. #x8FF8)	; &GT-52041;
+    (<-vulgar
+     ((shinjigen-1	  . 8311)
+      (=jis-x0212	  . #x6155)	; &M-38929; [65-53]
+      (=daikanwa	  . 38929)	; &I-M-38929;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -5358,36 +5452,47 @@
     (=cns11643-1	. #x5853)	; &C1-5853; [56-51]
     ))
 (define-char
-  '((=>ucs		. #x9008)	; 逈
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 6)
+    (=ucs		. #x9008)	; 逈
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9008)	; 逈
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=ks-x1001		. #x7B2D)	; &M-38868; [91-13]
+    (=jis-x0212		. #x614D)	; &I-JSP-614D; [65-45]
+    (=jis-x0213-1-2000	. #x7C57)	; &I-JX1-7C57; [92-55]
+    (=daikanwa		. 38868)	; &I-M-38868;
+    (=jef-china3	. #x67C0)	; &I-JC3-67C0;
+    (=ucs@jis		. #x9008)	; &M-38868;
     (<-vulgar
      ((=jis-x0208	  . #x6D6A)	; &GT-51864; [77-74]
       (=daikanwa	  . 38786)	; &I-M-38786;
       ))
     (<-vulgar*sources
      zhengzitong daikanwa)
-    (=ks-x1001		. #x7B2D)	; &M-38868; [91-13]
-    (=jis-x0212		. #x614D)	; &I-JSP-614D; [65-45]
-    (=jis-x0213-1-2000	. #x7C57)	; &I-JX1-7C57; [92-55]
-    (=daikanwa		. 38868)	; &I-M-38868;
-    (=ucs@jis		. #x9008)	; &M-38868;
     ))
 (define-char
-  '((=>ucs		. #x9008)	; 逈
-    (morohashi-daikanwa	38868 0 2)
+  '((<-denotational
+     ((=ucs		  . #x9008)	; 逈
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=cns11643-3	. #x3427)	; &C3-3427; [20-07]
+    (total-strokes	 . 9)
+    (=ucs@unicode	. #x9008)	; &UU+9008;
     ))
 (define-char
-  '((morohashi-daikanwa	38868 0 3)
+  '((<-denotational
+     ((=ucs		  . #x9008)	; 逈
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=ucs		. #x9008)	; 逈
+    (total-strokes	 . 10)
+    (=cns11643-3	. #x3427)	; &C3-3427; [20-07]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -5421,13 +5526,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38869)	; &M-38869;
     (<-ancient
      ((=ucs		  . #x7683)	; 皃
       (=daikanwa	  . 22686)	; &I-M-22686;
       ))
     (<-ancient*sources
      yupian daikanwa)
-    (=daikanwa		. 38869)	; &M-38869;
     ))
 (define-char
   '((morohashi-daikanwa	38869 0 2)
@@ -5481,12 +5586,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (<-synonyms
-     ((=ucs		  . #x6355)	; 捕
-      (=daikanwa	  . 12157)	; &I-M-12157;
-      ))
-    (<-synonyms*sources
-     shuowen-tongxundingsheng daikanwa)
     (shinjigen-2	. 8294)
     (=jis-x0208		. #x6D79)	; &GT-52157; [77-89]
     (=ks-x1001		. #x7867)	; &I-K0-7867; [88-71]
@@ -5494,6 +5593,12 @@
     (=gt-pj-1		. #x6D79)	; &I-GT-52157; [77-89]
     (=daikanwa		. 38871)	; &I-M-38871;
     (=ucs@jis		. #x900B)	; &GT-52157;
+    (<-synonyms
+     ((=ucs		  . #x6355)	; 捕
+      (=daikanwa	  . 12157)	; &I-M-12157;
+      ))
+    (<-synonyms*sources
+     shuowen-tongxundingsheng daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -5527,16 +5632,16 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=jis-x0212		. #x614E)	; &M-38872; [65-46]
+    (=jis-x0213-2-2000	. #x7978)	; &I-JX2-7978; [89-88]
+    (=daikanwa		. 38872)	; &I-M-38872;
+    (=ucs@jis		. #x900C)	; &M-38872;
     (<-ancient@s3
      ((=ucs		  . #x7531)	; 由
       (=daikanwa	  . 21724)	; &I-M-21724;
       ))
     (<-ancient@s3*sources
      zihui-bu liuxiang-xinxu daikanwa)
-    (=jis-x0212		. #x614E)	; &M-38872; [65-46]
-    (=jis-x0213-2-2000	. #x7978)	; &I-JX2-7978; [89-88]
-    (=daikanwa		. 38872)	; &I-M-38872;
-    (=ucs@jis		. #x900C)	; &M-38872;
     (->formed
      ((=daikanwa	  . 38981)	; &M-38981;
       ))
@@ -5574,12 +5679,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (<-synonyms
-     ((=ks-x1001	  . #x613C)	; &M-17529; [65-28]
-      (=daikanwa	  . 17529)	; &I-M-17529;
-      ))
-    (<-synonyms*sources
-     jiyun maoshi daikanwa)
     (shinjigen-2	. 8272)
     (=jis-x0208		. #x6D76)	; &GT-52103; [77-86]
     (=ks-x1001		. #x614E)	; &I-K0-614E; [65-46]
@@ -5587,6 +5686,12 @@
     (=gt-pj-1		. #x6D76)	; &I-GT-52103; [77-86]
     (=daikanwa		. 38873)	; &I-M-38873;
     (=ucs@jis		. #x900D)	; &GT-52103;
+    (<-synonyms
+     ((=ks-x1001	  . #x613C)	; &M-17529; [65-28]
+      (=daikanwa	  . 17529)	; &I-M-17529;
+      ))
+    (<-synonyms*sources
+     jiyun maoshi daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -5621,17 +5726,17 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (->subsumptive
-     ((<-ancient
+     ((shinjigen-2	  . 8327)
+      (=jis-x0208@1978	  . #x6E25)	; &M-38874; [78-05]
+      (=jis-x0208@1983	  . #x6E25)	; &I-J83-6E25; [78-05]
+      (=daikanwa	  . 38874)	; &I-M-38874;
+      (<-ancient
        ((=jis-x0208@1978    . #x6E24)	; &M-39008; [78-04]
 	(=jis-x0208@1983    . #x6E24)	; &I-J83-6E24; [78-04]
 	(=daikanwa	    . 39008)	; &I-M-39008;
 	))
       (<-ancient*sources
        zihui daikanwa)
-      (shinjigen-2	  . 8327)
-      (=jis-x0208@1978	  . #x6E25)	; &M-38874; [78-05]
-      (=jis-x0208@1983	  . #x6E25)	; &I-J83-6E25; [78-05]
-      (=daikanwa	  . 38874)	; &I-M-38874;
       )
      ((=jis-x0208@1990	  . #x6E25)	; &GT-52098; [78-05]
       (=gt		  . 52098)	; &I-GT-52098;
@@ -5686,8 +5791,7 @@
     (=ks-x1001		. #x7762)	; &M-38876; [87-66]
     (=daikanwa		. 38876)	; &I-M-38876;
     (->formed
-     ((=ucs		  . #x47AC)	; 䞬
-      (=daikanwa	  . 37155)	; &I-M-37155;
+     ((=daikanwa	  . 37155)	; &M-37155;
       ))
     (->formed*sources
      jiyun daikanwa)
@@ -5729,6 +5833,8 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=ks-x1001		. #x756F)	; &M-38877; [85-79]
+    (=daikanwa		. 38877)	; &I-M-38877;
     (<-same
      ((=jis-x0212	  . #x6B3C)	; &M-46454; [75-28]
       (=jis-x0213-1-2000  . #x7E51)	; &I-JX1-7E51; [94-49]
@@ -5742,8 +5848,6 @@
       ))
     (<-synonyms*sources
      shanhaijing shanhaijing-zhu daikanwa)
-    (=ks-x1001		. #x756F)	; &M-38877; [85-79]
-    (=daikanwa		. 38877)	; &I-M-38877;
     ))
 (define-char
   '((<-denotational
@@ -5783,12 +5887,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (<-synonyms
-     ((=ucs		  . #x4EC7)	; 仇
-      (=daikanwa	  . 00355)	; &I-M-00355;
-      ))
-    (<-synonyms*sources
-     shuowen shuowen-zhu shuowen-tongxundingsheng maoshi maoshi-zhuan daikanwa)
     (shinjigen-2	. 8267)
     (=jis-x0208		. #x6D73)	; &GT-52080; [77-83]
     (=ks-x1001		. #x4F47)	; &I-K0-4F47; [47-39]
@@ -5796,6 +5894,12 @@
     (=gt-pj-1		. #x6D73)	; &I-GT-52080; [77-83]
     (=daikanwa		. 38878)	; &I-M-38878;
     (=ucs@jis		. #x9011)	; &GT-52080;
+    (<-synonyms
+     ((=ucs		  . #x4EC7)	; 仇
+      (=daikanwa	  . 00355)	; &I-M-00355;
+      ))
+    (<-synonyms*sources
+     shuowen shuowen-zhu shuowen-tongxundingsheng maoshi maoshi-zhuan daikanwa)
     (->formed
      ((=jis-x0208	  . #x4837)	; &GT-63549; [40-23]
       (=ks-x1001	  . #x4F4D)	; &I-K0-4F4D; [47-45]
@@ -5835,13 +5939,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38879)	; &M-38879;
     (<-same
      ((=jis-x0212	  . #x613E)	; &M-38755; [65-30]
       (=daikanwa	  . 38755)	; &I-M-38755;
       ))
     (<-same*sources
      yupian daikanwa)
-    (=daikanwa		. 38879)	; &M-38879;
     (->formed
      ((=daikanwa	  . 37565)	; &M-37565;
       ))
@@ -5878,6 +5982,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38880)	; &M-38880;
     (<-same
      ((=jis-x0208	  . #x6E2A)	; &GT-52470; [78-10]
       (=ks-x1001	  . #x7476)	; &I-K0-7476; [84-86]
@@ -5885,7 +5990,6 @@
       ))
     (<-same*sources
      yupian daikanwa)
-    (=daikanwa		. 38880)	; &M-38880;
     ))
 (define-char
   '((<-denotational
@@ -5918,6 +6022,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38881)	; &M-38881;
     (<-vulgar
      ((=jis-x0208	  . #x6E2A)	; &GT-52470; [78-10]
       (=ks-x1001	  . #x7476)	; &I-K0-7476; [84-86]
@@ -5925,7 +6030,6 @@
       ))
     (<-vulgar*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38881)	; &M-38881;
     ))
 (define-char
   '((<-denotational
@@ -5944,16 +6048,16 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6E2A)	; &GT-52470; [78-10]
-      (=ks-x1001	  . #x7476)	; &I-K0-7476; [84-86]
-      (=daikanwa	  . 39045)	; &I-M-39045;
-      ))
     (=jis-x0208		. #x447E)	; &GT-52016; [36-94]
     (=gt		. 52016)	; &I-GT-52016;
     (=gt-pj-1		. #x447E)	; &I-GT-52016; [36-94]
     (=ucs@unicode	. #x9013)	; &GT-52016;
     (mojikyo		. 050505)	; &MCS-6000C549;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6E2A)	; &GT-52470; [78-10]
+      (=ks-x1001	  . #x7476)	; &I-K0-7476; [84-86]
+      (=daikanwa	  . 39045)	; &I-M-39045;
+      ))
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -6014,12 +6118,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (<-same
-     ((=ucs		  . #x5F91)	; 徑
-      (=daikanwa	  . 10118)	; &I-M-10118;
-      ))
-    (<-same*sources
-     jiyun daikanwa)
     (shinjigen-2	. 2337)
     (=jis-x0208		. #x6D74)	; &GT-52083; [77-84]
     (=ks-x1001		. #x4C6F)	; &I-K0-4C6F; [44-79]
@@ -6027,6 +6125,12 @@
     (=gt-pj-1		. #x6D74)	; &I-GT-52083; [77-84]
     (=daikanwa		. 38883)	; &I-M-38883;
     (=ucs@jis		. #x9015)	; &GT-52083;
+    (<-same
+     ((=ucs		  . #x5F91)	; 徑
+      (=daikanwa	  . 10118)	; &I-M-10118;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -6063,10 +6167,18 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x284C8)	; 𨓈
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 7)
+    (=ucs		. #x284C8)	; 𨓈
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x284C8)	; 𨓈
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38885)	; &M-38885;
     (<-original
      ((=ks-x1001	  . #x4E41)	; &M-38844; [46-33]
       (=jis-x0212	  . #x614B)	; &I-JSP-614B; [65-43]
@@ -6075,22 +6187,24 @@
       ))
     (<-original*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38885)	; &M-38885;
     ))
 (define-char
-  '((=>ucs		. #x284C8)	; 𨓈
-    (morohashi-daikanwa	38885 0 2)
+  '((<-denotational
+     ((=ucs		  . #x284C8)	; 𨓈
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=cns11643-4	. #x356A)	; &C4-356A; [21-74]
+    (=ucs@iso		. #x284C8)	; &U-000284C8;
     ))
 (define-char
-  '((morohashi-daikanwa	38885 0 3)
+  '((<-denotational
+     ((=ucs		  . #x284C8)	; 𨓈
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x284C8)	; 𨓈
+    (=cns11643-4	. #x356A)	; &C4-356A; [21-74]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -6153,14 +6267,14 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=jis-x0208@1978	. #x3F60)	; &M-38887; [31-64]
+    (=ks-x1001		. #x5468)	; &I-K0-5468; [52-72]
+    (=daikanwa		. 38887)	; &I-M-38887;
     (<-synonyms
      ((=daikanwa	  . 00505)	; &M-00505;
       ))
     (<-synonyms*sources
      fangyan fangyan-zhu jiyun hanshu hanshu-zhu daikanwa)
-    (=jis-x0208@1978	. #x3F60)	; &M-38887; [31-64]
-    (=ks-x1001		. #x5468)	; &I-K0-5468; [52-72]
-    (=daikanwa		. 38887)	; &I-M-38887;
     ))
 (define-char
   '((<-denotational
@@ -6187,27 +6301,45 @@
     (=cns11643-1	. #x5D58)	; &C1-5D58; [61-56]
     ))
 (define-char
-  '((=>ucs		. #x9018)	; 逘
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 7)
+    (=ucs		. #x9018)	; 逘
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9018)	; 逘
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=jis-x0212		. #x614F)	; &M-38888; [65-47]
+    (=daikanwa		. 38888)	; &I-M-38888;
+    (=jef-china3	. #x67C5)	; &I-JC3-67C5;
+    (=ucs@jis		. #x9018)	; &M-38888;
     (<-same
      ((=jis-x0208	  . #x636F)	; &GT-33237; [67-79]
       (=daikanwa	  . 25770)	; &I-M-25770;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=jis-x0212		. #x614F)	; &M-38888; [65-47]
-    (=daikanwa		. 38888)	; &I-M-38888;
-    (=ucs@jis		. #x9018)	; &M-38888;
     ))
 (define-char
-  '((morohashi-daikanwa	38888 0 2)
+  '((<-denotational
+     ((=ucs		  . #x9018)	; 逘
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=ucs@unicode	. #x9018)	; &UU+9018;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9018)	; 逘
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x9018)	; 逘
-    (=cns11643-4	. #x3568)	; &I-C4-3568; [21-72]
+    (=cns11643-4	. #x3568)	; &C4-3568; [21-72]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -6298,15 +6430,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=ks-x1001		. #x7757)	; &M-38892; [87-55]
+    (=daikanwa		. 38892)	; &I-M-38892;
+    (=jef-china3	. #x67C6)	; &I-JC3-67C6;
     (<-synonyms
      ((=ucs		  . #x772E)	; 眮
       (=daikanwa	  . 23283)	; &I-M-23283;
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng shiming daikanwa)
-    (=ks-x1001		. #x7757)	; &M-38892; [87-55]
-    (=daikanwa		. 38892)	; &I-M-38892;
-    (=jef-china3	. #x67C6)	; &I-JC3-67C6;
     (->ancient
      ((=ucs		  . #x224F6)	; 𢓶
       (=daikanwa	  . 10124)	; &I-M-10124;
@@ -6352,6 +6484,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=jis-x0212		. #x6150)	; &M-38893; [65-48]
+    (=daikanwa		. 38893)	; &I-M-38893;
+    (=ucs@jis		. #x901B)	; &M-38893;
     (<-formed
      ((=jis-x0212	  . #x613B)	; &M-38737; [65-27]
       (=daikanwa	  . 38737)	; &I-M-38737;
@@ -6364,9 +6499,6 @@
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=jis-x0212		. #x6150)	; &M-38893; [65-48]
-    (=daikanwa		. 38893)	; &I-M-38893;
-    (=ucs@jis		. #x901B)	; &M-38893;
     ))
 (define-char
   '((<-denotational
@@ -6400,13 +6532,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38894)	; &M-38894;
     (<-same
      ((=ucs		  . #x554E)	; 啎
       (=daikanwa	  . 03813)	; &I-M-03813;
       ))
     (<-same*sources
      erya erya-guopu-zhu guangyun zhengzitong daikanwa)
-    (=daikanwa		. 38894)	; &M-38894;
     (->formed
      ((=jis-x0212	  . #x6140)	; &M-38759; [65-32]
       (=jis-x0213-2-2000  . #x7972)	; &I-JX2-7972; [89-82]
@@ -6446,6 +6578,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=jis-x0208@1978	. #x4042)	; &M-38895; [32-34]
+    (=ks-x1001		. #x6026)	; &I-K0-6026; [64-06]
+    (=daikanwa		. 38895)	; &I-M-38895;
     (<-synonyms
      ((=jis-x0208	  . #x4040)	; &GT-47734; [32-32]
       (=ks-x1001	  . #x6025)	; &I-K0-6025; [64-05]
@@ -6453,9 +6588,6 @@
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng daikanwa)
-    (=jis-x0208@1978	. #x4042)	; &M-38895; [32-34]
-    (=ks-x1001		. #x6026)	; &I-K0-6026; [64-06]
-    (=daikanwa		. 38895)	; &I-M-38895;
     (->formed
      ((=jis-x0208	  . #x6E2A)	; &GT-52470; [78-10]
       (=ks-x1001	  . #x7476)	; &I-K0-7476; [84-86]
@@ -6501,6 +6633,8 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=ks-x1001		. #x5641)	; &M-38896; [54-33]
+    (=daikanwa		. 38896)	; &I-M-38896;
     (<-original
      ((=cns11643-1	  . #x4947)	; &M-03363; [41-39]
       (=daikanwa	  . 03363)	; &I-M-03363;
@@ -6510,8 +6644,6 @@
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng fangyan zuoshi-zhuan zuoshi-zhu daikanwa)
-    (=ks-x1001		. #x5641)	; &M-38896; [54-33]
-    (=daikanwa		. 38896)	; &I-M-38896;
     (->formed
      ((=cns11643-1	  . #x4947)	; &M-03363; [41-39]
       (=daikanwa	  . 03363)	; &I-M-03363;
@@ -6565,14 +6697,14 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (->subsumptive
-     ((<-synonyms@s10
+     ((=ks-x1001	  . #x615C)	; &M-38897; [65-60]
+      (=daikanwa	  . 38897)	; &I-M-38897;
+      (<-synonyms@s10
        ((=cns11643-2	    . #x5345)	; &M-31773; [51-37]
 	(=daikanwa	    . 31773)	; &I-M-31773;
 	))
       (<-synonyms@s10*sources
        kangxi daikanwa)
-      (=ks-x1001	  . #x615C)	; &M-38897; [65-60]
-      (=daikanwa	  . 38897)	; &I-M-38897;
       (->Large-Seal
        ((=jis-x0212	    . #x6163)	; &M-39080; [65-67]
 	(=daikanwa	    . 39080)	; &I-M-39080;
@@ -6623,14 +6755,14 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=ks-x1001		. #x7063)	; &M-38898; [80-67]
+    (=daikanwa		. 38898)	; &I-M-38898;
     (<-synonyms
      ((=ks-x1001	  . #x7064)	; &M-39082; [80-68]
       (=daikanwa	  . 39082)	; &I-M-39082;
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng shiji shiji-sanjiazhu daikanwa)
-    (=ks-x1001		. #x7063)	; &M-38898; [80-67]
-    (=daikanwa		. 38898)	; &I-M-38898;
     (->formed
      ((=daikanwa	  . 39041)	; &M-39041;
       ))
@@ -6675,6 +6807,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38899)	; &M-38899;
     (<-synonyms
      ((=daikanwa	  . 44775)	; &M-44775;
       ))
@@ -6685,7 +6818,6 @@
       ))
     (<-wrong*sources
      zhengzitong zhanguoce daikanwa)
-    (=daikanwa		. 38899)	; &M-38899;
     ))
 (define-char
   '((<-denotational
@@ -6724,6 +6856,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38900)	; &M-38900;
     (<-ancient
      ((=jis-x0208	  . #x347E)	; &GT-19254; [20-94]
       (=ks-x1001	  . #x5125)	; &I-K0-5125; [49-05]
@@ -6731,7 +6864,6 @@
       ))
     (<-ancient*sources
      jiyun daikanwa)
-    (=daikanwa		. 38900)	; &M-38900;
     ))
 (define-char
   '((morohashi-daikanwa	38900 0 3)
@@ -6753,17 +6885,17 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (jisx0208-type	. 78/4-)
+    (=jis-x0208@1978	. #x3029)	; &M-38901; [16-09]
+    (=ks-x1001		. #x5C71)	; &I-K0-5C71; [60-81]
+    (=daikanwa		. 38901)	; &I-M-38901;
+    (=jef-china3	. #x67CA)	; &I-JC3-67CA;
     (<-synonyms
      ((=gt		  . 31964)	; &GT-31964;
       (=daikanwa	  . 24817)	; &I-M-24817;
       ))
     (<-synonyms*sources
      jiyun daikanwa)
-    (jisx0208-type	. 78/4-)
-    (=jis-x0208@1978	. #x3029)	; &M-38901; [16-09]
-    (=ks-x1001		. #x5C71)	; &I-K0-5C71; [60-81]
-    (=daikanwa		. 38901)	; &I-M-38901;
-    (=jef-china3	. #x67CA)	; &I-JC3-67CA;
     ))
 (define-char
   '((<-denotational
@@ -6805,15 +6937,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (shinjigen-1	. 8298)
+    (=ks-x1001		. #x5627)	; &M-38902; [54-07]
+    (=daikanwa		. 38902)	; &I-M-38902;
+    (=jef-china3	. #x67CB)	; &I-JC3-67CB;
     (<-synonyms@p3
      ((=daikanwa	  . 18819)	; &M-18819;
       ))
     (<-synonyms@p3*sources
      shuowen-tongxundingsheng liji liji-zhu daikanwa)
-    (shinjigen-1	. 8298)
-    (=ks-x1001		. #x5627)	; &M-38902; [54-07]
-    (=daikanwa		. 38902)	; &I-M-38902;
-    (=jef-china3	. #x67CB)	; &I-JC3-67CB;
     (->ancient
      ((=ks-x1001	  . #x5622)	; &M-21206; [54-02]
       (=jis-x0212	  . #x4C50)	; &I-JSP-4C50; [44-48]
@@ -6900,13 +7032,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38905)	; &M-38905;
     (<-vulgar
      ((=jis-x0208	  . #x6D6A)	; &GT-51864; [77-74]
       (=daikanwa	  . 38786)	; &I-M-38786;
       ))
     (<-vulgar*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38905)	; &M-38905;
     ))
 (define-char
   '((<-denotational
@@ -6930,13 +7062,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38906)	; &M-38906;
     (<-ancient
      ((=ks-x1001	  . #x6B34)	; &M-38994; [75-20]
       (=daikanwa	  . 38994)	; &I-M-38994;
       ))
     (<-ancient*sources
      kangxi daikanwa)
-    (=daikanwa		. 38906)	; &M-38906;
     ))
 (define-char
   '((morohashi-daikanwa	38906 0 2)
@@ -6986,6 +7118,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38910)	; &M-38910;
     (<-same
      ((=jis-x0208@1978	  . #x4D5A)	; &GT-52486; [45-58]
       (=jis-x0208@1983	  . #x7423)	; &I-J83-7423; [84-03]
@@ -6994,7 +7127,6 @@
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 38910)	; &M-38910;
     ))
 (define-char
   '((morohashi-daikanwa	38910 0 2)
@@ -7039,6 +7171,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38913)	; &M-38913;
     (<-same
      ((=jis-x0212	  . #x614E)	; &M-38872; [65-46]
       (=jis-x0213-2-2000  . #x7978)	; &I-JX2-7978; [89-88]
@@ -7046,7 +7179,6 @@
       ))
     (<-same*sources
      pianhai-leibian daikanwa)
-    (=daikanwa		. 38913)	; &M-38913;
     ))
 (define-char
   '((morohashi-daikanwa	38913 0 2)
@@ -7059,13 +7191,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38914)	; &M-38914;
     (<-same
      ((=ks-x1001	  . #x7757)	; &M-38892; [87-55]
       (=daikanwa	  . 38892)	; &I-M-38892;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 38914)	; &M-38914;
     ))
 (define-char
   '((morohashi-daikanwa	38914 0 2)
@@ -7078,12 +7210,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38915)	; &M-38915;
     (<-same
      ((=daikanwa	  . 38881)	; &M-38881;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 38915)	; &M-38915;
     ))
 (define-char
   '((morohashi-daikanwa	38915 0 2)
@@ -7096,13 +7228,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38916)	; &M-38916;
     (<-same
      ((=ks-x1001	  . #x5431)	; &M-38845; [52-17]
       (=daikanwa	  . 38845)	; &I-M-38845;
       ))
     (<-same*sources
      xiyun daikanwa)
-    (=daikanwa		. 38916)	; &M-38916;
     ))
 (define-char
   '((morohashi-daikanwa	38916 0 2)
@@ -7115,12 +7247,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38917)	; &M-38917;
     (<-same
      ((=daikanwa	  . 38890)	; &M-38890;
       ))
     (<-same*sources
      sauzhenyujing daikanwa)
-    (=daikanwa		. 38917)	; &M-38917;
     ))
 (define-char
   '((morohashi-daikanwa	38917 0 2)
@@ -7133,6 +7265,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=daikanwa		. 38918)	; &M-38918;
     (<-wrong
      ((=jis-x0212	  . #x614E)	; &M-38872; [65-46]
       (=jis-x0213-2-2000  . #x7978)	; &I-JX2-7978; [89-88]
@@ -7140,7 +7273,6 @@
       ))
     (<-wrong*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 38918)	; &M-38918;
     ))
 (define-char
   '((morohashi-daikanwa	38918 0 2)
@@ -7219,15 +7351,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=jis-x0212		. #x6151)	; &M-38922; [65-49]
+    (=daikanwa		. 38922)	; &I-M-38922;
+    (=ucs@jis		. #x9028)	; &M-38922;
     (<-same
      ((=ucs		  . #x52D1)	; 勑
       (=daikanwa	  . 02380)	; &I-M-02380;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=jis-x0212		. #x6151)	; &M-38922; [65-49]
-    (=daikanwa		. 38922)	; &I-M-38922;
-    (=ucs@jis		. #x9028)	; &M-38922;
     ))
 (define-char
   '((<-denotational
@@ -7277,15 +7409,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=jis-x0212		. #x6153)	; &M-38924; [65-51]
+    (=daikanwa		. 38924)	; &I-M-38924;
+    (=ucs@jis		. #x902F)	; &M-38924;
     (<-ancient@jiyun
      ((=ks-x1001	  . #x7475)	; &M-38931; [84-85]
       (=daikanwa	  . 38931)	; &I-M-38931;
       ))
     (<-ancient@jiyun*sources
      jiyun daikanwa)
-    (=jis-x0212		. #x6153)	; &M-38924; [65-51]
-    (=daikanwa		. 38924)	; &I-M-38924;
-    (=ucs@jis		. #x902F)	; &M-38924;
     ))
 (define-char
   '((<-denotational
@@ -7318,15 +7450,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=jis-x0212		. #x6154)	; &M-38925; [65-52]
+    (=daikanwa		. 38925)	; &I-M-38925;
+    (=ucs@jis		. #x902A)	; &M-38925;
     (<-synonyms
      ((=ucs		  . #x932F)	; 錯
       (=daikanwa	  . 40579)	; &I-M-40579;
       ))
     (<-synonyms*sources
      zhengzitong daikanwa)
-    (=jis-x0212		. #x6154)	; &M-38925; [65-52]
-    (=daikanwa		. 38925)	; &I-M-38925;
-    (=ucs@jis		. #x902A)	; &M-38925;
     (->formed
      ((=daikanwa	  . 39139)	; &M-39139;
       ))
@@ -7387,24 +7519,41 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (=ucs		. #x284EC)	; 𨓬
-    (->subsumptive
-     ((total-strokes	   . 12)
-      (<-vulgar
-       ((=ks-x1001	    . #x534F)	; &M-39044; [51-47]
-	(=jis-x0212	    . #x615F)	; &I-JSP-615F; [65-63]
-	(=jis-x0213-2-2000  . #x797D)	; &I-JX2-797D; [89-93]
-	(=daikanwa	    . 39044)	; &I-M-39044;
-	))
-      (<-vulgar*sources
-       zhengzitong daikanwa)
-      (=daikanwa	  . 38927)	; &M-38927;
-      )
-     ((total-strokes	   . 12)
-      (=cns11643-5	  . #x3C76)	; &C5-3C76; [28-86]
-      )
-     ((total-strokes	   . 11)
-      (=ucs@iso		  . #x284EC)	; &U-000284EC;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x284EC)	; 𨓬
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=daikanwa		. 38927)	; &M-38927;
+    (<-vulgar
+     ((=ks-x1001	  . #x534F)	; &M-39044; [51-47]
+      (=jis-x0212	  . #x615F)	; &I-JSP-615F; [65-63]
+      (=jis-x0213-2-2000  . #x797D)	; &I-JX2-797D; [89-93]
+      (=daikanwa	  . 39044)	; &I-M-39044;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x284EC)	; 𨓬
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=ucs@iso		. #x284EC)	; &U-000284EC;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x284EC)	; 𨓬
       ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=cns11643-5	. #x3C76)	; &C5-3C76; [28-86]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -7436,6 +7585,10 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (shinjigen-1	. 8311)
+    (=jis-x0212		. #x6155)	; &M-38929; [65-53]
+    (=daikanwa		. 38929)	; &I-M-38929;
+    (=ucs@jis		. #x902C)	; &M-38929;
     (<-same
      ((=ucs		  . #x2F9DC)	; 跰
       (=daikanwa	  . 37638)	; &I-M-37638;
@@ -7449,10 +7602,6 @@
       ))
     (<-synonyms*sources
      zhengzitong daikanwa)
-    (shinjigen-1	. 8311)
-    (=jis-x0212		. #x6155)	; &M-38929; [65-53]
-    (=daikanwa		. 38929)	; &I-M-38929;
-    (=ucs@jis		. #x902C)	; &M-38929;
     (->formed
      ((=ucs		  . #x2F9DC)	; 跰
       (=daikanwa	  . 37638)	; &I-M-37638;
@@ -7528,6 +7677,8 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=ks-x1001		. #x7475)	; &M-38931; [84-85]
+    (=daikanwa		. 38931)	; &I-M-38931;
     (<-same
      ((=jis-x0212	  . #x6144)	; &M-38791; [65-36]
       (=jis-x0213-1-2000  . #x7C55)	; &I-JX1-7C55; [92-53]
@@ -7535,8 +7686,6 @@
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=ks-x1001		. #x7475)	; &M-38931; [84-85]
-    (=daikanwa		. 38931)	; &I-M-38931;
     (->ancient@jiyun
      ((=jis-x0212	  . #x6153)	; &M-38924; [65-51]
       (=daikanwa	  . 38924)	; &I-M-38924;
@@ -7574,13 +7723,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=daikanwa		. 38932)	; &M-38932;
     (<-ancient
      ((=ks-x1001	  . #x7475)	; &M-38931; [84-85]
       (=daikanwa	  . 38931)	; &I-M-38931;
       ))
     (<-ancient*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 38932)	; &M-38932;
     ))
 (define-char
   '((morohashi-daikanwa	38932 0 2)
@@ -7594,22 +7743,39 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (=ucs		. #x9030)	; 逰
-    (->subsumptive
-     ((total-strokes	   . 12)
-      (<-vulgar
-       ((=ks-x1001	    . #x6B34)	; &M-38994; [75-20]
-	(=daikanwa	    . 38994)	; &I-M-38994;
-	))
-      (<-vulgar*sources
-       zhengzitong daikanwa)
-      (=daikanwa	  . 38933)	; &M-38933;
-      )
-     ((total-strokes	   . 12)
-      (=cns11643-3	  . #x3F55)	; &C3-3F55; [31-53]
-      )
-     ((total-strokes	   . 11)
-      (=ucs@unicode	  . #x9030)	; &UU+9030;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9030)	; 逰
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=daikanwa		. 38933)	; &M-38933;
+    (<-vulgar
+     ((=ks-x1001	  . #x6B34)	; &M-38994; [75-20]
+      (=daikanwa	  . 38994)	; &I-M-38994;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9030)	; 逰
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=ucs@unicode	. #x9030)	; &UU+9030;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9030)	; 逰
       ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=cns11643-3	. #x3F55)	; &C3-3F55; [31-53]
     ))
 (define-char
   '((=>ucs		. #x284EE)	; 𨓮
@@ -7677,6 +7843,8 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=ks-x1001		. #x714E)	; &M-38937; [81-46]
+    (=daikanwa		. 38937)	; &I-M-38937;
     (<-vulgar
      ((=ks-x1001	  . #x7132)	; &M-03441; [81-18]
       (=cns11643-6	  . #x2A3C)	; &I-C6-2A3C; [10-28]
@@ -7684,8 +7852,6 @@
       ))
     (<-vulgar*sources
      jiyun zhengzitong daikanwa)
-    (=ks-x1001		. #x714E)	; &M-38937; [81-46]
-    (=daikanwa		. 38937)	; &I-M-38937;
     ))
 (define-char
   '((<-denotational
@@ -7714,13 +7880,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=daikanwa		. 38938)	; &M-38938;
     (<-vulgar
      ((=ks-x1001	  . #x5431)	; &M-38845; [52-17]
       (=daikanwa	  . 38845)	; &I-M-38845;
       ))
     (<-vulgar*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38938)	; &M-38938;
     ))
 (define-char
   '((morohashi-daikanwa	38938 0 2)
@@ -7734,13 +7900,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=daikanwa		. 38939)	; &M-38939;
     (<-same
      ((=ucs		  . #x6106)	; 愆
       (=daikanwa	  . 10900)	; &I-M-10900;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 38939)	; &M-38939;
     ))
 (define-char
   '((morohashi-daikanwa	38939 0 2)
@@ -7809,6 +7975,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=daikanwa		. 38942)	; &M-38942;
     (<-same
      ((=jis-x0208	  . #x5D45)	; &GT-20995; [61-37]
       (=ks-x1001	  . #x4F7D)	; &I-K0-4F7D; [47-93]
@@ -7817,7 +7984,6 @@
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38942)	; &M-38942;
     ))
 (define-char
   '((<-denotational
@@ -7850,6 +8016,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=ks-x1001		. #x7264)	; &M-38943; [82-68]
+    (=daikanwa		. 38943)	; &I-M-38943;
+    (=jef-china3	. #x67D1)	; &I-JC3-67D1;
     (<-synonyms
      ((=ucs		  . #x8CEE)	; è³®
       (=daikanwa	  . 36850)	; &I-M-36850;
@@ -7862,9 +8031,6 @@
       ))
     (<-wrong*sources
      liji liji-zhu daikanwa)
-    (=ks-x1001		. #x7264)	; &M-38943; [82-68]
-    (=daikanwa		. 38943)	; &I-M-38943;
-    (=jef-china3	. #x67D1)	; &I-JC3-67D1;
     (->Large-Seal
      ((=ucs		  . #x21966)	; 𡥦
       (=daikanwa	  . 06982)	; &I-M-06982;
@@ -7905,13 +8071,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=daikanwa		. 38944)	; &M-38944;
     (<-Large-Seal
      ((=ks-x1001	  . #x616A)	; &M-38842; [65-74]
       (=daikanwa	  . 38842)	; &I-M-38842;
       ))
     (<-Large-Seal*sources
      yupian daikanwa)
-    (=daikanwa		. 38944)	; &M-38944;
     ))
 (define-char
   '((morohashi-daikanwa	38944 0 3)
@@ -8004,15 +8170,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=jis-x0212		. #x6158)	; &M-38947; [65-56]
+    (=daikanwa		. 38947)	; &I-M-38947;
+    (=ucs@jis		. #x9034)	; &M-38947;
     (<-synonyms
      ((=ucs		  . #x71ED)	; 燭
       (=daikanwa	  . 19480)	; &I-M-19480;
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng chuci chuci-buzhu daikanwa)
-    (=jis-x0212		. #x6158)	; &M-38947; [65-56]
-    (=daikanwa		. 38947)	; &I-M-38947;
-    (=ucs@jis		. #x9034)	; &M-38947;
     (->formed
      ((=ucs		  . #x8DA0)	; 趠
       (=daikanwa	  . 37192)	; &I-M-37192;
@@ -8051,12 +8217,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (<-same
-     ((=ucs		  . #x9997)	; 馗
-      (=daikanwa	  . 44492)	; &I-M-44492;
-      ))
-    (<-same*sources
-     jiyun daikanwa)
     (shinjigen-2	. 8303)
     (=jis-x0208		. #x6D7C)	; &GT-52206; [77-92]
     (=ks-x1001		. #x5030)	; &I-K0-5030; [48-16]
@@ -8064,6 +8224,12 @@
     (=gt-pj-1		. #x6D7C)	; &I-GT-52206; [77-92]
     (=daikanwa		. 38948)	; &I-M-38948;
     (=ucs@jis		. #x9035)	; &GT-52206;
+    (<-same
+     ((=ucs		  . #x9997)	; 馗
+      (=daikanwa	  . 44492)	; &I-M-44492;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -8131,10 +8297,22 @@
     (=cns11643-1	. #x6251)	; &C1-6251; [66-49]
     ))
 (define-char
-  '((=>ucs		. #x9037)	; 逷
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 8)
+    (=ucs		. #x9037)	; 逷
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9037)	; 逷
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=jis-x0212		. #x6159)	; &M-38950; [65-57]
+    (=jis-x0213-2-2000	. #x7979)	; &I-JX2-7979; [89-89]
+    (=daikanwa		. 38950)	; &I-M-38950;
+    (=jef-china3	. #x67D4)	; &I-JC3-67D4;
+    (=ucs@jis		. #x9037)	; &M-38950;
     (<-ancient
      ((=jis-x0208	  . #x6D78)	; &GT-52140; [77-88]
       (=daikanwa	  . 38886)	; &I-M-38886;
@@ -8149,25 +8327,24 @@
       ))
     (<-synonyms@p1/s3*sources
      hanshu huainanzi daikanwa)
-    (=jis-x0212		. #x6159)	; &M-38950; [65-57]
-    (=jis-x0213-2-2000	. #x7979)	; &I-JX2-7979; [89-89]
-    (=daikanwa		. 38950)	; &I-M-38950;
-    (=ucs@jis		. #x9037)	; &M-38950;
     ))
 (define-char
-  '((=>ucs		. #x9037)	; 逷
-    (morohashi-daikanwa	38950 0 2)
+  '((<-denotational
+     ((=ucs		  . #x9037)	; 逷
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=cns11643-3	. #x3F56)	; &C3-3F56; [31-54]
+    (total-strokes	 . 11)
+    (=ucs@unicode	. #x9037)	; &UU+9037;
     ))
 (define-char
-  '((morohashi-daikanwa	38950 0 3)
+  '((<-denotational
+     ((=ucs		  . #x9037)	; 逷
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=ucs		. #x9037)	; 逷
+    (total-strokes	 . 12)
+    (=cns11643-3	. #x3F56)	; &C3-3F56; [31-54]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -8183,18 +8360,18 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (<-synonyms
-     ((=ucs		  . #x8EFC)	; 軼
-      (=daikanwa	  . 38275)	; &I-M-38275;
-      ))
-    (<-synonyms*sources
-     kangxi daikanwa)
     (shinjigen-1	. 8301)
     (=ucs		. #xFA67)	; 逸
     (=ks-x1001		. #x6C6F)	; &I-K0-6C6F; [76-79]
     (=jis-x0213-1-2000	. #x7C59)	; &I-JX1-7C59; [92-57]
     (=daikanwa		. 38951)	; &I-M-38951;
     (=ucs@ks		. #x9038)	; 逸
+    (<-synonyms
+     ((=ucs		  . #x8EFC)	; 軼
+      (=daikanwa	  . 38275)	; &I-M-38275;
+      ))
+    (<-synonyms*sources
+     kangxi daikanwa)
     (->ancient
      ((=daikanwa	  . 19791)	; &M-19791;
       ))
@@ -8226,36 +8403,35 @@
   '((<-denotational
      ((=ucs		  . #x9038)	; 逸
       ))
-    (morohashi-daikanwa	38951 1)
-    (ideographic-radical . 162)	; ⾡
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA67)	; 逸
-      (=jis-x0213-1-2000  . #x7C59)	; &I-JX1-7C59; [92-57]
-      ))
-    (shinjigen-1	. 8300)
-    (=jis-x0208		. #x306F)	; &GT-52065; [16-79]
-    (=gt		. 52065)	; &I-GT-52065;
-    (=gt-pj-1		. #x306F)	; &I-GT-52065; [16-79]
-    (=ucs@jis		. #x9038)	; &GT-52065;
-    (mojikyo		. 050514)	; &MCS-6000C552;
-    ))
-(define-char
-  '((=>ucs		. #x9038)	; 逸
-    (morohashi-daikanwa	38951 1 1)
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (mojikyo		. 055104)	; &MCS-6000D740;
+    (total-strokes	 . 11)
+    (mojikyo		. 077259)	; &MCS-60012DCB;
     ))
 (define-char
-  '((=>ucs		. #x9038)	; 逸
-    (morohashi-daikanwa	38951 1 3)
+  '((<-denotational
+     ((=ucs		  . #x9038)	; 逸
+      ))
     (ideographic-radical . 162)	; ⾡
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (mojikyo		. 077259)	; &MCS-60012DCB;
+    (->subsumptive
+     ((morohashi-daikanwa	38951 1)
+      (ideographic-strokes . 8)
+      (total-strokes	   . 11)
+      (shinjigen-1	  . 8300)
+      (=jis-x0208	  . #x306F)	; &GT-52065; [16-79]
+      (=gt		  . 52065)	; &I-GT-52065;
+      (=gt-pj-1		  . #x306F)	; &I-GT-52065; [16-79]
+      (=ucs@jis		  . #x9038)	; &GT-52065;
+      (mojikyo		  . 050514)	; &MCS-6000C552;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #xFA67)	; 逸
+	(=jis-x0213-1-2000  . #x7C59)	; &I-JX1-7C59; [92-57]
+	))
+      )
+     ((ideographic-strokes . 7)
+      (total-strokes	   . 10)
+      (mojikyo		  . 055104)	; &MCS-6000D740;
+      ))
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -8268,10 +8444,10 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=daikanwa		. 38953)	; &M-38953;
     (<-ancient
      ((=ucs		  . #x8F15)	; 輕
       ))
-    (=daikanwa		. 38953)	; &M-38953;
     ))
 (define-char
   '((morohashi-daikanwa	38953 0 2)
@@ -8284,13 +8460,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=daikanwa		. 38954)	; &M-38954;
     (<-ancient
      ((=ks-x1001	  . #x6244)	; &GT-52349; [66-36]
       (=daikanwa	  . 38985)	; &I-M-38985;
       ))
     (<-ancient*sources
      jiyun daikanwa)
-    (=daikanwa		. 38954)	; &M-38954;
     ))
 (define-char
   '((morohashi-daikanwa	38954 0 3)
@@ -8303,12 +8479,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=daikanwa		. 38955)	; &M-38955;
     (<-ancient
      ((=daikanwa	  . 10073)	; &M-10073;
       ))
     (<-ancient*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 38955)	; &M-38955;
     ))
 (define-char
   '((morohashi-daikanwa	38955 0 2)
@@ -8321,13 +8497,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=daikanwa		. 38956)	; &M-38956;
     (<-vulgar
      ((=ks-x1001	  . #x4E26)	; &M-39002; [46-06]
       (=daikanwa	  . 39002)	; &I-M-39002;
       ))
     (<-vulgar*sources
      kangxi daikanwa)
-    (=daikanwa		. 38956)	; &M-38956;
     ))
 (define-char
   '((morohashi-daikanwa	38956 0 2)
@@ -8457,12 +8633,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=daikanwa		. 38965)	; &M-38965;
     (<-same
      ((=daikanwa	  . 38757)	; &M-38757;
       ))
     (<-same*sources
      yupian daikanwa)
-    (=daikanwa		. 38965)	; &M-38965;
     ))
 (define-char
   '((morohashi-daikanwa	38965 0 2)
@@ -8488,13 +8664,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=daikanwa		. 38967)	; &M-38967;
     (<-same
      ((=ks-x1001	  . #x7468)	; &M-17695; [84-72]
       (=daikanwa	  . 17695)	; &I-M-17695;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 38967)	; &M-38967;
     ))
 (define-char
   '((morohashi-daikanwa	38967 0 5)
@@ -8515,13 +8691,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=daikanwa		. 38968)	; &M-38968;
     (<-same
      ((=ucs		  . #x7531)	; 由
       (=daikanwa	  . 21724)	; &I-M-21724;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 38968)	; &M-38968;
     ))
 (define-char
   '((<-denotational
@@ -8545,6 +8721,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=daikanwa		. 38969)	; &M-38969;
     (<-same
      ((=jis-x0208@1978	  . #x6D6C)	; &M-38795; [77-76]
       (=ks-x1001	  . #x6E68)	; &I-K0-6E68; [78-72]
@@ -8552,7 +8729,6 @@
       ))
     (<-same*sources
      pianhai-leibian daikanwa)
-    (=daikanwa		. 38969)	; &M-38969;
     ))
 (define-char
   '((morohashi-daikanwa	38969 0 3)
@@ -8573,13 +8749,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (=daikanwa		. 38970)	; &M-38970;
     (<-same
      ((=ks-x1001	  . #x616A)	; &M-38842; [65-74]
       (=daikanwa	  . 38842)	; &I-M-38842;
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38970)	; &M-38970;
     ))
 (define-char
   '((<-denotational
@@ -8625,11 +8801,11 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (->subsumptive
-     ((<-formed
+     ((=jis-x0208	  . #x6D7D)	; &J90-6D7D; [77-93]
+      (=ucs@jis		  . #x9039)	; &J90-6D7D;
+      (<-formed
        ((=jis-x0208	    . #x4323)	; &GT-52255; [35-03]
 	))
-      (=jis-x0208	  . #x6D7D)	; &J90-6D7D; [77-93]
-      (=ucs@jis		  . #x9039)	; &J90-6D7D;
       )
      ((=gt		  . 52256)	; &GT-52256;
       (=gt-pj-1		  . #x6D7D)	; &GT-52256; [77-93]
@@ -8733,13 +8909,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 38974)	; &M-38974;
     (<-ancient
      ((=ucs		  . #x52D5)	; 動
       (=daikanwa	  . 02390)	; &I-M-02390;
       ))
     (<-ancient*sources
      yupian daikanwa)
-    (=daikanwa		. 38974)	; &M-38974;
     ))
 (define-char
   '((morohashi-daikanwa	38974 0 2)
@@ -8752,13 +8928,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 38975)	; &M-38975;
     (<-same
      ((=ks-x1001	  . #x5433)	; &M-39010; [52-19]
       (=daikanwa	  . 39010)	; &I-M-39010;
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38975)	; &M-38975;
     ))
 (define-char
   '((morohashi-daikanwa	38975 0 2)
@@ -8875,12 +9051,12 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 38979)	; &M-38979;
     (<-same
      ((=daikanwa	  . 38787)	; &M-38787;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 38979)	; &M-38979;
     ))
 (define-char
   '((<-denotational
@@ -8912,6 +9088,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 38980)	; &M-38980;
     (<-ancient
      ((=jis-x0208	  . #x6E2E)	; &GT-56259; [78-14]
       (=ks-x1001	  . #x624B)	; &I-K0-624B; [66-43]
@@ -8919,7 +9096,6 @@
       ))
     (<-ancient*sources
      jiyun daikanwa)
-    (=daikanwa		. 38980)	; &M-38980;
     ))
 (define-char
   '((<-denotational
@@ -8944,6 +9120,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 38981)	; &M-38981;
     (<-formed
      ((=jis-x0212	  . #x614E)	; &M-38872; [65-46]
       (=jis-x0213-2-2000  . #x7978)	; &I-JX2-7978; [89-88]
@@ -8956,7 +9133,6 @@
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38981)	; &M-38981;
     ))
 (define-char
   '((morohashi-daikanwa	38981 0 2)
@@ -8978,14 +9154,14 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=jis-x0208@1978	. #x465B)	; &M-38982; [38-59]
+    (=ks-x1001		. #x546D)	; &I-K0-546D; [52-77]
+    (=daikanwa		. 38982)	; &I-M-38982;
     (<-same
      ((=daikanwa	  . 38983)	; &M-38983;
       ))
     (<-same*sources
      jinshu-yinyi daikanwa)
-    (=jis-x0208@1978	. #x465B)	; &M-38982; [38-59]
-    (=ks-x1001		. #x546D)	; &I-K0-546D; [52-77]
-    (=daikanwa		. 38982)	; &I-M-38982;
     ))
 (define-char
   '((<-denotational
@@ -9016,13 +9192,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 38983)	; &M-38983;
     (<-same
      ((=ucs		  . #x280A6)	; 𨂦
       (=daikanwa	  . 37692)	; &I-M-37692;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 38983)	; &M-38983;
     ))
 (define-char
   '((morohashi-daikanwa	38983 0 2)
@@ -9032,31 +9208,41 @@
     (=cns11643-6	. #x5930)	; &C6-5930; [57-16]
     ))
 (define-char
-  '((=>ucs		. #x28522)	; 𨔢
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 9)
+    (=ucs		. #x28522)	; 𨔢
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x28522)	; 𨔢
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 38984)	; &M-38984;
     (<-same
      ((=daikanwa	  . 09567)	; &M-09567;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 38984)	; &M-38984;
     ))
 (define-char
-  '((=>ucs		. #x28522)	; 𨔢
-    (morohashi-daikanwa	38984 0 2)
+  '((<-denotational
+     ((=ucs		  . #x28522)	; 𨔢
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=cns11643-4	. #x4131)	; &C4-4131; [33-17]
+    (total-strokes	 . 12)
+    (=ucs@iso		. #x28522)	; &U-00028522;
     ))
 (define-char
-  '((morohashi-daikanwa	38984 0 3)
+  '((<-denotational
+     ((=ucs		  . #x28522)	; 𨔢
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=ucs		. #x28522)	; 𨔢
+    (total-strokes	 . 13)
+    (=cns11643-4	. #x4131)	; &C4-4131; [33-17]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -9071,11 +9257,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (<-synonyms
-     ((=daikanwa	  . 40921)	; &M-40921;
-      ))
-    (<-synonyms*sources
-     shuowen-tongxundingsheng zhouli daikanwa)
     (=ks-x1001		. #x6244)	; &GT-52349; [66-36]
     (=gt		. 52349)	; &I-GT-52349;
     (=gt-k		. 10928)	; &I-GT-K10928;
@@ -9083,6 +9264,11 @@
     (=daikanwa		. 38985)	; &I-M-38985;
     (=jef-china3	. #x67D8)	; &I-JC3-67D8;
     (=ucs@ks		. #x9042)	; &GT-52349;
+    (<-synonyms
+     ((=daikanwa	  . 40921)	; &M-40921;
+      ))
+    (<-synonyms*sources
+     shuowen-tongxundingsheng zhouli daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -9201,16 +9387,16 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=jis-x0212		. #x615C)	; &M-38988; [65-60]
+    (=jis-x0213-2-2000	. #x797C)	; &I-JX2-797C; [89-92]
+    (=daikanwa		. 38988)	; &I-M-38988;
+    (=ucs@jis		. #x9044)	; &M-38988;
     (<-synonyms
      ((=ucs		  . #x9853)	; 顓
       (=daikanwa	  . 43600)	; &I-M-43600;
       ))
     (<-synonyms*sources
      zhouyi daikanwa)
-    (=jis-x0212		. #x615C)	; &M-38988; [65-60]
-    (=jis-x0213-2-2000	. #x797C)	; &I-JX2-797C; [89-92]
-    (=daikanwa		. 38988)	; &I-M-38988;
-    (=ucs@jis		. #x9044)	; &M-38988;
     (->ancient
      ((=daikanwa	  . 38805)	; &M-38805;
       ))
@@ -9248,6 +9434,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 38989)	; &M-38989;
     (<-vulgar
      ((=jis-x0208	  . #x6E2F)	; &GT-52644; [78-15]
       (=ks-x1001	  . #x7240)	; &I-K0-7240; [82-32]
@@ -9255,7 +9442,6 @@
       ))
     (<-vulgar*sources
      zihui daikanwa)
-    (=daikanwa		. 38989)	; &M-38989;
     ))
 (define-char
   '((<-denotational
@@ -9274,6 +9460,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (shinjigen-1	. 8336)
+    (=jis-x0208		. #x4359)	; &GT-52258; [35-57]
+    (=gt		. 52258)	; &I-GT-52258;
+    (=gt-k		. 09100)	; &I-GT-K09100;
+    (=gt-pj-1		. #x4359)	; &I-GT-52258; [35-57]
+    (=ucs@unicode	. #x9045)	; &GT-52258;
+    (mojikyo		. 050517)	; &MCS-6000C555;
     (<-simplified@JP/Jouyou
      ((shinjigen-1	  . 8337)
       (=jis-x0208	  . #x6E2F)	; &GT-52644; [78-15]
@@ -9282,28 +9475,38 @@
       ))
     (<-simplified@JP/Jouyou*sources
      zihui daikanwa shinjigen-1)
-    (shinjigen-1	. 8336)
-    (=jis-x0208		. #x4359)	; &GT-52258; [35-57]
-    (=gt		. 52258)	; &I-GT-52258;
-    (=gt-k		. 09100)	; &I-GT-K09100;
-    (=gt-pj-1		. #x4359)	; &I-GT-52258; [35-57]
-    (=ucs@unicode	. #x9045)	; &GT-52258;
-    (mojikyo		. 050517)	; &MCS-6000C555;
     ))
 (define-char
-  '((=>ucs		. #x9046)	; 遆
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 9)
+    (=ucs		. #x9046)	; 遆
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9046)	; 遆
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=daikanwa		. 38990)	; &M-38990;
     ))
 (define-char
-  '((morohashi-daikanwa	38990 0 2)
+  '((<-denotational
+     ((=ucs		  . #x9046)	; 遆
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (=ucs@unicode	. #x9046)	; &UU+9046;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9046)	; 遆
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs		. #x9046)	; 遆
-    (=cns11643-3	. #x447A)	; &I-C3-447A; [36-90]
+    (=cns11643-3	. #x447A)	; &C3-447A; [36-90]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -9318,14 +9521,14 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=ks-x1001		. #x6967)	; &M-38991; [73-71]
+    (=daikanwa		. 38991)	; &I-M-38991;
     (<-synonyms
      ((=ucs		  . #x611A)	; 愚
       (=daikanwa	  . 10946)	; &I-M-10946;
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng maoshi jingdian-shiwen daikanwa)
-    (=ks-x1001		. #x6967)	; &M-38991; [73-71]
-    (=daikanwa		. 38991)	; &I-M-38991;
     ))
 (define-char
   '((<-denotational
@@ -9397,12 +9600,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (<-same
-     ((=ucs		  . #x5075)	; 偵
-      (=daikanwa	  . 00898)	; &I-M-00898;
-      ))
-    (<-same*sources
-     zhengzitong daikanwa)
     (shinjigen-1	. 8339)
     (shinjigen-2	. 8339)
     (=jis-x0208		. #x6E26)	; &GT-52377; [78-06]
@@ -9410,6 +9607,12 @@
     (=gt-pj-1		. #x6E26)	; &I-GT-52377; [78-06]
     (=daikanwa		. 38993)	; &I-M-38993;
     (=ucs@jis		. #x9049)	; &GT-52377;
+    (<-same
+     ((=ucs		  . #x5075)	; 偵
+      (=daikanwa	  . 00898)	; &I-M-00898;
+      ))
+    (<-same*sources
+     zhengzitong daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -9442,6 +9645,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=ks-x1001		. #x6B34)	; &M-38994; [75-20]
+    (=daikanwa		. 38994)	; &I-M-38994;
+    (=jef-china3	. #x67DB)	; &I-JC3-67DB;
     (<-same
      ((=jis-x0208	  . #x5E62)	; &GT-22881; [62-66]
       (=ks-x1001	  . #x6A7D)	; &I-K0-6A7D; [74-93]
@@ -9456,9 +9662,6 @@
       ))
     (<-synonyms*sources
      maoshi daikanwa)
-    (=ks-x1001		. #x6B34)	; &M-38994; [75-20]
-    (=daikanwa		. 38994)	; &I-M-38994;
-    (=jef-china3	. #x67DB)	; &I-JC3-67DB;
     ))
 (define-char
   '((<-denotational
@@ -9488,12 +9691,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 38995)	; &M-38995;
     (<-vulgar
      ((=daikanwa	  . 39079)	; &M-39079;
       ))
     (<-vulgar*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 38995)	; &M-38995;
     ))
 (define-char
   '((morohashi-daikanwa	38995 0 2)
@@ -9507,6 +9710,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 38996)	; &M-38996;
     (<-ancient
      ((=ucs		  . #x6D25)	; æ´¥
       (=daikanwa	  . 17396)	; &I-M-17396;
@@ -9518,7 +9722,6 @@
       ))
     (<-same*sources
      kangxi daikanwa)
-    (=daikanwa		. 38996)	; &M-38996;
     ))
 (define-char
   '((morohashi-daikanwa	38996 0 2)
@@ -9556,14 +9759,14 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=ks-x1001		. #x6A21)	; &M-38998; [74-01]
+    (=daikanwa		. 38998)	; &I-M-38998;
     (<-synonyms
      ((=ucs		  . #x6688)	; 暈
       (=daikanwa	  . 14037)	; &I-M-14037;
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng zhouli-zhu jingdian-shiwen daikanwa)
-    (=ks-x1001		. #x6A21)	; &M-38998; [74-01]
-    (=daikanwa		. 38998)	; &I-M-38998;
     ))
 (define-char
   '((<-denotational
@@ -9594,13 +9797,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 38999)	; &M-38999;
     (<-ancient
      ((=ks-x1001	  . #x6A21)	; &M-38998; [74-01]
       (=daikanwa	  . 38998)	; &I-M-38998;
       ))
     (<-ancient*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 38999)	; &M-38999;
     ))
 (define-char
   '((morohashi-daikanwa	38999 0 2)
@@ -9621,14 +9824,14 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=jis-x0212		. #x615D)	; &M-39000; [65-61]
+    (=daikanwa		. 39000)	; &I-M-39000;
+    (=ucs@jis		. #x904C)	; &M-39000;
     (<-same
      ((=daikanwa	  . 39136)	; &M-39136;
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=jis-x0212		. #x615D)	; &M-39000; [65-61]
-    (=daikanwa		. 39000)	; &I-M-39000;
-    (=ucs@jis		. #x904C)	; &M-39000;
     ))
 (define-char
   '((<-denotational
@@ -9660,6 +9863,8 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=ks-x1001		. #x783C)	; &M-39001; [88-28]
+    (=daikanwa		. 39001)	; &I-M-39001;
     (<-same
      ((=jis-x0212	  . #x3D30)	; &M-10174; [29-16]
       (=cns11643-3	  . #x3B4B)	; &I-C3-3B4B; [27-43]
@@ -9668,8 +9873,6 @@
       ))
     (<-same*sources
      jiyun yinkeng-shi daikanwa)
-    (=ks-x1001		. #x783C)	; &M-39001; [88-28]
-    (=daikanwa		. 39001)	; &I-M-39001;
     ))
 (define-char
   '((<-denotational
@@ -9715,17 +9918,18 @@
 (define-char
   '((<-denotational
      ((=big5		  . #xB94C)	; &B-B94C;
+      (=jis-x0208@1997	  . #x3261)	; &B-B94C; [18-65]
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=ks-x1001		. #x4E26)	; &M-39002; [46-06]
+    (=daikanwa		. 39002)	; &I-M-39002;
     (<-synonyms
      ((=daikanwa	  . 28421)	; &M-28421;
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng jiyun shiji shiji-sanjiazhu daikanwa)
-    (=ks-x1001		. #x4E26)	; &M-39002; [46-06]
-    (=daikanwa		. 39002)	; &I-M-39002;
     ))
 (define-char
   '((<-denotational
@@ -9750,6 +9954,7 @@
 (define-char
   '((<-denotational
      ((=big5		  . #xB94C)	; &B-B94C;
+      (=jis-x0208@1997	  . #x3261)	; &B-B94C; [18-65]
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
@@ -9759,6 +9964,7 @@
 (define-char
   '((<-denotational
      ((=big5		  . #xB94C)	; &B-B94C;
+      (=jis-x0208@1997	  . #x3261)	; &B-B94C; [18-65]
       ))
     (morohashi-daikanwa	39002 1)
     (ideographic-radical . 162)	; ⾡
@@ -9775,13 +9981,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 39003)	; &M-39003;
     (<-same
      ((=jis-x0212	  . #x6155)	; &M-38929; [65-53]
       (=daikanwa	  . 38929)	; &I-M-38929;
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39003)	; &M-39003;
     ))
 (define-char
   '((morohashi-daikanwa	39003 0 2)
@@ -9803,17 +10009,17 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (<-synonyms
-     ((=daikanwa	  . 07165)	; &M-07165;
-      ))
-    (<-synonyms*sources
-     shuowen-tongxundingsheng maoshi jingdian-shiwen daikanwa)
     (shinjigen-2	. 8313)
     (=jis-x0208		. #x6E21)	; &GT-52306; [78-01]
     (=gt		. 52306)	; &I-GT-52306;
     (=gt-pj-1		. #x6E21)	; &I-GT-52306; [78-01]
     (=daikanwa		. 39004)	; &I-M-39004;
     (=ucs@jis		. #x904F)	; &GT-52306;
+    (<-synonyms
+     ((=daikanwa	  . 07165)	; &M-07165;
+      ))
+    (<-synonyms*sources
+     shuowen-tongxundingsheng maoshi jingdian-shiwen daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -9847,12 +10053,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (<-synonyms
-     ((=ucs		  . #x7455)	; 瑕
-      (=daikanwa	  . 21120)	; &I-M-21120;
-      ))
-    (<-synonyms*sources
-     jiyun daikanwa)
     (shinjigen-1	. 8320)
     (shinjigen-2	. 8320)
     (=jis-x0208		. #x6E22)	; &GT-52321; [78-02]
@@ -9862,6 +10062,12 @@
     (=gt-pj-1		. #x6E22)	; &I-GT-52321; [78-02]
     (=daikanwa		. 39005)	; &I-M-39005;
     (=ucs@jis		. #x9050)	; &GT-52321;
+    (<-synonyms
+     ((=ucs		  . #x7455)	; 瑕
+      (=daikanwa	  . 21120)	; &I-M-21120;
+      ))
+    (<-synonyms*sources
+     jiyun daikanwa)
     (->formed
      ((=ucs		  . #x5FA6)	; 徦
       (=daikanwa	  . 10173)	; &I-M-10173;
@@ -9901,12 +10107,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (<-synonyms
-     ((=ucs		  . #x7687)	; 皇
-      (=daikanwa	  . 22701)	; &I-M-22701;
-      ))
-    (<-synonyms*sources
-     maoshi zuoshi-zhuan daikanwa)
     (shinjigen-2	. 8325)
     (=jis-x0208		. #x6E23)	; &GT-52330; [78-03]
     (=ks-x1001		. #x7C5A)	; &I-K0-7C5A; [92-58]
@@ -9914,6 +10114,12 @@
     (=gt-pj-1		. #x6E23)	; &I-GT-52330; [78-03]
     (=daikanwa		. 39006)	; &I-M-39006;
     (=ucs@jis		. #x9051)	; &GT-52330;
+    (<-synonyms
+     ((=ucs		  . #x7687)	; 皇
+      (=daikanwa	  . 22701)	; &I-M-22701;
+      ))
+    (<-synonyms*sources
+     maoshi zuoshi-zhuan daikanwa)
     (->formed
      ((=ucs		  . #x5FA8)	; 徨
       (=daikanwa	  . 10178)	; &I-M-10178;
@@ -9944,12 +10150,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 39007)	; &M-39007;
     (<-same
      ((=daikanwa	  . 10180)	; &M-10180;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 39007)	; &M-39007;
     ))
 (define-char
   '((morohashi-daikanwa	39007 0 2)
@@ -9972,7 +10178,12 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (->subsumptive
-     ((<-same
+     ((shinjigen-1	  . 8326)
+      (shinjigen-2	  . 8326)
+      (=jis-x0208@1978	  . #x6E24)	; &M-39008; [78-04]
+      (=jis-x0208@1983	  . #x6E24)	; &I-J83-6E24; [78-04]
+      (=daikanwa	  . 39008)	; &I-M-39008;
+      (<-same
        ((=jis-x0208@1978    . #x6E25)	; &M-38874; [78-05]
 	(=jis-x0208@1983    . #x6E25)	; &I-J83-6E25; [78-05]
 	(=daikanwa	    . 38874)	; &I-M-38874;
@@ -9984,11 +10195,6 @@
 	))
       (<-synonyms*sources
        shuowen-tongxundingsheng shangshu daikanwa)
-      (shinjigen-1	  . 8326)
-      (shinjigen-2	  . 8326)
-      (=jis-x0208@1978	  . #x6E24)	; &M-39008; [78-04]
-      (=jis-x0208@1983	  . #x6E24)	; &I-J83-6E24; [78-04]
-      (=daikanwa	  . 39008)	; &I-M-39008;
       )
      ((=jis-x0208@1990	  . #x6E24)	; &GT-52341; [78-04]
       (=gt		  . 52341)	; &I-GT-52341;
@@ -10046,15 +10252,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=ks-x1001		. #x5433)	; &M-39010; [52-19]
+    (=daikanwa		. 39010)	; &I-M-39010;
+    (=jef-china3	. #x67DF)	; &I-JC3-67DF;
     (<-synonyms
      ((=ks-x1001	  . #x5374)	; &M-07465; [51-84]
       (=daikanwa	  . 07465)	; &I-M-07465;
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng lunyu jingdian-shiwen dadaili dadaili-zhu daikanwa)
-    (=ks-x1001		. #x5433)	; &M-39010; [52-19]
-    (=daikanwa		. 39010)	; &I-M-39010;
-    (=jef-china3	. #x67DF)	; &I-JC3-67DF;
     ))
 (define-char
   '((<-denotational
@@ -10096,6 +10302,8 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=ks-x1001		. #x5339)	; &M-39011; [51-25]
+    (=daikanwa		. 39011)	; &I-M-39011;
     (<-same
      ((=daikanwa	  . 01179)	; &M-01179;
       ))
@@ -10107,8 +10315,6 @@
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng zhouli daikanwa)
-    (=ks-x1001		. #x5339)	; &M-39011; [51-25]
-    (=daikanwa		. 39011)	; &I-M-39011;
     (->formed
      ((=jis-x0212	  . #x6136)	; &M-38717; [65-22]
       (=daikanwa	  . 38717)	; &I-M-38717;
@@ -10148,6 +10354,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 39012)	; &M-39012;
     (<-original
      ((=ks-x1001	  . #x5339)	; &M-39011; [51-25]
       (=daikanwa	  . 39011)	; &I-M-39011;
@@ -10158,7 +10365,6 @@
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39012)	; &M-39012;
     ))
 (define-char
   '((morohashi-daikanwa	39012 0 9)
@@ -10212,13 +10418,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 39015)	; &M-39015;
     (<-same
      ((=jis-x0212	  . #x614A)	; &M-38837; [65-42]
       (=daikanwa	  . 38837)	; &I-M-38837;
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39015)	; &M-39015;
     ))
 (define-char
   '((morohashi-daikanwa	39015 0 2)
@@ -10231,13 +10437,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 39016)	; &M-39016;
     (<-Large-Seal
      ((=ks-x1001	  . #x616A)	; &M-38842; [65-74]
       (=daikanwa	  . 38842)	; &I-M-38842;
       ))
     (<-Large-Seal*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39016)	; &M-39016;
     ))
 (define-char
   '((morohashi-daikanwa	39016 0 2)
@@ -10247,42 +10453,55 @@
     (=cns11643-6	. #x5942)	; &C6-5942; [57-34]
     ))
 (define-char
-  '((=>daikanwa		. 39017)	; &M-39017;
-    (ideographic-radical . 162)	; ⾡
+  '((ideographic-radical . 162)	; ⾡
     (=ucs		. #x2852F)	; 𨔯
-    (->subsumptive
-     ((ideographic-strokes . 9)
-      (total-strokes	   . 13)
-      (<-same
-       ((=jis-x0212	    . #x3D30)	; &M-10174; [29-16]
-	(=cns11643-3	    . #x3B4B)	; &I-C3-3B4B; [27-43]
-	(=jis-x0213-1-2000  . #x7442)	; &I-JX1-7442; [84-34]
-	(=daikanwa	    . 10174)	; &I-M-10174;
-	))
-      (<-same*sources
-       xiyun daikanwa)
-      (=daikanwa	  . 39017)	; &M-39017;
-      )
-     ((ideographic-strokes . 9)
-      (total-strokes	   . 12)
-      (=ucs@iso		  . #x2852F)	; &U-0002852F;
-      )
-     ((ideographic-strokes . 8)
-      (total-strokes	   . 12)
-      (=cns11643-5	  . #x3C7A)	; &C5-3C7A; [28-90]
-      ))
     ))
 (define-char
-  '((=>ucs		. #x28530)	; 𨔰
-    (ideographic-radical . 162)	; ⾡
+  '((<-denotational
+     ((=ucs		  . #x2852F)	; 𨔯
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=daikanwa		. 39017)	; &M-39017;
+    (<-same
+     ((=jis-x0212	  . #x3D30)	; &M-10174; [29-16]
+      (=cns11643-3	  . #x3B4B)	; &I-C3-3B4B; [27-43]
+      (=jis-x0213-1-2000  . #x7442)	; &I-JX1-7442; [84-34]
+      (=daikanwa	  . 10174)	; &I-M-10174;
+      ))
+    (<-same*sources
+     xiyun daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2852F)	; 𨔯
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (=ucs@iso		. #x2852F)	; &U-0002852F;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2852F)	; 𨔯
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=cns11643-5	. #x3C7A)	; &C5-3C7A; [28-90]
+    ))
+(define-char
+  '((=>ucs		. #x28530)	; 𨔰
+    (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 39018)	; &M-39018;
     (<-ancient
      ((=daikanwa	  . 39123)	; &M-39123;
       ))
     (<-ancient*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39018)	; &M-39018;
     ))
 (define-char
   '((morohashi-daikanwa	39018 0 2)
@@ -10296,13 +10515,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 39019)	; &M-39019;
     (<-ancient
      ((=ks-x1001	  . #x6244)	; &GT-52349; [66-36]
       (=daikanwa	  . 38985)	; &I-M-38985;
       ))
     (<-ancient*sources
      yupian daikanwa)
-    (=daikanwa		. 39019)	; &M-39019;
     ))
 (define-char
   '((morohashi-daikanwa	39019 0 2)
@@ -10315,13 +10534,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 39020)	; &M-39020;
     (<-ancient
      ((=ks-x1001	  . #x6244)	; &GT-52349; [66-36]
       (=daikanwa	  . 38985)	; &I-M-38985;
       ))
     (<-ancient*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39020)	; &M-39020;
     ))
 (define-char
   '((morohashi-daikanwa	39020 0 2)
@@ -10366,13 +10585,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 39024)	; &M-39024;
     (<-same
      ((=ks-x1001	  . #x7C3D)	; &M-39174; [92-29]
       (=daikanwa	  . 39174)	; &I-M-39174;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39024)	; &M-39024;
     ))
 (define-char
   '((morohashi-daikanwa	39024 0 2)
@@ -10385,6 +10604,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 39025)	; &M-39025;
     (<-same
      ((=jis-x0208	  . #x547E)	; &GT-07573; [52-94]
       (=cns11643-1	  . #x6845)	; &I-C1-6845; [72-37]
@@ -10392,7 +10612,6 @@
       ))
     (<-same*sources
      wuyin-pianhai daikanwa)
-    (=daikanwa		. 39025)	; &M-39025;
     ))
 (define-char
   '((morohashi-daikanwa	39025 0 2)
@@ -10405,6 +10624,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 39026)	; &M-39026;
     (<-same
      ((=jis-x0208	  . #x6E2A)	; &GT-52470; [78-10]
       (=ks-x1001	  . #x7476)	; &I-K0-7476; [84-86]
@@ -10412,7 +10632,6 @@
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39026)	; &M-39026;
     ))
 (define-char
   '((morohashi-daikanwa	39026 0 2)
@@ -10425,13 +10644,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=daikanwa		. 39027)	; &M-39027;
     (<-same
      ((=ucs		  . #x8D74)	; èµ´
       (=daikanwa	  . 37040)	; &I-M-37040;
       ))
     (<-same*sources
      wuyin-pianhai daikanwa)
-    (=daikanwa		. 39027)	; &M-39027;
     ))
 (define-char
   '((morohashi-daikanwa	39027 0 2)
@@ -10499,6 +10718,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (shinjigen-1	. 8359)
+    (=jis-x0208@1978	. #x6E29)	; &M-39031; [78-09]
+    (=daikanwa		. 39031)	; &I-M-39031;
     (<-synonyms
      ((=jis-x0208	  . #x6D70)	; &GT-51977; [77-80]
       (=ks-x1001	  . #x7D31)	; &I-K0-7D31; [93-17]
@@ -10506,9 +10728,6 @@
       ))
     (<-synonyms*sources
      maoshi daikanwa)
-    (shinjigen-1	. 8359)
-    (=jis-x0208@1978	. #x6E29)	; &M-39031; [78-09]
-    (=daikanwa		. 39031)	; &I-M-39031;
     ))
 (define-char
   '((<-denotational
@@ -10547,6 +10766,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=daikanwa		. 39032)	; &M-39032;
     (<-Large-Seal
      ((=jis-x0208	  . #x6D79)	; &GT-52157; [77-89]
       (=ks-x1001	  . #x7867)	; &I-K0-7867; [88-71]
@@ -10554,7 +10774,6 @@
       ))
     (<-Large-Seal*sources
      yupian daikanwa)
-    (=daikanwa		. 39032)	; &M-39032;
     ))
 (define-char
   '((morohashi-daikanwa	39032 0 2)
@@ -10567,12 +10786,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=daikanwa		. 39033)	; &M-39033;
     (<-vulgar
      ((=daikanwa	  . 39123)	; &M-39123;
       ))
     (<-vulgar*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39033)	; &M-39033;
     ))
 (define-char
   '((morohashi-daikanwa	39033 0 2)
@@ -10694,65 +10913,93 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified@JP
-     ((=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]
-      (=daikanwa	  . 39035)	; &I-M-39035;
-      ))
     (=jis-x0208@1983	. #x4D5A)	; &GT-52297; [45-58]
     (=jis-x0208@1990	. #x4D5A)	; &I-J90-4D5A; [45-58]
     (=gt		. 52297)	; &I-GT-52297;
     (=gt-k		. 09156)	; &I-GT-K09156;
     (=gt-pj-1		. #x4D5A)	; &I-GT-52297; [45-58]
     (=ucs@jis		. #x9065)	; &GT-52297;
+    (<-simplified@JP/jis
+     ((=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]
+      (=daikanwa	  . 39035)	; &I-M-39035;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 10)
+    (=ucs		. #x905A)	; 遚
     ))
 (define-char
-  '((=>ucs		. #x905A)	; 遚
+  '((<-denotational
+     ((=ucs		  . #x905A)	; 遚
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=daikanwa		. 39036)	; &M-39036;
     ))
 (define-char
-  '((morohashi-daikanwa	39036 0 2)
+  '((<-denotational
+     ((=ucs		  . #x905A)	; 遚
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs@unicode	. #x905A)	; &UU+905A;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x905A)	; 遚
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x905A)	; 遚
-    (=cns11643-3	. #x4A24)	; &I-C3-4A24; [42-04]
+    (=cns11643-3	. #x4A24)	; &C3-4A24; [42-04]
+    ))
+(define-char
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 10)
+    (=ucs		. #x905B)	; 遛
+    (=big5		. #xBBBF)	; &I-B-BBBF;
     ))
 (define-char
-  '((=>ucs		. #x905B)	; 遛
+  '((<-denotational
+     ((=ucs		  . #x905B)	; 遛
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=jis-x0212		. #x615E)	; &M-39037; [65-62]
+    (=daikanwa		. 39037)	; &I-M-39037;
+    (=jef-china3	. #x67E2)	; &I-JC3-67E2;
+    (=ucs@jis		. #x905B)	; &M-39037;
     (<-same
      ((=daikanwa	  . 39126)	; &M-39126;
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=jis-x0212		. #x615E)	; &M-39037; [65-62]
-    (=big5		. #xBBBF)	; &I-B-BBBF;
-    (=daikanwa		. 39037)	; &I-M-39037;
-    (=ucs@jis		. #x905B)	; &M-39037;
     ))
 (define-char
-  '((=>ucs		. #x905B)	; 遛
-    (morohashi-daikanwa	39037 0 2)
+  '((<-denotational
+     ((=ucs		  . #x905B)	; 遛
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=cns11643-1	. #x6B47)	; &C1-6B47; [75-39]
+    (total-strokes	 . 13)
+    (=gb2312		. #x655E)	; &G0-655E; [69-62]
+    (=ucs@unicode	. #x905B)	; &G0-655E;
     ))
 (define-char
-  '((morohashi-daikanwa	39037 0 3)
+  '((<-denotational
+     ((=ucs		  . #x905B)	; 遛
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=ucs		. #x905B)	; 遛
-    (=gb2312		. #x655E)	; &I-G0-655E; [69-62]
+    (total-strokes	 . 14)
+    (=cns11643-1	. #x6B47)	; &C1-6B47; [75-39]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -10767,15 +11014,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=jis-x0208@1978	. #x423D)	; &M-39038; [34-29]
+    (=ks-x1001		. #x6161)	; &I-K0-6161; [65-65]
+    (=daikanwa		. 39038)	; &I-M-39038;
     (<-synonyms
-     ((=ucs		  . #x613B)	; 愻
+     ((=cns11643-2	  . #x4A39)	; &M-11023; [42-25]
       (=daikanwa	  . 11023)	; &I-M-11023;
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng shangshu shangshu-zhuan daikanwa)
-    (=jis-x0208@1978	. #x423D)	; &M-39038; [34-29]
-    (=ks-x1001		. #x6161)	; &I-K0-6161; [65-65]
-    (=daikanwa		. 39038)	; &I-M-39038;
     (->formed
      ((=jis-x0208	  . #x4239)	; &GT-08784; [34-25]
       (=ks-x1001	  . #x615D)	; &I-K0-615D; [65-61]
@@ -10818,13 +11065,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=daikanwa		. 39039)	; &M-39039;
     (<-ancient
      ((=jis-x0208	  . #x567A)	; &GT-11840; [54-90]
       (=daikanwa	  . 09410)	; &I-M-09410;
       ))
     (<-ancient*sources
      zihui daikanwa)
-    (=daikanwa		. 39039)	; &M-39039;
     ))
 (define-char
   '((morohashi-daikanwa	39039 0 2)
@@ -10837,6 +11084,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=daikanwa		. 39040)	; &M-39040;
     (<-vulgar
      ((=jis-x0212	  . #x6145)	; &M-38801; [65-37]
       (=jis-x0213-1-2000  . #x7C56)	; &I-JX1-7C56; [92-54]
@@ -10844,7 +11092,6 @@
       ))
     (<-vulgar*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39040)	; &M-39040;
     ))
 (define-char
   '((morohashi-daikanwa	39040 0 2)
@@ -10857,6 +11104,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=daikanwa		. 39041)	; &M-39041;
     (<-formed
      ((=ks-x1001	  . #x7063)	; &M-38898; [80-67]
       (=daikanwa	  . 38898)	; &I-M-38898;
@@ -10867,7 +11115,6 @@
       ))
     (<-vulgar*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39041)	; &M-39041;
     ))
 (define-char
   '((morohashi-daikanwa	39041 0 2)
@@ -10896,12 +11143,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=daikanwa		. 39043)	; &M-39043;
     (<-same
      ((=daikanwa	  . 39136)	; &M-39136;
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39043)	; &M-39043;
     ))
 (define-char
   '((morohashi-daikanwa	39043 0 2)
@@ -10949,6 +11196,14 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (shinjigen-1	. 8284)
+    (shinjigen-2	. 8284)
+    (=jis-x0208		. #x6E2A)	; &GT-52470; [78-10]
+    (=ks-x1001		. #x7476)	; &I-K0-7476; [84-86]
+    (=gt		. 52470)	; &I-GT-52470;
+    (=gt-pj-1		. #x6E2A)	; &I-GT-52470; [78-10]
+    (=daikanwa		. 39045)	; &I-M-39045;
+    (=ucs@jis		. #x905E)	; &GT-52470;
     (<-formed
      ((=jis-x0208@1978	  . #x4042)	; &M-38895; [32-34]
       (=ks-x1001	  . #x6026)	; &I-K0-6026; [64-06]
@@ -10974,14 +11229,6 @@
       ))
     (<-vulgar*sources
      zhengzitong daikanwa)
-    (shinjigen-1	. 8284)
-    (shinjigen-2	. 8284)
-    (=jis-x0208		. #x6E2A)	; &GT-52470; [78-10]
-    (=ks-x1001		. #x7476)	; &I-K0-7476; [84-86]
-    (=gt		. 52470)	; &I-GT-52470;
-    (=gt-pj-1		. #x6E2A)	; &I-GT-52470; [78-10]
-    (=daikanwa		. 39045)	; &I-M-39045;
-    (=ucs@jis		. #x905E)	; &GT-52470;
     ))
 (define-char
   '((<-denotational
@@ -11011,10 +11258,19 @@
     (=cns11643-1	. #x6B44)	; &C1-6B44; [75-36]
     ))
 (define-char
-  '((=>ucs		. #x905F)	; 遟
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 10)
+    (=ucs		. #x905F)	; 遟
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x905F)	; 遟
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (shinjigen-1	. 8338)
+    (=daikanwa		. 39046)	; &M-39046;
     (<-Large-Seal
      ((=jis-x0208	  . #x6E2F)	; &GT-52644; [78-15]
       (=ks-x1001	  . #x7240)	; &I-K0-7240; [82-32]
@@ -11027,23 +11283,24 @@
       ))
     (<-same*sources
      jiyun daikanwa)
-    (shinjigen-1	. 8338)
-    (=daikanwa		. 39046)	; &M-39046;
     ))
 (define-char
-  '((=>ucs		. #x905F)	; 遟
-    (morohashi-daikanwa	39046 0 2)
+  '((<-denotational
+     ((=ucs		  . #x905F)	; 遟
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=cns11643-3	. #x4A27)	; &C3-4A27; [42-07]
+    (total-strokes	 . 13)
+    (=ucs@unicode	. #x905F)	; &UU+905F;
     ))
 (define-char
-  '((morohashi-daikanwa	39046 0 3)
+  '((<-denotational
+     ((=ucs		  . #x905F)	; 遟
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=ucs		. #x905F)	; 遟
+    (total-strokes	 . 14)
+    (=cns11643-3	. #x4A27)	; &C3-4A27; [42-07]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -11098,6 +11355,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=jis-x0208@1978	. #x414C)	; &M-39048; [33-44]
+    (=ks-x1001		. #x614F)	; &I-K0-614F; [65-47]
+    (=daikanwa		. 39048)	; &I-M-39048;
     (<-same
      ((=jis-x0213-2-2000  . #x6E71)	; &M-17777; [78-81]
       (=daikanwa	  . 17777)	; &I-M-17777;
@@ -11110,9 +11370,6 @@
       ))
     (<-synonyms*sources
      zhangxie-fu wenxuan-lishan-zhu daikanwa)
-    (=jis-x0208@1978	. #x414C)	; &M-39048; [33-44]
-    (=ks-x1001		. #x614F)	; &I-K0-614F; [65-47]
-    (=daikanwa		. 39048)	; &I-M-39048;
     ))
 (define-char
   '((<-denotational
@@ -11149,13 +11406,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=daikanwa		. 39049)	; &M-39049;
     (<-Large-Seal
      ((=ks-x1001	  . #x627B)	; &M-38803; [66-91]
       (=daikanwa	  . 38803)	; &I-M-38803;
       ))
     (<-Large-Seal*sources
      yupian daikanwa)
-    (=daikanwa		. 39049)	; &M-39049;
     ))
 (define-char
   '((<-denotational
@@ -11215,6 +11472,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=daikanwa		. 39051)	; &M-39051;
     (<-ancient
      ((=ks-x1001	  . #x5060)	; &M-03118; [48-64]
       (=cns11643-1	  . #x452F)	; &I-C1-452F; [37-15]
@@ -11222,7 +11480,6 @@
       ))
     (<-ancient*sources
      guangyun daikanwa)
-    (=daikanwa		. 39051)	; &M-39051;
     ))
 (define-char
   '((morohashi-daikanwa	39051 0 2)
@@ -11232,51 +11489,62 @@
     (=cns11643-6	. #x6338)	; &C6-6338; [67-24]
     ))
 (define-char
-  '((=>ucs		. #x9063)	; 遣
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 10)
+    (=ucs		. #x9063)	; 遣
+    (=big5		. #xBBBA)	; &I-B-BBBA;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9063)	; 遣
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=ks-x1001		. #x4C3A)	; &M-39052; [44-26]
+    (=daikanwa		. 39052)	; &I-M-39052;
+    (=jef-china3	. #x67E5)	; &I-JC3-67E5;
     (<-different
      ((=ks-x1001	  . #x6B36)	; &M-39134; [75-22]
       (=daikanwa	  . 39134)	; &I-M-39134;
       ))
-    (=ks-x1001		. #x4C3A)	; &M-39052; [44-26]
-    (=big5		. #xBBBA)	; &I-B-BBBA;
-    (=daikanwa		. 39052)	; &I-M-39052;
     ))
 (define-char
-  '((morohashi-daikanwa	39052 1)
+  '((<-denotational
+     ((=ucs		  . #x9063)	; 遣
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=cns11643-1	. #x6B42)	; &C1-6B42; [75-34]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9063)	; 遣
+      ))
+    (morohashi-daikanwa	39052 1)
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs		. #x9063)	; 遣
-    (=jis-x0208		. #x382F)	; &I-J90-382F; [24-15]
+    (=jis-x0208		. #x382F)	; &GT-52327; [24-15]
     (=gb2312		. #x4732)	; &I-G0-4732; [39-18]
     (=gt		. 52327)	; &I-GT-52327;
     (=gt-k		. 10206)	; &I-GT-K10206;
     (=gt-pj-1		. #x382F)	; &I-GT-52327; [24-15]
+    (=ucs@unicode	. #x9063)	; &GT-52327;
     (mojikyo		. 050526)	; &MCS-6000C55E;
     ))
 (define-char
-  '((=>ucs		. #x9063)	; 遣
-    (morohashi-daikanwa	39052 1 1)
-    (ideographic-radical . 162)	; ⾡
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (->mojikyo		. 050526)	; 遣
-    (=cns11643-1	. #x6B42)	; &C1-6B42; [75-34]
-    ))
-(define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=daikanwa		. 39053)	; &M-39053;
     (<-ancient
      ((=ks-x1001	  . #x5433)	; &M-39010; [52-19]
       (=daikanwa	  . 39010)	; &I-M-39010;
       ))
     (<-ancient*sources
      kangxi daikanwa)
-    (=daikanwa		. 39053)	; &M-39053;
     ))
 (define-char
   '((morohashi-daikanwa	39053 0 2)
@@ -11302,36 +11570,52 @@
       ))
     ))
 (define-char
-  '((=>daikanwa		. 39055)	; &M-39055;
-    (ideographic-radical . 162)	; ⾡
+  '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (=ucs		. #x28567)	; 𨕧
-    (->subsumptive
-     ((total-strokes	   . 14)
-      (<-same
-       ((=daikanwa	    . 38858)	; &M-38858;
-	))
-      (<-same*sources
-       jiyun daikanwa)
-      (=daikanwa	  . 39055)	; &M-39055;
-      )
-     ((total-strokes	   . 14)
-      (=cns11643-5	  . #x4A56)	; &C5-4A56; [42-54]
-      )
-     ((total-strokes	   . 13)
-      (=ucs@iso		  . #x28567)	; &U-00028567;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x28567)	; 𨕧
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=daikanwa		. 39055)	; &M-39055;
+    (<-same
+     ((=daikanwa	  . 38858)	; &M-38858;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x28567)	; 𨕧
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs@iso		. #x28567)	; &U-00028567;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x28567)	; 𨕧
       ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=cns11643-5	. #x4A56)	; &C5-4A56; [42-54]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=daikanwa		. 39056)	; &M-39056;
     (<-same
      ((=daikanwa	  . 38996)	; &M-38996;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39056)	; &M-39056;
     ))
 (define-char
   '((morohashi-daikanwa	39056 0 2)
@@ -11357,14 +11641,14 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
+    (=cns11643-7	. #x3C55)	; &M-39058; [28-53]
+    (=daikanwa		. 39058)	; &I-M-39058;
     (<-ancient
      ((=ks-x1001	  . #x616A)	; &M-38842; [65-74]
       (=daikanwa	  . 38842)	; &I-M-38842;
       ))
     (<-ancient*sources
      jiyun daikanwa)
-    (=cns11643-7	. #x3C55)	; &M-39058; [28-53]
-    (=daikanwa		. 39058)	; &I-M-39058;
     ))
 (define-char
   '((=>daikanwa		. 39059)	; &M-39059;
@@ -11386,40 +11670,65 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=ucs		. #x48A5)	; 䢥
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48A5)	; 䢥
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=daikanwa		. 39060)	; &M-39060;
     (<-wrong
      ((=daikanwa	  . 09579)	; &M-09579;
       ))
     (<-wrong*sources
      jiyun wuyin-jiyun daikanwa)
-    (=ucs		. #x48A5)	; 䢥
-    (=cns11643-3	. #x4A23)	; &I-C3-4A23; [42-03]
-    (=daikanwa		. 39060)	; &I-M-39060;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48A5)	; 䢥
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs@unicode	. #x48A5)	; &UU+48A5;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48A5)	; 䢥
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=cns11643-3	. #x4A23)	; &C3-4A23; [42-03]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=cns11643-6	. #x6339)	; &M-39061; [67-25]
+    (=daikanwa		. 39061)	; &I-M-39061;
     (<-same
      ((=ks-x1001	  . #x6A5E)	; &M-39013; [74-62]
       (=daikanwa	  . 39013)	; &I-M-39013;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=cns11643-6	. #x6339)	; &M-39061; [67-25]
-    (=daikanwa		. 39061)	; &I-M-39061;
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
+    (=cns11643-7	. #x3C57)	; &M-39063; [28-55]
+    (=daikanwa		. 39063)	; &I-M-39063;
     (<-same
      ((=ucs		  . #x8DF2)	; è·²
       (=daikanwa	  . 37532)	; &I-M-37532;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=cns11643-7	. #x3C57)	; &M-39063; [28-55]
-    (=daikanwa		. 39063)	; &I-M-39063;
     ))
 (define-char
   '((<-denotational
@@ -11457,33 +11766,58 @@
     (=gb12345		. #x7D6F)	; 遤 [93-79]
     ))
 (define-char
-  '((=>ucs		. #x9066)	; 遦
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (=ucs		. #x9066)	; 遦
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9066)	; 遦
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=jis-x0212		. #x6161)	; &M-39068; [65-65]
+    (=daikanwa		. 39068)	; &I-M-39068;
+    (=ucs@jis		. #x9066)	; &M-39068;
     (<-same
      ((=ucs		  . #x645C)	; 摜
       (=daikanwa	  . 12591)	; &I-M-12591;
       ))
     (<-same*sources
      shuowen jiyun daikanwa)
-    (=jis-x0212		. #x6161)	; &M-39068; [65-65]
-    (=daikanwa		. 39068)	; &I-M-39068;
-    (=ucs@jis		. #x9066)	; &M-39068;
     ))
 (define-char
-  '((morohashi-daikanwa	39068 0 2)
+  '((<-denotational
+     ((=ucs		  . #x9066)	; 遦
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x9066)	; &UU+9066;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9066)	; 遦
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x9066)	; 遦
-    (=cns11643-4	. #x4E32)	; &I-C4-4E32; [46-18]
+    (=cns11643-4	. #x4E32)	; &C4-4E32; [46-18]
     ))
 (define-char
-  '((=>ucs		. #x48A6)	; 䢦
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (=ucs		. #x48A6)	; 䢦
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48A6)	; 䢦
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39069)	; &M-39069;
     (<-same
      ((=daikanwa	  . 20817)	; &M-20817;
       ))
@@ -11495,26 +11829,35 @@
       ))
     (<-synonyms*sources
      yupian daikanwa)
-    (=daikanwa		. 39069)	; &M-39069;
     ))
 (define-char
-  '((morohashi-daikanwa	39069 0 3)
+  '((<-denotational
+     ((=ucs		  . #x48A6)	; 䢦
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x48A6)	; &UU+48A6;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48A6)	; 䢦
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x48A6)	; 䢦
-    (=cns11643-3	. #x4F3A)	; &I-C3-4F3A; [47-26]
+    (=cns11643-3	. #x4F3A)	; &C3-4F3A; [47-26]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39070)	; &M-39070;
     (<-Large-Seal
      ((=daikanwa	  . 38776)	; &M-38776;
       ))
     (<-Large-Seal*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39070)	; &M-39070;
     ))
 (define-char
   '((morohashi-daikanwa	39070 0 2)
@@ -11527,6 +11870,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39071)	; &M-39071;
     (<-vulgar
      ((=jis-x0212	  . #x615C)	; &M-38988; [65-60]
       (=jis-x0213-2-2000  . #x797C)	; &I-JX2-797C; [89-92]
@@ -11534,7 +11878,6 @@
       ))
     (<-vulgar*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39071)	; &M-39071;
     ))
 (define-char
   '((morohashi-daikanwa	39071 0 2)
@@ -11556,6 +11899,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=jis-x0212		. #x6162)	; &M-39072; [65-66]
+    (=daikanwa		. 39072)	; &I-M-39072;
+    (=ucs@jis		. #x9067)	; &M-39072;
     (<-synonyms
      ((=jis-x0208	  . #x3E4F)	; &GT-33228; [30-47]
       (=ks-x1001	  . #x6D71)	; &I-K0-6D71; [77-81]
@@ -11563,9 +11909,6 @@
       ))
     (<-synonyms*sources
      kangxi dadaili dadaili-buzhu daikanwa)
-    (=jis-x0212		. #x6162)	; &M-39072; [65-66]
-    (=daikanwa		. 39072)	; &I-M-39072;
-    (=ucs@jis		. #x9067)	; &M-39072;
     ))
 (define-char
   '((<-denotational
@@ -11598,13 +11941,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (<-same
-     ((=jis-x0208	  . #x5A44)	; &GT-16699; [58-36]
-      (=ks-x1001	  . #x6779)	; &I-K0-6779; [71-89]
-      (=daikanwa	  . 13226)	; &I-M-13226;
-      ))
-    (<-same*sources
-     yupian jiyun maoshi houhanshu daikanwa)
     (shinjigen-1	. 8365)
     (shinjigen-2	. 8365)
     (=jis-x0208		. #x6E2B)	; &GT-52518; [78-11]
@@ -11612,6 +11948,13 @@
     (=gt-pj-1		. #x6E2B)	; &I-GT-52518; [78-11]
     (=daikanwa		. 39073)	; &I-M-39073;
     (=ucs@jis		. #x9068)	; &GT-52518;
+    (<-same
+     ((=jis-x0208	  . #x5A44)	; &GT-16699; [58-36]
+      (=ks-x1001	  . #x6779)	; &I-K0-6779; [71-89]
+      (=daikanwa	  . 13226)	; &I-M-13226;
+      ))
+    (<-same*sources
+     yupian jiyun maoshi houhanshu daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -11644,6 +11987,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39074)	; &M-39074;
     (<-synonyms
      ((=jis-x0208@1978	  . #x4E4B)	; &M-39137; [46-43]
       (=ks-x1001	  . #x5721)	; &I-K0-5721; [55-01]
@@ -11651,7 +11995,6 @@
       ))
     (<-synonyms*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39074)	; &M-39074;
     ))
 (define-char
   '((<-denotational
@@ -11675,6 +12018,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39075)	; &M-39075;
     (<-same
      ((=jis-x0208@1978	  . #x4D5A)	; &GT-52486; [45-58]
       (=jis-x0208@1983	  . #x7423)	; &I-J83-7423; [84-03]
@@ -11683,7 +12027,6 @@
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 39075)	; &M-39075;
     ))
 (define-char
   '((morohashi-daikanwa	39075 0 2)
@@ -11706,16 +12049,16 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (->subsumptive
-     ((<-original
-       ((=daikanwa	    . 39140)	; &M-39140;
-	))
-      (<-original*sources
-       zhengzitong daikanwa)
-      (=ks-x1001	  . #x6E6A)	; &GT-52561; [78-74]
+     ((=ks-x1001	  . #x6E6A)	; &GT-52561; [78-74]
       (=gt		  . 52561)	; &I-GT-52561;
       (=gt-k		  . 11928)	; &I-GT-K11928;
       (=gt-pj-7		  . #x5877)	; &I-GT-52561; [56-87]
       (=daikanwa	  . 39076)	; &I-M-39076;
+      (<-original
+       ((=daikanwa	    . 39140)	; &M-39140;
+	))
+      (<-original*sources
+       zhengzitong daikanwa)
       )
      ((=jef-china3	  . #x67E6)	; &JC3-67E6;
       (mojikyo		  . 058252)	; &MCS-6000E38C;
@@ -11754,12 +12097,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39077)	; &M-39077;
     (<-same
      ((=daikanwa	  . 39192)	; &M-39192;
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39077)	; &M-39077;
     ))
 (define-char
   '((morohashi-daikanwa	39077 0 2)
@@ -11813,13 +12156,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39079)	; &M-39079;
     (<-synonyms
      ((=ucs		  . #x6157)	; 慗
       (=daikanwa	  . 11093)	; &I-M-11093;
       ))
     (<-synonyms*sources
      jiyun daikanwa)
-    (=daikanwa		. 39079)	; &M-39079;
     ))
 (define-char
   '((<-denotational
@@ -11851,6 +12194,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=jis-x0212		. #x6163)	; &M-39080; [65-67]
+    (=daikanwa		. 39080)	; &I-M-39080;
+    (=ucs@jis		. #x906C)	; &M-39080;
     (<-Large-Seal
      ((=ks-x1001	  . #x615C)	; &M-38897; [65-60]
       (=daikanwa	  . 38897)	; &I-M-38897;
@@ -11863,9 +12209,6 @@
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng liji liji-zhu daikanwa)
-    (=jis-x0212		. #x6163)	; &M-39080; [65-67]
-    (=daikanwa		. 39080)	; &I-M-39080;
-    (=ucs@jis		. #x906C)	; &M-39080;
     ))
 (define-char
   '((<-denotational
@@ -11889,6 +12232,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39081)	; &M-39081;
     (<-formed
      ((=jis-x0208	  . #x6D71)	; &GT-51996; [77-81]
       (=ks-x1001	  . #x6E69)	; &I-K0-6E69; [78-73]
@@ -11903,7 +12247,6 @@
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 39081)	; &M-39081;
     ))
 (define-char
   '((morohashi-daikanwa	39081 0 2)
@@ -11913,106 +12256,148 @@
     (=cns11643-7	. #x296B)	; &C7-296B; [09-75]
     ))
 (define-char
-  '((=>ucs		. #x906D)	; 遭
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (=ucs		. #x906D)	; 遭
+    (=big5		. #xBE44)	; &I-B-BE44;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x906D)	; 遭
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ks-x1001		. #x7064)	; &M-39082; [80-68]
+    (=daikanwa		. 39082)	; &I-M-39082;
+    (=jef-china3	. #x67E7)	; &I-JC3-67E7;
     (<-original
      ((=daikanwa	  . 39263)	; &M-39263;
       ))
     (<-original*sources
      zhengzitong shuowen liji shiji daikanwa)
-    (=ks-x1001		. #x7064)	; &M-39082; [80-68]
-    (=big5		. #xBE44)	; &I-B-BE44;
-    (=daikanwa		. 39082)	; &I-M-39082;
     ))
 (define-char
-  '((morohashi-daikanwa	39082 1)
+  '((<-denotational
+     ((=ucs		  . #x906D)	; 遭
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-1	. #x6F4E)	; &C1-6F4E; [79-46]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x906D)	; 遭
+      ))
+    (morohashi-daikanwa	39082 1)
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=ucs		. #x906D)	; 遭
-    (=jis-x0208		. #x4178)	; &I-J90-4178; [33-88]
+    (=jis-x0208		. #x4178)	; &GT-52459; [33-88]
     (=gb2312		. #x5462)	; &I-G0-5462; [52-66]
     (=gt		. 52459)	; &I-GT-52459;
     (=gt-k		. 11146)	; &I-GT-K11146;
     (=gt-pj-1		. #x4178)	; &I-GT-52459; [33-88]
+    (=ucs@unicode	. #x906D)	; &GT-52459;
     (mojikyo		. 050529)	; &MCS-6000C561;
     ))
 (define-char
-  '((=>ucs		. #x906D)	; 遭
-    (morohashi-daikanwa	39082 1 1)
+  '((<-denotational
+     ((=ucs		  . #x2858B)	; 𨖋
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (->mojikyo		. 050529)	; 遭
-    (=cns11643-1	. #x6F4E)	; &C1-6F4E; [79-46]
+    (=daikanwa		. 39083)	; &M-39083;
     ))
 (define-char
-  '((=>ucs		. #x2858B)	; 𨖋
+  '((<-denotational
+     ((=ucs		  . #x2858B)	; 𨖋
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=daikanwa		. 39083)	; &M-39083;
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x2858B)	; &U-0002858B;
     ))
 (define-char
-  '((=>ucs		. #x2858B)	; 𨖋
-    (morohashi-daikanwa	39083 0 2)
+  '((<-denotational
+     ((=ucs		  . #x2858B)	; 𨖋
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=cns11643-4	. #x4E2F)	; &C4-4E2F; [46-15]
     ))
 (define-char
-  '((morohashi-daikanwa	39083 0 3)
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (=ucs		. #x2858C)	; 𨖌
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2858C)	; 𨖌
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=ucs		. #x2858B)	; 𨖋
+    (total-strokes	 . 15)
+    (=daikanwa		. 39084)	; &M-39084;
     ))
 (define-char
-  '((=>daikanwa		. 39084)	; &M-39084;
+  '((<-denotational
+     ((=ucs		  . #x2858C)	; 𨖌
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
-    (=ucs		. #x2858C)	; 𨖌
-    (->subsumptive
-     ((total-strokes	   . 15)
-      (=daikanwa	  . 39084)	; &M-39084;
-      )
-     ((total-strokes	   . 15)
-      (=cns11643-5	  . #x5164)	; &C5-5164; [49-68]
-      )
-     ((total-strokes	   . 14)
-      (=ucs@iso		  . #x2858C)	; &U-0002858C;
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x2858C)	; &U-0002858C;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2858C)	; 𨖌
       ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-5	. #x5164)	; &C5-5164; [49-68]
     ))
 (define-char
-  '((=>ucs		. #x2858D)	; 𨖍
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (=ucs		. #x2858D)	; 𨖍
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2858D)	; 𨖍
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39085)	; &M-39085;
     (<-same
      ((=ucs		  . #x6211)	; 我
       (=daikanwa	  . 11545)	; &I-M-11545;
       ))
     (<-same*sources
      zhengzitong shiguwen daikanwa)
-    (=daikanwa		. 39085)	; &M-39085;
     ))
 (define-char
-  '((=>ucs		. #x2858D)	; 𨖍
-    (morohashi-daikanwa	39085 0 2)
+  '((<-denotational
+     ((=ucs		  . #x2858D)	; 𨖍
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-4	. #x4E30)	; &C4-4E30; [46-16]
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x2858D)	; &U-0002858D;
     ))
 (define-char
-  '((morohashi-daikanwa	39085 0 3)
+  '((<-denotational
+     ((=ucs		  . #x2858D)	; 𨖍
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=ucs		. #x2858D)	; 𨖍
+    (total-strokes	 . 15)
+    (=cns11643-4	. #x4E30)	; &C4-4E30; [46-16]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -12027,15 +12412,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=jis-x0208@1978	. #x3C57)	; &M-39086; [28-55]
+    (=ks-x1001		. #x7334)	; &I-K0-7334; [83-20]
+    (=daikanwa		. 39086)	; &I-M-39086;
     (<-synonyms
      ((=ucs		  . #xFA5B)	; 者
       (=daikanwa	  . 28853)	; &I-M-28853;
       ))
     (<-synonyms*sources
      xin-fangyan daikanwa)
-    (=jis-x0208@1978	. #x3C57)	; &M-39086; [28-55]
-    (=ks-x1001		. #x7334)	; &I-K0-7334; [83-20]
-    (=daikanwa		. 39086)	; &I-M-39086;
     ))
 (define-char
   '((<-denotational
@@ -12093,13 +12478,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39088)	; &M-39088;
     (<-same
      ((=ucs		  . #x22529)	; 𢔩
       (=daikanwa	  . 10190)	; &I-M-10190;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 39088)	; &M-39088;
     ))
 (define-char
   '((<-denotational
@@ -12132,11 +12517,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (<-ancient
-     ((=daikanwa	  . 39238)	; &M-39238;
-      ))
-    (<-ancient*sources
-     jiyun daikanwa)
     (shinjigen-1	. 8373)
     (shinjigen-2	. 8373)
     (=jis-x0208		. #x6E2C)	; &GT-52567; [78-12]
@@ -12145,6 +12525,11 @@
     (=gt-pj-1		. #x6E2C)	; &I-GT-52567; [78-12]
     (=daikanwa		. 39089)	; &I-M-39089;
     (=ucs@jis		. #x906F)	; &GT-52567;
+    (<-ancient
+     ((=daikanwa	  . 39238)	; &M-39238;
+      ))
+    (<-ancient*sources
+     jiyun daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -12215,31 +12600,55 @@
       ))
     ))
 (define-char
-  '((=>daikanwa		. 39092)	; &M-39092;
-    (ideographic-radical . 162)	; ⾡
+  '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (=ucs		. #x2858F)	; 𨖏
-    (->subsumptive
-     ((total-strokes	   . 15)
-      (<-original
-       ((=daikanwa	    . 39160)	; &M-39160;
-	))
-      (<-original*sources
-       zhengzitong shuowen daikanwa)
-      (=daikanwa	  . 39092)	; &M-39092;
-      )
-     ((total-strokes	   . 15)
-      (=cns11643-5	  . #x5165)	; &C5-5165; [49-69]
-      )
-     ((total-strokes	   . 14)
-      (=ucs@iso		  . #x2858F)	; &U-0002858F;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2858F)	; 𨖏
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=daikanwa		. 39092)	; &M-39092;
+    (<-original
+     ((=daikanwa	  . 39160)	; &M-39160;
+      ))
+    (<-original*sources
+     zhengzitong shuowen daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2858F)	; 𨖏
       ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x2858F)	; &U-0002858F;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2858F)	; 𨖏
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-5	. #x5165)	; &C5-5165; [49-69]
+    ))
+(define-char
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (=ucs		. #x28590)	; 𨖐
     ))
 (define-char
-  '((=>ucs		. #x28590)	; 𨖐
+  '((<-denotational
+     ((=ucs		  . #x28590)	; 𨖐
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39093)	; &M-39093;
     (<-Liwen
      ((=jis-x0208	  . #x6F58)	; &M-41088; [79-56]
       (=ks-x1001	  . #x733A)	; &I-K0-733A; [83-26]
@@ -12247,22 +12656,24 @@
       ))
     (<-Liwen*sources
      kangxi daikanwa)
-    (=daikanwa		. 39093)	; &M-39093;
     ))
 (define-char
-  '((=>ucs		. #x28590)	; 𨖐
-    (morohashi-daikanwa	39093 0 2)
+  '((<-denotational
+     ((=ucs		  . #x28590)	; 𨖐
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-4	. #x4E34)	; &C4-4E34; [46-20]
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x28590)	; &U-00028590;
     ))
 (define-char
-  '((morohashi-daikanwa	39093 0 3)
+  '((<-denotational
+     ((=ucs		  . #x28590)	; 𨖐
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=ucs		. #x28590)	; 𨖐
+    (total-strokes	 . 15)
+    (=cns11643-4	. #x4E34)	; &C4-4E34; [46-20]
     ))
 (define-char
   '((=>ucs		. #x9073)	; 遳
@@ -12295,37 +12706,54 @@
     (=ucs		. #x9073)	; 遳
     ))
 (define-char
-  '((=>ucs		. #x48A9)	; 䢩
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (=ucs		. #x48A9)	; 䢩
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48A9)	; 䢩
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39095)	; &M-39095;
     (<-same
      ((=ucs		  . #x5FA1)	; 御
       (=daikanwa	  . 10157)	; &I-M-10157;
       ))
     (<-same*sources
      zihui-bu shiguwen guwenyuan-zhu daikanwa)
-    (=daikanwa		. 39095)	; &M-39095;
     ))
 (define-char
-  '((morohashi-daikanwa	39095 0 2)
+  '((<-denotational
+     ((=ucs		  . #x48A9)	; 䢩
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x48A9)	; &UU+48A9;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48A9)	; 䢩
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x48A9)	; 䢩
-    (=cns11643-3	. #x4F3D)	; &I-C3-4F3D; [47-29]
+    (=cns11643-3	. #x4F3D)	; &C3-4F3D; [47-29]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 18)
+    (=daikanwa		. 39096)	; &M-39096;
     (<-same
      ((=ucs		  . #x5831)	; å ±
       (=daikanwa	  . 05275)	; &I-M-05275;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39096)	; &M-39096;
     ))
 (define-char
   '((morohashi-daikanwa	39096 0 2)
@@ -12338,13 +12766,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39097)	; &M-39097;
     (<-same
      ((=ks-x1001	  . #x5339)	; &M-39011; [51-25]
       (=daikanwa	  . 39011)	; &I-M-39011;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39097)	; &M-39097;
     ))
 (define-char
   '((morohashi-daikanwa	39097 0 2)
@@ -12386,25 +12814,41 @@
       ))
     ))
 (define-char
-  '((=>daikanwa		. 39100)	; &M-39100;
-    (ideographic-radical . 162)	; ⾡
+  '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (=ucs		. #x285AE)	; 𨖮
-    (->subsumptive
-     ((total-strokes	   . 15)
-      (<-same
-       ((=daikanwa	    . 09538)	; &M-09538;
-	))
-      (<-same*sources
-       jiyun daikanwa)
-      (=daikanwa	  . 39100)	; &M-39100;
-      )
-     ((total-strokes	   . 15)
-      (=cns11643-5	  . #x516C)	; &C5-516C; [49-76]
-      )
-     ((total-strokes	   . 14)
-      (=ucs@iso		  . #x285AE)	; &U-000285AE;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x285AE)	; 𨖮
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=daikanwa		. 39100)	; &M-39100;
+    (<-same
+     ((=daikanwa	  . 09538)	; &M-09538;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x285AE)	; 𨖮
       ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x285AE)	; &U-000285AE;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x285AE)	; 𨖮
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-5	. #x516C)	; &C5-516C; [49-76]
     ))
 (define-char
   '((=>ucs		. #x285AF)	; 𨖯
@@ -12441,6 +12885,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39103)	; &M-39103;
     (<-same
      ((=jis-x0208	  . #x6E33)	; &GT-52731; [78-19]
       (=ks-x1001	  . #x692D)	; &I-K0-692D; [73-13]
@@ -12448,7 +12893,6 @@
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39103)	; &M-39103;
     ))
 (define-char
   '((morohashi-daikanwa	39103 0 2)
@@ -12461,6 +12905,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39104)	; &M-39104;
     (<-same
      ((=jis-x0208@1978	  . #x465B)	; &M-38982; [38-59]
       (=ks-x1001	  . #x546D)	; &I-K0-546D; [52-77]
@@ -12468,7 +12913,6 @@
       ))
     (<-same*sources
      chuanpian daikanwa)
-    (=daikanwa		. 39104)	; &M-39104;
     ))
 (define-char
   '((morohashi-daikanwa	39104 0 3)
@@ -12481,25 +12925,25 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 18)
+    (=cns11643-7	. #x4374)	; &M-39105; [35-84]
+    (=daikanwa		. 39105)	; &I-M-39105;
     (<-same
      ((=daikanwa	  . 38757)	; &M-38757;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=cns11643-7	. #x4374)	; &M-39105; [35-84]
-    (=daikanwa		. 39105)	; &I-M-39105;
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39106)	; &M-39106;
     (<-same
      ((=ks-x1001	  . #x7C3D)	; &M-39174; [92-29]
       (=daikanwa	  . 39174)	; &I-M-39174;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39106)	; &M-39106;
     ))
 (define-char
   '((morohashi-daikanwa	39106 0 2)
@@ -12525,6 +12969,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39108)	; &M-39108;
     (<-same
      ((=jis-x0208@1978	  . #x3C57)	; &M-39086; [28-55]
       (=ks-x1001	  . #x7334)	; &I-K0-7334; [83-20]
@@ -12532,7 +12977,6 @@
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39108)	; &M-39108;
     ))
 (define-char
   '((morohashi-daikanwa	39108 0 2)
@@ -12545,6 +12989,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39109)	; &M-39109;
     (<-same
      ((=jis-x0208	  . #x5D57)	; &GT-21339; [61-55]
       (=ks-x1001	  . #x4A43)	; &I-K0-4A43; [42-35]
@@ -12552,7 +12997,6 @@
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39109)	; &M-39109;
     ))
 (define-char
   '((morohashi-daikanwa	39109 0 2)
@@ -12565,6 +13009,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=daikanwa		. 39110)	; &M-39110;
     (<-wrong
      ((=jis-x0208	  . #x703D)	; &GT-56793; [80-29]
       (=ks-x1001	  . #x6F7D)	; &I-K0-6F7D; [79-93]
@@ -12572,7 +13017,6 @@
       ))
     (<-wrong*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39110)	; &M-39110;
     ))
 (define-char
   '((morohashi-daikanwa	39110 0 3)
@@ -12633,6 +13077,14 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (shinjigen-1	. 8337)
+    (shinjigen-2	. 8337)
+    (=jis-x0208		. #x6E2F)	; &GT-52644; [78-15]
+    (=ks-x1001		. #x7240)	; &I-K0-7240; [82-32]
+    (=gt		. 52644)	; &I-GT-52644;
+    (=gt-pj-1		. #x6E2F)	; &I-GT-52644; [78-15]
+    (=daikanwa		. 39113)	; &I-M-39113;
+    (=ucs@jis		. #x9072)	; &GT-52644;
     (<-Large-Seal
      ((=daikanwa	  . 39046)	; &M-39046;
       ))
@@ -12645,14 +13097,6 @@
       ))
     (<-ancient*sources
      jiyun daikanwa)
-    (shinjigen-1	. 8337)
-    (shinjigen-2	. 8337)
-    (=jis-x0208		. #x6E2F)	; &GT-52644; [78-15]
-    (=ks-x1001		. #x7240)	; &I-K0-7240; [82-32]
-    (=gt		. 52644)	; &I-GT-52644;
-    (=gt-pj-1		. #x6E2F)	; &I-GT-52644; [78-15]
-    (=daikanwa		. 39113)	; &I-M-39113;
-    (=ucs@jis		. #x9072)	; &GT-52644;
     (->ideographic-variants
      ((shinjigen-1	  . 8338)
       (=daikanwa	  . 39046)	; &M-39046;
@@ -12683,12 +13127,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39114)	; &M-39114;
     (<-same
      ((=daikanwa	  . 37582)	; &M-37582;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 39114)	; &M-39114;
     ))
 (define-char
   '((morohashi-daikanwa	39114 0 2)
@@ -12741,6 +13185,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=jis-x0212		. #x6165)	; &M-39117; [65-69]
+    (=daikanwa		. 39117)	; &I-M-39117;
+    (=ucs@jis		. #x9074)	; &M-39117;
     (<-original
      ((=daikanwa	  . 39192)	; &M-39192;
       ))
@@ -12752,9 +13199,6 @@
       ))
     (<-synonyms*sources
      shuowen shuowen-tongxundingsheng zhengzitong xintangshu daikanwa)
-    (=jis-x0212		. #x6165)	; &M-39117; [65-69]
-    (=daikanwa		. 39117)	; &I-M-39117;
-    (=ucs@jis		. #x9074)	; &M-39117;
     ))
 (define-char
   '((<-denotational
@@ -12823,13 +13267,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39119)	; &M-39119;
     (<-original
      ((=ks-x1001	  . #x7165)	; &M-39118; [81-69]
       (=daikanwa	  . 39118)	; &I-M-39118;
       ))
     (<-original*sources
      zhonghua-dazidian daikanwa)
-    (=daikanwa		. 39119)	; &M-39119;
     ))
 (define-char
   '((morohashi-daikanwa	39119 0 2)
@@ -12880,13 +13324,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39121)	; &M-39121;
     (<-ancient
      ((=ks-x1001	  . #x6A40)	; &M-39047; [74-32]
       (=daikanwa	  . 39047)	; &I-M-39047;
       ))
     (<-ancient*sources
      jiyun daikanwa)
-    (=daikanwa		. 39121)	; &M-39121;
     ))
 (define-char
   '((morohashi-daikanwa	39121 0 3)
@@ -12946,6 +13390,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39123)	; &M-39123;
     (<-original
      ((=daikanwa	  . 39257)	; &M-39257;
       ))
@@ -12956,7 +13401,6 @@
       ))
     (<-synonyms*sources
      jiyun daikanwa)
-    (=daikanwa		. 39123)	; &M-39123;
     ))
 (define-char
   '((<-denotational
@@ -13011,24 +13455,41 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (=ucs		. #x285B9)	; 𨖹
-    (->subsumptive
-     ((total-strokes	   . 16)
-      (<-ancient
-       ((=jis-x0208@1978    . #x4676)	; &GT-52751; [38-86]
-	(=jis-x0208@1983    . #x6D6E)	; &I-J83-6D6E; [77-78]
-	(=ks-x1001	    . #x6C44)	; &I-K0-6C44; [76-36]
-	(=daikanwa	    . 39193)	; &I-M-39193;
-	))
-      (<-ancient*sources
-       jiyun daikanwa)
-      (=daikanwa	  . 39124)	; &M-39124;
-      )
-     ((total-strokes	   . 16)
-      (=cns11643-5	  . #x5877)	; &C5-5877; [56-87]
-      )
-     ((total-strokes	   . 15)
-      (=ucs@iso		  . #x285B9)	; &U-000285B9;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x285B9)	; 𨖹
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (=daikanwa		. 39124)	; &M-39124;
+    (<-ancient
+     ((=jis-x0208@1978	  . #x4676)	; &GT-52751; [38-86]
+      (=jis-x0208@1983	  . #x6D6E)	; &I-J83-6D6E; [77-78]
+      (=ks-x1001	  . #x6C44)	; &I-K0-6C44; [76-36]
+      (=daikanwa	  . 39193)	; &I-M-39193;
+      ))
+    (<-ancient*sources
+     jiyun daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x285B9)	; 𨖹
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs@iso		. #x285B9)	; &U-000285B9;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x285B9)	; 𨖹
       ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (=cns11643-5	. #x5877)	; &C5-5877; [56-87]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -13068,14 +13529,14 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=ks-x1001		. #x6054)	; &M-39127; [64-52]
+    (=daikanwa		. 39127)	; &I-M-39127;
     (<-synonyms
      ((=ucs		  . #x7B97)	; 算
       (=daikanwa	  . 26146)	; &I-M-26146;
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng jiyun shangshu shangshu-zhuan shangshu-shu hanshu hanshu-zhu daikanwa)
-    (=ks-x1001		. #x6054)	; &M-39127; [64-52]
-    (=daikanwa		. 39127)	; &I-M-39127;
     (->formed
      ((=jis-x0212	  . #x6445)	; &M-40470; [68-37]
       (=daikanwa	  . 40470)	; &I-M-40470;
@@ -13137,41 +13598,60 @@
     (=cns11643-7	. #x3447)	; &C7-3447; [20-39]
     ))
 (define-char
-  '((=>ucs		. #x9079)	; 遹
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 12)
+    (=ucs		. #x9079)	; 遹
+    (=big5		. #xEBD1)	; &I-B-EBD1;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9079)	; 遹
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=jis-x0212		. #x6166)	; &M-39129; [65-70]
+    (=daikanwa		. 39129)	; &I-M-39129;
+    (=jef-china3	. #x92F7)	; &I-JC3-92F7;
+    (=ucs@jis		. #x9079)	; &M-39129;
     (<-synonyms
-     ((=ucs		  . #x6B25)	; 欥
+     ((=cns11643-2	  . #x274A)	; &M-16017; [07-42]
       (=daikanwa	  . 16017)	; &I-M-16017;
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng maoshi maoshi-jizhuan daikanwa)
-    (=jis-x0212		. #x6166)	; &M-39129; [65-70]
-    (=big5		. #xEBD1)	; &I-B-EBD1;
-    (=daikanwa		. 39129)	; &I-M-39129;
-    (=ucs@jis		. #x9079)	; &M-39129;
     ))
 (define-char
-  '((=>ucs		. #x9079)	; 遹
-    (morohashi-daikanwa	39129 0 2)
+  '((<-denotational
+     ((=ucs		  . #x9079)	; 遹
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=cns11643-2	. #x5A7D)	; &C2-5A7D; [58-93]
+    (=ucs@unicode	. #x9079)	; &UU+9079;
     ))
 (define-char
-  '((morohashi-daikanwa	39129 0 3)
+  '((<-denotational
+     ((=ucs		  . #x9079)	; 遹
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=ucs		. #x9079)	; 遹
+    (=cns11643-2	. #x5A7D)	; &C2-5A7D; [58-93]
     ))
 (define-char
-  '((=>ucs		. #x48AA)	; 䢪
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 12)
+    (=ucs		. #x48AA)	; 䢪
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48AA)	; 䢪
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39131)	; &M-39131;
     (<-vulgar
      ((=jis-x0208	  . #x5C72)	; &GT-19939; [60-82]
       (=cns11643-1	  . #x707E)	; &I-C1-707E; [80-94]
@@ -13179,27 +13659,36 @@
       ))
     (<-vulgar*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39131)	; &M-39131;
     ))
 (define-char
-  '((morohashi-daikanwa	39131 0 2)
+  '((<-denotational
+     ((=ucs		  . #x48AA)	; 䢪
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x48AA)	; &UU+48AA;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48AA)	; 䢪
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=ucs		. #x48AA)	; 䢪
-    (=cns11643-3	. #x532A)	; &I-C3-532A; [51-10]
+    (=cns11643-3	. #x532A)	; &C3-532A; [51-10]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39132)	; &M-39132;
     (<-ancient
      ((=ks-x1001	  . #x6B36)	; &M-39134; [75-22]
       (=daikanwa	  . 39134)	; &I-M-39134;
       ))
     (<-ancient*sources
      jiyun daikanwa)
-    (=daikanwa		. 39132)	; &M-39132;
     ))
 (define-char
   '((morohashi-daikanwa	39132 0 2)
@@ -13212,13 +13701,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39133)	; &M-39133;
     (<-same
      ((=ks-x1001	  . #x6B36)	; &M-39134; [75-22]
       (=daikanwa	  . 39134)	; &I-M-39134;
       ))
     (<-same*sources
      yuwen daikanwa)
-    (=daikanwa		. 39133)	; &M-39133;
     ))
 (define-char
   '((morohashi-daikanwa	39133 0 2)
@@ -13378,13 +13867,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39138)	; &M-39138;
     (<-same
      ((=jis-x0208	  . #x6D7B)	; &GT-52182; [77-91]
       (=daikanwa	  . 38949)	; &I-M-38949;
       ))
     (<-same*sources
      kangxi daikanwa)
-    (=daikanwa		. 39138)	; &M-39138;
     ))
 (define-char
   '((morohashi-daikanwa	39138 0 2)
@@ -13397,6 +13886,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39139)	; &M-39139;
     (<-formed
      ((=jis-x0212	  . #x6154)	; &M-38925; [65-52]
       (=daikanwa	  . 38925)	; &I-M-38925;
@@ -13407,7 +13897,6 @@
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39139)	; &M-39139;
     ))
 (define-char
   '((morohashi-daikanwa	39139 0 2)
@@ -13428,13 +13917,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39140)	; &M-39140;
     (<-original
      ((=ks-x1001	  . #x6E6A)	; &GT-52561; [78-74]
       (=daikanwa	  . 39076)	; &I-M-39076;
       ))
     (<-original*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39140)	; &M-39140;
     ))
 (define-char
   '((<-denotational
@@ -13463,6 +13952,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39141)	; &M-39141;
     (<-same
      ((=jis-x0208	  . #x3476)	; &M-09208; [20-86]
       (=ks-x1001	  . #x507A)	; &I-K0-507A; [48-90]
@@ -13470,7 +13960,6 @@
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39141)	; &M-39141;
     ))
 (define-char
   '((morohashi-daikanwa	39141 0 2)
@@ -13483,26 +13972,26 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
+    (=cns11643-7	. #x4A77)	; &M-39142; [42-87]
+    (=daikanwa		. 39142)	; &I-M-39142;
     (<-ancient
      ((=ks-x1001	  . #x7264)	; &M-38943; [82-68]
       (=daikanwa	  . 38943)	; &I-M-38943;
       ))
     (<-ancient*sources
      jiyun daikanwa)
-    (=cns11643-7	. #x4A77)	; &M-39142; [42-87]
-    (=daikanwa		. 39142)	; &I-M-39142;
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39143)	; &M-39143;
     (<-same
      ((=jis-x0212	  . #x6165)	; &M-39117; [65-69]
       (=daikanwa	  . 39117)	; &I-M-39117;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39143)	; &M-39143;
     ))
 (define-char
   '((morohashi-daikanwa	39143 0 2)
@@ -13562,10 +14051,18 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x285D2)	; 𨗒
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 12)
+    (=ucs		. #x285D2)	; 𨗒
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x285D2)	; 𨗒
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39148)	; &M-39148;
     (<-same
      ((=jis-x0208	  . #x703D)	; &GT-56793; [80-29]
       (=ks-x1001	  . #x6F7D)	; &I-K0-6F7D; [79-93]
@@ -13573,18 +14070,21 @@
       ))
     (<-same*sources
      wuyin-jiyun daikanwa)
-    (=daikanwa		. 39148)	; &M-39148;
     ))
 (define-char
-  '((morohashi-daikanwa	39148 0 3)
+  '((<-denotational
+     ((=ucs		  . #x285D2)	; 𨗒
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x285D2)	; 𨗒
+    (=ucs@iso		. #x285D2)	; &U-000285D2;
     ))
 (define-char
-  '((=>ucs*		. #x285D2)	; 𨗒
-    (morohashi-daikanwa	39148 0 9)
+  '((<-denotational
+     ((=ucs		  . #x285D2)	; 𨗒
+      ))
+    (=>ucs*		. #x285D2)	; 𨗒
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
@@ -13608,10 +14108,18 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x48AB)	; 䢫
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 12)
+    (=ucs		. #x48AB)	; 䢫
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48AB)	; 䢫
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39150)	; &M-39150;
     (<-same
      ((=jis-x0208	  . #x6E2E)	; &GT-56259; [78-14]
       (=ks-x1001	  . #x624B)	; &I-K0-624B; [66-43]
@@ -13619,26 +14127,35 @@
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39150)	; &M-39150;
     ))
 (define-char
-  '((morohashi-daikanwa	39150 0 2)
+  '((<-denotational
+     ((=ucs		  . #x48AB)	; 䢫
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x48AB)	; &UU+48AB;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48AB)	; 䢫
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=ucs		. #x48AB)	; 䢫
-    (=cns11643-3	. #x5328)	; &I-C3-5328; [51-08]
+    (=cns11643-3	. #x5328)	; &C3-5328; [51-08]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39151)	; &M-39151;
     (<-same
      ((=daikanwa	  . 39123)	; &M-39123;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39151)	; &M-39151;
     ))
 (define-char
   '((morohashi-daikanwa	39151 0 2)
@@ -13666,6 +14183,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39154)	; &M-39154;
     (<-same
      ((=jis-x0208	  . #x6D79)	; &GT-52157; [77-89]
       (=ks-x1001	  . #x7867)	; &I-K0-7867; [88-71]
@@ -13673,7 +14191,6 @@
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39154)	; &M-39154;
     ))
 (define-char
   '((morohashi-daikanwa	39154 0 2)
@@ -13686,12 +14203,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39155)	; &M-39155;
     (<-same
      ((=daikanwa	  . 39078)	; &M-39078;
       ))
     (<-same*sources
      pianhai-leibian daikanwa)
-    (=daikanwa		. 39155)	; &M-39155;
     ))
 (define-char
   '((morohashi-daikanwa	39155 0 2)
@@ -13704,13 +14221,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39156)	; &M-39156;
     (<-same
      ((=ucs		  . #x5FB7)	; å¾·
       (=daikanwa	  . 10243)	; &I-M-10243;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39156)	; &M-39156;
     ))
 (define-char
   '((morohashi-daikanwa	39156 0 2)
@@ -13723,12 +14240,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39157)	; &M-39157;
     (<-same
      ((=daikanwa	  . 38858)	; &M-38858;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39157)	; &M-39157;
     ))
 (define-char
   '((morohashi-daikanwa	39157 0 2)
@@ -13741,13 +14258,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39158)	; &M-39158;
     (<-same
      ((=ks-x1001	  . #x7064)	; &M-39082; [80-68]
       (=daikanwa	  . 39082)	; &I-M-39082;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39158)	; &M-39158;
     ))
 (define-char
   '((morohashi-daikanwa	39158 0 2)
@@ -13757,35 +14274,52 @@
     (=cns11643-7	. #x343D)	; &C7-343D; [20-29]
     ))
 (define-char
-  '((=>ucs		. #x48AC)	; 䢬
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 12)
+    (=ucs		. #x48AC)	; 䢬
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48AC)	; 䢬
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39159)	; &M-39159;
     (<-same
      ((=daikanwa	  . 39123)	; &M-39123;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39159)	; &M-39159;
     ))
 (define-char
-  '((morohashi-daikanwa	39159 0 3)
+  '((<-denotational
+     ((=ucs		  . #x48AC)	; 䢬
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x48AC)	; &UU+48AC;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48AC)	; 䢬
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=ucs		. #x48AC)	; 䢬
-    (=cns11643-3	. #x5329)	; &I-C3-5329; [51-09]
+    (=cns11643-3	. #x5329)	; &C3-5329; [51-09]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (=daikanwa		. 39160)	; &M-39160;
     (<-original
      ((=daikanwa	  . 39092)	; &M-39092;
       ))
     (<-original*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39160)	; &M-39160;
     ))
 (define-char
   '((morohashi-daikanwa	39160 0 3)
@@ -13831,6 +14365,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
+    (shinjigen-2	. 8392)
+    (=jis-x0208		. #x6E31)	; &GT-52687; [78-17]
+    (=ks-x1001		. #x4B68)	; &I-K0-4B68; [43-72]
+    (=gt		. 52687)	; &I-GT-52687;
+    (=gt-pj-1		. #x6E31)	; &I-GT-52687; [78-17]
+    (=daikanwa		. 39161)	; &I-M-39161;
+    (=ucs@jis		. #x907D)	; &GT-52687;
     (<-same
      ((=daikanwa	  . 32509)	; &M-32509;
       ))
@@ -13843,13 +14384,6 @@
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng zhuangzi jingdian-shiwen daikanwa)
-    (shinjigen-2	. 8392)
-    (=jis-x0208		. #x6E31)	; &GT-52687; [78-17]
-    (=ks-x1001		. #x4B68)	; &I-K0-4B68; [43-72]
-    (=gt		. 52687)	; &I-GT-52687;
-    (=gt-pj-1		. #x6E31)	; &I-GT-52687; [78-17]
-    (=daikanwa		. 39161)	; &I-M-39161;
-    (=ucs@jis		. #x907D)	; &GT-52687;
     ))
 (define-char
   '((<-denotational
@@ -13918,6 +14452,7 @@
     (total-strokes	 . 17)
     (=ks-x1001		. #x792D)	; &M-39163; [89-13]
     (=daikanwa		. 39163)	; &I-M-39163;
+    (=jef-china3	. #x67ED)	; &I-JC3-67ED;
     (->formed
      ((=jis-x0208	  . #x6D64)	; &GT-51571; [77-68]
       (=daikanwa	  . 38642)	; &I-M-38642;
@@ -13994,12 +14529,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
+    (=daikanwa		. 39166)	; &M-39166;
     (<-same
      ((=daikanwa	  . 10259)	; &M-10259;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 39166)	; &M-39166;
     ))
 (define-char
   '((morohashi-daikanwa	39166 0 2)
@@ -14099,13 +14634,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
+    (=daikanwa		. 39169)	; &M-39169;
     (<-synonyms
      ((=cns11643-2	  . #x4F5C)	; &M-02459; [47-60]
       (=daikanwa	  . 02459)	; &I-M-02459;
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng zuoshi-zhuan zuoshi-zhu zuoshi-shu daikanwa)
-    (=daikanwa		. 39169)	; &M-39169;
     (->formed
      ((=daikanwa	  . 39258)	; &M-39258;
       ))
@@ -14163,6 +14698,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
+    (=daikanwa		. 39171)	; &M-39171;
     (<-different
      ((=daikanwa	  . 39093)	; &M-39093;
       ))
@@ -14176,12 +14712,10 @@
     (<-same*sources
      zihui daikanwa)
     (<-synonyms
-     ((=ucs		  . #x5AD9)	; 嫙
-      (=daikanwa	  . 06642)	; &I-M-06642;
+     ((=daikanwa	  . 06642)	; &M-06642;
       ))
     (<-synonyms*sources
      shuowen-tongxundingsheng daikanwa)
-    (=daikanwa		. 39171)	; &M-39171;
     ))
 (define-char
   '((morohashi-daikanwa	39171 0 3)
@@ -14273,13 +14807,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
+    (=ks-x1001		. #x7C3D)	; &M-39174; [92-29]
+    (=daikanwa		. 39174)	; &I-M-39174;
     (<-original
      ((=daikanwa	  . 39222)	; &M-39222;
       ))
     (<-original*sources
      zhengzitong daikanwa)
-    (=ks-x1001		. #x7C3D)	; &M-39174; [92-29]
-    (=daikanwa		. 39174)	; &I-M-39174;
     ))
 (define-char
   '((<-denotational
@@ -14327,15 +14861,15 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
+    (=jis-x0212		. #x6167)	; &M-39175; [65-71]
+    (=jis-x0213-2-2000	. #x7A22)	; &I-JX2-7A22; [90-02]
+    (=daikanwa		. 39175)	; &I-M-39175;
+    (=ucs@jis		. #x9085)	; &M-39175;
     (<-same
      ((=daikanwa	  . 37315)	; &M-37315;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=jis-x0212		. #x6167)	; &M-39175; [65-71]
-    (=jis-x0213-2-2000	. #x7A22)	; &I-JX2-7A22; [90-02]
-    (=daikanwa		. 39175)	; &I-M-39175;
-    (=ucs@jis		. #x9085)	; &M-39175;
     ))
 (define-char
   '((<-denotational
@@ -14359,21 +14893,38 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (=ucs		. #x48AE)	; 䢮
-    (->subsumptive
-     ((total-strokes	   . 17)
-      (<-wrong
-       ((=daikanwa	    . 42369)	; &M-42369;
-	))
-      (<-wrong*sources
-       jiyun jiyun-jiaozheng daikanwa)
-      (=daikanwa	  . 39176)	; &M-39176;
-      )
-     ((total-strokes	   . 17)
-      (=cns11643-4	  . #x5939)	; &C4-5939; [57-25]
-      )
-     ((total-strokes	   . 16)
-      (=ucs@unicode	  . #x48AE)	; &UU+48AE;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48AE)	; 䢮
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 13)
+    (total-strokes	 . 17)
+    (=daikanwa		. 39176)	; &M-39176;
+    (<-wrong
+     ((=daikanwa	  . 42369)	; &M-42369;
       ))
+    (<-wrong*sources
+     jiyun jiyun-jiaozheng daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48AE)	; 䢮
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x48AE)	; &UU+48AE;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48AE)	; 䢮
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 13)
+    (total-strokes	 . 17)
+    (=cns11643-4	. #x5939)	; &C4-5939; [57-25]
     ))
 (define-char
   '((=>ucs		. #x285F1)	; 𨗱
@@ -14394,12 +14945,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
+    (=daikanwa		. 39178)	; &M-39178;
     (<-ancient
      ((=daikanwa	  . 11170)	; &M-11170;
       ))
     (<-ancient*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39178)	; &M-39178;
     ))
 (define-char
   '((morohashi-daikanwa	39178 0 2)
@@ -14412,26 +14963,26 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (total-strokes	 . 20)
+    (=cns11643-7	. #x5057)	; &M-39179; [48-55]
+    (=daikanwa		. 39179)	; &I-M-39179;
     (<-ancient
      ((=ucs		  . #x5F99)	; 徙
       (=daikanwa	  . 10142)	; &I-M-10142;
       ))
     (<-ancient*sources
      wuyin-jiyun daikanwa)
-    (=cns11643-7	. #x5057)	; &M-39179; [48-55]
-    (=daikanwa		. 39179)	; &I-M-39179;
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
+    (=daikanwa		. 39180)	; &M-39180;
     (<-ancient
      ((=ks-x1001	  . #x6B36)	; &M-39134; [75-22]
       (=daikanwa	  . 39134)	; &I-M-39134;
       ))
     (<-ancient*sources
      jiyun daikanwa)
-    (=daikanwa		. 39180)	; &M-39180;
     ))
 (define-char
   '((morohashi-daikanwa	39180 0 2)
@@ -14444,13 +14995,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
+    (=daikanwa		. 39181)	; &M-39181;
     (<-ancient
      ((=ks-x1001	  . #x6B36)	; &M-39134; [75-22]
       (=daikanwa	  . 39134)	; &I-M-39134;
       ))
     (<-ancient*sources
      jiyun daikanwa)
-    (=daikanwa		. 39181)	; &M-39181;
     ))
 (define-char
   '((morohashi-daikanwa	39181 0 2)
@@ -14463,13 +15014,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
+    (=daikanwa		. 39182)	; &M-39182;
     (<-same
      ((=jis-x0208	  . #x6E2B)	; &GT-52518; [78-11]
       (=daikanwa	  . 39073)	; &I-M-39073;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39182)	; &M-39182;
     ))
 (define-char
   '((morohashi-daikanwa	39182 0 2)
@@ -14562,12 +15113,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
+    (=daikanwa		. 39188)	; &M-39188;
     (<-same
      ((=daikanwa	  . 39123)	; &M-39123;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39188)	; &M-39188;
     ))
 (define-char
   '((morohashi-daikanwa	39188 0 3)
@@ -14580,13 +15131,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
+    (=daikanwa		. 39189)	; &M-39189;
     (<-same
      ((=ks-x1001	  . #x7475)	; &M-38931; [84-85]
       (=daikanwa	  . 38931)	; &I-M-38931;
       ))
     (<-same*sources
      wuyin-pianhai daikanwa)
-    (=daikanwa		. 39189)	; &M-39189;
     ))
 (define-char
   '((morohashi-daikanwa	39189 0 2)
@@ -14599,13 +15150,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
+    (=daikanwa		. 39190)	; &M-39190;
     (<-same
      ((=ucs		  . #x5E36)	; 帶
       (=daikanwa	  . 08950)	; &I-M-08950;
       ))
     (<-same*sources
      pianhai-leibian daikanwa)
-    (=daikanwa		. 39190)	; &M-39190;
     ))
 (define-char
   '((morohashi-daikanwa	39190 0 2)
@@ -14670,12 +15221,12 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=daikanwa		. 39191)	; &M-39191;
     (<-same
      ((=daikanwa	  . 25448)	; &M-25448;
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 39191)	; &M-39191;
     (->formed
      ((=jis-x0208	  . #x702B)	; &GT-56258; [80-11]
       (=ks-x1001	  . #x624A)	; &I-K0-624A; [66-42]
@@ -14738,13 +15289,13 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=daikanwa		. 39192)	; &M-39192;
     (<-original
      ((=jis-x0212	  . #x6165)	; &M-39117; [65-69]
       (=daikanwa	  . 39117)	; &I-M-39117;
       ))
     (<-original*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39192)	; &M-39192;
     ))
 (define-char
   '((<-denotational
@@ -14777,6 +15328,16 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (shinjigen-1	. 8399)
+    (shinjigen-2	. 8399)
+    (=jis-x0208@1978	. #x4676)	; &GT-52751; [38-86]
+    (=jis-x0208@1983	. #x6D6E)	; &I-J83-6D6E; [77-78]
+    (=ks-x1001		. #x6C44)	; &I-K0-6C44; [76-36]
+    (=jis-x0208@1990	. #x6D6E)	; &I-J90-6D6E; [77-78]
+    (=gt		. 52751)	; &I-GT-52751;
+    (=gt-pj-1		. #x6D6E)	; &I-GT-52751; [77-78]
+    (=daikanwa		. 39193)	; &I-M-39193;
+    (=ucs@jis		. #x9087)	; &GT-52751;
     (<-ancient
      ((=daikanwa	  . 39124)	; &M-39124;
       ))
@@ -14788,16 +15349,6 @@
       ))
     (<-synonyms*sources
      jingdian-shiwen daikanwa)
-    (shinjigen-1	. 8399)
-    (shinjigen-2	. 8399)
-    (=jis-x0208@1978	. #x4676)	; &GT-52751; [38-86]
-    (=jis-x0208@1983	. #x6D6E)	; &I-J83-6D6E; [77-78]
-    (=ks-x1001		. #x6C44)	; &I-K0-6C44; [76-36]
-    (=jis-x0208@1990	. #x6D6E)	; &I-J90-6D6E; [77-78]
-    (=gt		. 52751)	; &I-GT-52751;
-    (=gt-pj-1		. #x6D6E)	; &I-GT-52751; [77-78]
-    (=daikanwa		. 39193)	; &I-M-39193;
-    (=ucs@jis		. #x9087)	; &GT-52751;
     (->formed
      ((=jis-x0208@1978	  . #x6D6E)	; &M-38793; [77-78]
       (=daikanwa	  . 38793)	; &I-M-38793;
@@ -14853,52 +15404,93 @@
     (=cns11643-7	. #x437C)	; &C7-437C; [35-92]
     ))
 (define-char
-  '((=>ucs		. #x48B0)	; 䢰
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 14)
+    (=ucs		. #x48B0)	; 䢰
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48B0)	; 䢰
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
     (=daikanwa		. 39196)	; &M-39196;
     ))
 (define-char
-  '((morohashi-daikanwa	39196 0 2)
+  '((<-denotational
+     ((=ucs		  . #x48B0)	; 䢰
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs@unicode	. #x48B0)	; &UU+48B0;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x48B0)	; 䢰
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (=ucs		. #x48B0)	; 䢰
-    (=cns11643-3	. #x5939)	; &I-C3-5939; [57-25]
+    (=cns11643-3	. #x5939)	; &C3-5939; [57-25]
+    ))
+(define-char
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 14)
+    (=ucs		. #x28609)	; 𨘉
     ))
 (define-char
-  '((=>ucs		. #x28609)	; 𨘉
+  '((<-denotational
+     ((=ucs		  . #x28609)	; 𨘉
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=daikanwa		. 39197)	; &M-39197;
     (<-same
      ((=daikanwa	  . 38936)	; &M-38936;
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39197)	; &M-39197;
     ))
 (define-char
-  '((=>ucs		. #x28609)	; 𨘉
-    (morohashi-daikanwa	39197 0 2)
+  '((<-denotational
+     ((=ucs		  . #x28609)	; 𨘉
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (=cns11643-4	. #x5E22)	; &C4-5E22; [62-02]
+    (=ucs@iso		. #x28609)	; &U-00028609;
     ))
 (define-char
-  '((morohashi-daikanwa	39197 0 3)
+  '((<-denotational
+     ((=ucs		  . #x28609)	; 𨘉
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (=ucs		. #x28609)	; 𨘉
+    (=cns11643-4	. #x5E22)	; &C4-5E22; [62-02]
+    ))
+(define-char
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 14)
+    (=ucs		. #x9088)	; 邈
+    (=big5		. #xC2E4)	; &I-B-C2E4;
     ))
 (define-char
-  '((=>ucs		. #x9088)	; 邈
+  '((<-denotational
+     ((=ucs		  . #x9088)	; 邈
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=ks-x1001		. #x5831)	; &M-39198; [56-17]
+    (=jis-x0212		. #x6168)	; &I-JSP-6168; [65-72]
+    (=jis-x0213-1-2000	. #x7C5A)	; &I-JX1-7C5A; [92-58]
+    (=daikanwa		. 39198)	; &I-M-39198;
+    (=jef-china3	. #x67F1)	; &I-JC3-67F1;
+    (=ucs@jis		. #x9088)	; &M-39198;
     (<-same
      ((=daikanwa	  . 39235)	; &M-39235;
       ))
@@ -14910,40 +15502,37 @@
       ))
     (<-synonyms*sources
      jiyun daikanwa)
-    (=ks-x1001		. #x5831)	; &M-39198; [56-17]
-    (=jis-x0212		. #x6168)	; &I-JSP-6168; [65-72]
-    (=jis-x0213-1-2000	. #x7C5A)	; &I-JX1-7C5A; [92-58]
-    (=big5		. #xC2E4)	; &I-B-C2E4;
-    (=daikanwa		. 39198)	; &I-M-39198;
-    (=ucs@jis		. #x9088)	; &M-39198;
     ))
 (define-char
-  '((=>ucs		. #x9088)	; 邈
-    (morohashi-daikanwa	39198 0 2)
+  '((<-denotational
+     ((=ucs		  . #x9088)	; 邈
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
-    (total-strokes	 . 18)
-    (=cns11643-1	. #x774F)	; &C1-774F; [87-47]
+    (total-strokes	 . 17)
+    (=gb2312		. #x6563)	; &G0-6563; [69-67]
+    (=ucs@unicode	. #x9088)	; &G0-6563;
     ))
 (define-char
-  '((morohashi-daikanwa	39198 0 3)
+  '((<-denotational
+     ((=ucs		  . #x9088)	; 邈
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x9088)	; 邈
-    (=gb2312		. #x6563)	; &I-G0-6563; [69-67]
+    (total-strokes	 . 18)
+    (=cns11643-1	. #x774F)	; &C1-774F; [87-47]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=daikanwa		. 39199)	; &M-39199;
     (<-ancient
      ((=ks-x1001	  . #x7165)	; &M-39118; [81-69]
       (=daikanwa	  . 39118)	; &I-M-39118;
       ))
     (<-ancient*sources
      yupian daikanwa)
-    (=daikanwa		. 39199)	; &M-39199;
     ))
 (define-char
   '((morohashi-daikanwa	39199 0 2)
@@ -14972,6 +15561,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=daikanwa		. 39201)	; &M-39201;
     (<-same
      ((=jis-x0212	  . #x5324)	; &M-26801; [51-04]
       (=jis-x0213-2-2000  . #x736F)	; &I-JX2-736F; [83-79]
@@ -14979,7 +15569,6 @@
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39201)	; &M-39201;
     ))
 (define-char
   '((morohashi-daikanwa	39201 0 3)
@@ -15010,13 +15599,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=daikanwa		. 39203)	; &M-39203;
     (<-same
      ((=ucs		  . #x6EEF)	; 滯
       (=daikanwa	  . 18075)	; &I-M-18075;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39203)	; &M-39203;
     ))
 (define-char
   '((morohashi-daikanwa	39203 0 2)
@@ -15029,13 +15618,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=daikanwa		. 39204)	; &M-39204;
     (<-same
      ((=ks-x1001	  . #x7064)	; &M-39082; [80-68]
       (=daikanwa	  . 39082)	; &I-M-39082;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39204)	; &M-39204;
     ))
 (define-char
   '((morohashi-daikanwa	39204 0 2)
@@ -15094,13 +15683,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=daikanwa		. 39208)	; &M-39208;
     (<-same
      ((=ks-x1001	  . #x5627)	; &M-38902; [54-07]
       (=daikanwa	  . 38902)	; &I-M-38902;
       ))
     (<-same*sources
      wuyin-pianhai daikanwa)
-    (=daikanwa		. 39208)	; &M-39208;
     ))
 (define-char
   '((morohashi-daikanwa	39208 0 2)
@@ -15113,12 +15702,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=daikanwa		. 39209)	; &M-39209;
     (<-same
      ((=daikanwa	  . 39091)	; &M-39091;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39209)	; &M-39209;
     ))
 (define-char
   '((morohashi-daikanwa	39209 0 2)
@@ -15131,13 +15720,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=daikanwa		. 39210)	; &M-39210;
     (<-same
      ((=ucs		  . #x64F7)	; 擷
       (=daikanwa	  . 12900)	; &I-M-12900;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39210)	; &M-39210;
     ))
 (define-char
   '((morohashi-daikanwa	39210 0 3)
@@ -15150,13 +15739,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=daikanwa		. 39212)	; &M-39212;
     (<-same
      ((=ks-x1001	  . #x775C)	; &M-38839; [87-60]
       (=daikanwa	  . 38839)	; &I-M-38839;
       ))
     (<-same*sources
      wuyin-pianhai daikanwa)
-    (=daikanwa		. 39212)	; &M-39212;
     ))
 (define-char
   '((morohashi-daikanwa	39212 0 2)
@@ -15176,6 +15765,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=daikanwa		. 39214)	; &M-39214;
     (<-wrong
      ((=jis-x0208	  . #x6E34)	; &GT-52803; [78-20]
       (=ks-x1001	  . #x5C2B)	; &I-K0-5C2B; [60-11]
@@ -15183,7 +15773,6 @@
       ))
     (<-wrong*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39214)	; &M-39214;
     ))
 (define-char
   '((<-denotational
@@ -15242,10 +15831,25 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x908A)	; 邊
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 15)
+    (=ucs		. #x908A)	; 邊
+    (=big5		. #xC3E4)	; &I-B-C3E4;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x908A)	; 邊
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
+    (shinjigen-2	. 8209)
+    (=jis-x0208		. #x6E34)	; &GT-52803; [78-20]
+    (=ks-x1001		. #x5C2B)	; &I-K0-5C2B; [60-11]
+    (=gt		. 52803)	; &I-GT-52803;
+    (=gt-pj-1		. #x6E34)	; &I-GT-52803; [78-20]
+    (=daikanwa		. 39216)	; &I-M-39216;
+    (=ucs@jis		. #x908A)	; &GT-52803;
     (<-ancient
      ((=daikanwa	  . 28423)	; &M-28423;
       ))
@@ -15256,35 +15860,31 @@
       ))
     (<-original*sources
      zhengzitong shuowen daikanwa)
-    (shinjigen-2	. 8209)
-    (=jis-x0208		. #x6E34)	; &GT-52803; [78-20]
-    (=ks-x1001		. #x5C2B)	; &I-K0-5C2B; [60-11]
-    (=big5		. #xC3E4)	; &I-B-C3E4;
-    (=gt		. 52803)	; &I-GT-52803;
-    (=gt-pj-1		. #x6E34)	; &I-GT-52803; [78-20]
-    (=daikanwa		. 39216)	; &I-M-39216;
-    (=ucs@jis		. #x908A)	; &GT-52803;
     ))
 (define-char
-  '((=>ucs		. #x908A)	; 邊
-    (morohashi-daikanwa	39216 0 2)
+  '((<-denotational
+     ((=ucs		  . #x908A)	; 邊
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 15)
-    (total-strokes	 . 19)
-    (=cns11643-1	. #x7931)	; &C1-7931; [89-17]
+    (total-strokes	 . 18)
+    (=gb12345		. #x315F)	; &UU+908A; [17-63]
+    (=ucs@unicode	. #x908A)	; &UU+908A;
     ))
 (define-char
-  '((morohashi-daikanwa	39216 0 3)
+  '((<-denotational
+     ((=ucs		  . #x908A)	; 邊
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x908A)	; 邊
-    (=gb12345		. #x315F)	; 邊 [17-63]
+    (total-strokes	 . 19)
+    (=cns11643-1	. #x7931)	; &C1-7931; [89-17]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
+    (=daikanwa		. 39217)	; &M-39217;
     (<-original
      ((=jis-x0208	  . #x6E34)	; &GT-52803; [78-20]
       (=ks-x1001	  . #x5C2B)	; &I-K0-5C2B; [60-11]
@@ -15292,7 +15892,6 @@
       ))
     (<-original*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39217)	; &M-39217;
     ))
 (define-char
   '((morohashi-daikanwa	39217 0 2)
@@ -15349,6 +15948,10 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
+    (=jis-x0212		. #x616A)	; &M-39219; [65-74]
+    (=jis-x0213-2-2000	. #x7A23)	; &I-JX2-7A23; [90-03]
+    (=daikanwa		. 39219)	; &I-M-39219;
+    (=ucs@jis		. #x908C)	; &M-39219;
     (<-ancient
      ((=jis-x0208	  . #x6E2F)	; &GT-52644; [78-15]
       (=ks-x1001	  . #x7240)	; &I-K0-7240; [82-32]
@@ -15356,10 +15959,6 @@
       ))
     (<-ancient*sources
      jiyun daikanwa)
-    (=jis-x0212		. #x616A)	; &M-39219; [65-74]
-    (=jis-x0213-2-2000	. #x7A23)	; &I-JX2-7A23; [90-03]
-    (=daikanwa		. 39219)	; &I-M-39219;
-    (=ucs@jis		. #x908C)	; &M-39219;
     ))
 (define-char
   '((<-denotational
@@ -15383,13 +15982,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
+    (=daikanwa		. 39222)	; &M-39222;
     (<-original
      ((=ks-x1001	  . #x7C3D)	; &M-39174; [92-29]
       (=daikanwa	  . 39174)	; &I-M-39174;
       ))
     (<-original*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39222)	; &M-39222;
     ))
 (define-char
   '((morohashi-daikanwa	39222 0 2)
@@ -15449,6 +16048,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
+    (=daikanwa		. 39227)	; &M-39227;
     (<-same
      ((=jis-x0208	  . #x5462)	; &GT-07089; [52-66]
       (=ks-x1001	  . #x5666)	; &I-K0-5666; [54-70]
@@ -15456,7 +16056,6 @@
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39227)	; &M-39227;
     ))
 (define-char
   '((morohashi-daikanwa	39227 0 2)
@@ -15469,6 +16068,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
+    (=daikanwa		. 39228)	; &M-39228;
     (<-same
      ((=jis-x0208	  . #x6E2C)	; &GT-52567; [78-12]
       (=ks-x1001	  . #x546E)	; &I-K0-546E; [52-78]
@@ -15476,7 +16076,6 @@
       ))
     (<-same*sources
      wuyin-pianhai daikanwa)
-    (=daikanwa		. 39228)	; &M-39228;
     ))
 (define-char
   '((morohashi-daikanwa	39228 0 2)
@@ -15489,6 +16088,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
+    (=daikanwa		. 39229)	; &M-39229;
     (<-same
      ((=jis-x0208	  . #x6E2A)	; &GT-52470; [78-10]
       (=ks-x1001	  . #x7476)	; &I-K0-7476; [84-86]
@@ -15496,7 +16096,6 @@
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39229)	; &M-39229;
     ))
 (define-char
   '((morohashi-daikanwa	39229 0 2)
@@ -15509,6 +16108,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
+    (=daikanwa		. 39230)	; &M-39230;
     (<-same
      ((=jis-x0208	  . #x6D7C)	; &GT-52206; [77-92]
       (=ks-x1001	  . #x5030)	; &I-K0-5030; [48-16]
@@ -15516,7 +16116,6 @@
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39230)	; &M-39230;
     ))
 (define-char
   '((morohashi-daikanwa	39230 0 5)
@@ -15529,13 +16128,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
+    (=daikanwa		. 39231)	; &M-39231;
     (<-same
      ((=ucs		  . #x8F26)	; 輦
       (=daikanwa	  . 38393)	; &I-M-38393;
       ))
     (<-same*sources
      wuyin-pianhai daikanwa)
-    (=daikanwa		. 39231)	; &M-39231;
     ))
 (define-char
   '((morohashi-daikanwa	39231 0 2)
@@ -15565,36 +16164,39 @@
     (=cns11643-5	. #x697C)	; &I-C5-697C; [73-92]
     ))
 (define-char
-  '((=>ucs		. #x908D)	; 邍
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 16)
+    (=ucs		. #x908D)	; 邍
+    (=big5		. #xF4E0)	; &I-B-F4E0;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x908D)	; 邍
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
+    (=daikanwa		. 39234)	; &M-39234;
     (<-synonyms
      ((=ucs		  . #x539F)	; 原
       (=daikanwa	  . 02973)	; &I-M-02973;
       ))
     (<-synonyms*sources
      shuowen jiyun daikanwa)
-    (=daikanwa		. 39234)	; &M-39234;
     ))
 (define-char
-  '((morohashi-daikanwa	39234 0 2)
+  '((<-denotational
+     ((=ucs		  . #x908D)	; 邍
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (=ucs		. #x908D)	; 邍
-    ))
-(define-char
-  '((=>ucs		. #x908D)	; 邍
-    (morohashi-daikanwa	39234 0 4)
-    (ideographic-radical . 162)	; ⾡
-    (ideographic-strokes . 16)
-    (total-strokes	 . 20)
-    (=big5		. #xF4E0)	; &B-F4E0;
+    (=ucs@unicode	. #x908D)	; &UU+908D;
     ))
 (define-char
-  '((=>ucs		. #x908D)	; 邍
-    (morohashi-daikanwa	39234 0 5)
+  '((<-denotational
+     ((=ucs		  . #x908D)	; 邍
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
@@ -15604,6 +16206,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
+    (=daikanwa		. 39235)	; &M-39235;
     (<-same
      ((=ks-x1001	  . #x5831)	; &M-39198; [56-17]
       (=jis-x0212	  . #x6168)	; &I-JSP-6168; [65-72]
@@ -15612,7 +16215,6 @@
       ))
     (<-same*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39235)	; &M-39235;
     ))
 (define-char
   '((morohashi-daikanwa	39235 0 2)
@@ -15625,6 +16227,8 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 16)
     (total-strokes	 . 23)
+    (=cns11643-7	. #x5D22)	; &M-39236; [61-02]
+    (=daikanwa		. 39236)	; &I-M-39236;
     (<-same
      ((=ks-x1001	  . #x5831)	; &M-39198; [56-17]
       (=jis-x0212	  . #x6168)	; &I-JSP-6168; [65-72]
@@ -15633,8 +16237,6 @@
       ))
     (<-same*sources
      shuowen-changjian daikanwa)
-    (=cns11643-7	. #x5D22)	; &M-39236; [61-02]
-    (=daikanwa		. 39236)	; &I-M-39236;
     ))
 (define-char
   '((=>daikanwa		. 39237)	; &M-39237;
@@ -15666,39 +16268,55 @@
     (=cns11643-7	. #x5059)	; &C7-5059; [48-57]
     ))
 (define-char
-  '((=>daikanwa		. 39239)	; &M-39239;
-    (ideographic-radical . 162)	; ⾡
+  '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 16)
     (=ucs		. #x28640)	; 𨙀
-    (->subsumptive
-     ((total-strokes	   . 20)
-      (<-ancient
-       ((=jis-x0208	    . #x6E2C)	; &GT-52567; [78-12]
-	(=ks-x1001	    . #x546E)	; &I-K0-546E; [52-78]
-	(=daikanwa	    . 39089)	; &I-M-39089;
-	))
-      (<-ancient*sources
-       jiyun daikanwa)
-      (=daikanwa	  . 39239)	; &M-39239;
-      )
-     ((total-strokes	   . 20)
-      (=cns11643-5	  . #x6E28)	; &C5-6E28; [78-08]
-      )
-     ((total-strokes	   . 19)
-      (=ucs@iso		  . #x28640)	; &U-00028640;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x28640)	; 𨙀
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=daikanwa		. 39239)	; &M-39239;
+    (<-ancient
+     ((=jis-x0208	  . #x6E2C)	; &GT-52567; [78-12]
+      (=ks-x1001	  . #x546E)	; &I-K0-546E; [52-78]
+      (=daikanwa	  . 39089)	; &I-M-39089;
+      ))
+    (<-ancient*sources
+     jiyun daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x28640)	; 𨙀
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (=ucs@iso		. #x28640)	; &U-00028640;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x28640)	; 𨙀
       ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=cns11643-5	. #x6E28)	; &C5-6E28; [78-08]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
+    (=daikanwa		. 39240)	; &M-39240;
     (<-same
      ((=ucs		  . #x96A4)	; 隤
       (=daikanwa	  . 41849)	; &I-M-41849;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39240)	; &M-39240;
     ))
 (define-char
   '((morohashi-daikanwa	39240 0 3)
@@ -15708,43 +16326,53 @@
     (=cns11643-7	. #x5058)	; &C7-5058; [48-56]
     ))
 (define-char
-  '((=>ucs		. #x28642)	; 𨙂
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 17)
+    (=ucs		. #x28642)	; 𨙂
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x28642)	; 𨙂
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
+    (=daikanwa		. 39242)	; &M-39242;
     (<-original
      ((=jis-x0212	  . #x616B)	; &M-39250; [65-75]
       (=daikanwa	  . 39250)	; &I-M-39250;
       ))
     (<-original*sources
      zhengzitong shuowen daikanwa)
-    (=daikanwa		. 39242)	; &M-39242;
     ))
 (define-char
-  '((=>ucs		. #x28642)	; 𨙂
-    (morohashi-daikanwa	39242 0 2)
+  '((<-denotational
+     ((=ucs		  . #x28642)	; 𨙂
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 17)
-    (total-strokes	 . 21)
-    (=cns11643-4	. #x6755)	; &C4-6755; [71-53]
+    (total-strokes	 . 20)
+    (=ucs@iso		. #x28642)	; &U-00028642;
     ))
 (define-char
-  '((morohashi-daikanwa	39242 0 3)
+  '((<-denotational
+     ((=ucs		  . #x28642)	; 𨙂
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 17)
-    (total-strokes	 . 20)
-    (=ucs		. #x28642)	; 𨙂
+    (total-strokes	 . 21)
+    (=cns11643-4	. #x6755)	; &C4-6755; [71-53]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
+    (=daikanwa		. 39243)	; &M-39243;
     (<-vulgar
      ((=daikanwa	  . 39242)	; &M-39242;
       ))
     (<-vulgar*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39243)	; &M-39243;
     ))
 (define-char
   '((morohashi-daikanwa	39243 0 2)
@@ -15773,12 +16401,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
+    (=daikanwa		. 39245)	; &M-39245;
     (<-original
      ((=daikanwa	  . 39234)	; &M-39234;
       ))
     (<-original*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39245)	; &M-39245;
     ))
 (define-char
   '((morohashi-daikanwa	39245 0 2)
@@ -15791,6 +16419,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
+    (=daikanwa		. 39246)	; &M-39246;
     (<-ancient
      ((=jis-x0208@1978	  . #x465B)	; &M-38982; [38-59]
       (=ks-x1001	  . #x546D)	; &I-K0-546D; [52-77]
@@ -15798,7 +16427,6 @@
       ))
     (<-ancient*sources
      wuyin-jiyun daikanwa)
-    (=daikanwa		. 39246)	; &M-39246;
     ))
 (define-char
   '((morohashi-daikanwa	39246 0 2)
@@ -15842,13 +16470,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
+    (=daikanwa		. 39249)	; &M-39249;
     (<-same
      ((=ucs		  . #x5331)	; 匱
       (=daikanwa	  . 02651)	; &I-M-02651;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39249)	; &M-39249;
     ))
 (define-char
   '((morohashi-daikanwa	39249 0 2)
@@ -15858,48 +16486,80 @@
     (=cns11643-7	. #x5551)	; &C7-5551; [53-49]
     ))
 (define-char
-  '((=>daikanwa		. 39250)	; &M-39250;
-    (ideographic-radical . 162)	; ⾡
+  '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 17)
     (=ucs		. #x908E)	; 邎
-    (->subsumptive
-     ((total-strokes	   . 22)
-      (<-same
-       ((=daikanwa	    . 39242)	; &M-39242;
-	))
-      (<-same*sources
-       zhengzitong daikanwa)
-      (=jis-x0212	  . #x616B)	; &M-39250; [65-75]
-      (=daikanwa	  . 39250)	; &I-M-39250;
-      (=ucs@jis		  . #x908E)	; &M-39250;
-      )
-     ((total-strokes	   . 22)
-      (=cns11643-4	  . #x6952)	; &C4-6952; [73-50]
-      )
-     ((total-strokes	   . 21)
-      (=ucs@unicode	  . #x908E)	; &UU+908E;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x908E)	; 邎
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 17)
+    (total-strokes	 . 22)
+    (=jis-x0212		. #x616B)	; &M-39250; [65-75]
+    (=daikanwa		. 39250)	; &I-M-39250;
+    (=ucs@jis		. #x908E)	; &M-39250;
+    (<-same
+     ((=daikanwa	  . 39242)	; &M-39242;
+      ))
+    (<-same*sources
+     zhengzitong daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x908E)	; 邎
       ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=ucs@unicode	. #x908E)	; &UU+908E;
     ))
 (define-char
-  '((=>daikanwa		. 39251)	; &M-39251;
+  '((<-denotational
+     ((=ucs		  . #x908E)	; 邎
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 17)
+    (total-strokes	 . 22)
+    (=cns11643-4	. #x6952)	; &C4-6952; [73-50]
+    ))
+(define-char
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 17)
     (=ucs		. #x28652)	; 𨙒
-    (->subsumptive
-     ((total-strokes	   . 21)
-      (<-same
-       ((=daikanwa	    . 37358)	; &M-37358;
-	))
-      (<-same*sources
-       jiyun daikanwa)
-      (=daikanwa	  . 39251)	; &M-39251;
-      )
-     ((total-strokes	   . 21)
-      (=cns11643-5	  . #x7152)	; &C5-7152; [81-50]
-      )
-     ((total-strokes	   . 20)
-      (=ucs@iso		  . #x28652)	; &U-00028652;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x28652)	; 𨙒
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=daikanwa		. 39251)	; &M-39251;
+    (<-same
+     ((=daikanwa	  . 37358)	; &M-37358;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x28652)	; 𨙒
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
+    (=ucs@iso		. #x28652)	; &U-00028652;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x28652)	; 𨙒
       ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 17)
+    (total-strokes	 . 21)
+    (=cns11643-5	. #x7152)	; &C5-7152; [81-50]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -15952,6 +16612,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
+    (=daikanwa		. 39254)	; &M-39254;
     (<-ancient
      ((=jis-x0212	  . #x6156)	; &M-38930; [65-54]
       (=jis-x0213-1-2000  . #x7C58)	; &I-JX1-7C58; [92-56]
@@ -15959,7 +16620,6 @@
       ))
     (<-ancient*sources
      yupian daikanwa)
-    (=daikanwa		. 39254)	; &M-39254;
     ))
 (define-char
   '((morohashi-daikanwa	39254 0 3)
@@ -15972,12 +16632,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
+    (=daikanwa		. 39255)	; &M-39255;
     (<-same
      ((=daikanwa	  . 39169)	; &M-39169;
       ))
     (<-same*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39255)	; &M-39255;
     ))
 (define-char
   '((morohashi-daikanwa	39255 0 2)
@@ -16003,12 +16663,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 19)
     (total-strokes	 . 23)
+    (=daikanwa		. 39257)	; &M-39257;
     (<-original
      ((=daikanwa	  . 39123)	; &M-39123;
       ))
     (<-original*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39257)	; &M-39257;
     ))
 (define-char
   '((morohashi-daikanwa	39257 0 2)
@@ -16021,6 +16681,7 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 19)
     (total-strokes	 . 23)
+    (=daikanwa		. 39258)	; &M-39258;
     (<-formed
      ((=daikanwa	  . 39169)	; &M-39169;
       ))
@@ -16029,7 +16690,6 @@
       ))
     (<-same*sources
      jiyun daikanwa)
-    (=daikanwa		. 39258)	; &M-39258;
     ))
 (define-char
   '((morohashi-daikanwa	39258 0 2)
@@ -16039,69 +16699,90 @@
     (=cns11643-7	. #x5D25)	; &C7-5D25; [61-05]
     ))
 (define-char
-  '((=>ucs		. #x908F)	; 邏
+  '((ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 19)
+    (=ucs		. #x908F)	; 邏
+    (=big5		. #xC5DE)	; &I-B-C5DE;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x908F)	; 邏
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 19)
     (total-strokes	 . 23)
-    (<-same
-     ((=jis-x0208	  . #x4D65)	; &GT-36564; [45-69]
-      (=ks-x1001	  . #x547E)	; &I-K0-547E; [52-94]
-      (=daikanwa	  . 28397)	; &I-M-28397;
-      ))
-    (<-same*sources
-     jiyun daikanwa)
     (shinjigen-1	. 8404)
     (shinjigen-2	. 8404)
     (=jis-x0208		. #x6E36)	; &GT-52869; [78-22]
     (=ks-x1001		. #x5524)	; &I-K0-5524; [53-04]
-    (=big5		. #xC5DE)	; &I-B-C5DE;
     (=gt		. 52869)	; &I-GT-52869;
     (=gt-pj-1		. #x6E36)	; &I-GT-52869; [78-22]
     (=daikanwa		. 39259)	; &I-M-39259;
     (=ucs@jis		. #x908F)	; &GT-52869;
+    (<-same
+     ((=jis-x0208	  . #x4D65)	; &GT-36564; [45-69]
+      (=ks-x1001	  . #x547E)	; &I-K0-547E; [52-94]
+      (=daikanwa	  . 28397)	; &I-M-28397;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x908F)	; 邏
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 19)
+    (total-strokes	 . 22)
+    (=gb12345		. #x425F)	; &UU+908F; [34-63]
+    (=ucs@unicode	. #x908F)	; &UU+908F;
     ))
 (define-char
-  '((=>ucs		. #x908F)	; 邏
-    (morohashi-daikanwa	39259 0 2)
+  '((<-denotational
+     ((=ucs		  . #x908F)	; 邏
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 19)
     (total-strokes	 . 23)
     (=cns11643-1	. #x7C4A)	; &C1-7C4A; [92-42]
     ))
 (define-char
-  '((morohashi-daikanwa	39259 0 3)
-    (ideographic-radical . 162)	; ⾡
+  '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 19)
-    (total-strokes	 . 22)
-    (=ucs		. #x908F)	; 邏
-    (=gb12345		. #x425F)	; 邏 [34-63]
+    (=ucs		. #x9090)	; 邐
+    (=big5		. #xC5DD)	; &I-B-C5DD;
     ))
 (define-char
-  '((=>ucs		. #x9090)	; 邐
+  '((<-denotational
+     ((=ucs		  . #x9090)	; 邐
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 19)
     (total-strokes	 . 23)
     (=jis-x0212		. #x616C)	; &M-39260; [65-76]
     (=jis-x0213-2-2000	. #x7A24)	; &I-JX2-7A24; [90-04]
-    (=big5		. #xC5DD)	; &I-B-C5DD;
     (=daikanwa		. 39260)	; &I-M-39260;
+    (=jef-china3	. #x67F3)	; &I-JC3-67F3;
     (=ucs@jis		. #x9090)	; &M-39260;
     ))
 (define-char
-  '((=>ucs		. #x9090)	; 邐
-    (morohashi-daikanwa	39260 0 2)
+  '((<-denotational
+     ((=ucs		  . #x9090)	; 邐
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 19)
-    (total-strokes	 . 23)
-    (=cns11643-1	. #x7C49)	; &C1-7C49; [92-41]
+    (total-strokes	 . 22)
+    (=gb12345		. #x654E)	; &UU+9090; [69-46]
+    (=ucs@unicode	. #x9090)	; &UU+9090;
     ))
 (define-char
-  '((morohashi-daikanwa	39260 0 3)
+  '((<-denotational
+     ((=ucs		  . #x9090)	; 邐
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 19)
-    (total-strokes	 . 22)
-    (=ucs		. #x9090)	; 邐
-    (=gb12345		. #x654E)	; 邐 [69-46]
+    (total-strokes	 . 23)
+    (=cns11643-1	. #x7C49)	; &C1-7C49; [92-41]
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -16149,13 +16830,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 20)
     (total-strokes	 . 24)
+    (=daikanwa		. 39262)	; &M-39262;
     (<-ancient
      ((=ks-x1001	  . #x7264)	; &M-38943; [82-68]
       (=daikanwa	  . 38943)	; &I-M-38943;
       ))
     (<-ancient*sources
      yupian daikanwa)
-    (=daikanwa		. 39262)	; &M-39262;
     ))
 (define-char
   '((morohashi-daikanwa	39262 0 3)
@@ -16168,13 +16849,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 20)
     (total-strokes	 . 24)
+    (=daikanwa		. 39263)	; &M-39263;
     (<-original
      ((=ks-x1001	  . #x7064)	; &M-39082; [80-68]
       (=daikanwa	  . 39082)	; &I-M-39082;
       ))
     (<-original*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39263)	; &M-39263;
     ))
 (define-char
   '((morohashi-daikanwa	39263 0 2)
@@ -16202,13 +16883,13 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 21)
     (total-strokes	 . 19)
+    (=daikanwa		. 39221)	; &M-39221;
     (<-ancient
      ((=ucs		  . #x539F)	; 原
       (=daikanwa	  . 02973)	; &I-M-02973;
       ))
     (<-ancient*sources
      zihui-bu daikanwa)
-    (=daikanwa		. 39221)	; &M-39221;
     ))
 (define-char
   '((morohashi-daikanwa	39221 0 2)
@@ -16221,12 +16902,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 21)
     (total-strokes	 . 25)
+    (=daikanwa		. 39266)	; &M-39266;
     (<-same
      ((=daikanwa	  . 42540)	; &M-42540;
       ))
     (<-same*sources
      longkanshoujian daikanwa)
-    (=daikanwa		. 39266)	; &M-39266;
     ))
 (define-char
   '((morohashi-daikanwa	39266 0 2)
@@ -16239,12 +16920,12 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 22)
     (total-strokes	 . 26)
+    (=daikanwa		. 39267)	; &M-39267;
     (<-original
      ((=daikanwa	  . 39253)	; &M-39253;
       ))
     (<-original*sources
      zhengzitong daikanwa)
-    (=daikanwa		. 39267)	; &M-39267;
     ))
 (define-char
   '((morohashi-daikanwa	39267 0 2)
@@ -16257,6 +16938,8 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 26)
     (total-strokes	 . 30)
+    (=cns11643-7	. #x6568)	; &M-39268; [69-72]
+    (=daikanwa		. 39268)	; &I-M-39268;
     (<-same
      ((=jis-x0208	  . #x733B)	; &M-47359; [83-27]
       (=ks-x1001	  . #x7D53)	; &I-K0-7D53; [93-51]
@@ -16264,6 +16947,4 @@
       ))
     (<-same*sources
      shuowen-changjian daikanwa)
-    (=cns11643-7	. #x6568)	; &M-39268; [69-72]
-    (=daikanwa		. 39268)	; &I-M-39268;
     ))
diff --git a/lisp/utf-2000/Ideograph-R163-City.el b/lisp/utf-2000/Ideograph-R163-City.el
index e61ee4b..9ca0f13 100644
--- a/lisp/utf-2000/Ideograph-R163-City.el
+++ b/lisp/utf-2000/Ideograph-R163-City.el
@@ -33,13 +33,13 @@
     (ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
+    (=ucs		. #x2ECF)	; ⻏
     (<-formed@component/connect-left
      ((=ucs		  . #x9091)	; 邑
       ))
     (<-identical@component/connect-left
      ((=ucs		  . #x961D)	; 阝
       ))
-    (=ucs		. #x2ECF)	; ⻏
     ))
 (define-char
   '((ideographic-radical@ucs . 170)	; ⾩
@@ -1301,8 +1301,12 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x48C0)	; 䣀
-    (=cns11643-4	. #x2B58)	; &I-C4-2B58; [11-56]
-    (=daikanwa		. 39378)	; &I-M-39378;
+    (->subsumptive
+     ((=daikanwa	  . 39378)	; &M-39378;
+      )
+     ((=cns11643-4	  . #x2B58)	; &C4-2B58; [11-56]
+      (=ucs@unicode	  . #x48C0)	; &C4-2B58;
+      ))
     ))
 (define-char
   '((ideographic-radical . 163)	; â¾¢
@@ -1314,6 +1318,7 @@
     (=cns11643-3	. #x2F3E)	; &I-C3-2F3E; [15-30]
     (=jis-x0213-1-2000	. #x7C62)	; &I-JX1-7C62; [92-66]
     (=daikanwa		. 39379)	; &I-M-39379;
+    (=jef-china3	. #x68A1)	; &I-JC3-68A1;
     ))
 (define-char
   '((ideographic-radical . 163)	; â¾¢
@@ -1597,32 +1602,36 @@
     (=daikanwa		. 39404)	; &I-M-39404;
     ))
 (define-char
-  '((=>ucs		. #x90CE)	; 郎
-    (morohashi-daikanwa	39405 1)
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x4F3A)	; &J97-4F3A; [47-26]
+      ))
     (ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x554D)	; &M-39431; [53-45]
-      (=jis-x0213-1-2000  . #x7C67)	; &I-JX1-7C67; [92-71]
-      (=daikanwa	  . 39431)	; &I-M-39431;
-      ))
-    (=jis-x0208		. #x4F3A)	; &GT-53018; [47-26]
+    (=ucs		. #x90CE)	; 郎
     (=big5		. #xADA6)	; &I-B-ADA6;
-    (=gt		. 53018)	; &I-GT-53018;
-    (=gt-k		. 05204)	; &I-GT-K05204;
-    (=gt-pj-1		. #x4F3A)	; &I-GT-53018; [47-26]
-    (=ucs@jis		. #x90CE)	; &GT-53018;
-    (mojikyo		. 050539)	; &MCS-6000C56B;
+    (->subsumptive
+     ((morohashi-daikanwa	39405 1)
+      (=jis-x0208	  . #x4F3A)	; &GT-53018; [47-26]
+      (=gt		  . 53018)	; &I-GT-53018;
+      (=gt-k		  . 05204)	; &I-GT-K05204;
+      (=gt-pj-1		  . #x4F3A)	; &I-GT-53018; [47-26]
+      (=ucs@jis		  . #x90CE)	; &GT-53018;
+      (mojikyo		  . 050539)	; &MCS-6000C56B;
+      (<-simplified@JP/Jouyou
+       ((=ks-x1001	    . #x554D)	; &M-39431; [53-45]
+	(=jis-x0213-1-2000  . #x7C67)	; &I-JX1-7C67; [92-71]
+	(=daikanwa	    . 39431)	; &I-M-39431;
+	))
+      )
+     ((=gb2312		  . #x4049)	; &C1-5367; [32-41]
+      (=cns11643-1	  . #x5367)	; &I-C1-5367; [51-71]
+      (=ucs@unicode	  . #x90CE)	; &C1-5367;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	39405 1 0)
-    (ideographic-radical . 163)	; â¾¢
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=ucs		. #x90CE)	; 郎
-    (=gb2312		. #x4049)	; &I-G0-4049; [32-41]
-    (=cns11643-1	. #x5367)	; &I-C1-5367; [51-71]
+  '((ideographic-radical . 163)	; â¾¢
+    (=jis-x0208@1997	. #x4F3A)	; &J97-4F3A; [47-26]
     ))
 (define-char
   '((ideographic-radical . 163)	; â¾¢
@@ -1952,22 +1961,22 @@
     (=daikanwa		. 39430)	; &I-M-39430;
     ))
 (define-char
-  '((=>ucs		. #x90DE)	; 郞
-    (ideographic-radical . 163)	; â¾¢
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=ks-x1001		. #x554D)	; &M-39431; [53-45]
-    (=jis-x0213-1-2000	. #x7C67)	; &I-JX1-7C67; [92-71]
-    (=daikanwa		. 39431)	; &I-M-39431;
-    (=ucs@jis		. #x90DE)	; &M-39431;
-    ))
-(define-char
-  '((morohashi-daikanwa	39431 0 0)
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x4F3A)	; &J97-4F3A; [47-26]
+      ))
     (ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x90DE)	; 郞
-    (=cns11643-3	. #x3429)	; &I-C3-3429; [20-09]
+    (->subsumptive
+     ((=ks-x1001	  . #x554D)	; &M-39431; [53-45]
+      (=jis-x0213-1-2000  . #x7C67)	; &I-JX1-7C67; [92-71]
+      (=daikanwa	  . 39431)	; &I-M-39431;
+      (=ucs@jis		  . #x90DE)	; &M-39431;
+      )
+     ((=cns11643-3	  . #x3429)	; &C3-3429; [20-09]
+      (=ucs@unicode	  . #x90DE)	; &C3-3429;
+      ))
     ))
 (define-char
   '((ideographic-radical . 163)	; â¾¢
@@ -2505,28 +2514,26 @@
     (=daikanwa		. 39473)	; &I-M-39473;
     ))
 (define-char
-  '((=>ucs		. #x90ED)	; 郭
-    (ideographic-radical . 163)	; â¾¢
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (shinjigen-2	. 8448)
-    (=jis-x0208		. #x3354)	; &GT-53074; [19-52]
-    (=ks-x1001		. #x4E2C)	; &I-K0-4E2C; [46-12]
-    (=big5		. #xB3A2)	; &I-B-B3A2;
-    (=gt		. 53074)	; &I-GT-53074;
-    (=gt-k		. 07727)	; &I-GT-K07727;
-    (=gt-pj-1		. #x3354)	; &I-GT-53074; [19-52]
-    (=daikanwa		. 39474)	; &I-M-39474;
-    (=ucs@jis		. #x90ED)	; &GT-53074;
-    ))
-(define-char
-  '((morohashi-daikanwa	39474 0 0)
-    (ideographic-radical . 163)	; â¾¢
+  '((ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x90ED)	; 郭
-    (=gb2312		. #x3979)	; &I-G0-3979; [25-89]
-    (=cns11643-1	. #x5D66)	; &I-C1-5D66; [61-70]
+    (=big5		. #xB3A2)	; &I-B-B3A2;
+    (->subsumptive
+     ((shinjigen-1	  . 8448)
+      (shinjigen-2	  . 8448)
+      (=jis-x0208	  . #x3354)	; &GT-53074; [19-52]
+      (=ks-x1001	  . #x4E2C)	; &I-K0-4E2C; [46-12]
+      (=gt		  . 53074)	; &I-GT-53074;
+      (=gt-k		  . 07727)	; &I-GT-K07727;
+      (=gt-pj-1		  . #x3354)	; &I-GT-53074; [19-52]
+      (=daikanwa	  . 39474)	; &I-M-39474;
+      (=ucs@jis		  . #x90ED)	; &GT-53074;
+      )
+     ((=gb2312		  . #x3979)	; &C1-5D66; [25-89]
+      (=cns11643-1	  . #x5D66)	; &I-C1-5D66; [61-70]
+      (=ucs@unicode	  . #x90ED)	; &C1-5D66;
+      ))
     ))
 (define-char
   '((=>ucs		. #x90EE)	; 郮
@@ -2740,6 +2747,7 @@
     (=cns11643-4	. #x3570)	; &I-C4-3570; [21-80]
     (=daikanwa		. 39489)	; &I-M-39489;
     (=hanziku-1		. #xC9AF)	; &I-HZK01-C9AF;
+    (=cbeta		. 07051)	; &I-CB07051;
     ))
 (define-char
   '((ideographic-radical . 163)	; â¾¢
@@ -2851,11 +2859,6 @@
     (ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA26")
-      (=ucs		  . #xFA26)	; 都
-      (=jis-x0213-1-2000  . #x7C6A)	; &I-JX1-7C6A; [92-74]
-      ))
     (shinjigen-1	. 8455)
     (=jis-x0208		. #x4554)	; &GT-53115; [37-52]
     (=gb2312		. #x363C)	; &I-G0-363C; [22-28]
@@ -2866,6 +2869,11 @@
     (=gt-pj-1		. #x4554)	; &I-GT-53115; [37-52]
     (=ucs@unicode	. #x90FD)	; &GT-53115;
     (mojikyo		. 050540)	; &MCS-6000C56C;
+    (<-simplified@JP/Jouyou
+     ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA26")
+      (=ucs		  . #xFA26)	; 都
+      (=jis-x0213-1-2000  . #x7C6A)	; &I-JX1-7C6A; [92-74]
+      ))
     ))
 (define-char
   '((ideographic-radical . 163)	; â¾¢
@@ -2875,13 +2883,13 @@
     (=daikanwa		. 39498)	; &I-M-39498;
     ))
 (define-char
-  '((morohashi-daikanwa	39498 1)
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x363F)	; &J97-363F; [22-31]
+      ))
+    (morohashi-daikanwa	39498 1)
     (ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0213-1-2000  . #x7C6C)	; &CDP-B66D; [92-76]
-      ))
     (=ucs		. #x90F7)	; 郷
     (=jis-x0208		. #x363F)	; &I-J90-363F; [22-31]
     (=cns11643-3	. #x3952)	; &I-C3-3952; [25-50]
@@ -2889,6 +2897,13 @@
     (=gt-k		. 07750)	; &I-GT-K07750;
     (=gt-pj-1		. #x363F)	; &I-GT-53083; [22-31]
     (mojikyo		. 050541)	; &MCS-6000C56D;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0213-1-2000  . #x7C6C)	; &JX1-7C6C; [92-76]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 163)	; â¾¢
+    (=jis-x0208@1997	. #x363F)	; &J97-363F; [22-31]
     ))
 (define-char
   '((ideographic-radical . 163)	; â¾¢
@@ -3807,37 +3822,61 @@
     (=daikanwa		. 39570)	; &I-M-39570;
     ))
 (define-char
-  '((ideographic-radical . 163)	; â¾¢
+  '((<-denotational
+     ((=big5		  . #xB66D)	; &B-B66D;
+      ))
+    (ideographic-radical . 163)	; â¾¢
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs		. #x9115)	; 鄕
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9115)	; 鄕
+      ))
+    (ideographic-radical . 163)	; â¾¢
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
     (->subsumptive
-     ((ideographic-strokes . 10)
-      (total-strokes	   . 13)
-      (=ucs		  . #x9115)	; 鄕
-      (->subsumptive
-       ((=ks-x1001	    . #x7A41)	; &M-39571; [90-33]
-	(=daikanwa	    . 39571)	; &I-M-39571;
-	(=jef-china3	    . #x68AC)	; &I-JC3-68AC;
-	(=ucs@unicode	    . #x9115)	; &M-39571;
-	)
-       ((=cns11643-3	    . #x4525)	; &C3-4525; [37-05]
-	))
-      )
-     ((=>ucs		  . #x9115)	; 鄕
-      (ideographic-strokes . 10)
-      (total-strokes	   . 13)
-      (=jis-x0213-1-2000  . #x7C6C)	; &CDP-B66D; [92-76]
-      (=big5-cdp	  . #xB66D)	; &I-B-B66D;
-      (=ucs@jis		  . #x9115)	; &CDP-B66D;
+     ((=ks-x1001	  . #x7A41)	; &M-39571; [90-33]
+      (=daikanwa	  . 39571)	; &I-M-39571;
+      (=jef-china3	  . #x68AC)	; &I-JC3-68AC;
+      (=ucs@unicode	  . #x9115)	; &M-39571;
       )
-     ((ideographic-strokes . 9)
-      (total-strokes	   . 12)
-      (=ucs		  . #x9109)	; 鄉
-      (=cns11643-1	  . #x6254)	; &I-C1-6254; [66-52]
-      (=gb12345		  . #x4F67)	; 鄉 [47-71]
-      (=big5		  . #xB66D)	; &I-B-B66D;
-      (=ucs@unicode	  . #x9109)	; 鄉
+     ((=cns11643-3	  . #x4525)	; &C3-4525; [37-05]
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x363F)	; &J97-363F; [22-31]
+      ))
+    (ideographic-radical . 163)	; â¾¢
+    (=big5		. #xB66D)	; &B-B66D;
+    (=ucs@big5		. #x9109)	; &B-B66D;
+    ))
+(define-char
+  '((<-denotational
+     ((=big5		  . #xB66D)	; &B-B66D;
+      ))
+    (ideographic-radical . 163)	; â¾¢
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (=ucs		. #x9109)	; 鄉
+    (=cns11643-1	. #x6254)	; &I-C1-6254; [66-52]
+    (=gb12345		. #x4F67)	; 鄉 [47-71]
+    (=ucs@unicode	. #x9109)	; 鄉
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9115)	; 鄕
+      ))
+    (ideographic-radical . 163)	; â¾¢
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=jis-x0213-1-2000	. #x7C6C)	; &JX1-7C6C; [92-76]
+    (=ucs@jis		. #x9115)	; &JX1-7C6C;
+    ))
+(define-char
   '((ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
diff --git a/lisp/utf-2000/Ideograph-R164-Wine.el b/lisp/utf-2000/Ideograph-R164-Wine.el
index 6f15d0b..78497f7 100644
--- a/lisp/utf-2000/Ideograph-R164-Wine.el
+++ b/lisp/utf-2000/Ideograph-R164-Wine.el
@@ -88,6 +88,7 @@
       (=gt		  . 53499)	; &I-GT-53499;
       (=gt-k		  . 05099)	; &I-GT-K05099;
       (=gt-pj-1		  . #x3D36)	; &I-GT-53499; [29-22]
+      (=jef-china3	  . #x43E9)	; &I-JC3-43E9;
       (=ucs@unicode	  . #x914B)	; &GT-53499;
       ))
     ))
@@ -531,69 +532,87 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
     (=ucs		. #x9159)	; 酙
-    (=jis-x0212		. #x6259)	; &I-JSP-6259; [66-57]
-    (=cns11643-3	. #x3954)	; &I-C3-3954; [25-52]
-    (=jis-x0213-2-2000	. #x7A41)	; &I-JX2-7A41; [90-33]
-    (=daikanwa		. 39805)	; &I-M-39805;
+    (->subsumptive
+     ((=daikanwa	  . 39805)	; &M-39805;
+      (=jef-china3	  . #x68E6)	; &I-JC3-68E6;
+      )
+     ((=cns11643-3	  . #x3954)	; &C3-3954; [25-52]
+      )
+     ((=jis-x0212	  . #x6259)	; &JX2-7A41; [66-57]
+      (=jis-x0213-2-2000  . #x7A41)	; &I-JX2-7A41; [90-33]
+      (=ucs@jis		  . #x9159)	; &JX2-7A41;
+      )
+     ((=ucs@unicode	  . #x9159)	; &UU+9159;
+      ))
     ))
 (define-char
   '((ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
     (=ucs		. #x28807)	; 𨠇
-    (=cns11643-4	. #x3579)	; &I-C4-3579; [21-89]
-    (=daikanwa		. 39806)	; &I-M-39806;
+    (->subsumptive
+     ((=daikanwa	  . 39806)	; &M-39806;
+      )
+     ((=cns11643-4	  . #x3579)	; &C4-3579; [21-89]
+      )
+     ((=ucs@iso		  . #x28807)	; &U-00028807;
+      ))
     ))
 (define-char
   '((ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6E4D)	; &GT-53665; [78-45]
-      (=ks-x1001	  . #x762D)	; &I-K0-762D; [86-13]
-      (=daikanwa	  . 39906)	; &I-M-39906;
-      ))
-    (shinjigen-2	. 8501)
     (=ucs		. #x9154)	; 酔
-    (=jis-x0208		. #x3F6C)	; &I-J90-3F6C; [31-76]
-    (=cns11643-3	. #x3955)	; &I-C3-3955; [25-53]
-    (=gt		. 53537)	; &I-GT-53537;
-    (=gt-pj-1		. #x3F6C)	; &I-GT-53537; [31-76]
-    (=daikanwa		. 39807)	; &I-M-39807;
-    ))
-(define-char
-  '((=>ucs		. #x915A)	; 酚
-    (ideographic-radical . 164)	; â¾£
-    (ideographic-strokes . 4)
-    (total-strokes	 . 11)
-    (=jis-x0212		. #x625A)	; &M-39808; [66-58]
-    (=daikanwa		. 39808)	; &I-M-39808;
-    (=ucs@jis		. #x915A)	; &M-39808;
-    ))
-(define-char
-  '((=>ucs		. #x915A)	; 酚
-    (morohashi-daikanwa	39808 0 0)
-    (ideographic-radical . 164)	; â¾£
-    (ideographic-strokes . 4)
-    (total-strokes	 . 11)
-    (=cns11643-2	. #x3977)	; &C2-3977; [25-87]
+    (->subsumptive
+     ((=daikanwa	  . 39807)	; &M-39807;
+      )
+     ((=cns11643-3	  . #x3955)	; &C3-3955; [25-53]
+      )
+     ((shinjigen-1	  . 8501)
+      (shinjigen-2	  . 8501)
+      (=jis-x0208	  . #x3F6C)	; &J90-3F6C; [31-76]
+      (=ucs@jis		  . #x9154)	; &J90-3F6C;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6E4D)	; &J90-6E4D; [78-45]
+	(=ks-x1001	    . #x762D)	; &I-K0-762D; [86-13]
+	))
+      )
+     ((=gt		  . 53537)	; &GT-53537;
+      (=gt-pj-1		  . #x3F6C)	; &GT-53537; [31-76]
+      (=ucs@unicode	  . #x9154)	; &GT-53537;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	39808 0 1)
-    (ideographic-radical . 164)	; â¾£
+  '((ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
     (=ucs		. #x915A)	; 酚
-    (=gb2312		. #x3753)	; &I-G0-3753; [23-51]
+    (->subsumptive
+     ((=jis-x0212	  . #x625A)	; &M-39808; [66-58]
+      (=daikanwa	  . 39808)	; &I-M-39808;
+      (=ucs@jis		  . #x915A)	; &M-39808;
+      )
+     ((=cns11643-2	  . #x3977)	; &C2-3977; [25-87]
+      )
+     ((=gb2312		  . #x3753)	; &G0-3753; [23-51]
+      (=ucs@unicode	  . #x915A)	; &G0-3753;
+      ))
     ))
 (define-char
   '((ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
     (=ucs		. #x915B)	; 酛
-    (=jis-x0212		. #x625B)	; &I-JSP-625B; [66-59]
-    (=jis-x0213-1-2000	. #x7C76)	; &I-JX1-7C76; [92-86]
-    (=daikanwa		. 39809)	; &I-M-39809;
+    (->subsumptive
+     ((=daikanwa	  . 39809)	; &M-39809;
+      (=jef-china3	  . #x68E7)	; &I-JC3-68E7;
+      )
+     ((=jis-x0212	  . #x625B)	; &JX1-7C76; [66-59]
+      (=jis-x0213-1-2000  . #x7C76)	; &I-JX1-7C76; [92-86]
+      (=ucs@jis		  . #x915B)	; &JX1-7C76;
+      )
+     ((=ucs@unicode	  . #x915B)	; &UU+915B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 164)	; â¾£
@@ -607,7 +626,11 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
     (=ucs		. #x48ED)	; 䣭
-    (=cns11643-4	. #x3575)	; &I-C4-3575; [21-85]
+    (->subsumptive
+     ((=cns11643-4	  . #x3575)	; &C4-3575; [21-85]
+      )
+     ((=ucs@unicode	  . #x48ED)	; &UU+48ED;
+      ))
     ))
 (define-char
   '((ideographic-radical . 164)	; â¾£
@@ -1768,50 +1791,56 @@
     (=daikanwa		. 39904)	; &I-M-39904;
     ))
 (define-char
-  '((=>ucs		. #x48FE)	; 䣾
-    (ideographic-radical . 164)	; â¾£
-    (ideographic-strokes . 8)
-    (total-strokes	 . 15)
-    (=daikanwa		. 39905)	; &M-39905;
-    ))
-(define-char
-  '((morohashi-daikanwa	39905 0 0)
-    (ideographic-radical . 164)	; â¾£
+  '((ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
     (=ucs		. #x48FE)	; 䣾
-    (=cns11643-4	. #x4E3E)	; &I-C4-4E3E; [46-30]
-    ))
-(define-char
-  '((=>ucs		. #x9189)	; 醉
-    (ideographic-radical . 164)	; â¾£
-    (ideographic-strokes . 8)
-    (total-strokes	 . 15)
-    (shinjigen-2	. 8502)
-    (=jis-x0208		. #x6E4D)	; &GT-53665; [78-45]
-    (=ks-x1001		. #x762D)	; &I-K0-762D; [86-13]
-    (=gt		. 53665)	; &I-GT-53665;
-    (=gt-pj-1		. #x6E4D)	; &I-GT-53665; [78-45]
-    (=daikanwa		. 39906)	; &I-M-39906;
-    (=ucs@jis		. #x9189)	; &GT-53665;
+    (->subsumptive
+     ((=daikanwa	  . 39905)	; &M-39905;
+      )
+     ((=cns11643-4	  . #x4E3E)	; &C4-4E3E; [46-30]
+      )
+     ((=ucs@unicode	  . #x48FE)	; &UU+48FE;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	39906 0 0)
-    (ideographic-radical . 164)	; â¾£
+  '((ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
     (=ucs		. #x9189)	; 醉
-    (=gb2312		. #x576D)	; &I-G0-576D; [55-77]
-    (=cns11643-1	. #x6F55)	; &I-C1-6F55; [79-53]
+    (->subsumptive
+     ((shinjigen-1	  . 8502)
+      (shinjigen-2	  . 8502)
+      (=daikanwa	  . 39906)	; &M-39906;
+      )
+     ((=jis-x0208	  . #x6E4D)	; &J90-6E4D; [78-45]
+      (=ks-x1001	  . #x762D)	; &I-K0-762D; [86-13]
+      (=ucs@jis		  . #x9189)	; &J90-6E4D;
+      )
+     ((=gt		  . 53665)	; &GT-53665;
+      (=gt-pj-1		  . #x6E4D)	; &GT-53665; [78-45]
+      )
+     ((=cns11643-1	  . #x6F55)	; &C1-6F55; [79-53]
+      )
+     ((=gb2312		  . #x576D)	; &G0-576D; [55-77]
+      (=ucs@unicode	  . #x9189)	; &G0-576D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
     (=ucs		. #x918A)	; 醊
-    (=jis-x0212		. #x6268)	; &I-JSP-6268; [66-72]
-    (=cns11643-2	. #x5527)	; &I-C2-5527; [53-07]
-    (=daikanwa		. 39907)	; &I-M-39907;
+    (->subsumptive
+     ((=daikanwa	  . 39907)	; &M-39907;
+      )
+     ((=cns11643-2	  . #x5527)	; &C2-5527; [53-07]
+      )
+     ((=jis-x0212	  . #x6268)	; &JSP-6268; [66-72]
+      (=ucs@jis		  . #x918A)	; &JSP-6268;
+      )
+     ((=ucs@unicode	  . #x918A)	; &UU+918A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 164)	; â¾£
@@ -3608,82 +3637,103 @@
     (=daikanwa		. 40063)	; &I-M-40063;
     ))
 (define-char
-  '((=>ucs		. #x91B8)	; 醸
-    (morohashi-daikanwa	40064 1)
-    (ideographic-radical . 164)	; â¾£
-    (ideographic-strokes . 13)
-    (total-strokes	 . 20)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6E56)	; &GT-53914; [78-54]
-      (=ks-x1001	  . #x6554)	; &I-K0-6554; [69-52]
-      (=daikanwa	  . 40099)	; &I-M-40099;
-      ))
-    (=jis-x0208		. #x3E7A)	; &GT-53867; [30-90]
-    (=gt		. 53867)	; &I-GT-53867;
-    (=gt-pj-1		. #x3E7A)	; &I-GT-53867; [30-90]
-    (=ucs@jis		. #x91B8)	; &GT-53867;
-    (mojikyo		. 050544)	; &MCS-6000C570;
-    ))
-(define-char
-  '((morohashi-daikanwa	40064 1 0)
-    (ideographic-radical . 164)	; â¾£
+  '((ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 13)
     (total-strokes	 . 20)
     (=ucs		. #x91B8)	; 醸
+    (->subsumptive
+     ((morohashi-daikanwa	40064 1)
+      (=jis-x0208	  . #x3E7A)	; &GT-53867; [30-90]
+      (=gt		  . 53867)	; &I-GT-53867;
+      (=gt-pj-1		  . #x3E7A)	; &I-GT-53867; [30-90]
+      (=ucs@jis		  . #x91B8)	; &GT-53867;
+      (mojikyo		  . 050544)	; &MCS-6000C570;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x6E56)	; &GT-53914; [78-54]
+	(=ks-x1001	    . #x6554)	; &I-K0-6554; [69-52]
+	(=daikanwa	    . 40099)	; &I-M-40099;
+	))
+      )
+     ((=ucs@unicode	  . #x91B8)	; &UU+91B8;
+      ))
     ))
 (define-char
   '((ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 14)
     (total-strokes	 . 21)
     (=ucs		. #x288E6)	; 𨣦
-    (=cns11643-4	. #x6759)	; &I-C4-6759; [71-57]
-    (=daikanwa		. 40065)	; &I-M-40065;
+    (->subsumptive
+     ((=daikanwa	  . 40065)	; &M-40065;
+      )
+     ((=ucs@iso		  . #x288E6)	; &U-000288E6;
+      )
+     ((=cns11643-4	  . #x6759)	; &C4-6759; [71-57]
+      ))
     ))
 (define-char
   '((ideographic-radical . 164)	; â¾£
-    (ideographic-strokes . 14)
-    (total-strokes	 . 21)
     (=ucs		. #x4913)	; 䤓
-    (=cns11643-4	. #x675A)	; &I-C4-675A; [71-58]
-    (=daikanwa		. 40066)	; &I-M-40066;
     ))
 (define-char
-  '((=>ucs		. #x288E7)	; 𨣧
+  '((<-denotational
+     ((=ucs		  . #x4913)	; 䤓
+      ))
     (ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 14)
     (total-strokes	 . 21)
-    (=daikanwa		. 40067)	; &M-40067;
+    (->subsumptive
+     ((=daikanwa	  . 40066)	; &M-40066;
+      )
+     ((=cns11643-4	  . #x675A)	; &C4-675A; [71-58]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	40067 0 0)
+  '((<-denotational
+     ((=ucs		  . #x4913)	; 䤓
+      ))
     (ideographic-radical . 164)	; â¾£
+    (ideographic-strokes . 13)
+    (total-strokes	 . 20)
+    (=ucs@unicode	. #x4913)	; &UU+4913;
+    ))
+(define-char
+  '((ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 14)
     (total-strokes	 . 21)
     (=ucs		. #x288E7)	; 𨣧
-    (=cns11643-4	. #x6757)	; &I-C4-6757; [71-55]
+    (->subsumptive
+     ((=daikanwa	  . 40067)	; &M-40067;
+      )
+     ((=cns11643-4	  . #x6757)	; &C4-6757; [71-55]
+      )
+     ((=ucs@iso		  . #x288E7)	; &U-000288E7;
+      ))
     ))
 (define-char
   '((ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 14)
     (total-strokes	 . 21)
     (=ucs		. #x4914)	; 䤔
-    (=cns11643-4	. #x675B)	; &I-C4-675B; [71-59]
-    (=daikanwa		. 40068)	; &I-M-40068;
+    (->subsumptive
+     ((=daikanwa	  . 40068)	; &M-40068;
+      )
+     ((=cns11643-4	  . #x675B)	; &C4-675B; [71-59]
+      )
+     ((=ucs@unicode	  . #x4914)	; &UU+4914;
+      ))
     ))
 (define-char
   '((ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 14)
     (total-strokes	 . 21)
     (=ucs		. #x91B9)	; 醹
-    (=daikanwa		. 40069)	; &I-M-40069;
-    ))
-(define-char
-  '((=>ucs		. #x91B9)	; 醹
-    (morohashi-daikanwa	40069 0 2)
-    (ideographic-radical . 164)	; â¾£
-    (ideographic-strokes . 14)
-    (total-strokes	 . 21)
-    (=cns11643-2	. #x6C4C)	; &C2-6C4C; [76-44]
+    (->subsumptive
+     ((=daikanwa	  . 40069)	; &M-40069;
+      )
+     ((=ucs@unicode	  . #x91B9)	; &UU+91B9;
+      )
+     ((=cns11643-2	  . #x6C4C)	; &C2-6C4C; [76-44]
+      ))
     ))
 (define-char
   '((ideographic-radical . 164)	; â¾£
diff --git a/lisp/utf-2000/Ideograph-R165-Distinguish.el b/lisp/utf-2000/Ideograph-R165-Distinguish.el
index 5020700..8a03fbf 100644
--- a/lisp/utf-2000/Ideograph-R165-Distinguish.el
+++ b/lisp/utf-2000/Ideograph-R165-Distinguish.el
@@ -84,18 +84,14 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 165)	; ⾤
-    (ideographic-strokes . 4)
-    (total-strokes	 . 11)
-    (=ucs		. #x91C8)	; 釈
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x91C8)	; 釈
-      ))
+  '((=>ucs		. #x91C8)	; 釈
     (ideographic-radical . 165)	; ⾤
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
+    (=gt		. 53949)	; &GT-53949;
+    (=gt-pj-7		. #x6356)	; &GT-53949; [67-54]
+    (=daikanwa		. 40120)	; &I-M-40120;
+    (mojikyo		. 040120)	; &MCS-60009CB8;
     (<-vulgar
      ((=jis-x0208	  . #x6E59)	; &GT-53966; [78-57]
       (=ks-x1001	  . #x6037)	; &I-K0-6037; [64-23]
@@ -103,48 +99,53 @@
       ))
     (<-vulgar*sources
      daikanwa)
-    (=gt		. 53949)	; &GT-53949;
-    (=gt-pj-7		. #x6356)	; &GT-53949; [67-54]
-    (=daikanwa		. 40120)	; &I-M-40120;
-    (mojikyo		. 040120)	; &MCS-60009CB8;
     ))
 (define-char
-  '((<-denotational
-     ((=ucs		  . #x91C8)	; 釈
-      ))
-    (morohashi-daikanwa	40120 1)
+  '((morohashi-daikanwa	40120 1)
     (ideographic-radical . 165)	; ⾤
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
+    (=ucs		. #x91C8)	; 釈
+    (=jis-x0208		. #x3C61)	; &I-J90-3C61; [28-65]
+    (=gt		. 53950)	; &I-GT-53950;
+    (=gt-pj-1		. #x3C61)	; &I-GT-53950; [28-65]
+    (mojikyo		. 050545)	; &MCS-6000C571;
     (<-simplified@JP/Jouyou
      ((=jis-x0208	  . #x6E59)	; &GT-53966; [78-57]
       (=ks-x1001	  . #x6037)	; &I-K0-6037; [64-23]
       (=daikanwa	  . 40129)	; &I-M-40129;
       ))
-    (=jis-x0208		. #x3C61)	; &GT-53950; [28-65]
-    (=gt		. 53950)	; &I-GT-53950;
-    (=gt-pj-1		. #x3C61)	; &I-GT-53950; [28-65]
-    (=ucs@unicode	. #x91C8)	; &GT-53950;
-    (mojikyo		. 050545)	; &MCS-6000C571;
     ))
 (define-char
   '((ideographic-radical . 165)	; ⾤
     (ideographic-strokes . 5)
     (=ucs		. #x91C9)	; 釉
-    (->subsumptive
-     ((total-strokes	   . 12)
-      (shinjigen-2	  . 8562)
-      (=jis-x0208	  . #x6E58)	; &GT-53953; [78-56]
-      (=gb2312		  . #x5354)	; &I-G0-5354; [51-52]
-      (=ks-x1001	  . #x6B38)	; &I-K0-6B38; [75-24]
-      (=gt		  . 53953)	; &I-GT-53953;
-      (=gt-pj-1		  . #x6E58)	; &I-GT-53953; [78-56]
-      (=daikanwa	  . 40121)	; &I-M-40121;
-      (=ucs@unicode	  . #x91C9)	; &GT-53953;
-      )
-     ((total-strokes	   . 13)
-      (=cns11643-1	  . #x673E)	; &C1-673E; [71-30]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x91C9)	; 釉
+      ))
+    (ideographic-radical . 165)	; ⾤
+    (ideographic-strokes . 5)
+    (total-strokes	 . 12)
+    (shinjigen-1	. 8562)
+    (shinjigen-2	. 8562)
+    (=jis-x0208		. #x6E58)	; &GT-53953; [78-56]
+    (=gb2312		. #x5354)	; &I-G0-5354; [51-52]
+    (=ks-x1001		. #x6B38)	; &I-K0-6B38; [75-24]
+    (=gt		. 53953)	; &I-GT-53953;
+    (=gt-pj-1		. #x6E58)	; &I-GT-53953; [78-56]
+    (=daikanwa		. 40121)	; &I-M-40121;
+    (=ucs@unicode	. #x91C9)	; &GT-53953;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x91C9)	; 釉
       ))
+    (ideographic-radical . 165)	; ⾤
+    (ideographic-strokes . 5)
+    (total-strokes	 . 13)
+    (=cns11643-1	. #x673E)	; &C1-673E; [71-30]
     ))
 (define-char
   '((ideographic-radical . 165)	; ⾤
diff --git a/lisp/utf-2000/Ideograph-R167-Gold.el b/lisp/utf-2000/Ideograph-R167-Gold.el
index cb3a182..2961a4b 100644
--- a/lisp/utf-2000/Ideograph-R167-Gold.el
+++ b/lisp/utf-2000/Ideograph-R167-Gold.el
@@ -22,6 +22,7 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED0)	; ⻐
     (<-identical@component/connect-right
      ((=ucs		  . #x9485)	; 钅
       ))
@@ -29,22 +30,24 @@
      ((=ucs		  . #x91D1)	; 金
       (=gb2312		  . #x3D70)	; &I-G0-3D70; [29-80]
       ))
-    (=ucs		. #x2ED0)	; ⻐
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 0)
     (total-strokes	 . 8)
-    (<-formed@component
-     ((=ucs		  . #x91D1)	; 金
-      ))
     (=ucs		. #x91D2)	; 釒
     (=gb12345		. #x6E44)	; 釒 [78-36]
+    (<-same@component/connect-right
+     ((=ucs		  . #x91D1)	; 金
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
+    (=ucs		. #x9485)	; 钅
+    (=gb2312		. #x6E44)	; &I-G0-6E44; [78-36]
+    (=big5-cdp		. #x895A)	; &I-CDP-895A;
     (<-simplified@CN
      ((=ucs		  . #x91D2)	; 釒
       (=gb12345		  . #x6E44)	; 釒 [78-36]
@@ -53,18 +56,15 @@
      ((=ucs		  . #x91D1)	; 金
       (=gb2312		  . #x3D70)	; &I-G0-3D70; [29-80]
       ))
-    (=ucs		. #x9485)	; 钅
-    (=gb2312		. #x6E44)	; &I-G0-6E44; [78-36]
-    (=big5-cdp		. #x895A)	; &I-CDP-895A;
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
+    (=big5-cdp		. #x8DE3)	; &CDP-8DE3;
     (<-simplified@component
      ((=ucs		  . #x91D1)	; 金
       ))
-    (=big5-cdp		. #x8DE3)	; &CDP-8DE3;
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
@@ -464,70 +464,111 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 11)
     (=ucs		. #x91EE)	; 釮
-    (=jis-x0212		. #x6330)	; &I-JSP-6330; [67-16]
-    (=cns11643-2	. #x3A27)	; &I-C2-3A27; [26-07]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x91EE)	; 釮
+      ))
+    (ideographic-radical . 167)	; ⾦
+    (ideographic-strokes . 3)
+    (total-strokes	 . 11)
+    (=jis-x0212		. #x6330)	; &M-40184; [67-16]
     (=jis-x0213-2-2000	. #x7A52)	; &I-JX2-7A52; [90-50]
     (=daikanwa		. 40184)	; &I-M-40184;
+    (=jef-china3	. #x69C6)	; &I-JC3-69C6;
+    (=ucs@jis		. #x91EE)	; &M-40184;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x91EE)	; 釮
+      ))
+    (ideographic-radical . 167)	; ⾦
+    (ideographic-strokes . 3)
+    (total-strokes	 . 11)
+    (=cns11643-2	. #x3A27)	; &C2-3A27; [26-07]
+    (=ucs@unicode	. #x91EE)	; &C2-3A27;
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 3)
     (total-strokes	 . 11)
     (=ucs		. #x91EF)	; 釯
-    (=jis-x0212		. #x6331)	; &I-JSP-6331; [67-17]
-    (=cns11643-4	. #x357B)	; &I-C4-357B; [21-91]
-    (=daikanwa		. 40185)	; &I-M-40185;
+    (->subsumptive
+     ((=jis-x0212	  . #x6331)	; &M-40185; [67-17]
+      (=daikanwa	  . 40185)	; &I-M-40185;
+      (=ucs@jis		  . #x91EF)	; &M-40185;
+      )
+     ((=cns11643-4	  . #x357B)	; &C4-357B; [21-91]
+      )
+     ((=ucs@unicode	  . #x91EF)	; &UU+91EF;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 167)	; ⾦
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x6E5F)	; &J97-6E5F; [78-63]
+      ))
+    (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 3)
     (total-strokes	 . 11)
     (=ucs		. #x91F0)	; 釰
-    (=jis-x0212		. #x6332)	; &I-JSP-6332; [67-18]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x91F0)	; 釰
+      ))
+    (ideographic-radical . 167)	; ⾦
+    (ideographic-strokes . 3)
+    (total-strokes	 . 11)
+    (=jis-x0212		. #x6332)	; &GT-54031; [67-18]
     (=gt		. 54031)	; &I-GT-54031;
     (=gt-pj-7		. #x6431)	; &I-GT-54031; [68-17]
     (=daikanwa		. 40186)	; &I-M-40186;
+    (=ucs@unicode	. #x91F0)	; &GT-54031;
     ))
 (define-char
-  '((=>ucs		. #x91F0)	; 釰
-    (morohashi-daikanwa	40186 0 1)
-    (ideographic-radical . 167)	; ⾦
+  '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 3)
     (total-strokes	 . 11)
-    (=cns11643-3	. #x3957)	; &C3-3957; [25-55]
+    (=jis-x0208@1997	. #x6E5F)	; &J97-6E5F; [78-63]
     ))
 (define-char
-  '((=>ucs		. #x91F0)	; 釰
-    (morohashi-daikanwa	40186 0 2)
+  '((<-denotational
+     ((=ucs		  . #x91F0)	; 釰
+      ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 3)
     (total-strokes	 . 11)
-    (=gt		. 54023)	; &GT-54023;
-    (=gt-pj-9		. #x3A55)	; &GT-54023; [26-53]
+    (=cns11643-3	. #x3957)	; &C3-3957; [25-55]
     ))
 (define-char
-  '((morohashi-daikanwa	40186 0 4)
+  '((<-denotational
+     ((=ucs		  . #x91F0)	; 釰
+      ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 3)
     (total-strokes	 . 11)
-    (<-simplified
-     ((=ucs		  . #x91F0)	; 釰
-      ))
-    (=ucs		. #x91FC)	; 釼
+    (=gt		. 54023)	; &GT-54023;
+    (=gt-pj-9		. #x3A55)	; &GT-54023; [26-53]
     ))
 (define-char
-  '((=>ucs		. #x91FC)	; 釼
-    (morohashi-daikanwa	40186 0 5)
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x6E5F)	; &J97-6E5F; [78-63]
+      ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 3)
     (total-strokes	 . 11)
+    (=ucs		. #x91FC)	; 釼
     (<-simplified
      ((=ucs		  . #x91F0)	; 釰
       ))
-    (=jis-x0208		. #x6E5F)	; &GT-54022; [78-63]
-    (=gt		. 54022)	; &I-GT-54022;
-    (=gt-pj-1		. #x6E5F)	; &I-GT-54022; [78-63]
-    (=ucs@jis		. #x91FC)	; &GT-54022;
+    (->subsumptive
+     ((=jis-x0208	  . #x6E5F)	; &GT-54022; [78-63]
+      (=gt		  . 54022)	; &I-GT-54022;
+      (=gt-pj-1		  . #x6E5F)	; &I-GT-54022; [78-63]
+      (=ucs@jis		  . #x91FC)	; &GT-54022;
+      )
+     ((=ucs@unicode	  . #x91FC)	; &UU+91FC;
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
@@ -1406,13 +1447,15 @@
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
-    (<-simplified
-     ((=ucs		  . #x9438)	; 鐸
-      ))
     (=ucs		. #x922C)	; 鈬
     (=jis-x0208		. #x6E65)	; &I-J90-6E65; [78-69]
     (=gt		. 54098)	; &I-GT-54098;
     (=gt-pj-1		. #x6E65)	; &I-GT-54098; [78-69]
+    (<-simplified@JP/jis
+     ((=jis-x0208	  . #x4278)	; &GT-55070; [34-88]
+      (=ks-x1001	  . #x7721)	; &I-K0-7721; [87-01]
+      (=daikanwa	  . 40951)	; &I-M-40951;
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
@@ -1889,36 +1932,36 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 13)
     (=ucs		. #x9242)	; 鉂
-    (=jis-x0212		. #x6359)	; &I-JSP-6359; [67-57]
-    (=cns11643-4	. #x4141)	; &I-C4-4141; [33-33]
-    (=jis-x0213-2-2000	. #x7A59)	; &I-JX2-7A59; [90-57]
-    (=daikanwa		. 40283)	; &I-M-40283;
+    (->subsumptive
+     ((=jis-x0212	  . #x6359)	; &M-40283; [67-57]
+      (=jis-x0213-2-2000  . #x7A59)	; &I-JX2-7A59; [90-57]
+      (=daikanwa	  . 40283)	; &I-M-40283;
+      (=ucs@jis		  . #x9242)	; &M-40283;
+      )
+     ((=cns11643-4	  . #x4141)	; &C4-4141; [33-33]
+      )
+     ((=jef-china3	  . #x69E5)	; &JC3-69E5;
+      (=ucs@unicode	  . #x9242)	; &JC3-69E5;
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 5)
     (total-strokes	 . 13)
     (=ucs		. #x9243)	; 鉃
-    (=jis-x0212		. #x635A)	; &I-JSP-635A; [67-58]
-    (=jis-x0213-1-2000	. #x7D2B)	; &I-JX1-7D2B; [93-11]
-    (=daikanwa		. 40284)	; &I-M-40284;
-    ))
-(define-char
-  '((=>ucs		. #x9243)	; 鉃
-    (morohashi-daikanwa	40284 0 0)
-    (ideographic-radical . 167)	; ⾦
-    (ideographic-strokes . 5)
-    (total-strokes	 . 13)
-    (=cns11643-4	. #x4146)	; &C4-4146; [33-38]
+    (->subsumptive
+     ((=jis-x0212	  . #x635A)	; &M-40284; [67-58]
+      (=jis-x0213-1-2000  . #x7D2B)	; &I-JX1-7D2B; [93-11]
+      (=daikanwa	  . 40284)	; &I-M-40284;
+      (=ucs@unicode	  . #x9243)	; &M-40284;
+      )
+     ((=cns11643-4	  . #x4146)	; &C4-4146; [33-38]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 5)
     (total-strokes	 . 13)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9435)	; 鐵
-      (=jis-x0208	  . #x6F44)	; &I-J90-6F44; [79-36]
-      ))
     (shinjigen-2	. 8612)
     (=ucs		. #x9244)	; 鉄
     (=jis-x0208		. #x4534)	; &I-J90-4534; [37-20]
@@ -1926,20 +1969,29 @@
     (=gt		. 54185)	; &I-GT-54185;
     (=gt-pj-1		. #x4534)	; &I-GT-54185; [37-20]
     (=daikanwa		. 40285)	; &I-M-40285;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x9435)	; 鐵
+      (=jis-x0208	  . #x6F44)	; &I-J90-6F44; [79-36]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 5)
     (total-strokes	 . 13)
-    (shinjigen-2	. 8601)
     (=ucs		. #x9245)	; 鉅
-    (=jis-x0208		. #x6E6A)	; &I-J90-6E6A; [78-74]
-    (=ks-x1001		. #x4B69)	; &I-K0-4B69; [43-73]
-    (=cns11643-1	. #x674C)	; &I-C1-674C; [71-44]
-    (=gb12345		. #x6E52)	; 鉅 [78-50]
-    (=gt		. 54137)	; &I-GT-54137;
-    (=gt-pj-1		. #x6E6A)	; &I-GT-54137; [78-74]
-    (=daikanwa		. 40286)	; &I-M-40286;
+    (->subsumptive
+     ((shinjigen-2	  . 8601)
+      (=jis-x0208	  . #x6E6A)	; &GT-54137; [78-74]
+      (=ks-x1001	  . #x4B69)	; &I-K0-4B69; [43-73]
+      (=cns11643-1	  . #x674C)	; &I-C1-674C; [71-44]
+      (=gt		  . 54137)	; &I-GT-54137;
+      (=gt-pj-1		  . #x6E6A)	; &I-GT-54137; [78-74]
+      (=daikanwa	  . 40286)	; &I-M-40286;
+      (=ucs@jis		  . #x9245)	; &GT-54137;
+      )
+     ((=gb12345		  . #x6E52)	; &UU+9245; [78-50]
+      (=ucs@unicode	  . #x9245)	; &UU+9245;
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
@@ -1955,10 +2007,14 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 13)
     (=ucs		. #x9247)	; 鉇
-    (=jis-x0212		. #x635C)	; &I-JSP-635C; [67-60]
-    (=cns11643-4	. #x4148)	; &I-C4-4148; [33-40]
-    (=jis-x0213-2-2000	. #x7A5A)	; &I-JX2-7A5A; [90-58]
-    (=daikanwa		. 40288)	; &I-M-40288;
+    (->subsumptive
+     ((=jis-x0212	  . #x635C)	; &M-40288; [67-60]
+      (=jis-x0213-2-2000  . #x7A5A)	; &I-JX2-7A5A; [90-58]
+      (=daikanwa	  . 40288)	; &I-M-40288;
+      (=ucs@unicode	  . #x9247)	; &M-40288;
+      )
+     ((=cns11643-4	  . #x4148)	; &C4-4148; [33-40]
+      ))
     ))
 (define-char
   '((=>ucs		. #x9248)	; 鉈
@@ -2505,6 +2561,11 @@
     (=ucs		. #x9271)	; 鉱
     (->subsumptive
      ((morohashi-daikanwa	40340 1)
+      (=jis-x0208	  . #x395B)	; &GT-54151; [25-59]
+      (=gt		  . 54151)	; &I-GT-54151;
+      (=gt-pj-1		  . #x395B)	; &I-GT-54151; [25-59]
+      (=ucs@jis		  . #x9271)	; &GT-54151;
+      (mojikyo		  . 050548)	; &MCS-6000C574;
       (<-simplified@JP/Jouyou
        ((=jis-x0208@1978    . #x395C)	; &GT-31404; [25-60]
 	(=jis-x0208@1983    . #x6268)	; &I-J83-6268; [66-72]
@@ -2513,11 +2574,6 @@
 	))
       (<-simplified@JP/Jouyou*sources
        JP/Jouyou daikanwa)
-      (=jis-x0208	  . #x395B)	; &GT-54151; [25-59]
-      (=gt		  . 54151)	; &I-GT-54151;
-      (=gt-pj-1		  . #x395B)	; &I-GT-54151; [25-59]
-      (=ucs@jis		  . #x9271)	; &GT-54151;
-      (mojikyo		  . 050548)	; &MCS-6000C574;
       )
      ((=ucs@unicode	  . #x9271)	; &UU+9271;
       ))
@@ -3554,18 +3610,22 @@
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9322)	; 錢
-      (=jis-x0208	  . #x6F22)	; &I-J90-6F22; [79-02]
-      ))
-    (shinjigen-2	. 8633)
     (=ucs		. #x92AD)	; 銭
-    (=jis-x0208		. #x412C)	; &I-J90-412C; [33-12]
-    (=cns11643-3	. #x4A32)	; &I-C3-4A32; [42-18]
-    (=gt		. 54279)	; &I-GT-54279;
-    (=gt-k		. 11143)	; &I-GT-K11143;
-    (=gt-pj-1		. #x412C)	; &I-GT-54279; [33-12]
-    (=daikanwa		. 40413)	; &I-M-40413;
+    (->subsumptive
+     ((shinjigen-2	  . 8633)
+      (=jis-x0208	  . #x412C)	; &GT-54279; [33-12]
+      (=gt		  . 54279)	; &I-GT-54279;
+      (=gt-k		  . 11143)	; &I-GT-K11143;
+      (=gt-pj-1		  . #x412C)	; &I-GT-54279; [33-12]
+      (=daikanwa	  . 40413)	; &I-M-40413;
+      (=ucs@unicode	  . #x92AD)	; &GT-54279;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x9322)	; 錢
+	(=jis-x0208	    . #x6F22)	; &I-J90-6F22; [79-02]
+	))
+      )
+     ((=cns11643-3	  . #x4A32)	; &C3-4A32; [42-18]
+      ))
     ))
 (define-char
   '((=>ucs		. #x92AE)	; 銮
@@ -4550,13 +4610,13 @@
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 7)
     (total-strokes	 . 15)
+    (=jis-x0212		. #x6445)	; &M-40470; [68-37]
+    (=daikanwa		. 40470)	; &I-M-40470;
+    (=ucs@jis		. #x92DD)	; &M-40470;
     (<-formed
      ((=ks-x1001	  . #x6054)	; &M-39127; [64-52]
       (=daikanwa	  . 39127)	; &I-M-39127;
       ))
-    (=jis-x0212		. #x6445)	; &M-40470; [68-37]
-    (=daikanwa		. 40470)	; &I-M-40470;
-    (=ucs@jis		. #x92DD)	; &M-40470;
     ))
 (define-char
   '((<-denotational
@@ -4910,20 +4970,25 @@
     (=daikanwa		. 40503)	; &I-M-40503;
     ))
 (define-char
-  '((morohashi-daikanwa	40503 1)
-    (ideographic-radical . 167)	; ⾦
+  '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 7)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9444)	; 鑄
-      (=jis-x0208	  . #x6F49)	; &I-J90-6F49; [79-41]
-      ))
     (=ucs		. #x92F3)	; 鋳
-    (=jis-x0208		. #x4372)	; &I-J90-4372; [35-82]
-    (=cns11643-3	. #x4F4D)	; &I-C3-4F4D; [47-45]
-    (=gt		. 54392)	; &I-GT-54392;
-    (=gt-pj-1		. #x4372)	; &I-GT-54392; [35-82]
-    (mojikyo		. 050550)	; &MCS-6000C576;
+    (->subsumptive
+     ((morohashi-daikanwa	40503 1)
+      (=jis-x0208	  . #x4372)	; &GT-54392; [35-82]
+      (=cns11643-3	  . #x4F4D)	; &I-C3-4F4D; [47-45]
+      (=gt		  . 54392)	; &I-GT-54392;
+      (=gt-pj-1		  . #x4372)	; &I-GT-54392; [35-82]
+      (=ucs@jis		  . #x92F3)	; &GT-54392;
+      (mojikyo		  . 050550)	; &MCS-6000C576;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x9444)	; 鑄
+	(=jis-x0208	    . #x6F49)	; &I-J90-6F49; [79-41]
+	))
+      )
+     ((=ucs@unicode	  . #x92F3)	; &UU+92F3;
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
@@ -5390,46 +5455,67 @@
     (=daikanwa		. 40517)	; &I-M-40517;
     ))
 (define-char
-  '((=>ucs		. #x9303)	; 錃
-    (ideographic-radical . 167)	; ⾦
+  '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
-    (=cns11643-3	. #x533D)	; &M-40518; [51-29]
-    (=daikanwa		. 40518)	; &I-M-40518;
+    (=ucs		. #x9303)	; 錃
+    (->subsumptive
+     ((=cns11643-3	  . #x533D)	; &M-40518; [51-29]
+      (=daikanwa	  . 40518)	; &I-M-40518;
+      )
+     ((=ucs@unicode	  . #x9303)	; &UU+9303;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	40518 0 0)
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x4F3F)	; &J97-4F3F; [47-31]
+      ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
-    (=ucs		. #x9303)	; 錃
+    (=ucs		. #x9304)	; 錄
+    (->subsumptive
+     ((=ks-x1001	  . #x5662)	; &M-40519; [54-66]
+      (=jis-x0213-1-2000  . #x7D35)	; &I-JX1-7D35; [93-21]
+      (=daikanwa	  . 40519)	; &I-M-40519;
+      (=jef-china3	  . #x6ACD)	; &I-JC3-6ACD;
+      (=ucs@unicode	  . #x9304)	; &M-40519;
+      )
+     ((=cns11643-1	  . #x7267)	; &C1-7267; [82-71]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
-    (=ucs		. #x9304)	; 錄
-    (=ks-x1001		. #x5662)	; &I-K0-5662; [54-66]
-    (=cns11643-1	. #x7267)	; &I-C1-7267; [82-71]
-    (=jis-x0213-1-2000	. #x7D35)	; &I-JX1-7D35; [93-21]
-    (=daikanwa		. 40519)	; &I-M-40519;
+    (=jis-x0208@1997	. #x4F3F)	; &J97-4F3F; [47-31]
     ))
 (define-char
-  '((morohashi-daikanwa	40519 1)
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x4F3F)	; &J97-4F3F; [47-31]
+      ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9304)	; 錄
-      (=jis-x0213-1-2000  . #x7D35)	; &I-JX1-7D35; [93-21]
-      ))
     (=ucs		. #x9332)	; 録
-    (=jis-x0208		. #x4F3F)	; &I-J90-4F3F; [47-31]
-    (=cns11643-3	. #x533A)	; &I-C3-533A; [51-26]
-    (=gb12345		. #x423C)	; 録 [34-28]
-    (=gt		. 54573)	; &I-GT-54573;
-    (=gt-pj-1		. #x4F3F)	; &I-GT-54573; [47-31]
-    (mojikyo		. 050551)	; &MCS-6000C577;
+    (->subsumptive
+     ((morohashi-daikanwa	40519 1)
+      (=jis-x0208	  . #x4F3F)	; &J90-4F3F; [47-31]
+      (=ucs@jis		  . #x9332)	; &J90-4F3F;
+      (mojikyo		  . 050551)	; &MCS-6000C577;
+      (<-simplified@JP/Jouyou
+       ((=ks-x1001	    . #x5662)	; &M-40519; [54-66]
+	(=jis-x0213-1-2000  . #x7D35)	; &I-JX1-7D35; [93-21]
+	(=daikanwa	    . 40519)	; &I-M-40519;
+	))
+      )
+     ((=gb12345		  . #x423C)	; &GT-54573; [34-28]
+      (=gt		  . 54573)	; &GT-54573;
+      (=gt-pj-1		  . #x4F3F)	; &GT-54573; [47-31]
+      (=ucs@unicode	  . #x9332)	; &GT-54573;
+      )
+     ((=cns11643-3	  . #x533A)	; &C3-533A; [51-26]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
@@ -5444,23 +5530,25 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
     (=ucs		. #x289E7)	; 𨧧
-    (=cns11643-5	. #x5932)	; &I-C5-5932; [57-18]
-    (=daikanwa		. 40521)	; &I-M-40521;
+    (->subsumptive
+     ((=daikanwa	  . 40521)	; &M-40521;
+      )
+     ((=ucs@iso		  . #x289E7)	; &U-000289E7;
+      )
+     ((=cns11643-5	  . #x5932)	; &C5-5932; [57-18]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
     (=ucs		. #x289E8)	; 𨧨
-    (=daikanwa		. 40522)	; &I-M-40522;
-    ))
-(define-char
-  '((=>ucs		. #x289E8)	; 𨧨
-    (morohashi-daikanwa	40522 0 0)
-    (ideographic-radical . 167)	; ⾦
-    (ideographic-strokes . 8)
-    (total-strokes	 . 16)
-    (=cns11643-4	. #x5447)	; &C4-5447; [52-39]
+    (->subsumptive
+     ((=daikanwa	  . 40522)	; &M-40522;
+      (=ucs@iso		  . #x289E8)	; &M-40522;
+      )
+     ((=cns11643-4	  . #x5447)	; &C4-5447; [52-39]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
@@ -5488,17 +5576,17 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
     (->subsumptive
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x3B2C)	; &GT-54506; [27-12]
-	(=daikanwa	    . 40523)	; &I-M-40523;
-	))
-      (=jis-x0208@1983	  . #x3B2C)	; &GT-54510; [27-12]
+     ((=jis-x0208@1983	  . #x3B2C)	; &GT-54510; [27-12]
       (=jis-x0208@1990	  . #x3B2C)	; &I-J90-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;
       (=ucs@unicode	  . #x9306)	; &GT-54510;
+      (<-simplified@JP/jis
+       ((=jis-x0208@1978    . #x3B2C)	; &GT-54506; [27-12]
+	(=daikanwa	    . 40523)	; &I-M-40523;
+	))
       )
      ((=cns11643-2	  . #x5B2F)	; &C2-5B2F; [59-15]
       ))
@@ -6095,10 +6183,6 @@
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x934A)	; 鍊
-      (=jis-x0213-1-2000  . #x7D3B)	; &I-JX1-7D3B; [93-27]
-      ))
     (shinjigen-2	. 8680)
     (=ucs		. #x932C)	; 錬
     (=jis-x0208		. #x4F23)	; &I-J90-4F23; [47-03]
@@ -6106,21 +6190,35 @@
     (=gt		. 54571)	; &I-GT-54571;
     (=gt-pj-1		. #x4F23)	; &I-GT-54571; [47-03]
     (=daikanwa		. 40576)	; &I-M-40576;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x934A)	; 鍊
+      (=jis-x0213-1-2000  . #x7D3B)	; &I-JX1-7D3B; [93-27]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 167)	; ⾦
+    (ideographic-strokes . 8)
+    (total-strokes	 . 16)
+    (=ucs		. #x932D)	; 錭
     ))
 (define-char
-  '((=>ucs		. #x932D)	; 錭
+  '((<-denotational
+     ((=ucs		  . #x932D)	; 錭
+      ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
     (=daikanwa		. 40577)	; &M-40577;
     ))
 (define-char
-  '((morohashi-daikanwa	40577 0 2)
+  '((<-denotational
+     ((=ucs		  . #x932D)	; 錭
+      ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
-    (=ucs		. #x932D)	; 錭
-    (=cns11643-2	. #x5B39)	; &I-C2-5B39; [59-25]
+    (=cns11643-2	. #x5B39)	; &C2-5B39; [59-25]
+    (=ucs@unicode	. #x932D)	; &C2-5B39;
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
@@ -8151,32 +8249,65 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (=ucs		. #x28A89)	; 𨪉
-    (=cns11643-4	. #x5E2E)	; &I-C4-5E2E; [62-14]
-    (=daikanwa		. 40711)	; &I-M-40711;
+    (->subsumptive
+     ((=daikanwa	  . 40711)	; &M-40711;
+      )
+     ((=ucs@iso		  . #x28A89)	; &U-00028A89;
+      )
+     ((=cns11643-4	  . #x5E2E)	; &C4-5E2E; [62-14]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (=ucs		. #x4940)	; 䥀
-    (=cns11643-4	. #x5E2C)	; &I-C4-5E2C; [62-12]
-    (=daikanwa		. 40712)	; &I-M-40712;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4940)	; 䥀
+      ))
+    (ideographic-radical . 167)	; ⾦
+    (ideographic-strokes . 10)
+    (total-strokes	 . 18)
+    (->subsumptive
+     ((=daikanwa	  . 40712)	; &M-40712;
+      )
+     ((=ucs@unicode	  . #x4940)	; &UU+4940;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4940)	; 䥀
+      ))
+    (ideographic-radical . 167)	; ⾦
+    (ideographic-strokes . 10)
+    (total-strokes	 . 18)
+    (=cns11643-4	. #x5E2C)	; &C4-5E2C; [62-12]
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (=ucs		. #x9399)	; 鎙
-    (=cns11643-2	. #x642D)	; &I-C2-642D; [68-13]
-    (=daikanwa		. 40713)	; &I-M-40713;
+    (->subsumptive
+     ((=daikanwa	  . 40713)	; &M-40713;
+      )
+     ((=cns11643-2	  . #x642D)	; &C2-642D; [68-13]
+      (=ucs@unicode	  . #x9399)	; &C2-642D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (=ucs		. #x28A8A)	; 𨪊
-    (=cns11643-5	. #x6552)	; &I-C5-6552; [69-50]
-    (=daikanwa		. 40714)	; &I-M-40714;
+    (->subsumptive
+     ((=daikanwa	  . 40714)	; &M-40714;
+      (=ucs@iso		  . #x28A8A)	; &M-40714;
+      )
+     ((=cns11643-5	  . #x6552)	; &C5-6552; [69-50]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
@@ -8202,17 +8333,17 @@
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 9)
     (total-strokes	 . 17)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x444A)	; &GT-54783; [36-42]
-      (=ks-x1001	  . #x7560)	; &I-K0-7560; [85-64]
-      (=daikanwa	  . 40715)	; &I-M-40715;
-      ))
     (=jis-x0208@1983	. #x444A)	; &GT-54670; [36-42]
     (=jis-x0208@1990	. #x444A)	; &I-J90-444A; [36-42]
     (=gt		. 54670)	; &I-GT-54670;
     (=gt-pj-1		. #x444A)	; &I-GT-54670; [36-42]
     (=jef-china3	. #x69AA)	; &I-JC3-69AA;
     (=ucs@unicode	. #x939A)	; &GT-54670;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x444A)	; &GT-54783; [36-42]
+      (=ks-x1001	  . #x7560)	; &I-K0-7560; [85-64]
+      (=daikanwa	  . 40715)	; &I-M-40715;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -8224,87 +8355,143 @@
     (=cns11643-1	. #x775C)	; &C1-775C; [87-60]
     ))
 (define-char
-  '((=>ucs		. #x28A8B)	; 𨪋
+  '((ideographic-radical . 167)	; ⾦
+    (ideographic-strokes . 10)
+    (total-strokes	 . 18)
+    (=ucs		. #x28A8B)	; 𨪋
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x28A8B)	; 𨪋
+      ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (=daikanwa		. 40716)	; &M-40716;
     ))
 (define-char
-  '((morohashi-daikanwa	40716 0 1)
+  '((<-denotational
+     ((=ucs		  . #x28A8B)	; 𨪋
+      ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
-    (=ucs		. #x28A8B)	; 𨪋
-    (=cns11643-4	. #x5E28)	; &I-C4-5E28; [62-08]
+    (=cns11643-4	. #x5E28)	; &C4-5E28; [62-08]
+    (=ucs@iso		. #x28A8B)	; &C4-5E28;
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (=ucs		. #x28A8C)	; 𨪌
-    (=cns11643-4	. #x5E2A)	; &I-C4-5E2A; [62-10]
-    (=daikanwa		. 40717)	; &I-M-40717;
+    (->subsumptive
+     ((=daikanwa	  . 40717)	; &M-40717;
+      (=ucs@iso		  . #x28A8C)	; &M-40717;
+      )
+     ((=cns11643-4	  . #x5E2A)	; &C4-5E2A; [62-10]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (=ucs		. #x939B)	; 鎛
-    (=jis-x0212		. #x652F)	; &I-JSP-652F; [69-15]
-    (=cns11643-2	. #x6423)	; &I-C2-6423; [68-03]
-    (=jis-x0213-1-2000	. #x7D40)	; &I-JX1-7D40; [93-32]
-    (=daikanwa		. 40718)	; &I-M-40718;
+    (->subsumptive
+     ((=jis-x0212	  . #x652F)	; &M-40718; [69-15]
+      (=jis-x0213-1-2000  . #x7D40)	; &I-JX1-7D40; [93-32]
+      (=daikanwa	  . 40718)	; &I-M-40718;
+      (=ucs@unicode	  . #x939B)	; &M-40718;
+      )
+     ((=cns11643-2	  . #x6423)	; &C2-6423; [68-03]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (=ucs		. #x4941)	; 䥁
-    (=cns11643-7	. #x4439)	; &I-C7-4439; [36-25]
-    (=daikanwa		. 40719)	; &I-M-40719;
+    (->subsumptive
+     ((=daikanwa	  . 40719)	; &M-40719;
+      )
+     ((=cns11643-7	  . #x4439)	; &C7-4439; [36-25]
+      (=ucs@unicode	  . #x4941)	; &C7-4439;
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (=ucs		. #x939C)	; 鎜
-    (=cns11643-3	. #x5949)	; &I-C3-5949; [57-41]
-    (=daikanwa		. 40720)	; &I-M-40720;
+    (->subsumptive
+     ((=daikanwa	  . 40720)	; &M-40720;
+      )
+     ((=cns11643-3	  . #x5949)	; &C3-5949; [57-41]
+      )
+     ((=ucs@unicode	  . #x939C)	; &UU+939C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
+    (=ucs		. #x939D)	; 鎝
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x939D)	; 鎝
+      ))
+    (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
-    (=ucs		. #x939D)	; 鎝
-    (=cns11643-2	. #x6424)	; &I-C2-6424; [68-04]
+    (=cns11643-2	. #x6424)	; &M-40721; [68-04]
     (=daikanwa		. 40721)	; &I-M-40721;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x939D)	; 鎝
+      ))
+    (ideographic-radical . 167)	; ⾦
+    (ideographic-strokes . 9)
+    (total-strokes	 . 17)
+    (=ucs@unicode	. #x939D)	; &UU+939D;
+    ))
+(define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (=ucs		. #x939E)	; 鎞
-    (=jis-x0212		. #x6530)	; &I-JSP-6530; [69-16]
-    (=cns11643-2	. #x6429)	; &I-C2-6429; [68-09]
-    (=jis-x0213-2-2000	. #x7B3B)	; &I-JX2-7B3B; [91-27]
-    (=daikanwa		. 40722)	; &I-M-40722;
+    (->subsumptive
+     ((=jis-x0212	  . #x6530)	; &M-40722; [69-16]
+      (=jis-x0213-2-2000  . #x7B3B)	; &I-JX2-7B3B; [91-27]
+      (=daikanwa	  . 40722)	; &I-M-40722;
+      (=ucs@unicode	  . #x939E)	; &M-40722;
+      )
+     ((=cns11643-2	  . #x6429)	; &C2-6429; [68-09]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (=ucs		. #x4942)	; 䥂
-    (=cns11643-4	. #x5E27)	; &I-C4-5E27; [62-07]
-    (=daikanwa		. 40723)	; &I-M-40723;
+    (->subsumptive
+     ((=daikanwa	  . 40723)	; &M-40723;
+      )
+     ((=ucs@unicode	  . #x4942)	; &UU+4942;
+      )
+     ((=cns11643-4	  . #x5E27)	; &C4-5E27; [62-07]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (=ucs		. #x939F)	; 鎟
-    (=cns11643-2	. #x642E)	; &I-C2-642E; [68-14]
-    (=daikanwa		. 40724)	; &I-M-40724;
+    (->subsumptive
+     ((=daikanwa	  . 40724)	; &M-40724;
+      (=jef-china3	  . #x6AF1)	; &I-JC3-6AF1;
+      (=ucs@unicode	  . #x939F)	; &M-40724;
+      )
+     ((=cns11643-2	  . #x642E)	; &C2-642E; [68-14]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
@@ -8515,53 +8702,70 @@
   '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
-    (shinjigen-2	. 8715)
     (=ucs		. #x93AD)	; 鎭
-    (=jis-x0208		. #x6F2F)	; &I-J90-6F2F; [79-15]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x93AD)	; 鎭
+      ))
+    (ideographic-radical . 167)	; ⾦
+    (ideographic-strokes . 10)
+    (total-strokes	 . 18)
+    (shinjigen-2	. 8715)
+    (=jis-x0208		. #x6F2F)	; &GT-54781; [79-15]
     (=ks-x1001		. #x7265)	; &I-K0-7265; [82-69]
     (=gt		. 54781)	; &I-GT-54781;
     (=gt-pj-1		. #x6F2F)	; &I-GT-54781; [79-15]
     (=daikanwa		. 40744)	; &I-M-40744;
+    (=ucs@unicode	. #x93AD)	; &GT-54781;
     ))
 (define-char
-  '((=>ucs		. #x93AD)	; 鎭
-    (morohashi-daikanwa	40744 0 0)
+  '((<-denotational
+     ((=ucs		  . #x93AD)	; 鎭
+      ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (=cns11643-3	. #x5944)	; &C3-5944; [57-36]
     ))
 (define-char
-  '((=>ucs		. #x93AE)	; 鎮
-    (ideographic-radical . 167)	; ⾦
+  '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x93AD)	; 鎭
-      (=jis-x0208	  . #x6F2F)	; &I-J90-6F2F; [79-15]
+    (=ucs		. #x93AE)	; 鎮
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x93AE)	; 鎮
       ))
+    (ideographic-radical . 167)	; ⾦
+    (ideographic-strokes . 10)
+    (total-strokes	 . 18)
     (shinjigen-2	. 8714)
     (=jis-x0208		. #x4443)	; &GT-54782; [36-35]
     (=gt		. 54782)	; &I-GT-54782;
     (=gt-pj-1		. #x4443)	; &I-GT-54782; [36-35]
     (=daikanwa		. 40745)	; &I-M-40745;
     (=ucs@jis		. #x93AE)	; &GT-54782;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6F2F)	; &GT-54781; [79-15]
+      (=ks-x1001	  . #x7265)	; &I-K0-7265; [82-69]
+      (=daikanwa	  . 40744)	; &I-M-40744;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	40745 0 1)
-    (ideographic-radical . 167)	; ⾦
-    (ideographic-strokes . 10)
-    (total-strokes	 . 18)
-    (=ucs		. #x93AE)	; 鎮
-    (=gb12345		. #x5572)	; 鎮 [53-82]
-    ))
-(define-char
-  '((=>ucs		. #x93AE)	; 鎮
-    (morohashi-daikanwa	40745 0 2)
+  '((<-denotational
+     ((=ucs		  . #x93AE)	; 鎮
+      ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
-    (=cns11643-1	. #x7758)	; &C1-7758; [87-56]
+    (->subsumptive
+     ((=gb12345		  . #x5572)	; &UU+93AE; [53-82]
+      (=ucs@unicode	  . #x93AE)	; &UU+93AE;
+      )
+     ((=cns11643-1	  . #x7758)	; &C1-7758; [87-56]
+      ))
     ))
 (define-char
   '((=>ucs		. #x93AF)	; 鎯
@@ -11802,16 +12006,16 @@
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 13)
     (total-strokes	 . 21)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4C7A)	; &GT-55156; [44-90]
-      (=daikanwa	  . 40998)	; &I-M-40998;
-      ))
     (=jis-x0208@1983	. #x4C7A)	; &GT-55096; [44-90]
     (=jis-x0208@1990	. #x4C7A)	; &I-J90-4C7A; [44-90]
     (=gt		. 55096)	; &I-GT-55096;
     (=gt-pj-1		. #x4C7A)	; &I-GT-55096; [44-90]
     (=jef-china3	. #x69AB)	; &I-JC3-69AB;
     (=ucs@unicode	. #x9453)	; &GT-55096;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x4C7A)	; &GT-55156; [44-90]
+      (=daikanwa	  . 40998)	; &I-M-40998;
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
diff --git a/lisp/utf-2000/Ideograph-R168-Long.el b/lisp/utf-2000/Ideograph-R168-Long.el
index 43a3400..98cca85 100644
--- a/lisp/utf-2000/Ideograph-R168-Long.el
+++ b/lisp/utf-2000/Ideograph-R168-Long.el
@@ -23,15 +23,22 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED1)	; ⻑
     (<-identical@component
      ((=ucs		  . #x9577)	; 長
       ))
-    (=ucs		. #x2ED1)	; ⻑
     ))
 (define-char
   '((ideographic-radical . 168)	; ⾧
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
+    (shinjigen-1	. 8794)
+    (=ucs		. #x9578)	; 镸
+    (=jis-x0212		. #x657D)	; &I-JSP-657D; [69-93]
+    (=cns11643-4	. #x252B)	; &I-C4-252B; [05-11]
+    (=jis-x0213-2-2000	. #x7B52)	; &I-JX2-7B52; [91-50]
+    (=big5-cdp		. #x8D72)	; &I-CDP-8D72;
+    (=daikanwa		. 41101)	; &I-M-41101;
     (<-formed
      ((shinjigen-1	  . 8793)
       (=ucs		  . #x9577)	; 長
@@ -39,12 +46,6 @@
       ))
     (<-formed*sources
      shinjigen-1)
-    (shinjigen-1	. 8794)
-    (=ucs		. #x9578)	; 镸
-    (=jis-x0212		. #x657D)	; &I-JSP-657D; [69-93]
-    (=cns11643-4	. #x252B)	; &I-C4-252B; [05-11]
-    (=jis-x0213-2-2000	. #x7B52)	; &I-JX2-7B52; [91-50]
-    (=daikanwa		. 41101)	; &I-M-41101;
     ))
 (define-char
   '((<-denotational
@@ -54,13 +55,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED2)	; ⻒
     (<-formed@component
      ((=ucs		  . #x9577)	; 長
       ))
     (<-identical@component
      ((=ucs		  . #x9578)	; 镸
       ))
-    (=ucs		. #x2ED2)	; ⻒
     ))
 (define-char
   '((ideographic-radical . 168)	; ⾧
@@ -84,23 +85,23 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED3)	; ⻓
     (<-identical@component
      ((=ucs		  . #x957F)	; 长
       ))
-    (=ucs		. #x2ED3)	; ⻓
     ))
 (define-char
   '((ideographic-radical . 168)	; ⾧
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-simplified@CN
-     ((=ucs		  . #x9577)	; 長
-      (=gb12345		  . #x3324)	; 長 [19-04]
-      ))
     (=ucs		. #x957F)	; 长
     (=gb2312		. #x3324)	; &I-G0-3324; [19-04]
     (=big5-cdp		. #x89A5)	; &I-CDP-89A5;
     (=jef-china3	. #x81E1)	; &I-JC3-81E1;
+    (<-simplified@CN
+     ((=ucs		  . #x9577)	; 長
+      (=gb12345		  . #x3324)	; 長 [19-04]
+      ))
     ))
 (define-char
   '((ideographic-radical . 168)	; ⾧
diff --git a/lisp/utf-2000/Ideograph-R169-Gate.el b/lisp/utf-2000/Ideograph-R169-Gate.el
index 800a066..abb6c85 100644
--- a/lisp/utf-2000/Ideograph-R169-Gate.el
+++ b/lisp/utf-2000/Ideograph-R169-Gate.el
@@ -28,24 +28,24 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED4)	; ⻔
     (<-identical@component
      ((=ucs		  . #x95E8)	; 门
       ))
-    (=ucs		. #x2ED4)	; ⻔
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
+    (=ucs		. #x95E8)	; 门
+    (=gb2312		. #x4345)	; &I-G0-4345; [35-37]
+    (=big5-cdp		. #x896B)	; &I-CDP-896B;
     (<-simplified@CN
      ((=jis-x0208	  . #x4C67)	; &GT-55423; [44-71]
       (=ks-x1001	  . #x5A26)	; &I-K0-5A26; [58-06]
       (=cns11643-1	  . #x4F5C)	; &I-C1-4F5C; [47-60]
       (=gb12345		  . #x4345)	; &GT-55423; [35-37]
       ))
-    (=ucs		. #x95E8)	; 门
-    (=gb2312		. #x4345)	; &I-G0-4345; [35-37]
-    (=big5-cdp		. #x896B)	; &I-CDP-896B;
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
@@ -93,13 +93,13 @@
   '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 1)
     (total-strokes	 . 4)
+    (=ucs		. #x95E9)	; 闩
+    (=gb2312		. #x6345)	; &I-G0-6345; [67-37]
     (<-simplified@CN
      ((=jis-x0208	  . #x6F59)	; &GT-55425; [79-57]
       (=cns11643-1	  . #x536D)	; &I-C1-536D; [51-77]
       (=gb12345		  . #x6345)	; &GT-55425; [67-37]
       ))
-    (=ucs		. #x95E9)	; 闩
-    (=gb2312		. #x6345)	; &I-G0-6345; [67-37]
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
@@ -436,140 +436,168 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x28CDA)	; 𨳚
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 4)
-    (total-strokes	 . 12)
-    (=daikanwa		. 41235)	; &M-41235;
-    ))
-(define-char
-  '((morohashi-daikanwa	41235 0 0)
-    (ideographic-radical . 169)	; ⾨
+  '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
     (=ucs		. #x28CDA)	; 𨳚
+    (->subsumptive
+     ((=daikanwa	  . 41235)	; &M-41235;
+      )
+     ((=ucs@iso		  . #x28CDA)	; &U-00028CDA;
+      )
+     ((=cns11643-4	  . #x3B6A)	; &C4-3B6A; [27-74]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x28CDA)	; 𨳚
-    (morohashi-daikanwa	41235 0 1)
-    (ideographic-radical . 169)	; ⾨
+  '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
-    (=cns11643-4	. #x3B6A)	; &C4-3B6A; [27-74]
+    (=ucs		. #x28CDB)	; 𨳛
     ))
 (define-char
-  '((ideographic-radical . 169)	; ⾨
+  '((<-denotational
+     ((=ucs		  . #x28CDB)	; 𨳛
+      ))
+    (ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
-    (=ucs		. #x28CDB)	; 𨳛
     (->subsumptive
      ((=daikanwa	  . 41236)	; &M-41236;
       )
      ((=cns11643-5	  . #x3D30)	; &C5-3D30; [29-16]
-      )
-     ((=ucs@iso		  . #x28CDB)	; &U-00028CDB;
       ))
     ))
 (define-char
-  '((ideographic-radical . 169)	; ⾨
+  '((<-denotational
+     ((=ucs		  . #x28CDB)	; 𨳛
+      ))
+    (ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
-    (=ucs		. #x498F)	; 䦏
-    (=cns11643-4	. #x3B6B)	; &I-C4-3B6B; [27-75]
-    (=daikanwa		. 41237)	; &I-M-41237;
+    (=ucs@iso		. #x28CDB)	; &U-00028CDB;
     ))
 (define-char
-  '((=>ucs		. #x28CDC)	; 𨳜
-    (ideographic-radical . 169)	; ⾨
+  '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
-    (=daikanwa		. 41238)	; &M-41238;
+    (=ucs		. #x498F)	; 䦏
+    (->subsumptive
+     ((=daikanwa	  . 41237)	; &M-41237;
+      )
+     ((=cns11643-4	  . #x3B6B)	; &C4-3B6B; [27-75]
+      (=ucs@unicode	  . #x498F)	; &C4-3B6B;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	41238 0 0)
-    (ideographic-radical . 169)	; ⾨
+  '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
     (=ucs		. #x28CDC)	; 𨳜
-    (=cns11643-4	. #x3B6C)	; &I-C4-3B6C; [27-76]
+    (->subsumptive
+     ((=daikanwa	  . 41238)	; &M-41238;
+      )
+     ((=cns11643-4	  . #x3B6C)	; &C4-3B6C; [27-76]
+      (=ucs@iso		  . #x28CDC)	; &C4-3B6C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
     (=ucs		. #x958C)	; 閌
-    (=jis-x0212		. #x6624)	; &I-JSP-6624; [70-04]
-    (=cns11643-2	. #x4141)	; &I-C2-4141; [33-33]
-    (=jis-x0213-2-2000	. #x7B55)	; &I-JX2-7B55; [91-53]
-    (=gb12345		. #x634A)	; 閌 [67-42]
-    (=daikanwa		. 41239)	; &I-M-41239;
+    (->subsumptive
+     ((=daikanwa	  . 41239)	; &M-41239;
+      )
+     ((=jis-x0212	  . #x6624)	; &JX2-7B55; [70-04]
+      (=jis-x0213-2-2000  . #x7B55)	; &I-JX2-7B55; [91-53]
+      (=ucs@jis		  . #x958C)	; &JX2-7B55;
+      )
+     ((=cns11643-2	  . #x4141)	; &C2-4141; [33-33]
+      (=gb12345		  . #x634A)	; &C2-4141; [67-42]
+      (=ucs@unicode	  . #x958C)	; &C2-4141;
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
     (=ucs		. #x958D)	; 閍
-    (=jis-x0212		. #x6625)	; &I-JSP-6625; [70-05]
-    (=cns11643-2	. #x4140)	; &I-C2-4140; [33-32]
-    (=jis-x0213-2-2000	. #x7B56)	; &I-JX2-7B56; [91-54]
-    (=daikanwa		. 41240)	; &I-M-41240;
+    (->subsumptive
+     ((=daikanwa	  . 41240)	; &M-41240;
+      )
+     ((=jis-x0212	  . #x6625)	; &JX2-7B56; [70-05]
+      (=jis-x0213-2-2000  . #x7B56)	; &I-JX2-7B56; [91-54]
+      (=jef-china3	  . #x6BDE)	; &I-JC3-6BDE;
+      (=ucs@jis		  . #x958D)	; &JX2-7B56;
+      )
+     ((=cns11643-2	  . #x4140)	; &C2-4140; [33-32]
+      (=ucs@unicode	  . #x958D)	; &C2-4140;
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
     (=ucs		. #x958E)	; 閎
-    (=jis-x0212		. #x6626)	; &I-JSP-6626; [70-06]
-    (=cns11643-1	. #x6268)	; &I-C1-6268; [66-72]
-    (=jis-x0213-1-2000	. #x7D4E)	; &I-JX1-7D4E; [93-46]
-    (=gb12345		. #x6348)	; 閎 [67-40]
-    (=daikanwa		. 41241)	; &I-M-41241;
+    (->subsumptive
+     ((=daikanwa	  . 41241)	; &M-41241;
+      )
+     ((=jis-x0212	  . #x6626)	; &JX1-7D4E; [70-06]
+      (=cns11643-1	  . #x6268)	; &I-C1-6268; [66-72]
+      (=jis-x0213-1-2000  . #x7D4E)	; &I-JX1-7D4E; [93-46]
+      (=gb12345		  . #x6348)	; &JX1-7D4E; [67-40]
+      (=jef-china3	  . #x6BDF)	; &I-JC3-6BDF;
+      (=ucs@unicode	  . #x958E)	; &JX1-7D4E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
     (=ucs		. #x4990)	; 䦐
-    (=cns11643-3	. #x3F6E)	; &I-C3-3F6E; [31-78]
-    (=daikanwa		. 41242)	; &I-M-41242;
-    ))
-(define-char
-  '((=>ucs		. #x28CDD)	; 𨳝
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 4)
-    (total-strokes	 . 12)
-    (=daikanwa		. 41243)	; &M-41243;
+    (->subsumptive
+     ((=daikanwa	  . 41242)	; &M-41242;
+      )
+     ((=cns11643-3	  . #x3F6E)	; &C3-3F6E; [31-78]
+      (=ucs@unicode	  . #x4990)	; &C3-3F6E;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	41243 0 0)
-    (ideographic-radical . 169)	; ⾨
+  '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
     (=ucs		. #x28CDD)	; 𨳝
-    (=cns11643-3	. #x3F6D)	; &I-C3-3F6D; [31-77]
-    ))
-(define-char
-  '((=>ucs		. #x958F)	; 閏
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 4)
-    (total-strokes	 . 12)
-    (=daikanwa		. 41244)	; &M-41244;
+    (->subsumptive
+     ((=daikanwa	  . 41243)	; &M-41243;
+      )
+     ((=cns11643-3	  . #x3F6D)	; &GT-55472; [31-77]
+      (=jis-x0208@1978/i1 . #x313C)	; &GT-55472; [17-28]
+      (=gt		  . 55472)	; &I-GT-55472;
+      (=gt-pj-7		  . #x6E48)	; &I-GT-55472; [78-40]
+      )
+     ((=jef-china3	  . #x6BE0)	; &JC3-6BE0;
+      )
+     ((=ucs@iso		  . #x28CDD)	; &U-00028CDD;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	41244 0 0)
-    (ideographic-radical . 169)	; ⾨
+  '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
-    (jisx0208-difference . 78/1)
-    (shinjigen-2	. 8806)
     (=ucs		. #x958F)	; 閏
-    (=jis-x0208		. #x313C)	; &I-J90-313C; [17-28]
-    (=ks-x1001		. #x6B4E)	; &I-K0-6B4E; [75-46]
-    (=cns11643-1	. #x6263)	; &I-C1-6263; [66-67]
-    (=gb12345		. #x4872)	; 閏 [40-82]
-    (=gt		. 55468)	; &I-GT-55468;
-    (=gt-k		. 08995)	; &I-GT-K08995;
-    (=gt-pj-1		. #x313C)	; &I-GT-55468; [17-28]
+    (->subsumptive
+     ((=daikanwa	  . 41244)	; &M-41244;
+      )
+     ((shinjigen-2	  . 8806)
+      (=jis-x0208	  . #x313C)	; &GT-55468; [17-28]
+      (=ks-x1001	  . #x6B4E)	; &I-K0-6B4E; [75-46]
+      (=cns11643-1	  . #x6263)	; &I-C1-6263; [66-67]
+      (=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]
+      (=ucs@unicode	  . #x958F)	; &GT-55468;
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
@@ -588,129 +616,117 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
     (=ucs		. #x9590)	; 閐
-    (=cns11643-2	. #x4142)	; &I-C2-4142; [33-34]
-    (=daikanwa		. 41246)	; &I-M-41246;
-    ))
-(define-char
-  '((=>ucs		. #x9591)	; 閑
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 4)
-    (total-strokes	 . 12)
-    (=daikanwa		. 41247)	; &M-41247;
-    ))
-(define-char
-  '((=>ucs		. #x9591)	; 閑
-    (morohashi-daikanwa	41247 0 0)
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 4)
-    (total-strokes	 . 12)
-    (shinjigen-2	. 8804)
-    (=jis-x0208		. #x3457)	; &GT-55455; [20-55]
-    (=ks-x1001		. #x7958)	; &I-K0-7958; [89-56]
-    (=cns11643-1	. #x6265)	; &I-C1-6265; [66-69]
-    (=gt		. 55455)	; &I-GT-55455;
-    (=gt-k		. 09018)	; &I-GT-K09018;
-    (=gt-pj-1		. #x3457)	; &I-GT-55455; [20-55]
-    (=ucs@jis		. #x9591)	; &GT-55455;
+    (->subsumptive
+     ((=daikanwa	  . 41246)	; &M-41246;
+      )
+     ((=ucs@unicode	  . #x9590)	; &UU+9590;
+      )
+     ((=cns11643-2	  . #x4142)	; &C2-4142; [33-34]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	41247 0 1)
-    (ideographic-radical . 169)	; ⾨
+  '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
     (=ucs		. #x9591)	; 閑
-    (=gb12345		. #x4F50)	; 閑 [47-48]
+    (->subsumptive
+     ((=daikanwa	  . 41247)	; &M-41247;
+      )
+     ((shinjigen-2	  . 8804)
+      (=jis-x0208	  . #x3457)	; &GT-55455; [20-55]
+      (=ks-x1001	  . #x7958)	; &I-K0-7958; [89-56]
+      (=cns11643-1	  . #x6265)	; &I-C1-6265; [66-69]
+      (=gt		  . 55455)	; &I-GT-55455;
+      (=gt-k		  . 09018)	; &I-GT-K09018;
+      (=gt-pj-1		  . #x3457)	; &I-GT-55455; [20-55]
+      (=ucs@jis		  . #x9591)	; &GT-55455;
+      )
+     ((=gb12345		  . #x4F50)	; &UU+9591; [47-48]
+      (=ucs@unicode	  . #x9591)	; &UU+9591;
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
     (=ucs		. #x9592)	; 閒
-    (=ks-x1001		. #x7959)	; &I-K0-7959; [89-57]
-    (=cns11643-1	. #x6267)	; &I-C1-6267; [66-71]
-    (=daikanwa		. 41248)	; &I-M-41248;
-    ))
-(define-char
-  '((=>ucs		. #x9593)	; 間
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 4)
-    (total-strokes	 . 12)
-    (=daikanwa		. 41249)	; &M-41249;
+    (->subsumptive
+     ((=daikanwa	  . 41248)	; &M-41248;
+      )
+     ((=jef-china3	  . #x6BE1)	; &JC3-6BE1;
+      )
+     ((=ks-x1001	  . #x7959)	; &C1-6267; [89-57]
+      (=cns11643-1	  . #x6267)	; &I-C1-6267; [66-71]
+      (=ucs@unicode	  . #x9592)	; &C1-6267;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	41249 0 0)
-    (ideographic-radical . 169)	; ⾨
+  '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
-    (shinjigen-2	. 8802)
     (=ucs		. #x9593)	; 間
-    (=jis-x0208		. #x3456)	; &I-J90-3456; [20-54]
-    (=ks-x1001		. #x4A60)	; &I-K0-4A60; [42-64]
-    (=cns11643-1	. #x6266)	; &I-C1-6266; [66-70]
-    (=gb12345		. #x3C64)	; 間 [28-68]
-    (=gt		. 55457)	; &I-GT-55457;
-    (=gt-k		. 09017)	; &I-GT-K09017;
-    (=gt-pj-1		. #x3456)	; &I-GT-55457; [20-54]
+    (->subsumptive
+     ((=daikanwa	  . 41249)	; &M-41249;
+      )
+     ((shinjigen-2	  . 8802)
+      (=jis-x0208	  . #x3456)	; &GT-55457; [20-54]
+      (=ks-x1001	  . #x4A60)	; &I-K0-4A60; [42-64]
+      (=cns11643-1	  . #x6266)	; &I-C1-6266; [66-70]
+      (=gb12345		  . #x3C64)	; &GT-55457; [28-68]
+      (=gt		  . 55457)	; &I-GT-55457;
+      (=gt-k		  . 09017)	; &I-GT-K09017;
+      (=gt-pj-1		  . #x3456)	; &I-GT-55457; [20-54]
+      (=ucs@unicode	  . #x9593)	; &GT-55457;
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
     (=ucs		. #x4991)	; 䦑
-    (=cns11643-3	. #x3F6B)	; &I-C3-3F6B; [31-75]
-    (=daikanwa		. 41250)	; &I-M-41250;
-    ))
-(define-char
-  '((=>ucs		. #x9594)	; 閔
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 4)
-    (total-strokes	 . 12)
-    (=daikanwa		. 41251)	; &M-41251;
-    ))
-(define-char
-  '((=>ucs		. #x9594)	; 閔
-    (morohashi-daikanwa	41251 0 0)
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 4)
-    (total-strokes	 . 12)
-    (shinjigen-2	. 8807)
-    (=jis-x0208		. #x6F5C)	; &J90-6F5C; [79-60]
-    (=ks-x1001		. #x5A4A)	; &I-K0-5A4A; [58-42]
-    (=ucs@jis		. #x9594)	; &J90-6F5C;
-    ))
-(define-char
-  '((=>ucs		. #x9594)	; 閔
-    (morohashi-daikanwa	41251 0 1)
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 4)
-    (total-strokes	 . 12)
-    (=gt		. 55474)	; &GT-55474;
-    (=gt-k		. 09240)	; &I-GT-K09240;
-    (=gt-pj-1		. #x6F5C)	; &GT-55474; [79-60]
-    ))
-(define-char
-  '((=>ucs		. #x9594)	; 閔
-    (morohashi-daikanwa	41251 0 2)
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 4)
-    (total-strokes	 . 12)
-    (=cns11643-1	. #x6262)	; &C1-6262; [66-66]
+    (->subsumptive
+     ((=daikanwa	  . 41250)	; &M-41250;
+      )
+     ((=cns11643-3	  . #x3F6B)	; &C3-3F6B; [31-75]
+      (=ucs@unicode	  . #x4991)	; &C3-3F6B;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	41251 0 3)
-    (ideographic-radical . 169)	; ⾨
+  '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
     (=ucs		. #x9594)	; 閔
-    (=gb12345		. #x6349)	; 閔 [67-41]
+    (->subsumptive
+     ((=daikanwa	  . 41251)	; &M-41251;
+      )
+     ((shinjigen-1	  . 8807)
+      (shinjigen-2	  . 8807)
+      (=jis-x0208	  . #x6F5C)	; &J90-6F5C; [79-60]
+      (=ks-x1001	  . #x5A4A)	; &I-K0-5A4A; [58-42]
+      (=ucs@jis		  . #x9594)	; &J90-6F5C;
+      )
+     ((=gt		  . 55474)	; &GT-55474;
+      (=gt-k		  . 09240)	; &I-GT-K09240;
+      (=gt-pj-1		  . #x6F5C)	; &GT-55474; [79-60]
+      )
+     ((=cns11643-1	  . #x6262)	; &C1-6262; [66-66]
+      )
+     ((=gb12345		  . #x6349)	; &UU+9594; [67-41]
+      (=ucs@unicode	  . #x9594)	; &UU+9594;
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
     (=ucs		. #x9595)	; 閕
-    (=cns11643-3	. #x3F6C)	; &I-C3-3F6C; [31-76]
-    (=daikanwa		. 41252)	; &I-M-41252;
+    (->subsumptive
+     ((=daikanwa	  . 41252)	; &M-41252;
+      )
+     ((=ucs@unicode	  . #x9595)	; &UU+9595;
+      )
+     ((=cns11643-3	  . #x3F6C)	; &C3-3F6C; [31-76]
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
@@ -1305,36 +1321,27 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x95A2)	; 関
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 6)
-    (total-strokes	 . 14)
-    (=daikanwa		. 41297)	; &M-41297;
-    ))
-(define-char
-  '((=>ucs		. #x95A2)	; 関
-    (morohashi-daikanwa	41297 0 0)
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 6)
-    (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x95DC)	; 關
-      (=jis-x0208	  . #x6F70)	; &I-J90-6F70; [79-80]
-      ))
-    (shinjigen-2	. 8812)
-    (=jis-x0208		. #x3458)	; &J90-3458; [20-56]
-    (=ucs@jis		. #x95A2)	; &J90-3458;
-    ))
-(define-char
-  '((morohashi-daikanwa	41297 0 1)
-    (ideographic-radical . 169)	; ⾨
+  '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
     (=ucs		. #x95A2)	; 関
-    (=cns11643-3	. #x4A3D)	; &I-C3-4A3D; [42-29]
-    (=gt		. 55529)	; &I-GT-55529;
-    (=gt-k		. 11109)	; &I-GT-K11109;
-    (=gt-pj-1		. #x3458)	; &I-GT-55529; [20-56]
+    (->subsumptive
+     ((=daikanwa	  . 41297)	; &M-41297;
+      )
+     ((shinjigen-2	  . 8812)
+      (=jis-x0208	  . #x3458)	; &J90-3458; [20-56]
+      (=ucs@jis		  . #x95A2)	; &J90-3458;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #x95DC)	; 關
+	(=jis-x0208	    . #x6F70)	; &I-J90-6F70; [79-80]
+	))
+      )
+     ((=cns11643-3	  . #x4A3D)	; &GT-55529; [42-29]
+      (=gt		  . 55529)	; &I-GT-55529;
+      (=gt-k		  . 11109)	; &I-GT-K11109;
+      (=gt-pj-1		  . #x3458)	; &I-GT-55529; [20-56]
+      (=ucs@unicode	  . #x95A2)	; &GT-55529;
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
@@ -2104,6 +2111,23 @@
     (=cns11643-5	. #x5226)	; &I-C5-5226; [50-06]
     ))
 (define-char
+  '((ideographic-radical . 169)	; ⾨
+    (ideographic-strokes . 7)
+    (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+      (=ucs		  . #x2FF5)	; ⿵
+      )
+     ((=jis-x0208	  . #x4C67)	; &GT-55423; [44-71]
+      (=ks-x1001	  . #x5A26)	; &I-K0-5A26; [58-06]
+      (=cns11643-1	  . #x4F5C)	; &I-C1-4F5C; [47-60]
+      )
+     ((=ucs		  . #x4E32)	; 串
+      ))
+    (sources		bos=A2003-10922-00012)
+    (=ruimoku-v6	. #xE01D)	; &RUI6-E01D;
+    ))
+(define-char
   '((=>ucs		. #x95B5)	; 閵
     (ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 8)
@@ -2291,80 +2315,78 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x28D64)	; 𨵤
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 8)
-    (total-strokes	 . 16)
-    (=daikanwa		. 41378)	; &M-41378;
-    ))
-(define-char
-  '((morohashi-daikanwa	41378 0 0)
-    (ideographic-radical . 169)	; ⾨
+  '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
     (=ucs		. #x28D64)	; 𨵤
-    (=cns11643-4	. #x544E)	; &I-C4-544E; [52-46]
-    ))
-(define-char
-  '((=>ucs		. #x95BB)	; 閻
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 8)
-    (total-strokes	 . 16)
-    (=daikanwa		. 41379)	; &M-41379;
-    ))
-(define-char
-  '((=>ucs		. #x95BB)	; 閻
-    (morohashi-daikanwa	41379 0 0)
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 8)
-    (total-strokes	 . 16)
-    (jisx0208-difference . 78/1)
-    (shinjigen-1	. 8824)
-    (shinjigen-2	. 8824)
-    (=jis-x0208		. #x6F65)	; &GT-55612; [79-69]
-    (=ks-x1001		. #x6722)	; &I-K0-6722; [71-02]
-    (=gt		. 55612)	; &I-GT-55612;
-    (=gt-pj-1		. #x6F65)	; &I-GT-55612; [79-69]
-    (=ucs@jis		. #x95BB)	; &GT-55612;
-    (=ucs@ks		. #x95BB)	; &GT-55612;
+    (->subsumptive
+     ((=daikanwa	  . 41378)	; &M-41378;
+      )
+     ((=cns11643-4	  . #x544E)	; &C4-544E; [52-46]
+      (=ucs@iso		  . #x28D64)	; &C4-544E;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	41379 0 1)
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x6F65)	; &J97-6F65; [79-69]
+      ))
     (ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
     (=ucs		. #x95BB)	; 閻
-    (=cns11643-1	. #x726F)	; &I-C1-726F; [82-79]
-    (=gb12345		. #x5156)	; 閻 [49-54]
+    (->subsumptive
+     ((=daikanwa	  . 41379)	; &M-41379;
+      )
+     ((jisx0208-difference . 78/1)
+      (shinjigen-1	  . 8824)
+      (shinjigen-2	  . 8824)
+      (=jis-x0208	  . #x6F65)	; &GT-55612; [79-69]
+      (=ks-x1001	  . #x6722)	; &I-K0-6722; [71-02]
+      (=gt		  . 55612)	; &I-GT-55612;
+      (=gt-pj-1		  . #x6F65)	; &I-GT-55612; [79-69]
+      (=ucs@jis		  . #x95BB)	; &GT-55612;
+      (=ucs@ks		  . #x95BB)	; &GT-55612;
+      )
+     ((=cns11643-1	  . #x726F)	; &C1-726F; [82-79]
+      (=gb12345		  . #x5156)	; &C1-726F; [49-54]
+      (=ucs@unicode	  . #x95BB)	; &C1-726F;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x95BC)	; 閼
+  '((=>ucs		. #x95BB)	; 閻
     (ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
-    (=daikanwa		. 41380)	; &M-41380;
+    (=jis-x0208@1997	. #x6F65)	; &J97-6F65; [79-69]
     ))
 (define-char
-  '((=>ucs		. #x95BC)	; 閼
-    (morohashi-daikanwa	41380 0 0)
+  '((<-denotational
+     ((=jis-x0208@1997	  . #x6F65)	; &J97-6F65; [79-69]
+      ))
     (ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
-    (shinjigen-2	. 8823)
-    (=jis-x0208		. #x6F64)	; &GT-55605; [79-68]
-    (=ks-x1001		. #x6459)	; &I-K0-6459; [68-57]
-    (=gt		. 55605)	; &I-GT-55605;
-    (=gt-pj-1		. #x6F64)	; &I-GT-55605; [79-68]
-    (=ucs@jis		. #x95BC)	; &GT-55605;
+    (=jis-x0208@1978/i1 . #x6F65)	; &J78i1-6F65; [79-69]
     ))
 (define-char
-  '((morohashi-daikanwa	41380 0 1)
-    (ideographic-radical . 169)	; ⾨
+  '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
     (=ucs		. #x95BC)	; 閼
-    (=cns11643-2	. #x5B52)	; &I-C2-5B52; [59-50]
-    (=gb12345		. #x6355)	; 閼 [67-53]
+    (->subsumptive
+     ((=daikanwa	  . 41380)	; &M-41380;
+      )
+     ((shinjigen-2	  . 8823)
+      (=jis-x0208	  . #x6F64)	; &GT-55605; [79-68]
+      (=ks-x1001	  . #x6459)	; &I-K0-6459; [68-57]
+      (=gt		  . 55605)	; &I-GT-55605;
+      (=gt-pj-1		  . #x6F64)	; &I-GT-55605; [79-68]
+      (=ucs@jis		  . #x95BC)	; &GT-55605;
+      )
+     ((=cns11643-2	  . #x5B52)	; &C2-5B52; [59-50]
+      (=gb12345		  . #x6355)	; &C2-5B52; [67-53]
+      (=ucs@unicode	  . #x95BC)	; &C2-5B52;
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
@@ -3025,34 +3047,38 @@
     (=gb12345		. #x403B)	; 闌 [32-27]
     ))
 (define-char
-  '((=>ucs		. #x95CD)	; 闍
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 9)
-    (total-strokes	 . 17)
-    (=daikanwa		. 41434)	; &M-41434;
+  '((ideographic-radical . 169)	; ⾨
+    (=ucs		. #x95CD)	; 闍
     ))
 (define-char
-  '((=>ucs		. #x95CD)	; 闍
-    (morohashi-daikanwa	41434 0 0)
+  '((<-denotational
+     ((=ucs		  . #x95CD)	; 闍
+      ))
     (ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 9)
     (total-strokes	 . 17)
-    (shinjigen-1	. 8835)
-    (shinjigen-2	. 8835)
-    (=jis-x0208		. #x6F6B)	; &GT-55680; [79-75]
-    (=gt		. 55680)	; &I-GT-55680;
-    (=gt-pj-1		. #x6F6B)	; &I-GT-55680; [79-75]
-    (=ucs@jis		. #x95CD)	; &GT-55680;
+    (->subsumptive
+     ((=daikanwa	  . 41434)	; &M-41434;
+      )
+     ((shinjigen-1	  . 8835)
+      (shinjigen-2	  . 8835)
+      (=jis-x0208	  . #x6F6B)	; &GT-55680; [79-75]
+      (=gt		  . 55680)	; &I-GT-55680;
+      (=gt-pj-1		  . #x6F6B)	; &I-GT-55680; [79-75]
+      (=ucs@jis		  . #x95CD)	; &GT-55680;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	41434 0 2)
+  '((<-denotational
+     ((=ucs		  . #x95CD)	; 闍
+      ))
     (ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
-    (=ucs		. #x95CD)	; 闍
-    (=cns11643-2	. #x5B53)	; &I-C2-5B53; [59-51]
+    (=cns11643-2	. #x5B53)	; &GT-55641; [59-51]
     (=gt		. 55641)	; &I-GT-55641;
     (=gt-pj-10		. #x4471)	; &I-GT-55641; [36-81]
+    (=ucs@unicode	. #x95CD)	; &GT-55641;
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
@@ -3428,19 +3454,16 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x95D7)	; 闗
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 10)
-    (total-strokes	 . 18)
-    (=daikanwa		. 41464)	; &M-41464;
-    ))
-(define-char
-  '((morohashi-daikanwa	41464 0 0)
-    (ideographic-radical . 169)	; ⾨
+  '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (=ucs		. #x95D7)	; 闗
-    (=cns11643-3	. #x594B)	; &I-C3-594B; [57-43]
+    (->subsumptive
+     ((=daikanwa	  . 41464)	; &M-41464;
+      )
+     ((=cns11643-3	  . #x594B)	; &C3-594B; [57-43]
+      (=ucs@unicode	  . #x95D7)	; &C3-594B;
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	45649 1)
@@ -3448,17 +3471,16 @@
     (ideographic-radical@daikanwa . 191)	; â¾¾
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9B2D)	; 鬭
-      (=jis-x0212	  . #x6A32)	; &I-JSP-6A32; [74-18]
-      (=jis-x0213-1-2000  . #x7E3F)	; &I-JX1-7E3F; [94-31]
-      ))
     (=ucs		. #x95D8)	; 闘
     (=jis-x0208		. #x462E)	; &I-J90-462E; [38-14]
     (=cns11643-3	. #x594A)	; &I-C3-594A; [57-42]
     (=gt		. 61399)	; &I-GT-61399;
     (=gt-pj-1		. #x462E)	; &I-GT-61399; [38-14]
     (mojikyo		. 050601)	; &MCS-6000C5A9;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0212	  . #x6A32)	; &CB10823; [74-18]
+      (=jis-x0213-1-2000  . #x7E3F)	; &I-JX1-7E3F; [94-31]
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
diff --git a/lisp/utf-2000/Ideograph-R170-Mound.el b/lisp/utf-2000/Ideograph-R170-Mound.el
index 0c953b7..65abb0a 100644
--- a/lisp/utf-2000/Ideograph-R170-Mound.el
+++ b/lisp/utf-2000/Ideograph-R170-Mound.el
@@ -19,11 +19,25 @@
   '((ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 0)
     (total-strokes	 . 8)
-    (=cns11643-6	. #x2E45)	; &M-41535; [14-37]
+    (=ucs		. #x28E0F)	; 𨸏
+    (=cns11643-6	. #x2E45)	; &I-C6-2E45; [14-37]
     (=daikanwa		. 41535)	; &I-M-41535;
     ))
 (define-char
   '((<-denotational
+     ((=ucs		  . #x28E0F)	; 𨸏
+      ))
+    (name		. "CJK RADICAL MOUND ONE")
+    (general-category	symbol other) ; Informative Category
+    (bidi-category	. "ON")
+    (mirrored		. nil)
+    (=ucs		. #x2ED5)	; ⻕
+    (<-identical@component
+     ((=ucs		  . #x28E0F)	; 𨸏
+      ))
+    ))
+(define-char
+  '((<-denotational
      ((=ucs		  . #x961D)	; 阝
       ))
     (name		. "CJK RADICAL MOUND TWO")
@@ -33,16 +47,16 @@
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
+    (=ucs		. #x2ED6)	; ⻖
+    (=gb2312		. #x5A62)	; &I-G0-5A62; [58-66]
+    (=daikanwa		. 41536)	; &I-M-41536;
+    (=ucs@unicode	. #x961D)	; ⻖
     (<-formed@component/connect-right
      ((=ucs		  . #x961C)	; 阜
       ))
     (<-identical@component/connect-right
      ((=ucs		  . #x961D)	; 阝
       ))
-    (=ucs		. #x2ED6)	; ⻖
-    (=gb2312		. #x5A62)	; &I-G0-5A62; [58-66]
-    (=daikanwa		. 41536)	; &I-M-41536;
-    (=ucs@unicode	. #x961D)	; ⻖
     ))
 (define-char
   '((ideographic-radical@ucs . 170)	; ⾩
@@ -1592,13 +1606,13 @@
   '((ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (=daikanwa		. 41676)	; &M-41676;
+    (mojikyo		. 041676)	; &MCS-6000A2CC;
     (<-same
      ((=daikanwa	  . 41704)	; &M-41704;
       ))
     (<-same*sources
      zhonghua-dazidian daikanwa)
-    (=daikanwa		. 41676)	; &M-41676;
-    (mojikyo		. 041676)	; &MCS-6000A2CC;
     ))
 (define-char
   '((morohashi-daikanwa	41676 0 1)
@@ -1612,16 +1626,16 @@
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6F7C)	; &GT-55997; [79-92]
-      (=ks-x1001	  . #x7968)	; &I-K0-7968; [89-72]
-      (=daikanwa	  . 41707)	; &I-M-41707;
-      ))
     (=ucs		. #x9665)	; 陥
     (=jis-x0208		. #x3459)	; &I-J90-3459; [20-57]
     (=gt		. 55950)	; &I-GT-55950;
     (=gt-pj-1		. #x3459)	; &I-GT-55950; [20-57]
     (mojikyo		. 050556)	; &MCS-6000C57C;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6F7C)	; &GT-55997; [79-92]
+      (=ks-x1001	  . #x7968)	; &I-K0-7968; [89-72]
+      (=daikanwa	  . 41707)	; &I-M-41707;
+      ))
     ))
 (define-char
   '((=>ucs		. #x9666)	; 陦
@@ -2218,27 +2232,39 @@
     (=daikanwa		. 41717)	; &I-M-41717;
     ))
 (define-char
-  '((=>ucs		. #x9686)	; 隆
+  '((ideographic-radical . 170)	; ⾩
+    (=ucs		. #x9686)	; 隆
+    (=jis-x0208@1997	. #x4E34)	; 隆 [46-20]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9686)	; 隆
+      ))
     (morohashi-daikanwa	41720 1)
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9686)	; 隆
-      (=jis-x0213-1-2000  . #x7D5D)	; &I-JX1-7D5D; [93-61]
-      ))
     (=jis-x0208		. #x4E34)	; &GT-56046; [46-20]
     (=gt		. 56046)	; &I-GT-56046;
     (=gt-k		. 07896)	; &I-GT-K07896;
     (=gt-pj-1		. #x4E34)	; &I-GT-56046; [46-20]
     (=ucs@jis		. #x9686)	; &GT-56046;
     (mojikyo		. 050557)	; &MCS-6000C57D;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xF9DC)	; 隆
+      (=jis-x0213-1-2000  . #x7D5D)	; &I-JX1-7D5D; [93-61]
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	41721 1)
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (=ucs		. #x967A)	; 険
+    (=jis-x0208		. #x3831)	; &I-J90-3831; [24-17]
+    (=gt		. 56006)	; &I-GT-56006;
+    (=gt-pj-1		. #x3831)	; &I-GT-56006; [24-17]
+    (mojikyo		. 050558)	; &MCS-6000C57E;
     (<-simplified@JP/Jouyou
      ((=ucs		  . #x96AA)	; 險
       (=jis-x0208	  . #x702A)	; &I-J90-702A; [80-10]
@@ -2246,11 +2272,6 @@
       ))
     (<-simplified@JP/Jouyou*sources
      daikanwa JP/Jouyou)
-    (=ucs		. #x967A)	; 険
-    (=jis-x0208		. #x3831)	; &I-J90-3831; [24-17]
-    (=gt		. 56006)	; &I-GT-56006;
-    (=gt-pj-1		. #x3831)	; &I-GT-56006; [24-17]
-    (mojikyo		. 050558)	; &MCS-6000C57E;
     ))
 (define-char
   '((ideographic-radical . 170)	; ⾩
@@ -2505,33 +2526,39 @@
     (=daikanwa		. 41745)	; &I-M-41745;
     ))
 (define-char
-  '((ideographic-radical . 170)	; ⾩
+  '((<-denotational
+     ((=ucs		  . #x9686)	; 隆
+      ))
+    (=>ucs*		. #x9686)	; 隆
+    (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs		. #x9686)	; 隆
+    (=ucs		. #xF9DC)	; 隆
     (=gb2312		. #x4221)	; &I-G0-4221; [34-01]
-    (=ks-x1001		. #x574C)	; &I-K0-574C; [55-44]
     (=cns11643-1	. #x626E)	; &I-C1-626E; [66-78]
     (=jis-x0213-1-2000	. #x7D5D)	; &I-JX1-7D5D; [93-61]
     (=daikanwa		. 41746)	; &I-M-41746;
-    (=ucs@jis		. #xF9DC)	; 隆
-    ))
-(define-char
-  '((=>ucs*		. #x9686)	; 隆
-    (morohashi-daikanwa	41746 0 0)
-    (ideographic-radical . 170)	; ⾩
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=ucs		. #xF9DC)	; 隆
-    (=ks-x1001		. #x6B58)	; &I-K0-6B58; [75-56]
+    (=ucs@unicode	. #x9686)	; 隆
+    (=ucs@jis		. #xF9DC)	; 隆
+    (->subsumptive
+     ((=ks-x1001	  . #x574C)	; &K0-574C; [55-44]
+      (=ucs@ks		  . #x9686)	; &K0-574C;
+      )
+     ((=ks-x1001	  . #x6B58)	; &K0-6B58; [75-56]
+      (=ucs@ks		  . #xF9DC)	; &K0-6B58;
+      ))
     ))
 (define-char
   '((ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x9687)	; 隇
-    (=cns11643-2	. #x4143)	; &I-C2-4143; [33-35]
-    (=daikanwa		. 41747)	; &I-M-41747;
+    (->subsumptive
+     ((=daikanwa	  . 41747)	; &M-41747;
+      (=ucs@unicode	  . #x9687)	; &M-41747;
+      )
+     ((=cns11643-2	  . #x4143)	; &C2-4143; [33-35]
+      ))
     ))
 (define-char
   '((ideographic-radical . 170)	; ⾩
@@ -2741,11 +2768,6 @@
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6E2E)	; &GT-56259; [78-14]
-      (=ks-x1001	  . #x624B)	; &I-K0-624B; [66-43]
-      (=daikanwa	  . 41871)	; &I-M-41871;
-      ))
     (=ucs		. #x968F)	; 随
     (=jis-x0208		. #x3F6F)	; &I-J90-3F6F; [31-79]
     (=gb2312		. #x4B66)	; &I-G0-4B66; [43-70]
@@ -2753,6 +2775,11 @@
     (=gt-k		. 09082)	; &I-GT-K09082;
     (=gt-pj-1		. #x3F6F)	; &I-GT-56080; [31-79]
     (mojikyo		. 050559)	; &MCS-6000C57F;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6E2E)	; &GT-56259; [78-14]
+      (=ks-x1001	  . #x624B)	; &I-K0-624B; [66-43]
+      (=daikanwa	  . 41871)	; &I-M-41871;
+      ))
     ))
 (define-char
   '((ideographic-radical . 170)	; ⾩
@@ -3324,19 +3351,16 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x28EF5)	; 𨻵
-    (ideographic-radical . 170)	; ⾩
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=daikanwa		. 41812)	; &M-41812;
-    ))
-(define-char
-  '((morohashi-daikanwa	41812 0 1)
-    (ideographic-radical . 170)	; ⾩
+  '((ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x28EF5)	; 𨻵
-    (=cns11643-4	. #x4828)	; &I-C4-4828; [40-08]
+    (->subsumptive
+     ((=daikanwa	  . 41812)	; &M-41812;
+      )
+     ((=cns11643-4	  . #x4828)	; &C4-4828; [40-08]
+      (=ucs@iso		  . #x28EF5)	; &C4-4828;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -3347,15 +3371,15 @@
     (total-strokes	 . 14)
     (=ucs		. #x28EF6)	; 𨻶
     (->subsumptive
-     ((<-vulgar
+     ((=jis-x0208@1978	  . #x3764)	; &M-41813; [23-68]
+      (=daikanwa	  . 41813)	; &I-M-41813;
+      (mojikyo		  . 041813)	; &MCS-6000A355;
+      (<-vulgar
        ((=gb2312	    . #x4F36)	; &M-41792; [47-22]
 	(=daikanwa	    . 41792)	; &I-M-41792;
 	))
       (<-vulgar*sources
-       zhengzi-tong daikanwa)
-      (=jis-x0208@1978	  . #x3764)	; &M-41813; [23-68]
-      (=daikanwa	  . 41813)	; &I-M-41813;
-      (mojikyo		  . 041813)	; &MCS-6000A355;
+       zhengzitong daikanwa)
       )
      ((=cns11643-4	  . #x4829)	; &C4-4829; [40-09]
       (=ucs@iso		  . #x28EF6)	; &C4-4829;
@@ -3649,10 +3673,22 @@
     (=daikanwa		. 41835)	; &I-M-41835;
     ))
 (define-char
-  '((=>ucs		. #x96A0)	; 隠
+  '((ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=ucs		. #x96A0)	; 隠
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x96A0)	; 隠
+      ))
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (=gt		. 56167)	; &GT-56167;
+    (=gt-pj-7		. #x7426)	; &GT-56167; [84-06]
+    (=daikanwa		. 41836)	; &I-M-41836;
+    (mojikyo		. 041836)	; &MCS-6000A36C;
     (<-simplified
      ((=jis-x0208	  . #x702C)	; &GT-56268; [80-12]
       (=ks-x1001	  . #x6B5F)	; &I-K0-6B5F; [75-63]
@@ -3660,35 +3696,36 @@
       ))
     (<-simplified*sources
      songyuan-yilai-suzipu daikanwa)
-    (=gt		. 56167)	; &GT-56167;
-    (=gt-pj-7		. #x7426)	; &GT-56167; [84-06]
-    (=daikanwa		. 41836)	; &I-M-41836;
-    (mojikyo		. 041836)	; &MCS-6000A36C;
     ))
 (define-char
-  '((morohashi-daikanwa	41836 1)
+  '((<-denotational
+     ((=ucs		  . #x96A0)	; 隠
+      ))
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x702C)	; &GT-56268; [80-12]
-      (=ks-x1001	  . #x6B5F)	; &I-K0-6B5F; [75-63]
-      (=daikanwa	  . 41891)	; &I-M-41891;
-      ))
-    (=ucs		. #x96A0)	; 隠
-    (=jis-x0208		. #x3123)	; &I-J90-3123; [17-03]
-    (=gt		. 56168)	; &I-GT-56168;
-    (=gt-k		. 11099)	; &I-GT-K11099;
-    (=gt-pj-1		. #x3123)	; &I-GT-56168; [17-03]
-    (mojikyo		. 050560)	; &MCS-6000C580;
+    (=cns11643-3	. #x4A44)	; &C3-4A44; [42-36]
     ))
 (define-char
-  '((=>ucs		. #x96A0)	; 隠
-    (morohashi-daikanwa	41836 1 1)
+  '((<-denotational
+     ((=ucs		  . #x96A0)	; 隠
+      ))
+    (morohashi-daikanwa	41836 1)
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=cns11643-3	. #x4A44)	; &C3-4A44; [42-36]
+    (shinjigen-1	. 8923)
+    (=jis-x0208		. #x3123)	; &GT-56168; [17-03]
+    (=gt		. 56168)	; &I-GT-56168;
+    (=gt-k		. 11099)	; &I-GT-K11099;
+    (=gt-pj-1		. #x3123)	; &I-GT-56168; [17-03]
+    (=ucs@unicode	. #x96A0)	; &GT-56168;
+    (mojikyo		. 050560)	; &MCS-6000C580;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x702C)	; &GT-56268; [80-12]
+      (=ks-x1001	  . #x6B5F)	; &I-K0-6B5F; [75-63]
+      (=daikanwa	  . 41891)	; &I-M-41891;
+      ))
     ))
 (define-char
   '((ideographic-radical . 170)	; ⾩
@@ -4100,9 +4137,6 @@
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (<-formed
-     ((=daikanwa	  . 39191)	; &M-39191;
-      ))
     (shinjigen-2	. 8931)
     (=jis-x0208		. #x702B)	; &GT-56258; [80-11]
     (=ks-x1001		. #x624A)	; &I-K0-624A; [66-42]
@@ -4110,6 +4144,9 @@
     (=gt-pj-1		. #x702B)	; &I-GT-56258; [80-11]
     (=daikanwa		. 41870)	; &I-M-41870;
     (=ucs@jis		. #x96A7)	; &GT-56258;
+    (<-formed
+     ((=daikanwa	  . 39191)	; &M-39191;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -4376,10 +4413,19 @@
     (=daikanwa		. 41890)	; &I-M-41890;
     ))
 (define-char
-  '((=>ucs		. #x96B1)	; 隱
+  '((ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x96B1)	; 隱
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x96B1)	; 隱
+      ))
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
+    (shinjigen-1	. 8924)
     (shinjigen-2	. 8924)
     (=jis-x0208		. #x702C)	; &GT-56268; [80-12]
     (=ks-x1001		. #x6B5F)	; &I-K0-6B5F; [75-63]
@@ -4389,20 +4435,23 @@
     (=ucs@jis		. #x96B1)	; &GT-56268;
     ))
 (define-char
-  '((=>ucs		. #x96B1)	; 隱
-    (morohashi-daikanwa	41891 0 2)
+  '((<-denotational
+     ((=ucs		  . #x96B1)	; 隱
+      ))
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=cns11643-1	. #x7621)	; &C1-7621; [86-01]
+    (=gb12345		. #x527E)	; &UU+96B1; [50-94]
+    (=ucs@unicode	. #x96B1)	; &UU+96B1;
     ))
 (define-char
-  '((morohashi-daikanwa	41891 0 3)
+  '((<-denotational
+     ((=ucs		  . #x96B1)	; 隱
+      ))
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x96B1)	; 隱
-    (=gb12345		. #x527E)	; 隱 [50-94]
+    (=cns11643-1	. #x7621)	; &C1-7621; [86-01]
     ))
 (define-char
   '((ideographic-radical . 170)	; ⾩
@@ -4811,10 +4860,10 @@
   '((ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 23)
     (total-strokes	 . 31)
+    (=ucs		. #x28F75)	; 𨽵
     (<-same
      ((=daikanwa	  . 19650)	; &M-19650;
       ))
-    (=ucs		. #x28F75)	; 𨽵
     ))
 (define-char
   '((ideographic-radical . 170)	; ⾩
diff --git a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
index 3d4eeba..3e22b21 100644
--- a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
+++ b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
@@ -47,52 +47,42 @@
     (=cns11643-6	. #x3C70)	; &C6-3C70; [28-80]
     ))
 (define-char
-  '((=>ucs		. #x96BA)	; 隺
-    (ideographic-radical . 172)	; ⾫
-    (ideographic-strokes . 2)
-    (total-strokes	 . 10)
-    (=jis-x0212		. #x6671)	; &CDP-8D4B; [70-81]
-    (=jis-x0213-2-2000	. #x7B6E)	; &I-JX2-7B6E; [91-78]
-    (=big5-cdp		. #x8D4B)	; &I-CDP-8D4B;
-    (=daikanwa		. 41940)	; &I-M-41940;
-    (=ucs@jis		. #x96BA)	; &CDP-8D4B;
-    ))
-(define-char
-  '((morohashi-daikanwa	41940 0 1)
-    (ideographic-radical . 172)	; ⾫
+  '((ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 2)
     (total-strokes	 . 10)
     (=ucs		. #x96BA)	; 隺
-    (=cns11643-4	. #x3041)	; &I-C4-3041; [16-33]
-    ))
-(define-char
-  '((=>ucs		. #x96BB)	; 隻
-    (ideographic-radical . 172)	; ⾫
-    (ideographic-strokes . 2)
-    (total-strokes	 . 10)
-    (=daikanwa		. 41941)	; &M-41941;
-    ))
-(define-char
-  '((=>ucs		. #x96BB)	; 隻
-    (morohashi-daikanwa	41941 0 0)
-    (ideographic-radical . 172)	; ⾫
-    (ideographic-strokes . 2)
-    (total-strokes	 . 10)
-    (=jis-x0208		. #x4049)	; &GT-56358; [32-41]
-    (=ks-x1001		. #x7434)	; &I-K0-7434; [84-20]
-    (=gt		. 56358)	; &I-GT-56358;
-    (=gt-k		. 06483)	; &I-GT-K06483;
-    (=gt-pj-1		. #x4049)	; &I-GT-56358; [32-41]
-    (=ucs@jis		. #x96BB)	; &GT-56358;
+    (->subsumptive
+     ((=jis-x0212	  . #x6671)	; &CDP-8D4B; [70-81]
+      (=jis-x0213-2-2000  . #x7B6E)	; &I-JX2-7B6E; [91-78]
+      (=big5-cdp	  . #x8D4B)	; &I-CDP-8D4B;
+      (=daikanwa	  . 41940)	; &I-M-41940;
+      (=jef-china3	  . #x6BFA)	; &I-JC3-6BFA;
+      (=ucs@jis		  . #x96BA)	; &CDP-8D4B;
+      )
+     ((=cns11643-4	  . #x3041)	; &C4-3041; [16-33]
+      (=ucs@unicode	  . #x96BA)	; &C4-3041;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	41941 0 1)
-    (ideographic-radical . 172)	; ⾫
+  '((ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 2)
     (total-strokes	 . 10)
     (=ucs		. #x96BB)	; 隻
-    (=cns11643-1	. #x5869)	; &I-C1-5869; [56-73]
-    (=gb12345		. #x7922)	; 隻 [89-02]
+    (->subsumptive
+     ((=daikanwa	  . 41941)	; &M-41941;
+      (=jef-china3	  . #x6BF8)	; &I-JC3-6BF8;
+      )
+     ((=jis-x0208	  . #x4049)	; &GT-56358; [32-41]
+      (=ks-x1001	  . #x7434)	; &I-K0-7434; [84-20]
+      (=gt		  . 56358)	; &I-GT-56358;
+      (=gt-k		  . 06483)	; &I-GT-K06483;
+      (=gt-pj-1		  . #x4049)	; &I-GT-56358; [32-41]
+      (=ucs@jis		  . #x96BB)	; &GT-56358;
+      )
+     ((=cns11643-1	  . #x5869)	; &C1-5869; [56-73]
+      (=gb12345		  . #x7922)	; &C1-5869; [89-02]
+      (=ucs@unicode	  . #x96BB)	; &C1-5869;
+      ))
     ))
 (define-char
   '((ideographic-radical . 172)	; ⾫
@@ -313,7 +303,12 @@
   '((ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 3)
     (total-strokes	 . 11)
-    (=daikanwa		. 41956)	; &M-41956;
+    (=ucs		. #x28F8C)	; 𨾌
+    (->subsumptive
+     ((=daikanwa	  . 41956)	; &M-41956;
+      )
+     ((=ucs@iso		  . #x28F8C)	; &U-00028F8C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 172)	; ⾫
@@ -329,19 +324,46 @@
     (=cns11643-6	. #x4630)	; &C6-4630; [38-16]
     ))
 (define-char
-  '((=>ucs		. #x28F92)	; 𨾒
-    (ideographic-radical . 172)	; ⾫
-    (ideographic-strokes . 4)
-    (total-strokes	 . 12)
-    (=daikanwa		. 41958)	; &M-41958;
+  '((ideographic-radical . 172)	; ⾫
+    (ideographic-strokes . 3)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+      (=ucs		  . #x2FFB)	; â¿»
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((name*		    . "ideographic component person for top")
+	(=ucs		    . #x20089)	; 𠂉
+	)
+       ((=ucs		    . #x4E00)	; 一
+	))
+      )
+     ((=jis-x0208	  . #x7032)	; &GT-56353; [80-18]
+      (=daikanwa	  . 41937)	; &I-M-41937;
+      ))
+    (=gt		. 56364)	; &GT-56364;
+    (=gt-k		. 08651)	; &I-GT-K08651;
+    (=gt-pj-9		. #x4C4B)	; &GT-56364; [44-43]
+    (mojikyo		. 076024)	; &MCS-600128F8;
+    (<-simplified@component
+     ((=jis-x0212	  . #x6676)	; &GT-56559; [70-86]
+      (=daikanwa	  . 42120)	; &I-M-42120;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	41958 0 1)
-    (ideographic-radical . 172)	; ⾫
+  '((ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
     (=ucs		. #x28F92)	; 𨾒
-    (=cns11643-4	. #x3B70)	; &I-C4-3B70; [27-80]
+    (->subsumptive
+     ((=daikanwa	  . 41958)	; &M-41958;
+      )
+     ((=cns11643-4	  . #x3B70)	; &C4-3B70; [27-80]
+      (=ucs@iso		  . #x28F92)	; &C4-3B70;
+      ))
     ))
 (define-char
   '((ideographic-radical . 172)	; ⾫
@@ -1292,52 +1314,55 @@
     (=cns11643-6	. #x6370)	; &C6-6370; [67-80]
     ))
 (define-char
-  '((=>ucs		. #x96D1)	; 雑
-    (ideographic-radical . 172)	; ⾫
-    (ideographic-strokes . 6)
-    (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x7038)	; &GT-56564; [80-24]
-      (=ks-x1001	  . #x6D5A)	; &I-K0-6D5A; [77-58]
-      (=daikanwa	  . 42122)	; &I-M-42122;
-      ))
-    (shinjigen-2	. 8961)
-    (=jis-x0208		. #x3B28)	; &GT-56442; [27-08]
-    (=gt		. 56442)	; &I-GT-56442;
-    (=gt-k		. 11124)	; &I-GT-K11124;
-    (=gt-pj-1		. #x3B28)	; &I-GT-56442; [27-08]
-    (=daikanwa		. 42022)	; &I-M-42022;
-    (=ucs@jis		. #x96D1)	; &GT-56442;
-    ))
-(define-char
-  '((=>ucs		. #x96D1)	; 雑
-    (morohashi-daikanwa	42022 0 1)
-    (ideographic-radical . 172)	; ⾫
+  '((ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
-    (=cns11643-3	. #x4A49)	; &C3-4A49; [42-41]
+    (=ucs		. #x96D1)	; 雑
     ))
 (define-char
-  '((morohashi-daikanwa	42022 0 2)
+  '((<-denotational
+     ((=ucs		  . #x96D1)	; 雑
+      ))
     (ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
-    (=ucs		. #x96D1)	; 雑
+    (->subsumptive
+     ((shinjigen-2	  . 8961)
+      (=jis-x0208	  . #x3B28)	; &GT-56442; [27-08]
+      (=gt		  . 56442)	; &I-GT-56442;
+      (=gt-k		  . 11124)	; &I-GT-K11124;
+      (=gt-pj-1		  . #x3B28)	; &I-GT-56442; [27-08]
+      (=daikanwa	  . 42022)	; &I-M-42022;
+      (=ucs@jis		  . #x96D1)	; &GT-56442;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x7038)	; &GT-56564; [80-24]
+	(=ks-x1001	    . #x6D5A)	; &I-K0-6D5A; [77-58]
+	(=daikanwa	    . 42122)	; &I-M-42122;
+	))
+      )
+     ((=cns11643-3	  . #x4A49)	; &C3-4A49; [42-41]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x28FBB)	; 𨾻
+  '((<-denotational
+     ((=ucs		  . #x96D1)	; 雑
+      ))
     (ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
-    (=daikanwa		. 42023)	; &M-42023;
+    (=ucs@unicode	. #x96D1)	; &UU+96D1;
     ))
 (define-char
-  '((morohashi-daikanwa	42023 0 1)
-    (ideographic-radical . 172)	; ⾫
+  '((ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
     (=ucs		. #x28FBB)	; 𨾻
-    (=cns11643-4	. #x482A)	; &I-C4-482A; [40-10]
+    (->subsumptive
+     ((=daikanwa	  . 42023)	; &M-42023;
+      )
+     ((=cns11643-4	  . #x482A)	; &C4-482A; [40-10]
+      (=ucs@iso		  . #x28FBB)	; &C4-482A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 172)	; ⾫
@@ -2709,68 +2734,51 @@
 (define-char
   '((ideographic-radical . 172)	; ⾫
     (=ucs		. #x96DA)	; 雚
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x96DA)	; 雚
+      ))
+    (ideographic-radical . 172)	; ⾫
+    (ideographic-strokes . 10)
+    (total-strokes	 . 18)
     (->subsumptive
-     ((ideographic-strokes . 10)
-      (total-strokes	   . 18)
-      (->subsumptive
-       ((=jis-x0212	    . #x6676)	; &GT-56559; [70-86]
-	(=gt		    . 56559)	; &I-GT-56559;
-	(=gt-pj-8	    . #x326E)	; &I-GT-56559; [18-78]
-	(=daikanwa	    . 42120)	; &I-M-42120;
-	(=ucs@jis/1990	    . #x96DA)	; &GT-56559;
-	)
-       ((=cns11643-2	    . #x643D)	; &C2-643D; [68-29]
-	(=ucs@cns	    . #x96DA)	; &C2-643D;
-	))
-      )
-     ((ideographic-strokes . 10)
-      (total-strokes	   . 18)
-      (=gt		  . 56560)	; &GT-56560;
-      (=gt-pj-9		  . #x4C37)	; &GT-56560; [44-23]
+     ((=jis-x0212	  . #x6676)	; &GT-56559; [70-86]
+      (=gt		  . 56559)	; &I-GT-56559;
+      (=gt-pj-8		  . #x326E)	; &I-GT-56559; [18-78]
+      (=daikanwa	  . 42120)	; &I-M-42120;
+      (=ucs@jis/1990	  . #x96DA)	; &GT-56559;
       )
-     ((ideographic-strokes . 9)
-      (total-strokes	   . 17)
-      (->subsumptive
-       ((ideographic-strokes@jis-x0213 . 10)
-	(=jis-x0213-2-2000  . #x7B73)	; &GT-56531; [91-83]
-	(=gt		    . 56531)	; &I-GT-56531;
-	(=gt-pj-10	    . #x7344)	; &I-GT-56531; [83-36]
-	(=ucs@jis/2000	    . #x96DA)	; &GT-56531;
-	)
-       ((=ucs@unicode	    . #x96DA)	; &UU+96DA;
-	))
+     ((=cns11643-2	  . #x643D)	; &C2-643D; [68-29]
+      (=ucs@cns		  . #x96DA)	; &C2-643D;
       ))
     ))
 (define-char
-  '((=>daikanwa		. 42120)	; &GT-56559;
+  '((<-denotational
+     ((=ucs		  . #x96DA)	; 雚
+      ))
     (ideographic-radical . 172)	; ⾫
-    (ideographic-strokes . 3)
-    (total-strokes	 . 11)
-    (<-simplified@component
-     ((=jis-x0212	  . #x6676)	; &GT-56559; [70-86]
-      (=daikanwa	  . 42120)	; &I-M-42120;
+    (ideographic-strokes . 10)
+    (total-strokes	 . 18)
+    (=gt		. 56560)	; &GT-56560;
+    (=gt-pj-9		. #x4C37)	; &GT-56560; [44-23]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x96DA)	; 雚
       ))
-    (ideographic-structure
-     ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
-      (=ucs		  . #x2FFB)	; â¿»
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((name*		    . "ideographic component person for top")
-	(=ucs		    . #x20089)	; 𠂉
-	)
-       ((=ucs		    . #x4E00)	; 一
-	))
+    (ideographic-radical . 172)	; ⾫
+    (ideographic-strokes . 9)
+    (total-strokes	 . 17)
+    (->subsumptive
+     ((ideographic-strokes@jis-x0213 . 10)
+      (=jis-x0213-2-2000  . #x7B73)	; &GT-56531; [91-83]
+      (=gt		  . 56531)	; &I-GT-56531;
+      (=gt-pj-10	  . #x7344)	; &I-GT-56531; [83-36]
+      (=ucs@jis/2000	  . #x96DA)	; &GT-56531;
       )
-     ((=jis-x0208	  . #x7032)	; &GT-56353; [80-18]
-      (=daikanwa	  . 41937)	; &I-M-41937;
+     ((=ucs@unicode	  . #x96DA)	; &UU+96DA;
       ))
-    (=gt		. 56364)	; &GT-56364;
-    (=gt-k		. 08651)	; &I-GT-K08651;
-    (=gt-pj-9		. #x4C4B)	; &GT-56364; [44-43]
-    (mojikyo		. 076024)	; &MCS-600128F8;
     ))
 (define-char
   '((ideographic-radical . 172)	; ⾫
@@ -3179,17 +3187,22 @@
   '((<-denotational
      ((=ucs		  . #x96E3)	; 難
       ))
-    (=>ucs@jis		. #xFA68)	; 難
+    (=>ucs*		. #x96E3)	; 難
+    (=>ucs@gb		. #x96E3)	; &C1-7945;
+    (=>ucs@cns		. #x96E3)	; &C1-7945;
+    (=>ucs@jis		. #xFA68)	; &M-42145;
+    (=>ucs@ks		. #x96E3)	; &M-42145;
     (ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 11)
     (total-strokes	 . 19)
+    (=ucs		. #xFA68)	; 難
     (->subsumptive
-     ((=>ucs*		  . #x96E3)	; 難
-      (=ucs		  . #xFA68)	; 難
-      (=ks-x1001	  . #x5171)	; &I-K0-5171; [49-81]
+     ((=ks-x1001	  . #x5171)	; &M-42145; [49-81]
       (=jis-x0213-1-2000  . #x7D63)	; &I-JX1-7D63; [93-67]
       (=daikanwa	  . 42145)	; &I-M-42145;
-      (=ucs@ks		  . #x96E3)	; 難
+      (=jef-china3	  . #x6BFD)	; &I-JC3-6BFD;
+      (=ucs@unicode	  . #xFA68)	; &M-42145;
+      (=ucs@ks		  . #x96E3)	; &M-42145;
       )
      ((=cns11643-1	  . #x7945)	; &C1-7945; [89-37]
       (=gb12345		  . #x4451)	; &C1-7945; [36-49]
@@ -3203,14 +3216,15 @@
     (ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA68)	; 難
-      (=jis-x0213-1-2000  . #x7D63)	; &I-JX1-7D63; [93-67]
-      ))
     (=jis-x0208		. #x4671)	; &GT-56577; [38-81]
     (=gt		. 56577)	; &I-GT-56577;
     (=gt-pj-1		. #x4671)	; &I-GT-56577; [38-81]
     (=ucs@jis		. #x96E3)	; &GT-56577;
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x5171)	; &M-42145; [49-81]
+      (=jis-x0213-1-2000  . #x7D63)	; &I-JX1-7D63; [93-67]
+      (=daikanwa	  . 42145)	; &I-M-42145;
+      ))
     ))
 (define-char
   '((ideographic-radical . 172)	; ⾫
diff --git a/lisp/utf-2000/Ideograph-R173-Rain.el b/lisp/utf-2000/Ideograph-R173-Rain.el
index f1bb34e..00dc1fa 100644
--- a/lisp/utf-2000/Ideograph-R173-Rain.el
+++ b/lisp/utf-2000/Ideograph-R173-Rain.el
@@ -26,10 +26,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED7)	; ⻗
     (<-formed@component/connect-below
      ((=ucs		  . #x96E8)	; 雨
       ))
-    (=ucs		. #x2ED7)	; ⻗
     ))
 (define-char
   '((ideographic-radical . 173)	; ⾬
@@ -1431,31 +1431,39 @@
     (=ucs		. #x970A)	; 霊
     (->subsumptive
      ((morohashi-daikanwa	42309 1)
-      (<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x704D)	; &GT-57085; [80-45]
-	(=ks-x1001	    . #x5644)	; &I-K0-5644; [54-36]
-	(=daikanwa	    . 42532)	; &I-M-42532;
-	))
       (=jis-x0208	  . #x4E6E)	; &GT-56803; [46-78]
       (=gt		  . 56803)	; &I-GT-56803;
       (=gt-k		  . 11961)	; &I-GT-K11961;
       (=gt-pj-1		  . #x4E6E)	; &I-GT-56803; [46-78]
       (=ucs@unicode	  . #x970A)	; &GT-56803;
       (mojikyo		  . 050565)	; &MCS-6000C585;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x704D)	; &GT-57085; [80-45]
+	(=ks-x1001	    . #x5644)	; &I-K0-5644; [54-36]
+	(=daikanwa	    . 42532)	; &I-M-42532;
+	))
       )
      ((=cns11643-3	  . #x4F60)	; &C3-4F60; [47-64]
       ))
     ))
 (define-char
   '((ideographic-radical . 173)	; ⾬
+    (=ucs		. #x290D2)	; 𩃒
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x290D2)	; 𩃒
+      ))
+    (ideographic-radical . 173)	; ⾬
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
-    (=ucs		. #x290D2)	; 𩃒
-    (=daikanwa		. 42310)	; &I-M-42310;
+    (=daikanwa		. 42310)	; &M-42310;
+    (=ucs@iso		. #x290D2)	; &M-42310;
     ))
 (define-char
-  '((=>ucs		. #x290D2)	; 𩃒
-    (morohashi-daikanwa	42310 0 0)
+  '((<-denotational
+     ((=ucs		  . #x290D2)	; 𩃒
+      ))
     (ideographic-radical . 173)	; ⾬
     (ideographic-strokes . 9)
     (total-strokes	 . 17)
diff --git a/lisp/utf-2000/Ideograph-R174-Blue.el b/lisp/utf-2000/Ideograph-R174-Blue.el
index 28c9bec..27d1be5 100644
--- a/lisp/utf-2000/Ideograph-R174-Blue.el
+++ b/lisp/utf-2000/Ideograph-R174-Blue.el
@@ -21,12 +21,6 @@
     (=ucs		. #x9752)	; 青
     (->subsumptive
      ((morohashi-daikanwa	42564 1)
-      (<-same
-       ((=ks-x1001	    . #x746C)	; &M-42564; [84-76]
-	(=daikanwa	    . 42564)	; &I-M-42564;
-	))
-      (<-same*sources
-       daikanwa)
       (=jis-x0208	  . #x4044)	; &GT-57125; [32-36]
       (=gb2312		  . #x4760)	; &I-G0-4760; [39-64]
       (=gt		  . 57125)	; &I-GT-57125;
@@ -34,6 +28,12 @@
       (=gt-pj-1		  . #x4044)	; &I-GT-57125; [32-36]
       (=ucs@unicode	  . #x9752)	; &GT-57125;
       (mojikyo		  . 050568)	; &MCS-6000C588;
+      (<-same
+       ((=ks-x1001	    . #x746C)	; &M-42564; [84-76]
+	(=daikanwa	    . 42564)	; &I-M-42564;
+	))
+      (<-same*sources
+       daikanwa)
       )
      ((=cns11643-1	  . #x4F65)	; &C1-4F65; [47-69]
       ))
@@ -46,13 +46,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED8)	; ⻘
     (<-formed@component
      ((=ucs		  . #x9751)	; 靑
       ))
     (<-identical@component
      ((=ucs		  . #x9752)	; 青
       ))
-    (=ucs		. #x2ED8)	; ⻘
     ))
 (define-char
   '((ideographic-radical . 174)	; â¾­
@@ -266,11 +266,6 @@
     (=ucs		. #x9759)	; 静
     (->subsumptive
      ((morohashi-daikanwa	42574 1)
-      (<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x7050)	; &GT-57156; [80-48]
-	(=ks-x1001	    . #x7021)	; &I-K0-7021; [80-01]
-	(=daikanwa	    . 42578)	; &I-M-42578;
-	))
       (=jis-x0208	  . #x4045)	; &GT-57143; [32-37]
       (=gb2312		  . #x3E32)	; &I-G0-3E32; [30-18]
       (=gt		  . 57143)	; &I-GT-57143;
@@ -278,6 +273,11 @@
       (=gt-pj-1		  . #x4045)	; &I-GT-57143; [32-37]
       (=ucs@unicode	  . #x9759)	; &GT-57143;
       (mojikyo		  . 050570)	; &MCS-6000C58A;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x7050)	; &GT-57156; [80-48]
+	(=ks-x1001	    . #x7021)	; &I-K0-7021; [80-01]
+	(=daikanwa	    . 42578)	; &I-M-42578;
+	))
       )
      ((=cns11643-3	  . #x4A4C)	; &C3-4A4C; [42-44]
       ))
diff --git a/lisp/utf-2000/Ideograph-R177-Leather.el b/lisp/utf-2000/Ideograph-R177-Leather.el
index d81c80e..5e59656 100644
--- a/lisp/utf-2000/Ideograph-R177-Leather.el
+++ b/lisp/utf-2000/Ideograph-R177-Leather.el
@@ -72,7 +72,13 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 12)
     (->subsumptive
-     ((<-same@jiyun
+     ((=jis-x0208@1978	  . #x7057)	; &GT-57333; [80-55]
+      (=ks-x1001	  . #x6C65)	; &I-K0-6C65; [76-69]
+      (=gt		  . 57333)	; &I-GT-57333;
+      (=gt-pj-8		  . #x386F)	; &I-GT-57333; [24-79]
+      (=daikanwa	  . 42715)	; &I-M-42715;
+      (=ucs@unicode	  . #x976D)	; &GT-57333;
+      (<-same@jiyun
        ((=daikanwa	    . 29262)	; &M-29262;
 	))
       (<-same@jiyun*sources
@@ -83,12 +89,6 @@
 	))
       (<-same@zihui*sources
        jiyun zihui daikanwa)
-      (=jis-x0208@1978	  . #x7057)	; &GT-57333; [80-55]
-      (=ks-x1001	  . #x6C65)	; &I-K0-6C65; [76-69]
-      (=gt		  . 57333)	; &I-GT-57333;
-      (=gt-pj-8		  . #x386F)	; &I-GT-57333; [24-79]
-      (=daikanwa	  . 42715)	; &I-M-42715;
-      (=ucs@unicode	  . #x976D)	; &GT-57333;
       )
      ((=cns11643-3	  . #x4024)	; &C3-4024; [32-04]
       ))
@@ -100,16 +100,16 @@
     (ideographic-radical . 177)	; â¾°
     (ideographic-strokes . 3)
     (total-strokes	 . 12)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x7057)	; &GT-57333; [80-55]
-      (=ks-x1001	  . #x6C65)	; &I-K0-6C65; [76-69]
-      (=daikanwa	  . 42715)	; &I-M-42715;
-      ))
     (=jis-x0208@1983	. #x3F59)	; &GT-57334; [31-57]
     (=jis-x0208@1990	. #x3F59)	; &I-J90-3F59; [31-57]
     (=gt		. 57334)	; &I-GT-57334;
     (=gt-pj-1		. #x3F59)	; &I-GT-57334; [31-57]
     (=ucs@jis		. #x976D)	; &GT-57334;
+    (<-simplified@JP/misc
+     ((=jis-x0208@1978	  . #x7057)	; &GT-57333; [80-55]
+      (=ks-x1001	  . #x6C65)	; &I-K0-6C65; [76-69]
+      (=daikanwa	  . 42715)	; &I-M-42715;
+      ))
     ))
 (define-char
   '((ideographic-radical . 177)	; â¾°
@@ -166,6 +166,14 @@
   '((ideographic-radical . 177)	; â¾°
     (ideographic-strokes . 3)
     (total-strokes	 . 12)
+    (=ucs		. #x4A52)	; 䩒
+    (=cns11643-4	. #x3B76)	; &I-C4-3B76; [27-86]
+    (=daikanwa		. 42721)	; &I-M-42721;
+    ))
+(define-char
+  '((ideographic-radical . 177)	; â¾°
+    (ideographic-strokes . 3)
+    (total-strokes	 . 12)
     (=ucs		. #x2925E)	; 𩉞
     (=cns11643-4	. #x3B78)	; &I-C4-3B78; [27-88]
     (=daikanwa		. 42722)	; &I-M-42722;
@@ -184,6 +192,10 @@
     (=ucs		. #x9771)	; 靱
     (->subsumptive
      ((morohashi-daikanwa	ho 701)
+      (=jis-x0208@1990	  . #x7057)	; &GT-57335; [80-55]
+      (=gt		  . 57335)	; &I-GT-57335;
+      (=gt-pj-1		  . #x7057)	; &I-GT-57335; [80-55]
+      (=ucs@jis		  . #x9771)	; &GT-57335;
       (<-vulgar@ruijumyougishou
        ((=jis-x0212	    . #x534E)	; &M-27248; [51-46]
 	(=jis-x0213-2-2000  . #x742A)	; &I-JX2-742A; [84-10]
@@ -197,10 +209,6 @@
 	))
       (<-vulgar@tongwen-tongkao*sources
        tongwen-tongkao daikanwa)
-      (=jis-x0208@1990	  . #x7057)	; &GT-57335; [80-55]
-      (=gt		  . 57335)	; &I-GT-57335;
-      (=gt-pj-1		  . #x7057)	; &I-GT-57335; [80-55]
-      (=ucs@jis		  . #x9771)	; &GT-57335;
       )
      ((=jis-x0208@1983	  . #x7057)	; &J83-7057; [80-55]
       (=ucs@unicode	  . #x9771)	; &J83-7057;
@@ -212,13 +220,6 @@
   '((ideographic-radical . 177)	; â¾°
     (ideographic-strokes . 3)
     (total-strokes	 . 12)
-    (=ucs		. #x4A52)	; 䩒
-    (=cns11643-4	. #x3B76)	; &I-C4-3B76; [27-86]
-    ))
-(define-char
-  '((ideographic-radical . 177)	; â¾°
-    (ideographic-strokes . 3)
-    (total-strokes	 . 12)
     (=ucs		. #x9770)	; 靰
     (=iso-ir165		. #x2D3E)	; &I-EGB-2D3E; [13-30]
     (=cns11643-2	. #x414F)	; &I-C2-414F; [33-47]
@@ -228,8 +229,12 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 13)
     (=ucs		. #x9772)	; 靲
-    (=cns11643-2	. #x4863)	; &I-C2-4863; [40-67]
-    (=daikanwa		. 42724)	; &I-M-42724;
+    (->subsumptive
+     ((=cns11643-2	  . #x4863)	; &M-42724; [40-67]
+      (=daikanwa	  . 42724)	; &I-M-42724;
+      )
+     ((=ucs@unicode	  . #x9772)	; &UU+9772;
+      ))
     ))
 (define-char
   '((ideographic-radical . 177)	; â¾°
diff --git a/lisp/utf-2000/Ideograph-R178-Tanned-Leather.el b/lisp/utf-2000/Ideograph-R178-Tanned-Leather.el
index 08430fc..2926525 100644
--- a/lisp/utf-2000/Ideograph-R178-Tanned-Leather.el
+++ b/lisp/utf-2000/Ideograph-R178-Tanned-Leather.el
@@ -8,9 +8,9 @@
      ((total-strokes	   . 9)
       (->subsumptive
        ((=gb12345	    . #x4E24)	; &GT-57812; [46-04]
-	(=gt		    . 57812)	; &GT-57812;
-	(=gt-pj-8	    . #x3C71)	; &GT-57812; [28-81]
-	(=daikanwa	    . 43108)	; &I-M-43108;
+	(=gt		    . 57812)	; &I-GT-57812;
+	(=gt-pj-8	    . #x3C71)	; &I-GT-57812; [28-81]
+	(=daikanwa	    . 43108)	; &GT-57812;
 	(=ucs@unicode	    . #x97CB)	; &GT-57812;
 	)
        ((=cns11643-1	    . #x5374)	; &C1-5374; [51-84]
@@ -33,22 +33,22 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED9)	; ⻙
     (<-identical@component
      ((=ucs		  . #x97E6)	; 韦
       ))
-    (=ucs		. #x2ED9)	; ⻙
     ))
 (define-char
   '((ideographic-radical . 178)	; â¾±
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-simplified@CN
-     ((=gb12345		  . #x4E24)	; &GT-57812; [46-04]
-      (=daikanwa	  . 43108)	; &I-M-43108;
-      ))
     (=ucs		. #x97E6)	; 韦
     (=gb2312		. #x4E24)	; &I-G0-4E24; [46-04]
     (=big5-cdp		. #x89D6)	; &I-CDP-89D6;
+    (<-simplified@CN
+     ((=gb12345		  . #x4E24)	; &GT-57812; [46-04]
+      (=daikanwa	  . 43108)	; &GT-57812;
+      ))
     ))
 (define-char
   '((ideographic-radical . 178)	; â¾±
diff --git a/lisp/utf-2000/Ideograph-R180-Sound.el b/lisp/utf-2000/Ideograph-R180-Sound.el
index e9b63f5..c9f461d 100644
--- a/lisp/utf-2000/Ideograph-R180-Sound.el
+++ b/lisp/utf-2000/Ideograph-R180-Sound.el
@@ -676,6 +676,7 @@
 (define-char
   '((ideographic-radical . 180)	; â¾³
     (=ucs		. #x97FF)	; 響
+    (=jis-x0208@1997	. #x3641)	; 響 [22-33]
     ))
 (define-char
   '((<-denotational
@@ -685,16 +686,16 @@
     (ideographic-radical . 180)	; â¾³
     (ideographic-strokes . 11)
     (total-strokes	 . 20)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA69)	; ï©©
-      (=jis-x0213-1-2000  . #x7D76)	; &I-JX1-7D76; [93-86]
-      ))
     (shinjigen-1	. 9139)
     (=jis-x0208		. #x3641)	; &GT-58170; [22-33]
     (=gt		. 58170)	; &I-GT-58170;
     (=gt-pj-1		. #x3641)	; &I-GT-58170; [22-33]
     (=ucs@jis		. #x97FF)	; &GT-58170;
     (mojikyo		. 050573)	; &MCS-6000C58D;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA69)	; ï©©
+      (=jis-x0213-1-2000  . #x7D76)	; &I-JX1-7D76; [93-86]
+      ))
     ))
 (define-char
   '((ideographic-radical . 180)	; â¾³
@@ -819,22 +820,31 @@
 (define-char
   '((ideographic-radical . 180)	; â¾³
     (=ucs		. #x9800)	; 頀
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9800)	; 頀
+      ))
+    (ideographic-radical . 180)	; â¾³
+    (ideographic-strokes . 14)
+    (total-strokes	 . 23)
     (->subsumptive
-     ((ideographic-strokes . 14)
-      (total-strokes	   . 23)
-      (=daikanwa	  . 43327)	; &M-43327;
-      )
-     ((ideographic-strokes . 14)
-      (total-strokes	   . 23)
-      (=cns11643-2	  . #x6F5F)	; &C2-6F5F; [79-63]
+     ((=daikanwa	  . 43327)	; &M-43327;
       )
-     ((ideographic-strokes . 13)
-      (total-strokes	   . 22)
-      (=ks-x1001	  . #x7B61)	; &K0-7B61; [91-65]
+     ((=cns11643-2	  . #x6F5F)	; &C2-6F5F; [79-63]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9800)	; 頀
+      ))
+    (ideographic-radical . 180)	; â¾³
+    (ideographic-strokes . 13)
+    (total-strokes	 . 22)
+    (->subsumptive
+     ((=ks-x1001	  . #x7B61)	; &K0-7B61; [91-65]
       )
-     ((ideographic-strokes . 13)
-      (total-strokes	   . 22)
-      (=ucs@unicode	  . #x9800)	; &UU+9800;
+     ((=ucs@unicode	  . #x9800)	; &UU+9800;
       ))
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R181-Leaf.el b/lisp/utf-2000/Ideograph-R181-Leaf.el
index aca950f..d37d2ab 100644
--- a/lisp/utf-2000/Ideograph-R181-Leaf.el
+++ b/lisp/utf-2000/Ideograph-R181-Leaf.el
@@ -29,21 +29,21 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EDA)	; ⻚
     (<-identical@component
      ((=ucs		  . #x9875)	; 页
       ))
-    (=ucs		. #x2EDA)	; ⻚
     ))
 (define-char
   '((ideographic-radical . 181)	; â¾´
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
+    (=ucs		. #x9875)	; 页
+    (=gb2312		. #x5233)	; &I-G0-5233; [50-19]
     (<-simplified@CN
      ((=ucs		  . #x9801)	; 頁
       (=gb12345		  . #x5233)	; 頁 [50-19]
       ))
-    (=ucs		. #x9875)	; 页
-    (=gb2312		. #x5233)	; &I-G0-5233; [50-19]
     ))
 (define-char
   '((ideographic-radical . 181)	; â¾´
@@ -1785,22 +1785,31 @@
     (total-strokes	 . 16)
     (=ucs		. #x9834)	; é ´
     (->subsumptive
-     ((<-vulgar
+     ((=daikanwa	  . 24824)	; &M-24824;
+      (<-vulgar
        ((=jis-x0208	    . #x314F)	; &GT-32559; [17-47]
 	(=ks-x1001	    . #x6744)	; &I-K0-6744; [71-36]
 	(=daikanwa	    . 25267)	; &I-M-25267;
 	))
       (<-vulgar*sources
-       zhengzi-tong daikanwa)
-      (=daikanwa	  . 24824)	; &M-24824;
+       zhengzitong daikanwa)
       )
      ((=cns11643-3	  . #x5228)	; &C3-5228; [50-08]
       )
-     ((shinjigen-2	  . 5660)
+     ((shinjigen-1	  . 5660)
+      (shinjigen-2	  . 5660)
       (=jis-x0208	  . #x3150)	; &GT-31942; [17-48]
       (=gt		  . 31942)	; &I-GT-31942;
       (=gt-pj-1		  . #x3150)	; &I-GT-31942; [17-48]
       (=ucs@unicode	  . #x9834)	; &GT-31942;
+      (<-vulgar
+       ((shinjigen-1	    . 5659)
+	(=jis-x0208	    . #x314F)	; &GT-32559; [17-47]
+	(=ks-x1001	    . #x6744)	; &I-K0-6744; [71-36]
+	(=daikanwa	    . 25267)	; &I-M-25267;
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       ))
     ))
 (define-char
@@ -1808,31 +1817,55 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 16)
     (=ucs		. #x4AC3)	; 䫃
-    (=cns11643-4	. #x546D)	; &I-C4-546D; [52-77]
-    (=daikanwa		. 43478)	; &I-M-43478;
+    (->subsumptive
+     ((=daikanwa	  . 43478)	; &M-43478;
+      )
+     ((=ucs@unicode	  . #x4AC3)	; &UU+4AC3;
+      )
+     ((=cns11643-4	  . #x546D)	; &C4-546D; [52-77]
+      ))
     ))
 (define-char
   '((ideographic-radical . 181)	; â¾´
     (ideographic-strokes . 7)
     (total-strokes	 . 16)
     (=ucs		. #x294AE)	; 𩒮
-    (=cns11643-4	. #x546C)	; &I-C4-546C; [52-76]
-    (=daikanwa		. 43479)	; &I-M-43479;
+    (->subsumptive
+     ((=cns11643-4	  . #x546C)	; &M-43479; [52-76]
+      (=daikanwa	  . 43479)	; &I-M-43479;
+      )
+     ((=ucs@iso		  . #x294AE)	; &U-000294AE;
+      ))
     ))
 (define-char
   '((ideographic-radical . 181)	; â¾´
     (ideographic-strokes . 7)
     (total-strokes	 . 16)
     (=ucs		. #x4AC4)	; 䫄
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4AC4)	; 䫄
+      ))
+    (ideographic-radical . 181)	; â¾´
+    (ideographic-strokes . 7)
+    (total-strokes	 . 16)
     (->subsumptive
      ((=daikanwa	  . 43480)	; &M-43480;
       )
      ((=cns11643-4	  . #x546F)	; &C4-546F; [52-79]
-      )
-     ((=ucs@unicode	  . #x4AC4)	; &UU+4AC4;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x4AC4)	; 䫄
+      ))
+    (ideographic-radical . 181)	; â¾´
+    (ideographic-strokes . 7)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x4AC4)	; &UU+4AC4;
+    ))
+(define-char
   '((ideographic-radical . 181)	; â¾´
     (ideographic-strokes . 7)
     (total-strokes	 . 16)
@@ -2004,29 +2037,42 @@
       ))
     (ideographic-strokes . 6)
     (total-strokes	 . 15)
-    (<-simplified@JP
-     ((=ucs		  . #x9830)	; é °
-      (=jis-x0208@1978	  . #x4B4B)	; &I-J78-4B4B; [43-43]
-      (=jis-x0212	  . #x6824)	; &I-JSP-6824; [72-04]
-      (=jis-x0213-1-2000  . #x7D7A)	; &I-JX1-7D7A; [93-90]
-      ))
     (=ucs		. #x982C)	; é ¬
     (=jis-x0208@1983	. #x4B4B)	; &I-J83-4B4B; [43-43]
     (=jis-x0208@1990	. #x4B4B)	; &I-J90-4B4B; [43-43]
     (=gt		. 58319)	; &I-GT-58319;
     (=gt-pj-1		. #x4B4B)	; &I-GT-58319; [43-43]
+    (<-simplified@JP/jis
+     ((=ucs		  . #x9830)	; é °
+      (=jis-x0208@1978	  . #x4B4B)	; &I-J78-4B4B; [43-43]
+      (=jis-x0212	  . #x6824)	; &I-JSP-6824; [72-04]
+      (=jis-x0213-1-2000  . #x7D7A)	; &I-JX1-7D7A; [93-90]
+      ))
     ))
 (define-char
   '((ideographic-radical . 181)	; â¾´
     (ideographic-strokes . 7)
     (total-strokes	 . 16)
     (=ucs		. #x9831)	; é ±
-    (->subsumptive
-     ((=daikanwa	  . 43497)	; &M-43497;
-      )
-     ((=cns11643-3	  . #x5359)	; &C3-5359; [51-57]
-      (=ucs@unicode	  . #x9831)	; &C3-5359;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9831)	; é ±
       ))
+    (ideographic-radical . 181)	; â¾´
+    (ideographic-strokes . 7)
+    (total-strokes	 . 16)
+    (=daikanwa		. 43497)	; &M-43497;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9831)	; é ±
+      ))
+    (ideographic-radical . 181)	; â¾´
+    (ideographic-strokes . 7)
+    (total-strokes	 . 16)
+    (=cns11643-3	. #x5359)	; &C3-5359; [51-57]
+    (=ucs@unicode	. #x9831)	; &C3-5359;
     ))
 (define-char
   '((ideographic-radical . 181)	; â¾´
@@ -2286,17 +2332,17 @@
     (ideographic-radical . 181)	; â¾´
     (ideographic-strokes . 8)
     (total-strokes	 . 17)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA6A)	; 頻
-      (=jis-x0208@1978	  . #x4951)	; &I-J78-4951; [41-49]
-      (=jis-x0213-1-2000  . #x7D7B)	; &I-JX1-7D7B; [93-91]
-      ))
     (=jis-x0208@1983	. #x4951)	; &GT-58465; [41-49]
     (=jis-x0208@1990	. #x4951)	; &I-J90-4951; [41-49]
     (=gt		. 58465)	; &I-GT-58465;
     (=gt-pj-1		. #x4951)	; &I-GT-58465; [41-49]
     (=jef-china3	. #x6CFB)	; &I-JC3-6CFB;
     (=ucs@jis		. #x983B)	; &GT-58465;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #xFA6A)	; 頻
+      (=jis-x0208@1978	  . #x4951)	; &I-J78-4951; [41-49]
+      (=jis-x0213-1-2000  . #x7D7B)	; &I-JX1-7D7B; [93-91]
+      ))
     ))
 (define-char
   '((ideographic-radical . 181)	; â¾´
@@ -2389,18 +2435,18 @@
     (ideographic-radical . 181)	; â¾´
     (ideographic-strokes . 7)
     (total-strokes	 . 16)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x5673)	; &M-36861; [54-83]
-      (=cns11643-1	  . #x724A)	; &I-C1-724A; [82-42]
-      (=jis-x0213-1-2000  . #x7C3A)	; &I-JX1-7C3A; [92-26]
-      (=daikanwa	  . 36861)	; &I-M-36861;
-      ))
     (=ucs		. #x983C)	; é ¼
     (=jis-x0208		. #x4D6A)	; &I-J90-4D6A; [45-74]
     (=cns11643-3	. #x535B)	; &I-C3-535B; [51-59]
     (=gt		. 58416)	; &I-GT-58416;
     (=gt-pj-1		. #x4D6A)	; &I-GT-58416; [45-74]
     (mojikyo		. 050574)	; &MCS-6000C58E;
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x5673)	; &M-36861; [54-83]
+      (=cns11643-1	  . #x724A)	; &I-C1-724A; [82-42]
+      (=jis-x0213-1-2000  . #x7C3A)	; &I-JX1-7C3A; [92-26]
+      (=daikanwa	  . 36861)	; &I-M-36861;
+      ))
     ))
 (define-char
   '((ideographic-radical . 181)	; â¾´
@@ -3376,16 +3422,16 @@
     (ideographic-radical . 181)	; â¾´
     (ideographic-strokes . 9)
     (total-strokes	 . 19)
-    (<-simplified@JP/Jouyou
-     ((=cns11643-1	  . #x794B)	; &GT-58567; [89-43]
-      (=jis-x0213-1-2000  . #x7E24)	; &I-JX1-7E24; [94-04]
-      (=daikanwa	  . 43636)	; &I-M-43636;
-      ))
     (=jis-x0208		. #x4E60)	; &GT-58526; [46-64]
     (=gt		. 58526)	; &I-GT-58526;
     (=gt-pj-1		. #x4E60)	; &I-GT-58526; [46-64]
     (=ucs@jis		. #x985E)	; &GT-58526;
     (mojikyo		. 050576)	; &MCS-6000C590;
+    (<-simplified@JP/Jouyou
+     ((=cns11643-1	  . #x794B)	; &GT-58567; [89-43]
+      (=jis-x0213-1-2000  . #x7E24)	; &I-JX1-7E24; [94-04]
+      (=daikanwa	  . 43636)	; &I-M-43636;
+      ))
     ))
 (define-char
   '((ideographic-radical . 181)	; â¾´
@@ -3404,16 +3450,16 @@
     (ideographic-radical . 181)	; â¾´
     (ideographic-strokes . 9)
     (total-strokes	 . 18)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x986F)	; 顯
-      (=jis-x0208	  . #x707D)	; &I-J90-707D; [80-93]
-      ))
     (=ucs		. #x9855)	; 顕
     (=jis-x0208		. #x3832)	; &I-J90-3832; [24-18]
     (=cns11643-3	. #x5958)	; &I-C3-5958; [57-56]
     (=gt		. 58498)	; &I-GT-58498;
     (=gt-pj-1		. #x3832)	; &I-GT-58498; [24-18]
     (mojikyo		. 050577)	; &MCS-6000C591;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x986F)	; 顯
+      (=jis-x0208	  . #x707D)	; &I-J90-707D; [80-93]
+      ))
     ))
 (define-char
   '((ideographic-radical . 181)	; â¾´
@@ -3695,32 +3741,49 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 19)
     (=ucs		. #x985B)	; 顛
-    (->subsumptive
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x453F)	; &GT-58555; [37-31]
-	(=ks-x1001	    . #x6F34)	; &I-K0-6F34; [79-20]
-	(=jis-x0212	    . #x6833)	; &I-JSP-6833; [72-19]
-	(=jis-x0213-1-2000  . #x7E23)	; &I-JX1-7E23; [94-03]
-	(=daikanwa	    . 43628)	; &I-M-43628;
-	))
-      (=jis-x0208@1983	  . #x453F)	; &GT-58557; [37-31]
-      (=jis-x0208@1990	  . #x453F)	; &I-J90-453F; [37-31]
-      (=gt		  . 58557)	; &I-GT-58557;
-      (=gt-pj-1		  . #x453F)	; &I-GT-58557; [37-31]
-      (=ucs@jis		  . #x985B)	; &GT-58557;
-      )
-     ((=cns11643-1	  . #x794D)	; &C1-794D; [89-45]
-      (=gb12345		  . #x355F)	; &C1-794D; [21-63]
-      (=ucs@unicode	  . #x985B)	; &C1-794D;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x985B)	; 顛
+      ))
+    (ideographic-radical . 181)	; â¾´
+    (ideographic-strokes . 10)
+    (total-strokes	 . 19)
+    (=jis-x0208@1983	. #x453F)	; &GT-58557; [37-31]
+    (=jis-x0208@1990	. #x453F)	; &I-J90-453F; [37-31]
+    (=gt		. 58557)	; &I-GT-58557;
+    (=gt-pj-1		. #x453F)	; &I-GT-58557; [37-31]
+    (=ucs@jis		. #x985B)	; &GT-58557;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x453F)	; &GT-58555; [37-31]
+      (=ks-x1001	  . #x6F34)	; &I-K0-6F34; [79-20]
+      (=jis-x0212	  . #x6833)	; &I-JSP-6833; [72-19]
+      (=jis-x0213-1-2000  . #x7E23)	; &I-JX1-7E23; [94-03]
+      (=daikanwa	  . 43628)	; &I-M-43628;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x985B)	; 顛
+      ))
+    (ideographic-radical . 181)	; â¾´
+    (ideographic-strokes . 10)
+    (total-strokes	 . 19)
+    (=cns11643-1	. #x794D)	; &C1-794D; [89-45]
+    (=gb12345		. #x355F)	; &C1-794D; [21-63]
+    (=ucs@unicode	. #x985B)	; &C1-794D;
+    ))
+(define-char
   '((ideographic-radical . 181)	; â¾´
     (ideographic-strokes . 10)
     (total-strokes	 . 19)
     (=ucs		. #x29520)	; 𩔠
-    (=cns11643-5	. #x6A5C)	; &I-C5-6A5C; [74-60]
-    (=daikanwa		. 43630)	; &I-M-43630;
+    (->subsumptive
+     ((=daikanwa	  . 43630)	; &M-43630;
+      (=ucs@iso		  . #x29520)	; &M-43630;
+      )
+     ((=cns11643-5	  . #x6A5C)	; &C5-6A5C; [74-60]
+      ))
     ))
 (define-char
   '((ideographic-radical . 181)	; â¾´
diff --git a/lisp/utf-2000/Ideograph-R182-Wind.el b/lisp/utf-2000/Ideograph-R182-Wind.el
index 38851cf..b74d4ee 100644
--- a/lisp/utf-2000/Ideograph-R182-Wind.el
+++ b/lisp/utf-2000/Ideograph-R182-Wind.el
@@ -27,38 +27,35 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EDB)	; ⻛
     (<-identical@component
      ((=ucs		  . #x98CE)	; 风
       ))
-    (=ucs		. #x2EDB)	; ⻛
     ))
 (define-char
   '((ideographic-radical . 182)	; â¾µ
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=ucs		. #x98CE)	; 风
+    (=gb2312		. #x3767)	; &I-G0-3767; [23-71]
     (<-simplified@CN
      ((=jis-x0208	  . #x4977)	; &GT-58717; [41-87]
       (=ks-x1001	  . #x7926)	; &I-K0-7926; [89-06]
       (=gb12345		  . #x3767)	; &GT-58717; [23-71]
       (=daikanwa	  . 43756)	; &I-M-43756;
       ))
-    (=ucs		. #x98CE)	; 风
-    (=gb2312		. #x3767)	; &I-G0-3767; [23-71]
     ))
 (define-char
   '((ideographic-radical . 182)	; â¾µ
     (ideographic-strokes . 2)
     (total-strokes	 . 11)
     (=ucs		. #x4AF8)	; 䫸
-    (=daikanwa		. 43759)	; &I-M-43759;
-    ))
-(define-char
-  '((=>ucs		. #x4AF8)	; 䫸
-    (morohashi-daikanwa	43759 0 1)
-    (ideographic-radical . 182)	; â¾µ
-    (ideographic-strokes . 2)
-    (total-strokes	 . 11)
-    (=cns11643-4	. #x362B)	; &C4-362B; [22-11]
+    (->subsumptive
+     ((=daikanwa	  . 43759)	; &M-43759;
+      (=ucs@unicode	  . #x4AF8)	; &M-43759;
+      )
+     ((=cns11643-4	  . #x362B)	; &C4-362B; [22-11]
+      ))
     ))
 (define-char
   '((ideographic-radical . 182)	; â¾µ
diff --git a/lisp/utf-2000/Ideograph-R183-Fly.el b/lisp/utf-2000/Ideograph-R183-Fly.el
index c7d5ad8..8dc1d97 100644
--- a/lisp/utf-2000/Ideograph-R183-Fly.el
+++ b/lisp/utf-2000/Ideograph-R183-Fly.el
@@ -22,23 +22,23 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EDC)	; ⻜
+    (=big5-cdp		. #x89F8)	; &I-CDP-89F8;
     (<-identical@component
      ((=ucs		  . #x98DE)	; 飞
       ))
-    (=ucs		. #x2EDC)	; ⻜
-    (=big5-cdp		. #x89F8)	; &I-CDP-89F8;
     ))
 (define-char
   '((ideographic-radical . 183)	; ⾶
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
+    (=ucs		. #x98DE)	; 飞
+    (=gb2312		. #x3749)	; &I-G0-3749; [23-41]
+    (=jef-china3	. #x81F1)	; &I-JC3-81F1;
     (<-simplified@CN
      ((=ucs		  . #x98DB)	; 飛
       (=gb12345		  . #x3749)	; 飛 [23-41]
       ))
-    (=ucs		. #x98DE)	; 飞
-    (=gb2312		. #x3749)	; &I-G0-3749; [23-41]
-    (=jef-china3	. #x81F1)	; &I-JC3-81F1;
     ))
 (define-char
   '((ideographic-radical . 183)	; ⾶
diff --git a/lisp/utf-2000/Ideograph-R184-Eat.el b/lisp/utf-2000/Ideograph-R184-Eat.el
index ba9882d..b844f77 100644
--- a/lisp/utf-2000/Ideograph-R184-Eat.el
+++ b/lisp/utf-2000/Ideograph-R184-Eat.el
@@ -38,10 +38,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EDD)	; ⻝
     (<-identical@component
      ((=ucs		  . #x98DF)	; 食
       ))
-    (=ucs		. #x2EDD)	; ⻝
     ))
 (define-char
   '((<-denotational
@@ -77,6 +77,10 @@
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 0)
     (total-strokes	 . 9)
+    (=cns11643-6	. #x347C)	; &GT-59037; [20-92]
+    (=gt		. 59037)	; &I-GT-59037;
+    (=gt-pj-8		. #x4630)	; &I-GT-59037; [38-16]
+    (=daikanwa		. 44015)	; &I-M-44015;
     (<-original
      ((=ks-x1001	  . #x635D)	; &GT-59026; [67-61]
       (=cns11643-1	  . #x537A)	; &I-C1-537A; [51-90]
@@ -84,10 +88,6 @@
       ))
     (<-original*sources
      zhengzitong daikanwa)
-    (=cns11643-6	. #x347C)	; &GT-59037; [20-92]
-    (=gt		. 59037)	; &I-GT-59037;
-    (=gt-pj-8		. #x4630)	; &I-GT-59037; [38-16]
-    (=daikanwa		. 44015)	; &I-M-44015;
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
@@ -95,17 +95,17 @@
     (total-strokes	 . 9)
     (=ucs		. #x29681)	; 𩚁
     (->subsumptive
-     ((<-vulgar
+     ((hanyu-dazidian	  1 155 4)
+      (=daikanwa	  . 44016)	; &M-44016;
+      (=hanziku-1	  . #xC3C2)	; &I-HZK01-C3C2;
+      (=ucs@iso		  . #x29681)	; &M-44016;
+      (<-vulgar
        ((=ks-x1001	    . #x635D)	; &GT-59026; [67-61]
 	(=cns11643-1	    . #x537A)	; &I-C1-537A; [51-90]
 	(=daikanwa	    . 44014)	; &I-M-44014;
 	))
       (<-vulgar*sources
        zhengzitong daikanwa)
-      (hanyu-dazidian	  1 155 4)
-      (=daikanwa	  . 44016)	; &M-44016;
-      (=hanziku-1	  . #xC3C2)	; &I-HZK01-C3C2;
-      (=ucs@iso		  . #x29681)	; &M-44016;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -122,6 +122,11 @@
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 0)
     (total-strokes	 . 9)
+    (hanyu-dazidian	1 155 7)
+    (=ucs		. #x29683)	; 𩚃
+    (=cns11643-6	. #x347E)	; &I-C6-347E; [20-94]
+    (=daikanwa		. 44017)	; &I-M-44017;
+    (=hanziku-1		. #xC3C5)	; &I-HZK01-C3C5;
     (<-ancient
      ((=ks-x1001	  . #x635D)	; &GT-59026; [67-61]
       (=cns11643-1	  . #x537A)	; &I-C1-537A; [51-90]
@@ -129,11 +134,6 @@
       ))
     (<-ancient*sources
      jiyun daikanwa)
-    (hanyu-dazidian	1 155 7)
-    (=ucs		. #x29683)	; 𩚃
-    (=cns11643-6	. #x347E)	; &I-C6-347E; [20-94]
-    (=daikanwa		. 44017)	; &I-M-44017;
-    (=hanziku-1		. #xC3C5)	; &I-HZK01-C3C5;
     ))
 (define-char
   '((ideographic-radical@ucs . 9)	; ⼈
@@ -145,14 +145,7 @@
     (total-strokes	 . 9)
     (=ucs		. #x2028A)	; 𠊊
     (->subsumptive
-     ((<-original
-       ((=ks-x1001	    . #x635D)	; &GT-59026; [67-61]
-	(=cns11643-1	    . #x537A)	; &I-C1-537A; [51-90]
-	(=daikanwa	    . 44014)	; &I-M-44014;
-	))
-      (<-original*sources
-       zhonghua-dazidian daikanwa)
-      (hanyu-dazidian	  1 169 7)
+     ((hanyu-dazidian	  1 169 7)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
@@ -166,6 +159,13 @@
       (=daikanwa	  . 44018)	; &M-44018;
       (=hanziku-1	  . #xC94D)	; &I-HZK01-C94D;
       (=ucs@iso		  . #x2028A)	; &M-44018;
+      (<-original
+       ((=ks-x1001	    . #x635D)	; &GT-59026; [67-61]
+	(=cns11643-1	    . #x537A)	; &I-C1-537A; [51-90]
+	(=daikanwa	    . 44014)	; &I-M-44014;
+	))
+      (<-original*sources
+       zhonghua-dazidian daikanwa)
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -186,13 +186,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EDE)	; ⻞
     (<-formed@component/connect-right
      ((=ucs		  . #x98DF)	; 食
       ))
     (<-identical@component/connect-right
      ((=ucs		  . #x2967F)	; 𩙿
       ))
-    (=ucs		. #x2EDE)	; ⻞
     ))
 (define-char
   '((<-denotational
@@ -202,10 +202,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EDF)	; ⻟
     (<-identical@component
      ((=ucs		  . #x98E0)	; 飠
       ))
-    (=ucs		. #x2EDF)	; ⻟
     ))
 (define-char
   '((<-denotational
@@ -215,19 +215,19 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE0)	; â» 
     (<-identical@component
      ((=ucs		  . #x9963)	; 饣
       ))
-    (=ucs		. #x2EE0)	; â» 
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 0)
     (total-strokes	 . 8)
+    (=ucs		. #x98E0)	; 飠
     (<-formed@component/connect-right
      ((=ucs		  . #x98DF)	; 食
       ))
-    (=ucs		. #x98E0)	; 飠
     ))
 (define-char
   '((<-denotational
@@ -237,11 +237,11 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 8)
     (->subsumptive
-     ((<-identical@component/connect-right
+     ((=gt-k		  . 04996)	; &GT-K04996;
+      (=gt-pj-k1	  . #x3471)	; &GT-K04996; [20-81]
+      (<-identical@component/connect-right
        ((=jis-x0213-2-2000  . #x7C4B)	; &GT-59024; [92-43]
 	))
-      (=gt-k		  . 04996)	; &GT-K04996;
-      (=gt-pj-k1	  . #x3471)	; &GT-K04996; [20-81]
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -288,29 +288,29 @@
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
+    (=ucs		. #x9963)	; 饣
+    (=gb2312		. #x623B)	; &I-G0-623B; [66-27]
     (<-simplified@CN
      ((=gb12345		  . #x623B)	; &UU+98E0; [66-27]
       ))
     (<-simplified@CN/component/connect-right
      ((=gb2312		  . #x4A33)	; &G0-4A33; [42-19]
       ))
-    (=ucs		. #x9963)	; 饣
-    (=gb2312		. #x623B)	; &I-G0-623B; [66-27]
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
-    (<-formed@component/connect-right
-     ((=ks-x1001	  . #x635D)	; &GT-59026; [67-61]
-      (=cns11643-1	  . #x537A)	; &I-C1-537A; [51-90]
-      (=daikanwa	  . 44014)	; &I-M-44014;
-      ))
     (=ucs		. #x2967F)	; 𩙿
     (=jis-x0213-2-2000	. #x7C4C)	; &I-JX2-7C4C; [92-44]
     (=gt		. 59030)	; &I-GT-59030;
     (=gt-k		. 06140)	; &I-GT-K06140;
     (=gt-pj-9		. #x4F28)	; &I-GT-59030; [47-08]
+    (<-formed@component/connect-right
+     ((=ks-x1001	  . #x635D)	; &GT-59026; [67-61]
+      (=cns11643-1	  . #x537A)	; &I-C1-537A; [51-90]
+      (=daikanwa	  . 44014)	; &I-M-44014;
+      ))
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
@@ -642,6 +642,9 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 3)
     (total-strokes	 . 12)
+    (=gt		. 59087)	; &GT-59087;
+    (=gt-pj-8		. #x4646)	; &GT-59087; [38-38]
+    (mojikyo		. 050581)	; &MCS-6000C595;
     (<-same
      ((=jis-x0212	  . #x6870)	; &M-44433; [72-80]
       (=jis-x0213-1-2000  . #x7E2A)	; &I-JX1-7E2A; [94-10]
@@ -649,29 +652,24 @@
       ))
     (<-same*sources
      daikanwa)
-    (=gt		. 59087)	; &GT-59087;
-    (=gt-pj-8		. #x4646)	; &GT-59087; [38-38]
-    (mojikyo		. 050581)	; &MCS-6000C595;
     ))
 (define-char
-  '((=>ucs		. #x98E7)	; 飧
-    (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 3)
-    (total-strokes	 . 12)
-    (=jis-x0212		. #x684C)	; &M-44038; [72-44]
-    (=cns11643-1	. #x627D)	; &I-C1-627D; [66-93]
-    (=jis-x0213-1-2000	. #x7E29)	; &I-JX1-7E29; [94-09]
-    (=daikanwa		. 44038)	; &I-M-44038;
-    (=ucs@jis		. #x98E7)	; &M-44038;
-    ))
-(define-char
-  '((morohashi-daikanwa	44038 0 1)
-    (ideographic-radical . 184)	; â¾·
+  '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 3)
     (total-strokes	 . 12)
     (=ucs		. #x98E7)	; 飧
-    (=gb2312		. #x6238)	; &I-G0-6238; [66-24]
-    (mojikyo		. 044038)	; &MCS-6000AC06;
+    (->subsumptive
+     ((=jis-x0212	  . #x684C)	; &M-44038; [72-44]
+      (=cns11643-1	  . #x627D)	; &I-C1-627D; [66-93]
+      (=jis-x0213-1-2000  . #x7E29)	; &I-JX1-7E29; [94-09]
+      (=daikanwa	  . 44038)	; &I-M-44038;
+      (=ucs@jis		  . #x98E7)	; &M-44038;
+      )
+     ((mojikyo		  . 044038)	; &MCS-6000AC06;
+      )
+     ((=gb2312		  . #x6238)	; &G0-6238; [66-24]
+      (=ucs@unicode	  . #x98E7)	; &G0-6238;
+      ))
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
@@ -1456,16 +1454,16 @@
     (->subsumptive
      ((=cns11643-1	  . #x6766)	; &C1-6766; [71-70]
       )
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x303B)	; &M-44080; [16-27]
-	(=ks-x1001	    . #x6C47)	; &I-K0-6C47; [76-39]
-	(=daikanwa	    . 44080)	; &I-M-44080;
-	))
-      (=jis-x0208@1983	  . #x303B)	; &GT-59108; [16-27]
+     ((=jis-x0208@1983	  . #x303B)	; &GT-59108; [16-27]
       (=jis-x0208@1990	  . #x303B)	; &I-J90-303B; [16-27]
       (=gt		  . 59108)	; &I-GT-59108;
       (=gt-pj-1		  . #x303B)	; &I-GT-59108; [16-27]
       (=ucs@jis		  . #x98F4)	; &GT-59108;
+      (<-simplified@JP/jis
+       ((=jis-x0208@1978    . #x303B)	; &M-44080; [16-27]
+	(=ks-x1001	    . #x6C47)	; &I-K0-6C47; [76-39]
+	(=daikanwa	    . 44080)	; &I-M-44080;
+	))
       )
      ((=gb12345		  . #x6242)	; &JC3-6DC8; [66-34]
       (=jef-china3	  . #x6DC8)	; &JC3-6DC8;
@@ -1476,15 +1474,27 @@
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
     (=ucs		. #x4B2E)	; 䬮
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4B2E)	; 䬮
+      ))
+    (ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 5)
+    (total-strokes	 . 14)
+    (=daikanwa		. 44081)	; &M-44081;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4B2E)	; 䬮
+      ))
+    (ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 5)
+    (total-strokes	 . 13)
     (->subsumptive
-     ((total-strokes	   . 14)
-      (=daikanwa	  . 44081)	; &M-44081;
+     ((=cns11643-3	  . #x455E)	; &C3-455E; [37-62]
       )
-     ((total-strokes	   . 13)
-      (=cns11643-3	  . #x455E)	; &C3-455E; [37-62]
-      )
-     ((total-strokes	   . 13)
-      (=ucs@unicode	  . #x4B2E)	; &UU+4B2E;
+     ((=ucs@unicode	  . #x4B2E)	; &UU+4B2E;
       ))
     ))
 (define-char
@@ -2348,15 +2358,15 @@
     (->subsumptive
      ((=cns11643-1	  . #x6B6F)	; &C1-6B6F; [75-79]
       )
-     ((<-simplified@JP
-       ((=jis-x0208@1978    . #x4C5F)	; &M-44133; [44-63]
-	(=daikanwa	    . 44133)	; &I-M-44133;
-	))
-      (=jis-x0208@1983	  . #x4C5F)	; &GT-59239; [44-63]
+     ((=jis-x0208@1983	  . #x4C5F)	; &GT-59239; [44-63]
       (=jis-x0208@1990	  . #x4C5F)	; &I-J90-4C5F; [44-63]
       (=gt		  . 59239)	; &I-GT-59239;
       (=gt-pj-1		  . #x4C5F)	; &I-GT-59239; [44-63]
       (=ucs@jis		  . #x9905)	; &GT-59239;
+      (<-simplified@JP/jis
+       ((=jis-x0208@1978    . #x4C5F)	; &M-44133; [44-63]
+	(=daikanwa	    . 44133)	; &I-M-44133;
+	))
       )
      ((=gb12345		  . #x317D)	; &JC3-6DCD; [17-93]
       (=jef-china3	  . #x6DCD)	; &JC3-6DCD;
@@ -2604,11 +2614,15 @@
      ((=gt		  . 59204)	; &GT-59204;
       (=gt-pj-1		  . #x3142)	; &GT-59204; [17-34]
       )
-     ((<-simplified@JP
+     ((=jis-x0208@1990	  . #x3142)	; &J90-3142; [17-34]
+      (=ucs@jis		  . #x990C)	; &J90-3142;
+      (<-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-x0208@1990	  . #x3142)	; &J90-3142; [17-34]
-      (=ucs@jis		  . #x990C)	; &J90-3142;
       )
      ((=jis-x0208@1983	  . #x3142)	; &J83-3142; [17-34]
       )
@@ -2617,26 +2631,31 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x296CF)	; 𩛏
-    (ideographic-radical . 184)	; â¾·
+  '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
-    (total-strokes	 . 15)
-    (=daikanwa		. 44147)	; &M-44147;
+    (=ucs		. #x296CF)	; 𩛏
     ))
 (define-char
-  '((morohashi-daikanwa	44147 0 1)
+  '((<-denotational
+     ((=ucs		  . #x296CF)	; 𩛏
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
-    (total-strokes	 . 14)
-    (=ucs		. #x296CF)	; 𩛏
+    (total-strokes	 . 15)
+    (=daikanwa		. 44147)	; &M-44147;
     ))
 (define-char
-  '((=>ucs		. #x296CF)	; 𩛏
-    (morohashi-daikanwa	44147 0 2)
+  '((<-denotational
+     ((=ucs		  . #x296CF)	; 𩛏
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
-    (=cns11643-4	. #x485A)	; &C4-485A; [40-58]
+    (->subsumptive
+     ((=ucs@iso		  . #x296CF)	; &U-000296CF;
+      )
+     ((=cns11643-4	  . #x485A)	; &C4-485A; [40-58]
+      ))
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
diff --git a/lisp/utf-2000/Ideograph-R185-Head.el b/lisp/utf-2000/Ideograph-R185-Head.el
index 1a4fdd1..16889fc 100644
--- a/lisp/utf-2000/Ideograph-R185-Head.el
+++ b/lisp/utf-2000/Ideograph-R185-Head.el
@@ -18,10 +18,24 @@
   '((ideographic-radical . 185)	; ⾸
     (ideographic-strokes . 0)
     (total-strokes	 . 10)
-    (=cns11643-6	. #x3C79)	; &M-44490; [28-89]
+    (=ucs		. #x29810)	; 𩠐
+    (=cns11643-6	. #x3C79)	; &I-C6-3C79; [28-89]
     (=daikanwa		. 44490)	; &I-M-44490;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x29810)	; 𩠐
+      ))
+    (name		. "CJK RADICAL HEAD")
+    (general-category	symbol other) ; Informative Category
+    (bidi-category	. "ON")
+    (mirrored		. nil)
+    (=ucs		. #x2EE1)	; ⻡
+    (<-identical@component
+     ((=ucs		  . #x29810)	; 𩠐
+      ))
+    ))
+(define-char
   '((ideographic-radical . 185)	; ⾸
     (ideographic-strokes . 2)
     (total-strokes	 . 11)
diff --git a/lisp/utf-2000/Ideograph-R186-Fragrant.el b/lisp/utf-2000/Ideograph-R186-Fragrant.el
index f486939..f1cb3ab 100644
--- a/lisp/utf-2000/Ideograph-R186-Fragrant.el
+++ b/lisp/utf-2000/Ideograph-R186-Fragrant.el
@@ -27,8 +27,13 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 13)
     (=ucs		. #x999A)	; 馚
-    (=cns11643-3	. #x455F)	; &I-C3-455F; [37-63]
-    (=daikanwa		. 44520)	; &I-M-44520;
+    (->subsumptive
+     ((=daikanwa	  . 44520)	; &M-44520;
+      )
+     ((=cns11643-3	  . #x455F)	; &C3-455F; [37-63]
+      )
+     ((=ucs@unicode	  . #x999A)	; &UU+999A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 186)	; â¾¹
@@ -41,13 +46,31 @@
   '((ideographic-radical . 186)	; â¾¹
     (ideographic-strokes . 4)
     (total-strokes	 . 13)
-    (=daikanwa		. 44522)	; &M-44522;
+    (=ucs		. #x2983D)	; ð© ½
+    (=daikanwa		. 44522)	; &I-M-44522;
     ))
 (define-char
-  '((ideographic-radical . 186)	; â¾¹
-    (ideographic-strokes . 5)
+  '((ideographic-radical@ucs . 186)	; â¾¹
+    (ideographic-radical@ucs*sources
+     daikanwa ucs)
+    (ideographic-radical@cns . 104)	; ⽧
+    (ideographic-strokes@cns . 5)
     (total-strokes	 . 14)
-    (=daikanwa		. 44523)	; &M-44523;
+    (=ucs		. #x2983E)	; ð© ¾
+    (->subsumptive
+     ((ideographic-radical . 186)	; â¾¹
+      (ideographic-strokes . 5)
+      (total-strokes	   . 14)
+      (=daikanwa	  . 44523)	; &M-44523;
+      )
+     ((ideographic-radical . 186)	; â¾¹
+      (ideographic-strokes . 5)
+      (=ucs@iso		  . #x2983E)	; &U-0002983E;
+      )
+     ((ideographic-radical . 104)	; ⽧
+      (ideographic-strokes . 9)
+      (=cns11643-5	  . #x4754)	; &C5-4754; [39-52]
+      ))
     ))
 (define-char
   '((ideographic-radical . 186)	; â¾¹
@@ -61,9 +84,28 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 14)
     (=ucs		. #x999B)	; 馛
-    (=jis-x0212		. #x6877)	; &I-JSP-6877; [72-87]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x999B)	; 馛
+      ))
+    (ideographic-radical . 186)	; â¾¹
+    (ideographic-strokes . 5)
+    (total-strokes	 . 14)
+    (=jis-x0212		. #x6877)	; &M-44525; [72-87]
     (=cns11643-5	. #x4B4E)	; &I-C5-4B4E; [43-46]
     (=daikanwa		. 44525)	; &I-M-44525;
+    (=jef-china3	. #x6DD0)	; &I-JC3-6DD0;
+    (=ucs@jis		. #x999B)	; &M-44525;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x999B)	; 馛
+      ))
+    (ideographic-radical . 186)	; â¾¹
+    (ideographic-strokes . 5)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x999B)	; &UU+999B;
     ))
 (define-char
   '((ideographic-radical . 186)	; â¾¹
@@ -78,8 +120,12 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 14)
     (=ucs		. #x999C)	; 馜
-    (=cns11643-2	. #x4F3A)	; &I-C2-4F3A; [47-26]
-    (=daikanwa		. 44527)	; &I-M-44527;
+    (->subsumptive
+     ((=daikanwa	  . 44527)	; &M-44527;
+      (=ucs@unicode	  . #x999C)	; &M-44527;
+      )
+     ((=cns11643-2	  . #x4F3A)	; &C2-4F3A; [47-26]
+      ))
     ))
 (define-char
   '((ideographic-radical . 186)	; â¾¹
diff --git a/lisp/utf-2000/Ideograph-R187-Horse.el b/lisp/utf-2000/Ideograph-R187-Horse.el
index 1072ab2..980b906 100644
--- a/lisp/utf-2000/Ideograph-R187-Horse.el
+++ b/lisp/utf-2000/Ideograph-R187-Horse.el
@@ -23,23 +23,23 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE2)	; ⻢
+    (=big5-cdp		. #x8A50)	; &I-CDP-8A50;
     (<-identical@component
      ((=ucs		  . #x9A6C)	; 马
       ))
-    (=ucs		. #x2EE2)	; ⻢
-    (=big5-cdp		. #x8A50)	; &I-CDP-8A50;
     ))
 (define-char
   '((ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
+    (=ucs		. #x9A6C)	; 马
+    (=gb2312		. #x426D)	; &I-G0-426D; [34-77]
+    (=jef-china3	. #x81EC)	; &I-JC3-81EC;
     (<-simplified@CN
      ((=ucs		  . #x99AC)	; 馬
       (=gb12345		  . #x426D)	; 馬 [34-77]
       ))
-    (=ucs		. #x9A6C)	; 马
-    (=gb2312		. #x426D)	; &I-G0-426D; [34-77]
-    (=jef-china3	. #x81EC)	; &I-JC3-81EC;
     ))
 (define-char
   '((ideographic-radical . 187)	; ⾺
@@ -689,16 +689,16 @@
     (ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 4)
     (total-strokes	 . 14)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x7163)	; &GT-60603; [81-67]
-      (=ks-x1001	  . #x663E)	; &I-K0-663E; [70-30]
-      (=daikanwa	  . 45030)	; &I-M-45030;
-      ))
     (=ucs		. #x99C5)	; 駅
     (=jis-x0208		. #x3158)	; &I-J90-3158; [17-56]
     (=gt		. 60077)	; &I-GT-60077;
     (=gt-pj-1		. #x3158)	; &I-GT-60077; [17-56]
     (mojikyo		. 050591)	; &MCS-6000C59F;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x7163)	; &GT-60603; [81-67]
+      (=ks-x1001	  . #x663E)	; &I-K0-663E; [70-30]
+      (=daikanwa	  . 45030)	; &I-M-45030;
+      ))
     ))
 (define-char
   '((ideographic-radical . 187)	; ⾺
@@ -706,16 +706,16 @@
     (total-strokes	 . 14)
     (=ucs		. #x99C6)	; 駆
     (->subsumptive
-     ((<-simplified@JP/Jouyou
-       ((=jis-x0208@1990    . #x715C)	; &GT-60508; [81-60]
-	))
-      (shinjigen-2	  . 9335)
+     ((shinjigen-2	  . 9335)
       (=jis-x0208	  . #x366E)	; &GT-60085; [22-78]
       (=gt		  . 60085)	; &I-GT-60085;
       (=gt-pj-1		  . #x366E)	; &I-GT-60085; [22-78]
       (=daikanwa	  . 44634)	; &I-M-44634;
       (=ucs@unicode	  . #x99C6)	; &GT-60085;
       (mojikyo		  . 058563)	; &MCS-6000E4C3;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208@1990    . #x715C)	; &GT-60508; [81-60]
+	))
       )
      ((=cns11643-4	  . #x4860)	; &C4-4860; [40-64]
       (mojikyo		  . 044634)	; &MCS-6000AE5A;
@@ -2994,16 +2994,16 @@
     (ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 8)
     (total-strokes	 . 18)
+    (=ucs		. #x9A12)	; 騒
+    (=jis-x0208		. #x417B)	; &I-J90-417B; [33-91]
+    (=gt		. 60338)	; &I-GT-60338;
+    (=gt-pj-1		. #x417B)	; &I-GT-60338; [33-91]
     (<-simplified@JP/Jouyou
      ((=jis-x0208	  . #x715B)	; &GT-60469; [81-59]
       (=ks-x1001	  . #x6153)	; &I-K0-6153; [65-51]
       (=cns11643-1	  . #x7A57)	; &I-C1-7A57; [90-55]
       (=daikanwa	  . 44935)	; &I-M-44935;
       ))
-    (=ucs		. #x9A12)	; 騒
-    (=jis-x0208		. #x417B)	; &I-J90-417B; [33-91]
-    (=gt		. 60338)	; &I-GT-60338;
-    (=gt-pj-1		. #x417B)	; &I-GT-60338; [33-91]
     ))
 (define-char
   '((=>ucs		. #x9A12)	; 騒
@@ -3017,16 +3017,16 @@
   '((ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 8)
     (total-strokes	 . 18)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9A57)	; 驗
-      (=jis-x0208	  . #x7164)	; &I-J90-7164; [81-68]
-      ))
     (shinjigen-2	. 9379)
     (=ucs		. #x9A13)	; 験
     (=jis-x0208		. #x3833)	; &I-J90-3833; [24-19]
     (=gt		. 60317)	; &I-GT-60317;
     (=gt-pj-1		. #x3833)	; &I-GT-60317; [24-19]
     (=daikanwa		. 44835)	; &I-M-44835;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x9A57)	; 驗
+      (=jis-x0208	  . #x7164)	; &I-J90-7164; [81-68]
+      ))
     ))
 (define-char
   '((ideographic-radical . 187)	; ⾺
@@ -3623,10 +3623,10 @@
   '((ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 9)
     (total-strokes	 . 19)
+    (=ucs		. #x29917)	; 𩤗
     (<-unknown
      ((=daikanwa	  . 44831)	; &M-44831;
       ))
-    (=ucs		. #x29917)	; 𩤗
     (->subsumptive
      ((=ucs@iso		  . #x29917)	; &U-00029917;
       )
@@ -5046,42 +5046,68 @@
     (ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 9)
     (total-strokes	 . 19)
-    (<-simplified@JP
-     ((=ucs		  . #x9A52)	; 驒
-      (=jis-x0208@1978	  . #x424D)	; &I-J78-424D; [34-45]
-      (=jis-x0213-1-2000  . #x7E34)	; &I-JX1-7E34; [94-20]
-      ))
     (=ucs		. #x9A28)	; 騨
     (=jis-x0208@1983	. #x424D)	; &I-J83-424D; [34-45]
     (=jis-x0208@1990	. #x424D)	; &I-J90-424D; [34-45]
     (=gt		. 60402)	; &I-GT-60402;
     (=gt-pj-1		. #x424D)	; &I-GT-60402; [34-45]
+    (<-simplified@JP/jis
+     ((=ucs		  . #x9A52)	; 驒
+      (=jis-x0208@1978	  . #x424D)	; &I-J78-424D; [34-45]
+      (=jis-x0213-1-2000  . #x7E34)	; &I-JX1-7E34; [94-20]
+      ))
     ))
 (define-char
   '((ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 12)
     (total-strokes	 . 22)
     (=ucs		. #x9A53)	; 驓
-    (->subsumptive
-     ((=daikanwa	  . 45003)	; &M-45003;
-      )
-     ((=cns11643-2	  . #x6E48)	; &C2-6E48; [78-40]
-      (=ucs@unicode	  . #x9A53)	; &C2-6E48;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9A53)	; 驓
+      ))
+    (ideographic-radical . 187)	; ⾺
+    (ideographic-strokes . 12)
+    (total-strokes	 . 22)
+    (=daikanwa		. 45003)	; &M-45003;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9A53)	; 驓
       ))
+    (ideographic-radical . 187)	; ⾺
+    (ideographic-strokes . 12)
+    (total-strokes	 . 22)
+    (=cns11643-2	. #x6E48)	; &C2-6E48; [78-40]
+    (=ucs@unicode	. #x9A53)	; &C2-6E48;
     ))
 (define-char
   '((ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 12)
     (total-strokes	 . 22)
     (=ucs		. #x9A54)	; 驔
-    (->subsumptive
-     ((=jis-x0212	  . #x6953)	; &M-45004; [73-51]
-      (=daikanwa	  . 45004)	; &I-M-45004;
-      (=ucs@jis		  . #x9A54)	; &M-45004;
-      )
-     ((=cns11643-2	  . #x6E49)	; &C2-6E49; [78-41]
-      (=ucs@unicode	  . #x9A54)	; &C2-6E49;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9A54)	; 驔
       ))
+    (ideographic-radical . 187)	; ⾺
+    (ideographic-strokes . 12)
+    (total-strokes	 . 22)
+    (=jis-x0212		. #x6953)	; &M-45004; [73-51]
+    (=daikanwa		. 45004)	; &I-M-45004;
+    (=ucs@jis		. #x9A54)	; &M-45004;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9A54)	; 驔
+      ))
+    (ideographic-radical . 187)	; ⾺
+    (ideographic-strokes . 12)
+    (total-strokes	 . 22)
+    (=cns11643-2	. #x6E49)	; &C2-6E49; [78-41]
+    (=ucs@unicode	. #x9A54)	; &C2-6E49;
     ))
 (define-char
   '((ideographic-radical . 187)	; ⾺
diff --git a/lisp/utf-2000/Ideograph-R188-Bone.el b/lisp/utf-2000/Ideograph-R188-Bone.el
index d961906..79ee21e 100644
--- a/lisp/utf-2000/Ideograph-R188-Bone.el
+++ b/lisp/utf-2000/Ideograph-R188-Bone.el
@@ -43,10 +43,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE3)	; ⻣
     (<-identical@component
      ((=ucs		  . #x9AA8)	; 骨
       ))
-    (=ucs		. #x2EE3)	; ⻣
     ))
 (define-char
   '((<-denotational
@@ -2020,36 +2020,45 @@
     (=cns11643-7	. #x4C39)	; &C7-4C39; [44-25]
     ))
 (define-char
-  '((=>ucs		. #x9AC4)	; 髄
+  '((ideographic-radical . 188)	; â¾»
+    (=ucs		. #x9AC4)	; 髄
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9AC4)	; 髄
+      ))
     (morohashi-daikanwa	45240 1)
     (ideographic-radical . 188)	; â¾»
     (ideographic-strokes . 9)
     (total-strokes	 . 19)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x7172)	; &GT-60935; [81-82]
-      (=ks-x1001	  . #x6250)	; &I-K0-6250; [66-48]
-      (=daikanwa	  . 45289)	; &I-M-45289;
-      ))
     (=jis-x0208		. #x3F71)	; &GT-60862; [31-81]
     (=gt		. 60862)	; &I-GT-60862;
     (=gt-pj-1		. #x3F71)	; &I-GT-60862; [31-81]
     (=ucs@jis		. #x9AC4)	; &GT-60862;
     (mojikyo		. 050599)	; &MCS-6000C5A7;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x7172)	; &GT-60935; [81-82]
+      (=ks-x1001	  . #x6250)	; &I-K0-6250; [66-48]
+      (=daikanwa	  . 45289)	; &I-M-45289;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x9AC4)	; 髄
-    (morohashi-daikanwa	45240 1 1)
+  '((<-denotational
+     ((=ucs		  . #x9AC4)	; 髄
+      ))
     (ideographic-radical . 188)	; â¾»
-    (ideographic-strokes . 10)
-    (total-strokes	 . 20)
-    (=cns11643-3	. #x5D61)	; &C3-5D61; [61-65]
+    (ideographic-strokes . 9)
+    (total-strokes	 . 18)
+    (=ucs@unicode	. #x9AC4)	; &UU+9AC4;
     ))
 (define-char
-  '((morohashi-daikanwa	45240 1 2)
+  '((<-denotational
+     ((=ucs		  . #x9AC4)	; 髄
+      ))
     (ideographic-radical . 188)	; â¾»
-    (ideographic-strokes . 9)
-    (total-strokes	 . 18)
-    (=ucs		. #x9AC4)	; 髄
+    (ideographic-strokes . 10)
+    (total-strokes	 . 20)
+    (=cns11643-3	. #x5D61)	; &C3-5D61; [61-65]
     ))
 (define-char
   '((ideographic-radical . 188)	; â¾»
diff --git a/lisp/utf-2000/Ideograph-R189-Tall.el b/lisp/utf-2000/Ideograph-R189-Tall.el
index 02775f6..d11c130 100644
--- a/lisp/utf-2000/Ideograph-R189-Tall.el
+++ b/lisp/utf-2000/Ideograph-R189-Tall.el
@@ -38,15 +38,15 @@
     (total-strokes	 . 11)
     (=ucs		. #x9AD9)	; 髙
     (->subsumptive
-     ((<-vulgar
+     ((shinjigen-1	  . 9451)
+      (=daikanwa	  . 45314)	; &M-45314;
+      (<-vulgar
        ((=jis-x0208	    . #x3962)	; &GT-60968; [25-66]
 	(=ks-x1001	    . #x4D54)	; &I-K0-4D54; [45-52]
 	(=daikanwa	    . 45313)	; &I-M-45313;
 	))
       (<-vulgar*sources
        yunhai daikanwa)
-      (shinjigen-1	  . 9451)
-      (=daikanwa	  . 45314)	; &M-45314;
       )
      ((hanyu-dazidian	  7 4594 1)
       (=cns11643-4	  . #x362D)	; &HZK12-B9E2; [22-13]
diff --git a/lisp/utf-2000/Ideograph-R190-Hair.el b/lisp/utf-2000/Ideograph-R190-Hair.el
index a2211bb..cf0f238 100644
--- a/lisp/utf-2000/Ideograph-R190-Hair.el
+++ b/lisp/utf-2000/Ideograph-R190-Hair.el
@@ -328,17 +328,17 @@
     (ideographic-radical . 190)	; â¾½
     (ideographic-strokes . 4)
     (total-strokes	 . 14)
+    (=ucs		. #x9AEA)	; 髪
+    (=jis-x0208		. #x4831)	; &I-J90-4831; [40-17]
+    (=cns11643-3	. #x4A72)	; &I-C3-4A72; [42-82]
+    (=gt		. 61080)	; &I-GT-61080;
+    (=gt-pj-1		. #x4831)	; &I-GT-61080; [40-17]
     (<-simplified@JP/Jouyou
      ((=jis-x0208	  . #x717B)	; &GT-61108; [81-91]
       (=ks-x1001	  . #x5B25)	; &I-K0-5B25; [59-05]
       (=cns11643-1	  . #x7021)	; &I-C1-7021; [80-01]
       (=daikanwa	  . 45400)	; &I-M-45400;
       ))
-    (=ucs		. #x9AEA)	; 髪
-    (=jis-x0208		. #x4831)	; &I-J90-4831; [40-17]
-    (=cns11643-3	. #x4A72)	; &I-C3-4A72; [42-82]
-    (=gt		. 61080)	; &I-GT-61080;
-    (=gt-pj-1		. #x4831)	; &I-GT-61080; [40-17]
     ))
 (define-char
   '((=>ucs		. #x9AEA)	; 髪
diff --git a/lisp/utf-2000/Ideograph-R191-Fight.el b/lisp/utf-2000/Ideograph-R191-Fight.el
index 2d3a5e5..be6c1f1 100644
--- a/lisp/utf-2000/Ideograph-R191-Fight.el
+++ b/lisp/utf-2000/Ideograph-R191-Fight.el
@@ -240,47 +240,53 @@
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
-    (ideographic-strokes . 10)
-    (total-strokes	 . 20)
     (=ucs		. #x4C17)	; 䰗
-    (=cns11643-7	. #x517D)	; &I-C7-517D; [49-93]
-    (=daikanwa		. 45648)	; &I-M-45648;
-    ))
-(define-char
-  '((=>ucs		. #x4C17)	; 䰗
-    (morohashi-daikanwa	45648 0 9)
-    (ideographic-radical . 191)	; â¾¾
-    (ideographic-strokes . 11)
-    (total-strokes	 . 20)
-    (=jis-x0213-1-2000	. #x7E3E)	; &JX1-7E3E; [94-30]
-    (=ucs@jis		. #x4C17)	; &JX1-7E3E;
     ))
 (define-char
-  '((=>ucs		. #x9B2A)	; 鬪
+  '((<-denotational
+     ((=ucs		  . #x4C17)	; 䰗
+      ))
     (ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 10)
     (total-strokes	 . 20)
-    (=daikanwa		. 45649)	; &M-45649;
+    (->subsumptive
+     ((=daikanwa	  . 45648)	; &M-45648;
+      )
+     ((=ucs@unicode	  . #x4C17)	; &UU+4C17;
+      )
+     ((=cns11643-7	  . #x517D)	; &C7-517D; [49-93]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	45649 0 0)
+  '((<-denotational
+     ((=ucs		  . #x4C17)	; 䰗
+      ))
     (ideographic-radical . 191)	; â¾¾
-    (ideographic-strokes . 10)
-    (total-strokes	 . 20)
-    (shinjigen-2	. 9498)
-    (=ucs		. #x9B2A)	; 鬪
-    (=jis-x0208		. #x722C)	; &I-J90-722C; [82-12]
-    (=ks-x1001		. #x7763)	; &I-K0-7763; [87-67]
-    (=gt		. 61402)	; &I-GT-61402;
-    (=gt-pj-1		. #x722C)	; &I-GT-61402; [82-12]
+    (ideographic-strokes . 11)
+    (total-strokes	 . 21)
+    (sound@ja/kun/name	"kuzi" "kuti" "^guti")
+    (sound@ja/kun/place "kuzi" "kuzu")
+    (=jis-x0213-1-2000	. #x7E3E)	; &JX1-7E3E; [94-30]
+    (=jef-china3	. #x6EB8)	; &I-JC3-6EB8;
+    (=ucs@jis		. #x4C17)	; &JX1-7E3E;
     ))
 (define-char
-  '((=>ucs		. #x9B2A)	; 鬪
-    (morohashi-daikanwa	45649 0 1)
-    (ideographic-radical . 191)	; â¾¾
+  '((ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 10)
     (total-strokes	 . 20)
-    (=cns11643-3	. #x5D62)	; &C3-5D62; [61-66]
+    (=ucs		. #x9B2A)	; 鬪
+    (->subsumptive
+     ((=daikanwa	  . 45649)	; &M-45649;
+      )
+     ((shinjigen-2	  . 9498)
+      (=jis-x0208	  . #x722C)	; &GT-61402; [82-12]
+      (=ks-x1001	  . #x7763)	; &I-K0-7763; [87-67]
+      (=gt		  . 61402)	; &I-GT-61402;
+      (=gt-pj-1		  . #x722C)	; &I-GT-61402; [82-12]
+      (=ucs@unicode	  . #x9B2A)	; &GT-61402;
+      )
+     ((=cns11643-3	  . #x5D62)	; &C3-5D62; [61-66]
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	45649 1)
@@ -288,17 +294,16 @@
     (ideographic-radical@daikanwa . 191)	; â¾¾
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9B2D)	; 鬭
-      (=jis-x0212	  . #x6A32)	; &I-JSP-6A32; [74-18]
-      (=jis-x0213-1-2000  . #x7E3F)	; &I-JX1-7E3F; [94-31]
-      ))
     (=ucs		. #x95D8)	; 闘
     (=jis-x0208		. #x462E)	; &I-J90-462E; [38-14]
     (=cns11643-3	. #x594A)	; &I-C3-594A; [57-42]
     (=gt		. 61399)	; &I-GT-61399;
     (=gt-pj-1		. #x462E)	; &I-GT-61399; [38-14]
     (mojikyo		. 050601)	; &MCS-6000C5A9;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0212	  . #x6A32)	; &CB10823; [74-18]
+      (=jis-x0213-1-2000  . #x7E3F)	; &I-JX1-7E3F; [94-31]
+      ))
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
@@ -308,19 +313,32 @@
     (=daikanwa		. 45650)	; &I-M-45650;
     ))
 (define-char
-  '((=>ucs		. #x4C18)	; 䰘
+  '((ideographic-radical . 191)	; â¾¾
+    (ideographic-strokes . 11)
+    (total-strokes	 . 21)
+    (=ucs		. #x4C18)	; 䰘
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4C18)	; 䰘
+      ))
     (ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 11)
     (total-strokes	 . 21)
     (=daikanwa		. 45651)	; &M-45651;
     ))
 (define-char
-  '((morohashi-daikanwa	45651 0 2)
+  '((<-denotational
+     ((=ucs		  . #x4C18)	; 䰘
+      ))
     (ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 11)
     (total-strokes	 . 21)
-    (=ucs		. #x4C18)	; 䰘
-    (=cns11643-5	. #x7241)	; &I-C5-7241; [82-33]
+    (->subsumptive
+     ((=ucs@unicode	  . #x4C18)	; &UU+4C18;
+      )
+     ((=cns11643-5	  . #x7241)	; &C5-7241; [82-33]
+      ))
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
@@ -337,13 +355,32 @@
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
+    (=ucs		. #x9B2B)	; 鬫
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9B2B)	; 鬫
+      ))
+    (ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 12)
     (total-strokes	 . 22)
-    (=ucs		. #x9B2B)	; 鬫
-    (=jis-x0212		. #x6A31)	; &I-JSP-6A31; [74-17]
-    (=cns11643-2	. #x6E53)	; &I-C2-6E53; [78-51]
-    (=jis-x0213-2-2000	. #x7D3C)	; &I-JX2-7D3C; [93-28]
-    (=daikanwa		. 45653)	; &I-M-45653;
+    (->subsumptive
+     ((=daikanwa	  . 45653)	; &M-45653;
+      )
+     ((=jis-x0212	  . #x6A31)	; &JX2-7D3C; [74-17]
+      (=cns11643-2	  . #x6E53)	; &I-C2-6E53; [78-51]
+      (=jis-x0213-2-2000  . #x7D3C)	; &I-JX2-7D3C; [93-28]
+      (=ucs@jis		  . #x9B2B)	; &JX2-7D3C;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9B2B)	; 鬫
+      ))
+    (ideographic-radical . 191)	; â¾¾
+    (ideographic-strokes . 11)
+    (total-strokes	 . 21)
+    (=ucs@unicode	. #x9B2B)	; &UU+9B2B;
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
@@ -373,22 +410,20 @@
     (=daikanwa		. 45656)	; &I-M-45656;
     ))
 (define-char
-  '((=>ucs		. #x9B2D)	; 鬭
-    (ideographic-radical . 191)	; â¾¾
-    (ideographic-strokes . 14)
-    (total-strokes	 . 25)
-    (=daikanwa		. 45657)	; &M-45657;
-    ))
-(define-char
-  '((morohashi-daikanwa	45657 0 0)
-    (ideographic-radical . 191)	; â¾¾
+  '((ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 14)
     (total-strokes	 . 25)
     (=ucs		. #x9B2D)	; 鬭
-    (=jis-x0212		. #x6A32)	; &I-JSP-6A32; [74-18]
-    (=cns11643-4	. #x6D37)	; &I-C4-6D37; [77-23]
-    (=jis-x0213-1-2000	. #x7E3F)	; &I-JX1-7E3F; [94-31]
-    (=cbeta		. 10823)	; &I-CB10823;
+    (->subsumptive
+     ((=daikanwa	  . 45657)	; &M-45657;
+      )
+     ((=jis-x0212	  . #x6A32)	; &CB10823; [74-18]
+      (=jis-x0213-1-2000  . #x7E3F)	; &I-JX1-7E3F; [94-31]
+      (=cbeta		  . 10823)	; &I-CB10823;
+      (=ucs@unicode	  . #x9B2D)	; &CB10823;
+      )
+     ((=cns11643-4	  . #x6D37)	; &C4-6D37; [77-23]
+      ))
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
@@ -408,7 +443,11 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 24)
     (=ucs		. #x9B2C)	; 鬬
-    (=cns11643-3	. #x612E)	; &I-C3-612E; [65-14]
+    (->subsumptive
+     ((=ucs@unicode	  . #x9B2C)	; &UU+9B2C;
+      )
+     ((=cns11643-3	  . #x612E)	; &C3-612E; [65-14]
+      ))
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
diff --git a/lisp/utf-2000/Ideograph-R194-Ghost.el b/lisp/utf-2000/Ideograph-R194-Ghost.el
index 6b606e0..72443d7 100644
--- a/lisp/utf-2000/Ideograph-R194-Ghost.el
+++ b/lisp/utf-2000/Ideograph-R194-Ghost.el
@@ -28,11 +28,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE4)	; ⻤
+    (=big5-cdp		. #x8A5D)	; &I-CDP-8A5D;
     (<-identical@component
      ((=ucs		  . #x9B3C)	; 鬼
       ))
-    (=ucs		. #x2EE4)	; ⻤
-    (=big5-cdp		. #x8A5D)	; &I-CDP-8A5D;
     ))
 (define-char
   '((ideographic-radical . 194)	; ⿁
@@ -815,10 +815,10 @@
   '((ideographic-radical . 194)	; ⿁
     (ideographic-strokes . 6)
     (total-strokes	 . 16)
+    (=daikanwa		. 49922)	; &M-49922;
     (<-unknown
      ((=ucs		  . #x4C23)	; ä°£
       ))
-    (=daikanwa		. 49922)	; &M-49922;
     ))
 (define-char
   '((=>daikanwa		. 49922)	; &M-49922;
diff --git a/lisp/utf-2000/Ideograph-R195-Fish.el b/lisp/utf-2000/Ideograph-R195-Fish.el
index 13308f3..2bd1b6d 100644
--- a/lisp/utf-2000/Ideograph-R195-Fish.el
+++ b/lisp/utf-2000/Ideograph-R195-Fish.el
@@ -28,16 +28,16 @@
     (total-strokes	 . 10)
     (=ucs		. #x29D4B)	; 𩵋
     (->subsumptive
-     ((<-vulgar
+     ((shinjigen-1	  . 9534)
+      (=daikanwa	  . 45958)	; &M-45958;
+      (=ucs@iso		  . #x29D4B)	; &M-45958;
+      (<-vulgar
        ((shinjigen-1	    . 9533)
 	(=ucs		    . #x9B5A)	; 魚
 	(=jis-x0208	    . #x357B)	; &I-J90-357B; [21-91]
 	))
       (<-vulgar*sources
        shinjigen-1)
-      (shinjigen-1	  . 9534)
-      (=daikanwa	  . 45958)	; &M-45958;
-      (=ucs@iso		  . #x29D4B)	; &M-45958;
       )
      ((=cns11643-4	  . #x3043)	; &C4-3043; [16-35]
       ))
@@ -50,22 +50,22 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE5)	; ⻥
+    (=big5-cdp		. #x8A5B)	; &I-CDP-8A5B;
     (<-identical@component
      ((=ucs		  . #x9C7C)	; é±¼
       ))
-    (=ucs		. #x2EE5)	; ⻥
-    (=big5-cdp		. #x8A5B)	; &I-CDP-8A5B;
     ))
 (define-char
   '((ideographic-radical . 195)	; ⿂
     (ideographic-strokes . 0)
     (total-strokes	 . 8)
+    (=ucs		. #x9C7C)	; é±¼
+    (=gb2312		. #x5363)	; &I-G0-5363; [51-67]
     (<-simplified@CN
      ((=ucs		  . #x9B5A)	; 魚
       (=gb12345		  . #x5363)	; 魚 [51-67]
       ))
-    (=ucs		. #x9C7C)	; é±¼
-    (=gb2312		. #x5363)	; &I-G0-5363; [51-67]
     ))
 (define-char
   '((ideographic-radical . 195)	; ⿂
@@ -6429,21 +6429,29 @@
     (ideographic-radical . 195)	; ⿂
     (ideographic-strokes . 8)
     (total-strokes	 . 19)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x3033)	; &M-46442; [16-19]
-      (=jis-x0208@1983	  . #x724D)	; &I-J83-724D; [82-45]
-      (=jis-x0208@1990	  . #x724D)	; &I-J90-724D; [82-45]
-      (=daikanwa	  . 46442)	; &I-M-46442;
-      ))
     (=ucs		. #x9BF5)	; 鯵
     (=jis-x0208@1978	. #x724D)	; &I-J78-724D; [82-45]
     (=jis-x0208@1983	. #x3033)	; &I-J83-3033; [16-19]
     (=jis-x0208@1990	. #x3033)	; &I-J90-3033; [16-19]
     (=gt		. 62575)	; &I-GT-62575;
     (=gt-pj-1		. #x3033)	; &I-GT-62575; [16-19]
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x3033)	; &M-46442; [16-19]
+      (=jis-x0208@1983	  . #x724D)	; &I-J83-724D; [82-45]
+      (=jis-x0208@1990	  . #x724D)	; &I-J90-724D; [82-45]
+      (=daikanwa	  . 46442)	; &I-M-46442;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 195)	; ⿂
+    (ideographic-strokes . 11)
+    (total-strokes	 . 22)
+    (=ucs		. #x9C3B)	; é°»
     ))
 (define-char
-  '((=>ucs		. #x9C3B)	; é°»
+  '((<-denotational
+     ((=ucs		  . #x9C3B)	; é°»
+      ))
     (ideographic-radical . 195)	; ⿂
     (ideographic-strokes . 11)
     (total-strokes	 . 22)
@@ -6453,24 +6461,46 @@
     (=daikanwa		. 46443)	; &I-M-46443;
     ))
 (define-char
-  '((morohashi-daikanwa	46443 0 1)
+  '((<-denotational
+     ((=ucs		  . #x9C3B)	; é°»
+      ))
     (ideographic-radical . 195)	; ⿂
     (ideographic-strokes . 11)
     (total-strokes	 . 22)
-    (=ucs		. #x9C3B)	; é°»
-    (=jis-x0208		. #x3137)	; &I-J90-3137; [17-23]
+    (=jis-x0208		. #x3137)	; &GT-63141; [17-23]
     (=ks-x1001		. #x5844)	; &I-K0-5844; [56-36]
-    (=gb12345		. #x7729)	; é°» [87-09]
+    (=gb12345		. #x7729)	; &GT-63141; [87-09]
     (=gt		. 63141)	; &I-GT-63141;
     (=gt-pj-1		. #x3137)	; &I-GT-63141; [17-23]
+    (=ucs@unicode	. #x9C3B)	; &GT-63141;
     ))
 (define-char
   '((ideographic-radical . 195)	; ⿂
     (ideographic-strokes . 11)
     (total-strokes	 . 22)
     (=ucs		. #x9C3C)	; é°¼
-    (=cns11643-2	. #x6E5E)	; &I-C2-6E5E; [78-62]
-    (=daikanwa		. 46444)	; &I-M-46444;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9C3C)	; é°¼
+      ))
+    (ideographic-radical . 195)	; ⿂
+    (ideographic-strokes . 11)
+    (total-strokes	 . 22)
+    (=daikanwa		. 46444)	; &M-46444;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9C3C)	; é°¼
+      ))
+    (ideographic-radical . 195)	; ⿂
+    (ideographic-strokes . 11)
+    (total-strokes	 . 22)
+    (->subsumptive
+     ((=cns11643-2	  . #x6E5E)	; &C2-6E5E; [78-62]
+      )
+     ((=ucs@unicode	  . #x9C3C)	; &UU+9C3C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 195)	; ⿂
diff --git a/lisp/utf-2000/Ideograph-R196-Bird.el b/lisp/utf-2000/Ideograph-R196-Bird.el
index 47eca4b..2f6c1e5 100644
--- a/lisp/utf-2000/Ideograph-R196-Bird.el
+++ b/lisp/utf-2000/Ideograph-R196-Bird.el
@@ -23,21 +23,21 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE6)	; ⻦
     (<-identical@component
      ((=ucs		  . #x9E1F)	; 鸟
       ))
-    (=ucs		. #x2EE6)	; ⻦
     ))
 (define-char
   '((ideographic-radical . 196)	; ⿃
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
+    (=ucs		. #x9E1F)	; 鸟
+    (=gb2312		. #x4471)	; &I-G0-4471; [36-81]
     (<-simplified@CN
      ((=ucs		  . #x9CE5)	; é³¥
       (=gb12345		  . #x4471)	; é³¥ [36-81]
       ))
-    (=ucs		. #x9E1F)	; 鸟
-    (=gb2312		. #x4471)	; &I-G0-4471; [36-81]
     ))
 (define-char
   '((ideographic-radical . 196)	; ⿃
@@ -165,18 +165,18 @@
     (total-strokes	 . 13)
     (=ucs		. #x9CE9)	; 鳩
     (->subsumptive
-     ((<-formed
-       ((=jis-x0208	    . #x6D73)	; &GT-52080; [77-83]
-	(=ks-x1001	    . #x4F47)	; &I-K0-4F47; [47-39]
-	(=daikanwa	    . 38878)	; &I-M-38878;
-	))
-      (shinjigen-2	  . 9647)
+     ((shinjigen-2	  . 9647)
       (=jis-x0208	  . #x4837)	; &GT-63549; [40-23]
       (=ks-x1001	  . #x4F4D)	; &I-K0-4F4D; [47-45]
       (=gt		  . 63549)	; &I-GT-63549;
       (=gt-pj-1		  . #x4837)	; &I-GT-63549; [40-23]
       (=daikanwa	  . 46648)	; &I-M-46648;
       (=ucs@jis		  . #x9CE9)	; &GT-63549;
+      (<-formed
+       ((=jis-x0208	    . #x6D73)	; &GT-52080; [77-83]
+	(=ks-x1001	    . #x4F47)	; &I-K0-4F47; [47-39]
+	(=daikanwa	    . 38878)	; &I-M-38878;
+	))
       )
      ((=cns11643-1	  . #x676D)	; &C1-676D; [71-77]
       (=gb12345		  . #x702F)	; &C1-676D; [80-15]
@@ -2033,19 +2033,19 @@
   '((ideographic-radical . 196)	; ⿃
     (ideographic-strokes . 5)
     (total-strokes	 . 16)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x3229)	; &GT-64200; [18-09]
-      (=jis-x0208@1983	  . #x7274)	; &I-J83-7274; [82-84]
-      (=ks-x1001	  . #x6523)	; &I-K0-6523; [69-03]
-      (=jis-x0208@1990	  . #x7274)	; &I-J90-7274; [82-84]
-      (=daikanwa	  . 47169)	; &I-M-47169;
-      ))
     (=ucs		. #x9D2C)	; é´¬
     (=jis-x0208@1978	. #x7274)	; &I-J78-7274; [82-84]
     (=jis-x0208@1983	. #x3229)	; &I-J83-3229; [18-09]
     (=jis-x0208@1990	. #x3229)	; &I-J90-3229; [18-09]
     (=gt		. 63689)	; &I-GT-63689;
     (=gt-pj-1		. #x3229)	; &I-GT-63689; [18-09]
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x3229)	; &GT-64200; [18-09]
+      (=jis-x0208@1983	  . #x7274)	; &I-J83-7274; [82-84]
+      (=ks-x1001	  . #x6523)	; &I-K0-6523; [69-03]
+      (=jis-x0208@1990	  . #x7274)	; &I-J90-7274; [82-84]
+      (=daikanwa	  . 47169)	; &I-M-47169;
+      ))
     ))
 (define-char
   '((ideographic-radical . 196)	; ⿃
@@ -4813,43 +4813,34 @@
     (=daikanwa		. 47073)	; &I-M-47073;
     ))
 (define-char
-  '((=>ucs		. #x9D8E)	; 鶎
-    (ideographic-radical . 196)	; ⿃
-    (ideographic-strokes . 8)
-    (total-strokes	 . 19)
-    (=daikanwa		. 47074)	; &M-47074;
-    ))
-(define-char
-  '((=>ucs		. #x9D8E)	; 鶎
-    (morohashi-daikanwa	47074 0 0)
-    (ideographic-radical . 196)	; ⿃
-    (ideographic-strokes . 8)
-    (total-strokes	 . 19)
-    (=jis-x0212		. #x6C28)	; &JSP-6C28; [76-08]
-    (=ucs@jis		. #x9D8E)	; &JSP-6C28;
-    ))
-(define-char
-  '((morohashi-daikanwa	47074 0 1)
-    (ideographic-radical . 196)	; ⿃
+  '((ideographic-radical . 196)	; ⿃
     (ideographic-strokes . 8)
     (total-strokes	 . 19)
     (=ucs		. #x9D8E)	; 鶎
+    (->subsumptive
+     ((=daikanwa	  . 47074)	; &M-47074;
+      )
+     ((=jis-x0212	  . #x6C28)	; &JSP-6C28; [76-08]
+      (=ucs@jis		  . #x9D8E)	; &JSP-6C28;
+      )
+     ((=ucs@unicode	  . #x9D8E)	; &UU+9D8E;
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	47074 1)
     (ideographic-radical . 196)	; ⿃
     (ideographic-strokes . 8)
     (total-strokes	 . 19)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x7331)	; &GT-64222; [83-17]
-      (=ks-x1001	  . #x4D2E)	; &I-K0-4D2E; [45-14]
-      (=daikanwa	  . 47209)	; &I-M-47209;
-      ))
     (=ucs		. #x9D8F)	; 鶏
     (=jis-x0208		. #x375C)	; &I-J90-375C; [23-60]
     (=gt		. 63989)	; &I-GT-63989;
     (=gt-pj-1		. #x375C)	; &I-GT-63989; [23-60]
     (mojikyo		. 050605)	; &MCS-6000C5AD;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x7331)	; &GT-64222; [83-17]
+      (=ks-x1001	  . #x4D2E)	; &I-K0-4D2E; [45-14]
+      (=daikanwa	  . 47209)	; &I-M-47209;
+      ))
     ))
 (define-char
   '((ideographic-radical . 196)	; ⿃
@@ -6807,14 +6798,14 @@
      ((=cns11643-2	  . #x6D26)	; &C2-6D26; [77-06]
       (=ucs@unicode	  . #x9DCF)	; &C2-6D26;
       )
-     ((<-simplified@JP
-       ((=ucs		    . #x9DC6)	; 鷆
-	(=jis-x0208	    . #x7336)	; &I-J90-7336; [83-22]
-	))
-      (=jis-x0208@1990	  . #x7337)	; &GT-64271; [83-23]
+     ((=jis-x0208@1990	  . #x7337)	; &GT-64271; [83-23]
       (=gt		  . 64271)	; &I-GT-64271;
       (=gt-pj-1		  . #x7337)	; &I-GT-64271; [83-23]
       (=ucs@jis		  . #x9DCF)	; &GT-64271;
+      (<-simplified@JP/jis
+       ((=ucs		    . #x9DC6)	; 鷆
+	(=jis-x0208	    . #x7336)	; &I-J90-7336; [83-22]
+	))
       )
      ((=jis-x0208@1978	  . #x7337)	; &J83-7337; [83-23]
       (=jis-x0208@1983	  . #x7337)	; &I-J83-7337; [83-23]
@@ -7560,17 +7551,21 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 22)
     (=ucs		. #x9DD7)	; 鷗
-    (->subsumptive
-     ((=jis-x0208@1978	  . #x322A)	; &M-47268; [18-10]
-      (=ks-x1001	  . #x4F4E)	; &I-K0-4F4E; [47-46]
-      (=jis-x0212	  . #x6C3F)	; &I-JSP-6C3F; [76-31]
-      (=jis-x0213-1-2000  . #x7E65)	; &I-JX1-7E65; [94-69]
-      (=gb12345		  . #x4538)	; &M-47268; [37-24]
-      (=daikanwa	  . 47268)	; &I-M-47268;
-      (=ucs@unicode	  . #x9DD7)	; &M-47268;
-      )
-     ((=cns11643-1	  . #x7C2F)	; &C1-7C2F; [92-15]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9DD7)	; 鷗
       ))
+    (ideographic-radical . 196)	; ⿃
+    (ideographic-strokes . 11)
+    (total-strokes	 . 22)
+    (=jis-x0208@1978	. #x322A)	; &M-47268; [18-10]
+    (=ks-x1001		. #x4F4E)	; &I-K0-4F4E; [47-46]
+    (=jis-x0212		. #x6C3F)	; &I-JSP-6C3F; [76-31]
+    (=jis-x0213-1-2000	. #x7E65)	; &I-JX1-7E65; [94-69]
+    (=gb12345		. #x4538)	; &M-47268; [37-24]
+    (=daikanwa		. 47268)	; &I-M-47268;
+    (=ucs@unicode	. #x9DD7)	; &M-47268;
     ))
 (define-char
   '((ideographic-radical . 196)	; ⿃
@@ -7583,13 +7578,6 @@
     (ideographic-radical . 196)	; ⿃
     (ideographic-strokes . 4)
     (total-strokes	 . 15)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x322A)	; &M-47268; [18-10]
-      (=ks-x1001	  . #x4F4E)	; &I-K0-4F4E; [47-46]
-      (=jis-x0212	  . #x6C3F)	; &I-JSP-6C3F; [76-31]
-      (=jis-x0213-1-2000  . #x7E65)	; &I-JX1-7E65; [94-69]
-      (=daikanwa	  . 47268)	; &I-M-47268;
-      ))
     (=ucs		. #x9D0E)	; 鴎
     (=jis-x0208@1983	. #x322A)	; &I-J83-322A; [18-10]
     (=jis-x0208@1990	. #x322A)	; &I-J90-322A; [18-10]
@@ -7597,18 +7585,47 @@
     (=gt-pj-1		. #x322A)	; &I-GT-63600; [18-10]
     (=jef-china3	. #x6FB0)	; &I-JC3-6FB0;
     (=ucs@unicode	. #x9D0E)	; 鴎
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x322A)	; &M-47268; [18-10]
+      (=ks-x1001	  . #x4F4E)	; &I-K0-4F4E; [47-46]
+      (=jis-x0212	  . #x6C3F)	; &I-JSP-6C3F; [76-31]
+      (=jis-x0213-1-2000  . #x7E65)	; &I-JX1-7E65; [94-69]
+      (=daikanwa	  . 47268)	; &I-M-47268;
+      ))
+    ))
+(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)
     (=ucs		. #x4CFC)	; ä³¼
-    (->subsumptive
-     ((=daikanwa	  . 47269)	; &M-47269;
-      (=ucs@unicode	  . #x4CFC)	; &M-47269;
-      )
-     ((=cns11643-3	  . #x6026)	; &C3-6026; [64-06]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4CFC)	; ä³¼
       ))
+    (ideographic-radical . 196)	; ⿃
+    (ideographic-strokes . 11)
+    (total-strokes	 . 22)
+    (=daikanwa		. 47269)	; &M-47269;
+    (=ucs@unicode	. #x4CFC)	; &M-47269;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4CFC)	; ä³¼
+      ))
+    (ideographic-radical . 196)	; ⿃
+    (ideographic-strokes . 11)
+    (total-strokes	 . 22)
+    (=cns11643-3	. #x6026)	; &C3-6026; [64-06]
     ))
 (define-char
   '((ideographic-radical . 196)	; ⿃
diff --git a/lisp/utf-2000/Ideograph-R197-Salt.el b/lisp/utf-2000/Ideograph-R197-Salt.el
index 5773411..938dd74 100644
--- a/lisp/utf-2000/Ideograph-R197-Salt.el
+++ b/lisp/utf-2000/Ideograph-R197-Salt.el
@@ -531,17 +531,17 @@
     (ideographic-radical . 197)	; ⿄
     (ideographic-strokes . 8)
     (total-strokes	 . 19)
-    (<-simplified@JP
-     ((=ucs		  . #x9E7C)	; é¹¼
-      (=jis-x0208@1978	  . #x3834)	; &I-J78-3834; [24-20]
-      (=jis-x0212	  . #x6C5B)	; &I-JSP-6C5B; [76-59]
-      (=jis-x0213-1-2000  . #x7E6A)	; &I-JX1-7E6A; [94-74]
-      ))
     (=ucs		. #x9E78)	; 鹸
     (=jis-x0208@1983	. #x3834)	; &I-J83-3834; [24-20]
     (=jis-x0208@1990	. #x3834)	; &I-J90-3834; [24-20]
     (=gt		. 64711)	; &I-GT-64711;
     (=gt-pj-1		. #x3834)	; &I-GT-64711; [24-20]
+    (<-simplified@JP/jis
+     ((=ucs		  . #x9E7C)	; é¹¼
+      (=jis-x0208@1978	  . #x3834)	; &I-J78-3834; [24-20]
+      (=jis-x0212	  . #x6C5B)	; &I-JSP-6C5B; [76-59]
+      (=jis-x0213-1-2000  . #x7E6A)	; &I-JX1-7E6A; [94-74]
+      ))
     ))
 (define-char
   '((ideographic-radical . 197)	; ⿄
diff --git a/lisp/utf-2000/Ideograph-R199-Wheat.el b/lisp/utf-2000/Ideograph-R199-Wheat.el
index 2e97334..cd39a6d 100644
--- a/lisp/utf-2000/Ideograph-R199-Wheat.el
+++ b/lisp/utf-2000/Ideograph-R199-Wheat.el
@@ -49,6 +49,15 @@
     (ideographic-radical . 199)	; ⿆
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
+    (shinjigen-1	. 9791)
+    (shinjigen-2	. 9791)
+    (=jis-x0208		. #x477E)	; &GT-64905; [39-94]
+    (=gb2312		. #x4273)	; &I-G0-4273; [34-83]
+    (=gt		. 64905)	; &I-GT-64905;
+    (=gt-k		. 02633)	; &I-GT-K02633;
+    (=gt-pj-1		. #x477E)	; &I-GT-64905; [39-94]
+    (=daikanwa		. 47718)	; &I-M-47718;
+    (=ucs@unicode	. #x9EA6)	; &GT-64905;
     (<-simplified@CN
      ((=jis-x0208	  . #x734E)	; &GT-64933; [83-46]
       (=ks-x1001	  . #x586A)	; &I-K0-586A; [56-74]
@@ -60,15 +69,6 @@
       (=ks-x1001	  . #x586A)	; &I-K0-586A; [56-74]
       (=daikanwa	  . 47717)	; &I-M-47717;
       ))
-    (shinjigen-1	. 9791)
-    (shinjigen-2	. 9791)
-    (=jis-x0208		. #x477E)	; &GT-64905; [39-94]
-    (=gb2312		. #x4273)	; &I-G0-4273; [34-83]
-    (=gt		. 64905)	; &I-GT-64905;
-    (=gt-k		. 02633)	; &I-GT-K02633;
-    (=gt-pj-1		. #x477E)	; &I-GT-64905; [39-94]
-    (=daikanwa		. 47718)	; &I-M-47718;
-    (=ucs@unicode	. #x9EA6)	; &GT-64905;
     ))
 (define-char
   '((<-denotational
@@ -78,10 +78,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE8)	; ⻨
     (<-identical@component
      ((=ucs		  . #x9EA6)	; 麦
       ))
-    (=ucs		. #x2EE8)	; ⻨
     ))
 (define-char
   '((ideographic-radical . 199)	; ⿆
diff --git a/lisp/utf-2000/Ideograph-R201-Yellow.el b/lisp/utf-2000/Ideograph-R201-Yellow.el
index 11910b2..a5e95f7 100644
--- a/lisp/utf-2000/Ideograph-R201-Yellow.el
+++ b/lisp/utf-2000/Ideograph-R201-Yellow.el
@@ -34,11 +34,6 @@
     (ideographic-radical . 201)	; ⿈
     (ideographic-strokes . 0)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ks-x1001	  . #x7C5C)	; &GT-65324; [92-60]
-      (=jis-x0213-1-2000  . #x7E71)	; &I-JX1-7E71; [94-81]
-      (=daikanwa	  . 47926)	; &I-M-47926;
-      ))
     (=ucs		. #x9EC4)	; 黄
     (=jis-x0208		. #x322B)	; &I-J90-322B; [18-11]
     (=gb2312		. #x3B46)	; &I-G0-3B46; [27-38]
@@ -47,6 +42,11 @@
     (=gt-k		. 07722)	; &I-GT-K07722;
     (=gt-pj-1		. #x322B)	; &I-GT-65323; [18-11]
     (mojikyo		. 050608)	; &MCS-6000C5B0;
+    (<-simplified@JP/Jouyou
+     ((=ks-x1001	  . #x7C5C)	; &GT-65324; [92-60]
+      (=jis-x0213-1-2000  . #x7E71)	; &I-JX1-7E71; [94-81]
+      (=daikanwa	  . 47926)	; &I-M-47926;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -56,11 +56,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE9)	; ⻩
+    (=big5-cdp		. #x8A5E)	; &I-CDP-8A5E;
     (<-identical@component
      ((=ucs		  . #x9EC4)	; 黄
       ))
-    (=ucs		. #x2EE9)	; ⻩
-    (=big5-cdp		. #x8A5E)	; &I-CDP-8A5E;
     ))
 (define-char
   '((ideographic-radical . 201)	; ⿈
diff --git a/lisp/utf-2000/Ideograph-R203-Black.el b/lisp/utf-2000/Ideograph-R203-Black.el
index c98bce1..45ca4f8 100644
--- a/lisp/utf-2000/Ideograph-R203-Black.el
+++ b/lisp/utf-2000/Ideograph-R203-Black.el
@@ -13,6 +13,7 @@
     (=cns11643-1	. #x6329)	; &I-C1-6329; [67-09]
     (=jis-x0213-1-2000	. #x7E72)	; &I-JX1-7E72; [94-82]
     (=daikanwa		. 48038)	; &I-M-48038;
+    (=jef-china3	. #x6FD6)	; &I-JC3-6FD6;
     ))
 (define-char
   '((ideographic-radical . 203)	; ⿊
@@ -32,10 +33,6 @@
     (ideographic-radical@daikanwa=19098 . 86)	; ⽕
     (ideographic-strokes@daikanwa=19098 . 7)
     (total-strokes	 . 11)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9ED1)	; 黑
-      (=jis-x0213-1-2000  . #x7E72)	; &I-JX1-7E72; [94-82]
-      ))
     (shinjigen-1	. 9817)
     (shinjigen-2	. 9817)
     (=ucs		. #x9ED2)	; 黒
@@ -44,6 +41,10 @@
     (=gt		. 65517)	; &I-GT-65517;
     (=gt-k		. 07761)	; &I-GT-K07761;
     (=gt-pj-1		. #x3975)	; &I-GT-65517; [25-85]
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x9ED1)	; 黑
+      (=jis-x0213-1-2000  . #x7E72)	; &I-JX1-7E72; [94-82]
+      ))
     (->subsumptive
      ((ideographic-radical . 86)	; ⽕
       (ideographic-strokes . 7)
@@ -296,71 +297,74 @@
   '((ideographic-radical . 203)	; ⿊
     (ideographic-strokes . 4)
     (total-strokes	 . 16)
-    (=daikanwa		. 48061)	; &M-48061;
-    ))
-(define-char
-  '((morohashi-daikanwa	48061 0 9)
-    (ideographic-radical . 203)	; ⿊
-    (ideographic-strokes . 4)
-    (total-strokes	 . 16)
     (=ucs		. #x4D61)	; 䵡
-    (=cns11643-4	. #x555F)	; &I-C4-555F; [53-63]
-    ))
-(define-char
-  '((=>ucs		. #x9ED7)	; 黗
-    (ideographic-radical . 203)	; ⿊
-    (ideographic-strokes . 4)
-    (total-strokes	 . 16)
-    (=daikanwa		. 48062)	; &M-48062;
+    (->subsumptive
+     ((=daikanwa	  . 48061)	; &M-48061;
+      (=ucs@unicode	  . #x4D61)	; &M-48061;
+      )
+     ((=cns11643-4	  . #x555F)	; &C4-555F; [53-63]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	48062 0 0)
-    (ideographic-radical . 203)	; ⿊
+  '((ideographic-radical . 203)	; ⿊
     (ideographic-strokes . 4)
     (total-strokes	 . 16)
     (=ucs		. #x9ED7)	; 黗
-    (=cns11643-3	. #x543D)	; &I-C3-543D; [52-29]
+    (->subsumptive
+     ((=daikanwa	  . 48062)	; &M-48062;
+      )
+     ((=cns11643-3	  . #x543D)	; &C3-543D; [52-29]
+      (=ucs@unicode	  . #x9ED7)	; &C3-543D;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x9ED8)	; 默
-    (ideographic-radical . 203)	; ⿊
+  '((ideographic-radical . 203)	; ⿊
     (ideographic-strokes . 4)
     (total-strokes	 . 16)
-    (=daikanwa		. 48063)	; &M-48063;
-    (mojikyo		. 048063)	; &MCS-6000BBBF;
+    (=ucs		. #x9ED8)	; 默
+    (->subsumptive
+     ((=daikanwa	  . 48063)	; &M-48063;
+      (mojikyo		  . 048063)	; &MCS-6000BBBF;
+      )
+     ((=jis-x0208	  . #x6054)	; &GT-65598; [64-52]
+      (=gb2312		  . #x442C)	; &I-G0-442C; [36-12]
+      (=ks-x1001	  . #x5979)	; &I-K0-5979; [57-89]
+      (=cns11643-1	  . #x733C)	; &I-C1-733C; [83-28]
+      (=gt		  . 65598)	; &I-GT-65598;
+      (=gt-pj-1		  . #x6054)	; &I-GT-65598; [64-52]
+      (=ucs@unicode	  . #x9ED8)	; &GT-65598;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	48063 0 0)
-    (ideographic-radical . 203)	; ⿊
+  '((ideographic-radical . 203)	; ⿊
     (ideographic-strokes . 4)
-    (total-strokes	 . 16)
-    (=ucs		. #x9ED8)	; 默
-    (=jis-x0208		. #x6054)	; &I-J90-6054; [64-52]
-    (=gb2312		. #x442C)	; &I-G0-442C; [36-12]
-    (=ks-x1001		. #x5979)	; &I-K0-5979; [57-89]
-    (=cns11643-1	. #x733C)	; &I-C1-733C; [83-28]
-    (=gt		. 65598)	; &I-GT-65598;
-    (=gt-pj-1		. #x6054)	; &I-GT-65598; [64-52]
+    (=ucs		. #x9ED9)	; 黙
     ))
 (define-char
-  '((morohashi-daikanwa	48063 1)
+  '((<-denotational
+     ((=ucs		  . #x9ED9)	; 黙
+      ))
+    (morohashi-daikanwa	48063 1)
     (ideographic-radical . 203)	; ⿊
     (ideographic-strokes . 4)
     (total-strokes	 . 15)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x9ED8)	; 默
-      (=jis-x0208	  . #x6054)	; &I-J90-6054; [64-52]
-      ))
-    (=ucs		. #x9ED9)	; 黙
-    (=jis-x0208		. #x4C5B)	; &I-J90-4C5B; [44-59]
+    (=jis-x0208		. #x4C5B)	; &GT-65566; [44-59]
     (=gt		. 65566)	; &I-GT-65566;
     (=gt-k		. 11953)	; &I-GT-K11953;
     (=gt-pj-1		. #x4C5B)	; &I-GT-65566; [44-59]
+    (=ucs@unicode	. #x9ED9)	; &GT-65566;
     (mojikyo		. 050609)	; &MCS-6000C5B1;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6054)	; &GT-65598; [64-52]
+      (=gb2312		  . #x442C)	; &I-G0-442C; [36-12]
+      (=ks-x1001	  . #x5979)	; &I-K0-5979; [57-89]
+      (=cns11643-1	  . #x733C)	; &I-C1-733C; [83-28]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x9ED9)	; 黙
-    (morohashi-daikanwa	48063 1 4)
+  '((<-denotational
+     ((=ucs		  . #x9ED9)	; 黙
+      ))
     (ideographic-radical . 203)	; ⿊
     (ideographic-strokes . 4)
     (total-strokes	 . 16)
@@ -480,40 +484,38 @@
     (ideographic-radical . 203)	; ⿊
     (ideographic-strokes . 5)
     (total-strokes	 . 16)
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4263)	; &M-48075; [34-67]
-      (=gb2312		  . #x776C)	; &I-G0-776C; [87-76]
-      (=ks-x1001	  . #x536A)	; &I-K0-536A; [51-74]
-      (=cns11643-1	  . #x7638)	; &I-C1-7638; [86-24]
-      (=daikanwa	  . 48075)	; &I-M-48075;
-      ))
     (=jis-x0208@1983	. #x4263)	; &GT-65587; [34-67]
     (=jis-x0208@1990	. #x4263)	; &I-J90-4263; [34-67]
     (=gt		. 65587)	; &I-GT-65587;
     (=gt-pj-1		. #x4263)	; &I-GT-65587; [34-67]
     (=jef-china3	. #x6FD8)	; &I-JC3-6FD8;
     (=ucs@jis		. #x9EDB)	; &GT-65587;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x4263)	; &M-48075; [34-67]
+      (=gb2312		  . #x776C)	; &I-G0-776C; [87-76]
+      (=ks-x1001	  . #x536A)	; &I-K0-536A; [51-74]
+      (=cns11643-1	  . #x7638)	; &I-C1-7638; [86-24]
+      (=daikanwa	  . 48075)	; &I-M-48075;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x9EDC)	; 黜
-    (ideographic-radical . 203)	; ⿊
-    (ideographic-strokes . 5)
-    (total-strokes	 . 17)
-    (=daikanwa		. 48076)	; &M-48076;
-    ))
-(define-char
-  '((morohashi-daikanwa	48076 0 0)
-    (ideographic-radical . 203)	; ⿊
+  '((ideographic-radical . 203)	; ⿊
     (ideographic-strokes . 5)
     (total-strokes	 . 17)
-    (shinjigen-2	. 9824)
     (=ucs		. #x9EDC)	; 黜
-    (=jis-x0208		. #x7359)	; &I-J90-7359; [83-57]
-    (=gb2312		. #x776D)	; &I-G0-776D; [87-77]
-    (=ks-x1001		. #x7575)	; &I-K0-7575; [85-85]
-    (=cns11643-1	. #x7636)	; &I-C1-7636; [86-22]
-    (=gt		. 65622)	; &I-GT-65622;
-    (=gt-pj-1		. #x7359)	; &I-GT-65622; [83-57]
+    (->subsumptive
+     ((shinjigen-1	  . 9824)
+      (=daikanwa	  . 48076)	; &M-48076;
+      )
+     ((shinjigen-2	  . 9824)
+      (=jis-x0208	  . #x7359)	; &GT-65622; [83-57]
+      (=gb2312		  . #x776D)	; &I-G0-776D; [87-77]
+      (=ks-x1001	  . #x7575)	; &I-K0-7575; [85-85]
+      (=cns11643-1	  . #x7636)	; &I-C1-7636; [86-22]
+      (=gt		  . 65622)	; &I-GT-65622;
+      (=gt-pj-1		  . #x7359)	; &I-GT-65622; [83-57]
+      (=ucs@unicode	  . #x9EDC)	; &GT-65622;
+      ))
     ))
 (define-char
   '((ideographic-radical . 203)	; ⿊
diff --git a/lisp/utf-2000/Ideograph-R205-Frog.el b/lisp/utf-2000/Ideograph-R205-Frog.el
index 2902f1e..23e9c8a 100644
--- a/lisp/utf-2000/Ideograph-R205-Frog.el
+++ b/lisp/utf-2000/Ideograph-R205-Frog.el
@@ -24,15 +24,15 @@
     (ideographic-radical . 205)	; ⿌
     (ideographic-strokes . 0)
     (total-strokes	 . 8)
+    (=ucs		. #x2FA18)	; 黾
+    (=cns11643-4	. #x2834)	; &I-C4-2834; [08-20]
+    (=daikanwa		. 48258)	; &I-M-48258;
     (<-vulgar
      ((=jis-x0208	  . #x7366)	; &M-48257; [83-70]
       (=daikanwa	  . 48257)	; &I-M-48257;
       ))
     (<-vulgar*sources
-     zhengzi-tong daikanwa)
-    (=ucs		. #x2FA18)	; 黾
-    (=cns11643-4	. #x2834)	; &I-C4-2834; [08-20]
-    (=daikanwa		. 48258)	; &I-M-48258;
+     zhengzitong daikanwa)
     ))
 (define-char
   '((=>daikanwa		. 48258)	; 黾
@@ -41,13 +41,13 @@
     (ideographic-radical@cns . 30)	; ⼝
     (ideographic-strokes@cns . 5)
     (total-strokes	 . 8)
-    (<-simplified@CN
-     ((=gb12345		  . #x763C)	; &GT-65951; [86-28]
-      ))
     (=ucs		. #x9EFE)	; 黾
     (=gb2312		. #x763C)	; &I-G0-763C; [86-28]
     (=cns11643-3	. #x2772)	; &I-C3-2772; [07-82]
     (mojikyo		. 051084)	; &MCS-6000C78C;
+    (<-simplified@CN
+     ((=gb12345		  . #x763C)	; &GT-65951; [86-28]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -57,10 +57,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EEA)	; ⻪
     (<-identical@component
      ((=ucs		  . #x9EFE)	; 黾
       ))
-    (=ucs		. #x2EEA)	; ⻪
     ))
 (define-char
   '((ideographic-radical . 205)	; ⿌
diff --git a/lisp/utf-2000/Ideograph-R210-Even.el b/lisp/utf-2000/Ideograph-R210-Even.el
index 8a1389d..bf8aa48 100644
--- a/lisp/utf-2000/Ideograph-R210-Even.el
+++ b/lisp/utf-2000/Ideograph-R210-Even.el
@@ -29,13 +29,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EEC)	; ⻬
     (<-identical@component
      ((=ucs		  . #x9F50)	; 齐
       ))
     (<-simplified@CN/component
      ((=ucs		  . #x9F4A)	; 齊
       ))
-    (=ucs		. #x2EEC)	; ⻬
     ))
 (define-char
   '((ideographic-radical@ucs . 210)	; ⿑
@@ -49,6 +49,7 @@
     (->subsumptive
      ((ideographic-radical . 67)	; ⽂
       (ideographic-strokes . 2)
+      (=daikanwa	  . 13451)	; &M-13451;
       (<-vulgar
        ((=jis-x0208	    . #x736E)	; &GT-66354; [83-78]
 	(=ks-x1001	    . #x703A)	; &I-K0-703A; [80-26]
@@ -56,123 +57,103 @@
 	))
       (<-vulgar*sources
        songyuan-yilai-suzipu daikanwa)
-      (=daikanwa	  . 13451)	; &M-13451;
       )
-     ((<-simplified@CN
+     ((=gb2312		  . #x466B)	; &C3-2370; [38-75]
+      (=cns11643-3	  . #x2370)	; &I-C3-2370; [03-80]
+      (=ucs@unicode	  . #x9F50)	; &C3-2370;
+      (<-simplified@CN
        ((=cns11643-1	    . #x6B7D)	; &C1-6B7D; [75-93]
 	(=gb12345	    . #x466B)	; &C1-6B7D; [38-75]
 	))
-      (=gb2312		  . #x466B)	; &C3-2370; [38-75]
-      (=cns11643-3	  . #x2370)	; &I-C3-2370; [03-80]
-      (=ucs@unicode	  . #x9F50)	; &C3-2370;
       ))
     ))
 (define-char
-  '((=>ucs		. #x2A5C5)	; 𪗅
-    (ideographic-radical . 210)	; ⿑
-    (ideographic-strokes . 2)
-    (total-strokes	 . 16)
-    (=daikanwa		. 48561)	; &M-48561;
-    ))
-(define-char
-  '((morohashi-daikanwa	48561 0 0)
-    (ideographic-radical . 210)	; ⿑
+  '((ideographic-radical . 210)	; ⿑
     (ideographic-strokes . 2)
     (total-strokes	 . 16)
-    (hanyu-dazidian	7 4785 2)
     (=ucs		. #x2A5C5)	; 𪗅
-    (=cns11643-4	. #x5564)	; &I-C4-5564; [53-68]
-    (=hanziku-12	. #xE377)	; &I-HZK12-E377;
-    ))
-(define-char
-  '((=>ucs		. #x2A5C6)	; 𪗆
-    (ideographic-radical . 210)	; ⿑
-    (ideographic-strokes . 3)
-    (total-strokes	 . 17)
-    (=daikanwa		. 48563)	; &M-48563;
+    (->subsumptive
+     ((=daikanwa	  . 48561)	; &M-48561;
+      )
+     ((=ucs@iso		  . #x2A5C5)	; &U-0002A5C5;
+      )
+     ((hanyu-dazidian	  7 4785 2)
+      (=hanziku-12	  . #xE377)	; &HZK12-E377;
+      )
+     ((=cns11643-4	  . #x5564)	; &C4-5564; [53-68]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	48563 0 0)
-    (ideographic-radical . 210)	; ⿑
+  '((ideographic-radical . 210)	; ⿑
     (ideographic-strokes . 3)
     (total-strokes	 . 17)
-    (hanyu-dazidian	2 907 2)
     (=ucs		. #x2A5C6)	; 𪗆
-    (=cns11643-4	. #x5A65)	; &I-C4-5A65; [58-69]
-    (=hanziku-3		. #xB6BF)	; &I-HZK03-B6BF;
+    (->subsumptive
+     ((=daikanwa	  . 48563)	; &M-48563;
+      )
+     ((hanyu-dazidian	  2 907 2)
+      (=cns11643-4	  . #x5A65)	; &HZK03-B6BF; [58-69]
+      (=hanziku-3	  . #xB6BF)	; &I-HZK03-B6BF;
+      (=ucs@iso		  . #x2A5C6)	; &HZK03-B6BF;
+      ))
     ))
 (define-char
   '((ideographic-radical . 210)	; ⿑
     (ideographic-strokes . 3)
     (total-strokes	 . 17)
     (=ucs		. #x4D93)	; 䶓
-    (=cns11643-5	. #x612D)	; &I-C5-612D; [65-13]
-    (=daikanwa		. 48564)	; &I-M-48564;
-    ))
-(define-char
-  '((=>ucs		. #x9F4B)	; 齋
-    (ideographic-radical . 210)	; ⿑
-    (ideographic-strokes . 3)
-    (total-strokes	 . 17)
-    (=jis-x0208		. #x6337)	; &GT-66359; [67-23]
-    (=gt		. 66359)	; &I-GT-66359;
-    (=gt-pj-1		. #x6337)	; &I-GT-66359; [67-23]
-    (=daikanwa		. 48565)	; &I-M-48565;
-    (=ucs@jis		. #x9F4B)	; &GT-66359;
+    (->subsumptive
+     ((=daikanwa	  . 48564)	; &M-48564;
+      )
+     ((=cns11643-5	  . #x612D)	; &C5-612D; [65-13]
+      (=ucs@unicode	  . #x4D93)	; &C5-612D;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	48565 0 0)
-    (ideographic-radical . 210)	; ⿑
+  '((ideographic-radical . 210)	; ⿑
     (ideographic-strokes . 3)
     (total-strokes	 . 17)
     (=ucs		. #x9F4B)	; 齋
-    (=gb12345		. #x552B)	; 齋 [53-11]
-    ))
-(define-char
-  '((=>ucs		. #x9F4B)	; 齋
-    (morohashi-daikanwa	48565 0 1)
-    (ideographic-radical . 210)	; ⿑
-    (ideographic-strokes . 3)
-    (total-strokes	 . 17)
-    (=ks-x1001		. #x6E31)	; &K0-6E31; [78-17]
-    ))
-(define-char
-  '((=>ucs		. #x9F4B)	; 齋
-    (morohashi-daikanwa	48565 0 2)
-    (ideographic-radical . 210)	; ⿑
-    (ideographic-strokes . 3)
-    (total-strokes	 . 17)
-    (=cns11643-1	. #x763A)	; &C1-763A; [86-26]
+    (->subsumptive
+     ((=jis-x0208	  . #x6337)	; &GT-66359; [67-23]
+      (=gt		  . 66359)	; &I-GT-66359;
+      (=gt-pj-1		  . #x6337)	; &I-GT-66359; [67-23]
+      (=daikanwa	  . 48565)	; &I-M-48565;
+      (=ucs@jis		  . #x9F4B)	; &GT-66359;
+      )
+     ((=gb12345		  . #x552B)	; &UU+9F4B; [53-11]
+      (=ucs@unicode	  . #x9F4B)	; &UU+9F4B;
+      )
+     ((=ks-x1001	  . #x6E31)	; &K0-6E31; [78-17]
+      )
+     ((=cns11643-1	  . #x763A)	; &C1-763A; [86-26]
+      ))
     ))
 (define-char
   '((ideographic-radical . 210)	; ⿑
     (ideographic-strokes . 3)
     (total-strokes	 . 17)
     (=ucs		. #x4D92)	; 䶒
-    (=daikanwa		. 48566)	; &I-M-48566;
-    ))
-(define-char
-  '((=>ucs		. #x4D92)	; 䶒
-    (morohashi-daikanwa	48566 0 1)
-    (ideographic-radical . 210)	; ⿑
-    (ideographic-strokes . 3)
-    (total-strokes	 . 17)
-    (=cns11643-4	. #x5A66)	; &C4-5A66; [58-70]
+    (->subsumptive
+     ((=daikanwa	  . 48566)	; &M-48566;
+      )
+     ((=ucs@unicode	  . #x4D92)	; &UU+4D92;
+      )
+     ((=cns11643-4	  . #x5A66)	; &C4-5A66; [58-70]
+      ))
     ))
 (define-char
   '((ideographic-radical . 210)	; ⿑
     (ideographic-strokes . 4)
     (total-strokes	 . 18)
     (=ucs		. #x9F4C)	; 齌
-    (=daikanwa		. 48567)	; &I-M-48567;
-    ))
-(define-char
-  '((=>ucs		. #x9F4C)	; 齌
-    (morohashi-daikanwa	48567 0 1)
-    (ideographic-radical . 210)	; ⿑
-    (ideographic-strokes . 4)
-    (total-strokes	 . 18)
-    (=cns11643-2	. #x6535)	; &C2-6535; [69-21]
+    (->subsumptive
+     ((=daikanwa	  . 48567)	; &M-48567;
+      )
+     ((=ucs@unicode	  . #x9F4C)	; &UU+9F4C;
+      )
+     ((=cns11643-2	  . #x6535)	; &C2-6535; [69-21]
+      ))
     ))
 (define-char
   '((ideographic-radical . 210)	; ⿑
diff --git a/lisp/utf-2000/Ideograph-R211-Tooth.el b/lisp/utf-2000/Ideograph-R211-Tooth.el
index ab92381..318fda7 100644
--- a/lisp/utf-2000/Ideograph-R211-Tooth.el
+++ b/lisp/utf-2000/Ideograph-R211-Tooth.el
@@ -35,21 +35,21 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EEE)	; â»®
     (<-identical@component
      ((=ucs		  . #x9F7F)	; 齿
       ))
-    (=ucs		. #x2EEE)	; â»®
     ))
 (define-char
   '((ideographic-radical . 211)	; ⿒
     (ideographic-strokes . 0)
     (total-strokes	 . 8)
+    (=ucs		. #x9F7F)	; 齿
+    (=gb2312		. #x335D)	; &I-G0-335D; [19-61]
     (<-simplified@CN
      ((=ucs		  . #x9F52)	; 齒
       (=gb12345		  . #x335D)	; 齒 [19-61]
       ))
-    (=ucs		. #x9F7F)	; 齿
-    (=gb2312		. #x335D)	; &I-G0-335D; [19-61]
     ))
 (define-char
   '((ideographic-radical . 211)	; ⿒
@@ -123,11 +123,11 @@
   '((ideographic-radical . 211)	; ⿒
     (ideographic-strokes . 2)
     (total-strokes	 . 10)
+    (=ucs		. #x9F80)	; 龀
+    (=gb2312		. #x7633)	; &I-G0-7633; [86-19]
     (<-simplified@CN
      ((=gb12345		  . #x7633)	; &UU+9F54; [86-19]
       ))
-    (=ucs		. #x9F80)	; 龀
-    (=gb2312		. #x7633)	; &I-G0-7633; [86-19]
     ))
 (define-char
   '((ideographic-radical . 211)	; ⿒
@@ -187,11 +187,11 @@
   '((ideographic-radical . 211)	; ⿒
     (ideographic-strokes . 3)
     (total-strokes	 . 11)
+    (=ucs		. #x9F81)	; 龁
+    (=iso-ir165		. #x7E7B)	; &I-EGB-7E7B; [94-91]
     (<-simplified@CN
      ((=ucs@unicode	  . #x9F55)	; &UU+9F55;
       ))
-    (=ucs		. #x9F81)	; 龁
-    (=iso-ir165		. #x7E7B)	; &I-EGB-7E7B; [94-91]
     ))
 (define-char
   '((ideographic-radical . 211)	; ⿒
@@ -529,105 +529,111 @@
     (=daikanwa		. 48629)	; &I-M-48629;
     ))
 (define-char
-  '((=>ucs		. #x9F60)	; é½ 
-    (ideographic-radical . 211)	; ⿒
+  '((ideographic-radical . 211)	; ⿒
     (ideographic-strokes . 5)
     (total-strokes	 . 20)
-    (=gt		. 66454)	; &GT-66454;
-    (=gt-pj-9		. #x3123)	; &GT-66454; [17-03]
-    (=daikanwa		. 48631)	; &I-M-48631;
-    (mojikyo		. 058052)	; &MCS-6000E2C4;
+    (=ucs		. #x9F60)	; é½ 
     ))
 (define-char
-  '((morohashi-daikanwa	48631 0 2)
+  '((<-denotational
+     ((=ucs		  . #x9F60)	; é½ 
+      ))
     (ideographic-radical . 211)	; ⿒
     (ideographic-strokes . 5)
     (total-strokes	 . 20)
-    (=ucs		. #x9F60)	; é½ 
-    (=jis-x0208		. #x7373)	; &I-J90-7373; [83-83]
-    (=cns11643-2	. #x6B49)	; &I-C2-6B49; [75-41]
-    (=gb12345		. #x7636)	; é½  [86-22]
-    (=gt		. 66455)	; &I-GT-66455;
-    (=gt-pj-1		. #x7373)	; &I-GT-66455; [83-83]
-    (mojikyo		. 048631)	; &MCS-6000BDF7;
+    (=gt		. 66454)	; &GT-66454;
+    (=gt-pj-9		. #x3123)	; &GT-66454; [17-03]
+    (=daikanwa		. 48631)	; &I-M-48631;
+    (mojikyo		. 058052)	; &MCS-6000E2C4;
     ))
 (define-char
-  '((=>ucs		. #x9F60)	; é½ 
-    (morohashi-daikanwa	48631 0 4)
+  '((<-denotational
+     ((=ucs		  . #x9F60)	; é½ 
+      ))
     (ideographic-radical . 211)	; ⿒
     (ideographic-strokes . 5)
-    (total-strokes	 . 20)
+    (total-strokes	 . 17)
     (=gt		. 66395)	; &GT-66395;
     (=gt-pj-10		. #x5A23)	; &GT-66395; [58-03]
+    (<-simplified@JP/misc
+     ((=gt		  . 66454)	; &GT-66454;
+      (=daikanwa	  . 48631)	; &I-M-48631;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x9F61)	; 齡
-    (ideographic-radical . 211)	; ⿒
-    (ideographic-strokes . 5)
-    (total-strokes	 . 20)
-    (shinjigen-2	. 9897)
-    (=jis-x0208		. #x7374)	; &GT-66459; [83-84]
-    (=ks-x1001		. #x5646)	; &I-K0-5646; [54-38]
-    (=gt		. 66459)	; &I-GT-66459;
-    (=gt-pj-1		. #x7374)	; &I-GT-66459; [83-84]
-    (=daikanwa		. 48632)	; &I-M-48632;
-    (=ucs@jis		. #x9F61)	; &GT-66459;
-    (mojikyo		. 048632)	; &MCS-6000BDF8;
-    ))
-(define-char
-  '((=>ucs		. #x9F61)	; 齡
-    (morohashi-daikanwa	48632 0 1)
+  '((<-denotational
+     ((=ucs		  . #x9F60)	; é½ 
+      ))
     (ideographic-radical . 211)	; ⿒
     (ideographic-strokes . 5)
     (total-strokes	 . 20)
-    (=cns11643-1	. #x7A61)	; &C1-7A61; [90-65]
+    (->subsumptive
+     ((=jis-x0208	  . #x7373)	; &GT-66455; [83-83]
+      (=cns11643-2	  . #x6B49)	; &I-C2-6B49; [75-41]
+      (=gt		  . 66455)	; &I-GT-66455;
+      (=gt-pj-1		  . #x7373)	; &I-GT-66455; [83-83]
+      (=ucs@jis		  . #x9F60)	; &GT-66455;
+      (mojikyo		  . 048631)	; &MCS-6000BDF7;
+      )
+     ((=gb12345		  . #x7636)	; &UU+9F60; [86-22]
+      (=ucs@unicode	  . #x9F60)	; &UU+9F60;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	48632 0 2)
-    (ideographic-radical . 211)	; ⿒
+  '((ideographic-radical . 211)	; ⿒
     (ideographic-strokes . 5)
     (total-strokes	 . 20)
     (=ucs		. #x9F61)	; 齡
-    (=gb12345		. #x4164)	; 齡 [33-68]
-    ))
-(define-char
-  '((=>ucs		. #x9F62)	; é½¢
-    (morohashi-daikanwa	48632 1)
-    (ideographic-radical . 211)	; ⿒
-    (ideographic-strokes . 5)
-    (total-strokes	 . 17)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x7374)	; &GT-66459; [83-84]
+    (->subsumptive
+     ((shinjigen-1	  . 9897)
+      (shinjigen-2	  . 9897)
+      (=jis-x0208	  . #x7374)	; &GT-66459; [83-84]
       (=ks-x1001	  . #x5646)	; &I-K0-5646; [54-38]
+      (=gt		  . 66459)	; &I-GT-66459;
+      (=gt-pj-1		  . #x7374)	; &I-GT-66459; [83-84]
       (=daikanwa	  . 48632)	; &I-M-48632;
+      (=ucs@jis		  . #x9F61)	; &GT-66459;
+      (mojikyo		  . 048632)	; &MCS-6000BDF8;
+      )
+     ((=cns11643-1	  . #x7A61)	; &C1-7A61; [90-65]
+      )
+     ((=gb12345		  . #x4164)	; &UU+9F61; [33-68]
+      (=ucs@unicode	  . #x9F61)	; &UU+9F61;
       ))
-    (=jis-x0208		. #x4E70)	; &GT-66398; [46-80]
-    (=gt		. 66398)	; &I-GT-66398;
-    (=gt-pj-1		. #x4E70)	; &I-GT-66398; [46-80]
-    (=ucs@jis		. #x9F62)	; &GT-66398;
-    (mojikyo		. 050612)	; &MCS-6000C5B4;
     ))
 (define-char
-  '((morohashi-daikanwa	48632 1 1)
-    (ideographic-radical . 211)	; ⿒
+  '((ideographic-radical . 211)	; ⿒
     (ideographic-strokes . 5)
     (total-strokes	 . 17)
     (=ucs		. #x9F62)	; é½¢
+    (->subsumptive
+     ((morohashi-daikanwa	48632 1)
+      (shinjigen-1	  . 9896)
+      (=jis-x0208	  . #x4E70)	; &GT-66398; [46-80]
+      (=gt		  . 66398)	; &I-GT-66398;
+      (=gt-pj-1		  . #x4E70)	; &I-GT-66398; [46-80]
+      (=ucs@jis		  . #x9F62)	; &GT-66398;
+      (mojikyo		  . 050612)	; &MCS-6000C5B4;
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x7374)	; &GT-66459; [83-84]
+	(=ks-x1001	    . #x5646)	; &I-K0-5646; [54-38]
+	(=daikanwa	    . 48632)	; &I-M-48632;
+	))
+      )
+     ((=ucs@unicode	  . #x9F62)	; &UU+9F62;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x2A5F2)	; 𪗲
-    (ideographic-radical . 211)	; ⿒
-    (ideographic-strokes . 5)
-    (total-strokes	 . 14)
-    (=daikanwa		. 48633)	; &M-48633;
-    ))
-(define-char
-  '((morohashi-daikanwa	48633 0 1)
-    (ideographic-radical . 211)	; ⿒
+  '((ideographic-radical . 211)	; ⿒
     (ideographic-strokes . 5)
     (total-strokes	 . 14)
     (=ucs		. #x2A5F2)	; 𪗲
-    (=cns11643-4	. #x4878)	; &I-C4-4878; [40-88]
+    (->subsumptive
+     ((=daikanwa	  . 48633)	; &M-48633;
+      )
+     ((=cns11643-4	  . #x4878)	; &C4-4878; [40-88]
+      (=ucs@iso		  . #x2A5F2)	; &C4-4878;
+      ))
     ))
 (define-char
   '((ideographic-radical . 211)	; ⿒
diff --git a/lisp/utf-2000/Ideograph-R212-Dragon.el b/lisp/utf-2000/Ideograph-R212-Dragon.el
index c27d5c7..0163773 100644
--- a/lisp/utf-2000/Ideograph-R212-Dragon.el
+++ b/lisp/utf-2000/Ideograph-R212-Dragon.el
@@ -32,21 +32,21 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EF0)	; â»°
     (<-identical@component
      ((=ucs		  . #x9F99)	; 龙
       ))
-    (=ucs		. #x2EF0)	; â»°
     ))
 (define-char
   '((ideographic-radical . 212)	; ⿓
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
-    (<-simplified@CN
-     ((=gb12345		  . #x417A)	; &UU+9F8D; [33-90]
-      ))
     (=ucs		. #x9F99)	; 龙
     (=gb2312		. #x417A)	; &I-G0-417A; [33-90]
     (=jef-china3	. #x82AD)	; &I-JC3-82AD;
+    (<-simplified@CN
+     ((=gb12345		  . #x417A)	; &UU+9F8D; [33-90]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -390,6 +390,9 @@
   '((ideographic-radical . 212)	; ⿓
     (ideographic-strokes . 17)
     (total-strokes	 . 33)
+    (sound@ja/kun	"okami")
+    (sound@ja/on	"ryou")
+    (sound@ja/on/name	"(n)ou")
     (=ucs		. #x9F97)	; 龗
     (->subsumptive
      ((=jis-x0212	  . #x6D5E)	; &M-48844; [77-62]
diff --git a/lisp/utf-2000/Ideograph-R213-Turtle.el b/lisp/utf-2000/Ideograph-R213-Turtle.el
index 48b89b4..1305994 100644
--- a/lisp/utf-2000/Ideograph-R213-Turtle.el
+++ b/lisp/utf-2000/Ideograph-R213-Turtle.el
@@ -9,13 +9,6 @@
     (ideographic-radical@cns*sources
      shinjigen-1 cns11643 gt)
     (total-strokes	 . 11)
-    (<-vulgar
-     ((=jis-x0208@1983	  . #x737D)	; &M-48847; [83-93]
-      (=ks-x1001	  . #x4F4F)	; &I-K0-4F4F; [47-47]
-      (=daikanwa	  . 48847)	; &I-M-48847;
-      ))
-    (<-vulgar*sources
-     daikanwa)
     (hanyu-dazidian	8 10 19)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -38,6 +31,13 @@
     (=daikanwa		. 00210)	; &I-M-00210;
     (=hanziku-12	. #xEBBD)	; &I-HZK12-EBBD;
     (mojikyo		. 000210)	; &MCS-600000D2;
+    (<-vulgar
+     ((=jis-x0208@1983	  . #x737D)	; &M-48847; [83-93]
+      (=ks-x1001	  . #x4F4F)	; &I-K0-4F4F; [47-47]
+      (=daikanwa	  . 48847)	; &I-M-48847;
+      ))
+    (<-vulgar*sources
+     daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -47,10 +47,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EF2)	; ⻲
     (<-identical@component
      ((=ucs		  . #x4E80)	; 亀
       ))
-    (=ucs		. #x2EF2)	; ⻲
     ))
 (define-char
   '((ideographic-radical . 213)	; ⿔
@@ -89,10 +89,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EF1)	; â»±
     (<-identical@component
      ((=ucs		  . #x9F9C)	; 龜
       ))
-    (=ucs		. #x2EF1)	; â»±
     ))
 (define-char
   '((<-denotational
@@ -111,6 +111,9 @@
     (ideographic-radical . 213)	; ⿔
     (ideographic-strokes . 0)
     (total-strokes	 . 15)
+    (shinjigen-1	. 9919)
+    (=cns11643-7	. #x2C3A)	; &M-48848; [12-26]
+    (=daikanwa		. 48848)	; &I-M-48848;
     (<-original
      ((shinjigen-1	  . 9918)
       (=jis-x0208@1983	  . #x737D)	; &M-48847; [83-93]
@@ -119,10 +122,7 @@
       (=daikanwa	  . 48847)	; &I-M-48847;
       ))
     (<-original*sources
-     zhengzi-tong daikanwa shinjigen-1)
-    (shinjigen-1	. 9919)
-    (=cns11643-7	. #x2C3A)	; &M-48848; [12-26]
-    (=daikanwa		. 48848)	; &I-M-48848;
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 213)	; ⿔
@@ -139,6 +139,7 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EF3)	; ⻳
     (<-compat
      ((=ucs		  . #x9F9F)	; 龟
       ))
@@ -152,17 +153,16 @@
     (<-simplified@CN/component
      ((=ucs		  . #x9F9C)	; 龜
       ))
-    (=ucs		. #x2EF3)	; ⻳
     ))
 (define-char
   '((ideographic-radical . 213)	; ⿔
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
+    (=ucs		. #x9F9F)	; 龟
+    (=gb2312		. #x396A)	; &I-G0-396A; [25-74]
     (<-simplified@CN
      ((=gb12345		  . #x396A)	; &UU+9F9C; [25-74]
       ))
-    (=ucs		. #x9F9F)	; 龟
-    (=gb2312		. #x396A)	; &I-G0-396A; [25-74]
     ))
 (define-char
   '((ideographic-radical . 213)	; ⿔
@@ -400,7 +400,9 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 21)
     (->subsumptive
-     ((<-ancient
+     ((=jis-x0208@1978	  . #x6354)	; &M-48869; [67-52]
+      (=daikanwa	  . 48869)	; &I-M-48869;
+      (<-ancient
        ((=jis-x0208	    . #x3D29)	; &GT-32182; [29-09]
 	(=gb2312	    . #x476F)	; &I-G0-476F; [39-79]
 	(=ks-x1001	    . #x7555)	; &I-K0-7555; [85-53]
@@ -408,8 +410,6 @@
 	))
       (<-ancient*sources
        zihui daikanwa)
-      (=jis-x0208@1978	  . #x6354)	; &M-48869; [67-52]
-      (=daikanwa	  . 48869)	; &I-M-48869;
       )
      ((=jis-x0208@1983	  . #x6354)	; &GT-32753; [67-52]
       (=jis-x0208@1990	  . #x6354)	; &I-J90-6354; [67-52]
@@ -428,6 +428,29 @@
     (=ucs@unicode	. #x9F9D)	; &UU+9F9D;
     ))
 (define-char
+  '((ideographic-radical@ucs . 213)	; ⿔
+    (ideographic-strokes@ucs . 5)
+    (ideographic-radical@ucs*sources
+     daikanwa ucs)
+    (ideographic-radical@cns . 115)	; â½²
+    (ideographic-strokes@cns . 16)
+    (total-strokes	 . 21)
+    (=ucs		. #x2A6BC)	; 𪚼
+    (->subsumptive
+     ((ideographic-radical . 213)	; ⿔
+      (ideographic-strokes . 5)
+      (=daikanwa	  . 48870)	; &M-48870;
+      )
+     ((ideographic-radical . 115)	; â½²
+      (ideographic-strokes . 16)
+      (=cns11643-7	  . #x542A)	; &C7-542A; [52-10]
+      )
+     ((ideographic-radical . 213)	; ⿔
+      (ideographic-strokes . 5)
+      (=ucs@iso		  . #x2A6BC)	; &U-0002A6BC;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 213)	; ⿔
     (ideographic-strokes . 5)
     (total-strokes	 . 21)
diff --git a/lisp/utf-2000/Oracle-Bones.el b/lisp/utf-2000/Oracle-Bones.el
index 44f07e0..852e620 100644
--- a/lisp/utf-2000/Oracle-Bones.el
+++ b/lisp/utf-2000/Oracle-Bones.el
@@ -1,14 +1,17 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00001)	; &ZOB-0001;
     (<-Oracle-Bones
      ((=ucs		  . #x4E00)	; 一
       ))
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00001)	; &ZOB-0001;
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (sources		zob1968=1791)
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00002)	; &ZOB-0002;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -25,12 +28,12 @@
 	  ))
 	))
       ))
-    (sources		zob1968=1791)
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00002)	; &ZOB-0002;
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (sources		zob1968=1333 zob1968=1348 zob1968=3065)
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00003)	; &ZOB-0003;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -38,9 +41,6 @@
        ((=ucs		    . #x725B)	; 牛
 	))
       ))
-    (sources		zob1968=1333 zob1968=1348 zob1968=3065)
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00003)	; &ZOB-0003;
     ))
 (define-char
   '((<-denotational
@@ -55,6 +55,10 @@
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (sources		zob1968=2258 zob1968=2264 zob1968=2279 zob1968=2332
+			zob1968=2333 zob1968=2337 zob1968=2979 zob1968=2997)
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00005)	; &ZOB-0005;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -62,13 +66,12 @@
        ((=ucs		    . #x7262)	; 牢
 	))
       ))
-    (sources		zob1968=2258 zob1968=2264 zob1968=2279 zob1968=2332
-			zob1968=2333 zob1968=2337 zob1968=2979 zob1968=2997)
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00005)	; &ZOB-0005;
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (sources		zob1968=0061)
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00006)	; &ZOB-0006;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -76,12 +79,11 @@
        ((=ucs		    . #x7269)	; 物
 	))
       ))
-    (sources		zob1968=0061)
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00006)	; &ZOB-0006;
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00007)	; &ZOB-0007;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -89,11 +91,11 @@
        ((=ucs		    . #x5409)	; 吉
 	))
       ))
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00007)	; &ZOB-0007;
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00008)	; &ZOB-0008;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -101,11 +103,12 @@
        ((=ucs		    . #x535C)	; 卜
 	))
       ))
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00008)	; &ZOB-0008;
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (sources		zob1968=1350 zob1968=2299)
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00009)	; &ZOB-0009;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -113,12 +116,12 @@
        ((=ucs		    . #x7F8A)	; 羊
 	))
       ))
-    (sources		zob1968=1350 zob1968=2299)
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00009)	; &ZOB-0009;
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (sources		zob1968=1383 zob1968=1819)
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00010)	; &ZOB-0010;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -133,12 +136,12 @@
 	  ))
 	))
       ))
-    (sources		zob1968=1383 zob1968=1819)
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00010)	; &ZOB-0010;
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (sources		zob1968=3248)
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00011)	; &ZOB-0011;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -146,12 +149,12 @@
        ((=ucs		    . #x7F8C)	; 羌
 	))
       ))
-    (sources		zob1968=3248)
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00011)	; &ZOB-0011;
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (sources		zob1968=1192 zob1968=3001 zob1968=3002)
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00012)	; &ZOB-0012;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -159,9 +162,6 @@
        ((=ucs		    . #x6708)	; 月
 	))
       ))
-    (sources		zob1968=1192 zob1968=3001 zob1968=3002)
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00012)	; &ZOB-0012;
     ))
 (define-char
   '((<-denotational
@@ -176,6 +176,8 @@
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00014)	; &ZOB-0014;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -183,11 +185,12 @@
        ((=ucs		    . #x5363)	; 卣
 	))
       ))
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00014)	; &ZOB-0014;
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (sources		zob1968=2219)
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00015)	; &ZOB-0015;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -195,12 +198,11 @@
        ((=ucs		    . #x4EBA)	; 人
 	))
       ))
-    (sources		zob1968=2219)
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00015)	; &ZOB-0015;
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00016)	; &ZOB-0016;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -208,11 +210,12 @@
        ((=ucs		    . #x4F10)	; 伐
 	))
       ))
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00016)	; &ZOB-0016;
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (sources		zob1968=3068)
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00017)	; &ZOB-0017;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -220,12 +223,12 @@
        ((=ucs		    . #x8C55)	; 豕
 	))
       ))
-    (sources		zob1968=3068)
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00017)	; &ZOB-0017;
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (sources		zob1968=1095)
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00018)	; &ZOB-0018;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E00)	; 一
@@ -234,28 +237,18 @@
 	(=ucs		    . #x304F)	; く
 	))
       ))
-    (sources		zob1968=1095)
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00018)	; &ZOB-0018;
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
-    (<-Oracle-Bones
-     ((=ucs		  . #x5143)	; 元
-      ))
     (sources		zob1968=1157)
     (zinbun-oracle-page . 3)
     (=zinbun-oracle	. 00019)	; &ZOB-0019;
+    (<-Oracle-Bones
+     ((=ucs		  . #x5143)	; 元
+      ))
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
-    (<-Oracle-Bones
-     ((ideographic-combination
-       ((=ucs		    . #x5143)	; 元
-	)
-       ((=ucs		    . #x793A)	; 示
-	))
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -267,34 +260,34 @@
     (sources		zob1968=0716)
     (zinbun-oracle-page . 3)
     (=zinbun-oracle	. 00020)	; &ZOB-0020;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5143)	; 元
+	)
+       ((=ucs		    . #x793A)	; 示
+	))
+      ))
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00021)	; &ZOB-0021;
     (<-Oracle-Bones
      ((=ucs		  . #x5929)	; 天
       ))
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00021)	; &ZOB-0021;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 3)
+    (=zinbun-oracle	. 00022)	; &ZOB-0022;
     (<-Oracle-Bones
      ((=ucs		  . #x2011E)	; 𠄞
       )
      ((=ucs		  . #x4E0A)	; 上
       ))
-    (zinbun-oracle-page . 3)
-    (=zinbun-oracle	. 00022)	; &ZOB-0022;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
-    (<-Oracle-Bones
-     ((ideographic-combination
-       ((=ucs		    . #x4E0A)	; 上
-	)
-       ((=ucs		    . #x5E1D)	; 帝
-	))
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -312,16 +305,16 @@
       ))
     (zinbun-oracle-page . 3)
     (=zinbun-oracle	. 00023)	; &ZOB-0023;
-    ))
-(define-char
-  '((shuowen-radical	. 2)	; 上
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0A)	; 上
 	)
-       ((=ucs		    . #x793A)	; 示
+       ((=ucs		    . #x5E1D)	; 帝
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 2)	; 上
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -332,16 +325,16 @@
       ))
     (zinbun-oracle-page . 4)
     (=zinbun-oracle	. 00024)	; &ZOB-0024;
-    ))
-(define-char
-  '((shuowen-radical	. 2)	; 上
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0A)	; 上
 	)
-       ((=ucs		    . #x5409)	; 吉
+       ((=ucs		    . #x793A)	; 示
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 2)	; 上
     (sources		zob1968=0010 zob1968=0027 zob1968=0045 zob1968=0046
 			zob1968=0052 zob1968=0088 zob1968=0145 zob1968=0166
 			zob1968=0175 zob1968=0302 zob1968=0452 zob1968=0491
@@ -349,29 +342,29 @@
 			zob1968=0496-0499)
     (zinbun-oracle-page . 4)
     (=zinbun-oracle	. 00025)	; &ZOB-0025;
-    ))
-(define-char
-  '((shuowen-radical	. 2)	; 上
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0A)	; 上
 	)
-       ((=ucs		    . #x6E09)	; 渉
+       ((=ucs		    . #x5409)	; 吉
 	))
       ))
-    (sources		zob1968=2155)
-    (zinbun-oracle-page . 4)
-    (=zinbun-oracle	. 00026)	; &ZOB-0026;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (sources		zob1968=2155)
+    (zinbun-oracle-page . 4)
+    (=zinbun-oracle	. 00026)	; &ZOB-0026;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0A)	; 上
 	)
-       ((=ucs		    . #x7532)	; 甲
+       ((=ucs		    . #x6E09)	; 渉
 	))
       ))
+    ))
+(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
@@ -379,6 +372,13 @@
 			zob1968=2285 zob1968=2363)
     (zinbun-oracle-page . 4)
     (=zinbun-oracle	. 00027)	; &ZOB-0027;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x4E0A)	; 上
+	)
+       ((=ucs		    . #x7532)	; 甲
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -416,6 +416,8 @@
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 4)
+    (=zinbun-oracle	. 00030)	; &ZOB-0030;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0A)	; 上
@@ -423,11 +425,11 @@
        ((=ucs		    . #x4E59)	; 乙
 	))
       ))
-    (zinbun-oracle-page . 4)
-    (=zinbun-oracle	. 00030)	; &ZOB-0030;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 4)
+    (=zinbun-oracle	. 00031)	; &ZOB-0031;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0A)	; 上
@@ -435,11 +437,11 @@
        ((=ucs		    . #x5B50)	; 子
 	))
       ))
-    (zinbun-oracle-page . 4)
-    (=zinbun-oracle	. 00031)	; &ZOB-0031;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 4)
+    (=zinbun-oracle	. 00032)	; &ZOB-0032;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0A)	; 上
@@ -463,20 +465,18 @@
 	  ))
 	))
       ))
-    (zinbun-oracle-page . 4)
-    (=zinbun-oracle	. 00032)	; &ZOB-0032;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
-    (<-Oracle-Bones
-     ((=ucs		  . #x5E1D)	; 帝
-      ))
     (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
@@ -516,6 +516,8 @@
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 4)
+    (=zinbun-oracle	. 00038)	; &ZOB-0038;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x5E1D)	; 帝
@@ -523,11 +525,11 @@
        ((=ucs		    . #x5B97)	; 宗
 	))
       ))
-    (zinbun-oracle-page . 4)
-    (=zinbun-oracle	. 00038)	; &ZOB-0038;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 4)
+    (=zinbun-oracle	. 00039)	; &ZOB-0039;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x5E1D)	; 帝
@@ -535,11 +537,11 @@
        ((=ucs		    . #x7532)	; 甲
 	))
       ))
-    (zinbun-oracle-page . 4)
-    (=zinbun-oracle	. 00039)	; &ZOB-0039;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 4)
+    (=zinbun-oracle	. 00040)	; &ZOB-0040;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x5E1D)	; 帝
@@ -547,19 +549,19 @@
        ((=ucs		    . #x4E01)	; 丁
 	))
       ))
-    (zinbun-oracle-page . 4)
-    (=zinbun-oracle	. 00040)	; &ZOB-0040;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 4)
+    (=zinbun-oracle	. 00041)	; &ZOB-0041;
     (<-Oracle-Bones
      ((=ucs		  . #x65C1)	; 旁
       ))
-    (zinbun-oracle-page . 4)
-    (=zinbun-oracle	. 00041)	; &ZOB-0041;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 4)
+    (=zinbun-oracle	. 00042)	; &ZOB-0042;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x65C1)	; 旁
@@ -567,33 +569,20 @@
        ((=ucs		    . #x65B9)	; 方
 	))
       ))
-    (zinbun-oracle-page . 4)
-    (=zinbun-oracle	. 00042)	; &ZOB-0042;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (sources		zob1968=0717)
+    (zinbun-oracle-page . 4)
+    (=zinbun-oracle	. 00043)	; &ZOB-0043;
     (<-Oracle-Bones
      ((=ucs		  . #x2011F)	; 𠄟
       )
      ((=ucs		  . #x4E0B)	; 下
       ))
-    (sources		zob1968=0717)
-    (zinbun-oracle-page . 4)
-    (=zinbun-oracle	. 00043)	; &ZOB-0043;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
-    (<-Oracle-Bones
-     ((=ucs		  . #x2001D)	; 𠀝
-      )
-     ((ideographic-combination
-       ((=ucs		    . #x4E0B)	; 下
-	)
-       ((=ucs		    . #x4E0A)	; 上
-	))
-      )
-     ((=ucs		  . #x209D7)	; 𠧗
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -605,16 +594,20 @@
     (sources		zob1968=0692 zob1968=0911)
     (zinbun-oracle-page . 4)
     (=zinbun-oracle	. 00044)	; &ZOB-0044;
-    ))
-(define-char
-  '((shuowen-radical	. 2)	; 上
     (<-Oracle-Bones
+     ((=ucs		  . #x2001D)	; 𠀝
+      )
      ((ideographic-combination
        ((=ucs		    . #x4E0B)	; 下
 	)
-       ((=ucs		    . #x793A)	; 示
+       ((=ucs		    . #x4E0A)	; 上
 	))
+      )
+     ((=ucs		  . #x209D7)	; 𠧗
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 2)	; 上
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -625,9 +618,18 @@
       ))
     (zinbun-oracle-page . 4)
     (=zinbun-oracle	. 00045)	; &ZOB-0045;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x4E0B)	; 下
+	)
+       ((=ucs		    . #x793A)	; 示
+	))
+      ))
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 4)
+    (=zinbun-oracle	. 00046)	; &ZOB-0046;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0B)	; 下
@@ -635,11 +637,12 @@
        ((=ucs		    . #x6B73)	; æ­³
 	))
       ))
-    (zinbun-oracle-page . 4)
-    (=zinbun-oracle	. 00046)	; &ZOB-0046;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (sources		zob1968=2363)
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00047)	; &ZOB-0047;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0B)	; 下
@@ -649,12 +652,11 @@
        ((=ucs		    . #x5216)	; 刖
 	))
       ))
-    (sources		zob1968=2363)
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00047)	; &ZOB-0047;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00048)	; &ZOB-0048;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0B)	; 下
@@ -662,11 +664,12 @@
        ((=ucs		    . #x65EC)	; 旬
 	))
       ))
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00048)	; &ZOB-0048;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (sources		zob1968=0331 zob1968=0887 zob1968=0913)
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00049)	; &ZOB-0049;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0B)	; 下
@@ -674,12 +677,12 @@
        ((=ucs		    . #x5371)	; 危
 	))
       ))
-    (sources		zob1968=0331 zob1968=0887 zob1968=0913)
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00049)	; &ZOB-0049;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (sources		zob1968=1932)
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00050)	; &ZOB-0050;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0B)	; 下
@@ -694,12 +697,11 @@
 	  ))
 	))
       ))
-    (sources		zob1968=1932)
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00050)	; &ZOB-0050;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00051)	; &ZOB-0051;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0B)	; 下
@@ -707,11 +709,11 @@
        ((=ucs		    . #x4E59)	; 乙
 	))
       ))
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00051)	; &ZOB-0051;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00052)	; &ZOB-0052;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0B)	; 下
@@ -719,11 +721,11 @@
        ((=ucs		    . #x5DF1)	; å·±
 	))
       ))
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00052)	; &ZOB-0052;
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00053)	; &ZOB-0053;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0B)	; 下
@@ -731,20 +733,18 @@
        ((=ucs		    . #x5B50)	; 子
 	))
       ))
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00053)	; &ZOB-0053;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
-    (<-Oracle-Bones
-     ((=ucs		  . #x793A)	; 示
-      ))
     (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
@@ -760,6 +760,8 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00056)	; &ZOB-0056;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x793A)	; 示
@@ -767,11 +769,11 @@
        ((=ucs		    . #x5F48)	; 彈
 	))
       ))
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00056)	; &ZOB-0056;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00057)	; &ZOB-0057;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x793A)	; 示
@@ -779,11 +781,11 @@
        ((=ucs		    . #x7532)	; 甲
 	))
       ))
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00057)	; &ZOB-0057;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00058)	; &ZOB-0058;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x793A)	; 示
@@ -791,11 +793,11 @@
        ((=ucs		    . #x4E01)	; 丁
 	))
       ))
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00058)	; &ZOB-0058;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00059)	; &ZOB-0059;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x793A)	; 示
@@ -803,11 +805,11 @@
        ((=ucs		    . #x58EC)	; 壬
 	))
       ))
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00059)	; &ZOB-0059;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00060)	; &ZOB-0060;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x793A)	; 示
@@ -815,8 +817,6 @@
        ((=ucs		    . #x7678)	; 癸
 	))
       ))
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00060)	; &ZOB-0060;
     ))
 (define-char
   '((<-denotational
@@ -829,62 +829,62 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
-    (<-Oracle-Bones
-     ((=ucs		  . #x795C)	; 祜
-      ))
     (sources		zob1968=1826 zob1968=1827)
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00062)	; &ZOB-0062;
+    (<-Oracle-Bones
+     ((=ucs		  . #x795C)	; 祜
+      ))
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00063)	; &ZOB-0063;
     (<-Oracle-Bones
      ((=ucs		  . #x8C4A)	; 豊
       )
      ((=ucs		  . #x79AE)	; 禮
       ))
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00063)	; &ZOB-0063;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00064)	; &ZOB-0064;
     (<-Oracle-Bones
      ((=ucs		  . #x5F54)	; 彔
       )
      ((=ucs		  . #x797F)	; 祿
       ))
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00064)	; &ZOB-0064;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
-    (<-Oracle-Bones
-     ((=ucs		  . #x7950)	; 祐
-      ))
     (sources		zob1968=1800 zob1968=1806 zob1968=1811 zob1968=1861
 			zob1968=1883 zob1968=2947)
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00065)	; &ZOB-0065;
+    (<-Oracle-Bones
+     ((=ucs		  . #x7950)	; 祐
+      ))
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00066)	; &ZOB-0066;
     (<-Oracle-Bones
      ((=ucs		  . #x5794)	; 垔
       )
      ((=ucs		  . #x798B)	; 禋
       ))
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00066)	; &ZOB-0066;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
-    (<-Oracle-Bones
-     ((=ucs		  . #x796D)	; 祭
-      ))
     (sources		zob1968=1255 zob1968=1284 zob1968=1302 zob1968=1785
 			zob1968=1790 zob1968=2316 zob1968=2613)
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00067)	; &ZOB-0067;
+    (<-Oracle-Bones
+     ((=ucs		  . #x796D)	; 祭
+      ))
     ))
 (define-char
   '((<-denotational
@@ -921,9 +921,6 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
-    (<-Oracle-Bones
-     ((=ucs		  . #x7940)	; 祀
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -935,94 +932,92 @@
     (sources		zob1968=3031)
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00072)	; &ZOB-0072;
+    (<-Oracle-Bones
+     ((=ucs		  . #x7940)	; 祀
+      ))
     ))
 (define-char
   '((<-denotational
      ((=zinbun-oracle	  . 00072)	; &ZOB-0072;
       ))
     (shuowen-radical	. 3)	; 示
+    (sources		zob1968=1885 zob1968=1886)
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00073)	; &ZOB-0073;
     (<-Oracle-Bones
      ((=ucs		  . #x5DF3)	; å·³
       )
      ((=ucs		  . #x7940)	; 祀
       ))
-    (sources		zob1968=1885 zob1968=1886)
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00073)	; &ZOB-0073;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 6)
+    (=zinbun-oracle	. 00074)	; &ZOB-0074;
     (<-Oracle-Bones
      ((=ucs		  . #x4E14)	; 且
       )
      ((=ucs		  . #x7956)	; 祖
       ))
-    (zinbun-oracle-page . 6)
-    (=zinbun-oracle	. 00074)	; &ZOB-0074;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 6)
+    (=zinbun-oracle	. 00075)	; &ZOB-0075;
     (<-Oracle-Bones
      ((=ucs		  . #x794A)	; 祊
       )
      ((=ucs		  . #x256F1)	; 𥛱
       ))
-    (zinbun-oracle-page . 6)
-    (=zinbun-oracle	. 00075)	; &ZOB-0075;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
-    (<-Oracle-Bones
-     ((=ucs		  . #x794A)	; 祊
-      ))
     (sources		zob1968=0009 zob1968=0012 zob1968=0268 zob1968=1271
 			zob1968=2263 zob1968=2284)
     (zinbun-oracle-page . 6)
     (=zinbun-oracle	. 00076)	; &ZOB-0076;
+    (<-Oracle-Bones
+     ((=ucs		  . #x794A)	; 祊
+      ))
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 6)
+    (=zinbun-oracle	. 00077)	; &ZOB-0077;
     (<-Oracle-Bones
      ((=ucs		  . #x794F)	; 祏
       ))
-    (zinbun-oracle-page . 6)
-    (=zinbun-oracle	. 00077)	; &ZOB-0077;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 6)
+    (=zinbun-oracle	. 00078)	; &ZOB-0078;
     (<-Oracle-Bones
      ((=ucs		  . #x53F8)	; 司
       )
      ((=ucs		  . #x7960)	; 祠
       ))
-    (zinbun-oracle-page . 6)
-    (=zinbun-oracle	. 00078)	; &ZOB-0078;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 6)
+    (=zinbun-oracle	. 00079)	; &ZOB-0079;
     (<-Oracle-Bones
      ((=ucs		  . #x793F)	; 礿
       ))
-    (zinbun-oracle-page . 6)
-    (=zinbun-oracle	. 00079)	; &ZOB-0079;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 6)
+    (=zinbun-oracle	. 00080)	; &ZOB-0080;
     (<-Oracle-Bones
      ((=ucs		  . #x5E1D)	; 帝
       )
      ((=ucs		  . #x7998)	; 禘
       ))
-    (zinbun-oracle-page . 6)
-    (=zinbun-oracle	. 00080)	; &ZOB-0080;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
-    (<-Oracle-Bones
-     ((=ucs		  . #x797C)	; 祼
-      )
-     ((=ucs		  . #x798F)	; 福
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -1035,6 +1030,11 @@
     (sources		zob1968=0117 zob1968=0454 zob1968=0737)
     (zinbun-oracle-page . 6)
     (=zinbun-oracle	. 00081)	; &ZOB-0081;
+    (<-Oracle-Bones
+     ((=ucs		  . #x797C)	; 祼
+      )
+     ((=ucs		  . #x798F)	; 福
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1175,44 +1175,44 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 6)
+    (=zinbun-oracle	. 00097)	; &ZOB-0097;
     (<-Oracle-Bones
      ((=ucs		  . #x795D)	; 祝
       ))
-    (zinbun-oracle-page . 6)
-    (=zinbun-oracle	. 00097)	; &ZOB-0097;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 6)
+    (=zinbun-oracle	. 00098)	; &ZOB-0098;
     (<-Oracle-Bones
      ((=ucs		  . #x7953)	; 祓
       ))
-    (zinbun-oracle-page . 6)
-    (=zinbun-oracle	. 00098)	; &ZOB-0098;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 6)
+    (=zinbun-oracle	. 00099)	; &ZOB-0099;
     (<-Oracle-Bones
      ((=ucs		  . #x7948)	; 祈
       ))
-    (zinbun-oracle-page . 6)
-    (=zinbun-oracle	. 00099)	; &ZOB-0099;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 6)
+    (=zinbun-oracle	. 00100)	; &ZOB-0100;
     (<-Oracle-Bones
      ((=ucs		  . #x79A6)	; 禦
       ))
-    (zinbun-oracle-page . 6)
-    (=zinbun-oracle	. 00100)	; &ZOB-0100;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
-    (<-Oracle-Bones
-     ((=ucs		  . #x798D)	; 禍
-      ))
     (sources		zob1968=0067 zob1968=0250 zob1968=2947)
     (zinbun-oracle-page . 6)
     (=zinbun-oracle	. 00101)	; &ZOB-0101;
+    (<-Oracle-Bones
+     ((=ucs		  . #x798D)	; 禍
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1309,18 +1309,6 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
-    (<-Oracle-Bones
-     ((ideographic-combination
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	  (=ucs		      . #x2FF1)	; ⿱
-	  )
-	 ((=ucs		      . #x96B9)	; 隹
-	  )
-	 ((=ucs		      . #x793A)	; 示
-	  ))
-	))
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1333,21 +1321,21 @@
 			zob1968=1787)
     (zinbun-oracle-page . 7)
     (=zinbun-oracle	. 00113)	; &ZOB-0113;
-    ))
-(define-char
-  '((shuowen-radical	. 3)	; 示
     (<-Oracle-Bones
      ((ideographic-combination
        ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	  (=ucs		      . #x2FF0)	; â¿°
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
 	  )
-	 ((=ucs		      . #x793A)	; 示
+	 ((=ucs		      . #x96B9)	; 隹
 	  )
-	 ((=ucs		      . #x518A)	; 冊
+	 ((=ucs		      . #x793A)	; 示
 	  ))
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 3)	; 示
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -1359,9 +1347,23 @@
     (sources		zob1968=1875 zob1968=1880)
     (zinbun-oracle-page . 7)
     (=zinbun-oracle	. 00114)	; &ZOB-0114;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((=ucs		      . #x793A)	; 示
+	  )
+	 ((=ucs		      . #x518A)	; 冊
+	  ))
+	))
+      ))
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 7)
+    (=zinbun-oracle	. 00115)	; &ZOB-0115;
     (<-Oracle-Bones
      ((ideographic-combination
        ((ideographic-structure
@@ -1374,11 +1376,11 @@
 	  ))
 	))
       ))
-    (zinbun-oracle-page . 7)
-    (=zinbun-oracle	. 00115)	; &ZOB-0115;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 7)
+    (=zinbun-oracle	. 00116)	; &ZOB-0116;
     (<-Oracle-Bones
      ((ideographic-combination
        ((ideographic-structure
@@ -1398,8 +1400,6 @@
 	  ))
 	))
       ))
-    (zinbun-oracle-page . 7)
-    (=zinbun-oracle	. 00116)	; &ZOB-0116;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
@@ -1431,21 +1431,14 @@
     ))
 (define-char
   '((shuowen-radical	. 4)	; 三
+    (zinbun-oracle-page . 7)
+    (=zinbun-oracle	. 00121)	; &ZOB-0121;
     (<-Oracle-Bones
      ((=ucs		  . #x4E09)	; 三
       ))
-    (zinbun-oracle-page . 7)
-    (=zinbun-oracle	. 00121)	; &ZOB-0121;
     ))
 (define-char
   '((shuowen-radical	. 4)	; 三
-    (<-Oracle-Bones
-     ((ideographic-combination
-       ((=ucs		    . #x4E09)	; 三
-	)
-       ((=ucs		    . #x793A)	; 示
-	))
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1456,16 +1449,16 @@
       ))
     (zinbun-oracle-page . 7)
     (=zinbun-oracle	. 00122)	; &ZOB-0122;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x7940)	; 祀
+       ((=ucs		    . #x793A)	; 示
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1478,16 +1471,16 @@
       ))
     (zinbun-oracle-page . 7)
     (=zinbun-oracle	. 00123)	; &ZOB-0123;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=jis-x0208	    . #x3252)	; &GT-31777; [18-50]
+       ((=ucs		    . #x7940)	; 祀
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1498,16 +1491,16 @@
       ))
     (zinbun-oracle-page . 7)
     (=zinbun-oracle	. 00124)	; &ZOB-0124;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x6BCE)	; 毎
+       ((=jis-x0208	    . #x3252)	; &GT-31777; [18-50]
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1519,9 +1512,19 @@
     (sources		zob1968=2297)
     (zinbun-oracle-page . 7)
     (=zinbun-oracle	. 00125)	; &ZOB-0125;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x4E09)	; 三
+	)
+       ((=ucs		    . #x6BCE)	; 毎
+	))
+      ))
     ))
 (define-char
   '((shuowen-radical	. 4)	; 三
+    (sources		zob1968=0001 zob1968=1541)
+    (zinbun-oracle-page . 7)
+    (=zinbun-oracle	. 00126)	; &ZOB-0126;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
@@ -1538,22 +1541,9 @@
 	  ))
 	))
       ))
-    (sources		zob1968=0001 zob1968=1541)
-    (zinbun-oracle-page . 7)
-    (=zinbun-oracle	. 00126)	; &ZOB-0126;
     ))
 (define-char
   '((shuowen-radical	. 4)	; 三
-    (<-Oracle-Bones
-     ((ideographic-combination
-       ((=ucs		    . #x4E09)	; 三
-	)
-       ((=gb2312	    . #x392B)	; &GT-01893; [25-11]
-	)
-       ((=gb2312	    . #x3838)	; &GT-25337; [24-24]
-	(=cns11643-1	    . #x4558)	; &I-C1-4558; [37-56]
-	))
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (=ucs		  . #x2FF3)	; ⿳
@@ -1567,16 +1557,19 @@
       ))
     (zinbun-oracle-page . 7)
     (=zinbun-oracle	. 00127)	; &ZOB-0127;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x725B)	; 牛
+       ((=gb2312	    . #x392B)	; &GT-01893; [25-11]
+	)
+       ((=gb2312	    . #x3838)	; &GT-25337; [24-24]
+	(=cns11643-1	    . #x4558)	; &I-C1-4558; [37-56]
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1591,16 +1584,16 @@
 			zob1968=3045)
     (zinbun-oracle-page . 7)
     (=zinbun-oracle	. 00128)	; &ZOB-0128;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x7262)	; 牢
+       ((=ucs		    . #x725B)	; 牛
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1615,16 +1608,16 @@
 			zob1968=2344 zob1968=3033)
     (zinbun-oracle-page . 7)
     (=zinbun-oracle	. 00129)	; &ZOB-0129;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x5409)	; 吉
+       ((=ucs		    . #x7262)	; 牢
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1635,16 +1628,16 @@
       ))
     (zinbun-oracle-page . 7)
     (=zinbun-oracle	. 00130)	; &ZOB-0130;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x5343)	; 千
+       ((=ucs		    . #x5409)	; 吉
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
       (=ucs		  . #x2FFB)	; â¿»
@@ -1655,16 +1648,16 @@
       ))
     (zinbun-oracle-page . 7)
     (=zinbun-oracle	. 00131)	; &ZOB-0131;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x7236)	; 父
+       ((=ucs		    . #x5343)	; 千
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1676,16 +1669,16 @@
     (sources		zob1968=1817)
     (zinbun-oracle-page . 7)
     (=zinbun-oracle	. 00132)	; &ZOB-0132;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x535C)	; 卜
+       ((=ucs		    . #x7236)	; 父
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1696,16 +1689,16 @@
       ))
     (zinbun-oracle-page . 7)
     (=zinbun-oracle	. 00133)	; &ZOB-0133;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x767E)	; 百
+       ((=ucs		    . #x535C)	; 卜
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1716,16 +1709,16 @@
       ))
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00134)	; &ZOB-0134;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x7F8A)	; 羊
+       ((=ucs		    . #x767E)	; 百
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1737,9 +1730,21 @@
     (sources		zob1968=1948)
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00135)	; &ZOB-0135;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x4E09)	; 三
+	)
+       ((=ucs		    . #x7F8A)	; 羊
+	))
+      ))
     ))
 (define-char
   '((shuowen-radical	. 4)	; 三
+    (sources		zob1968=1334 zob1968=1344 zob1968=1346 zob1968=1906
+			zob1968=2260 zob1968=2315 zob1968=2978 zob1968=3061
+			zob1968=3254 zob1968=3255)
+    (zinbun-oracle-page . 8)
+    (=zinbun-oracle	. 00136)	; &ZOB-0136;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
@@ -1754,21 +1759,9 @@
 	  ))
 	))
       ))
-    (sources		zob1968=1334 zob1968=1344 zob1968=1346 zob1968=1906
-			zob1968=2260 zob1968=2315 zob1968=2978 zob1968=3061
-			zob1968=3254 zob1968=3255)
-    (zinbun-oracle-page . 8)
-    (=zinbun-oracle	. 00136)	; &ZOB-0136;
     ))
 (define-char
   '((shuowen-radical	. 4)	; 三
-    (<-Oracle-Bones
-     ((ideographic-combination
-       ((=ucs		    . #x4E09)	; 三
-	)
-       ((=ucs		    . #x7F8C)	; 羌
-	))
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1779,23 +1772,16 @@
       ))
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00137)	; &ZOB-0137;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	  (=ucs		      . #x2FF0)	; â¿°
-	  )
-	 ((=ucs		      . #x7F8A)	; 羊
-	  )
-	 ((=ucs		      . #x571F)	; 土
-	  ))
+       ((=ucs		    . #x7F8C)	; 羌
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1814,16 +1800,23 @@
     (sources		zob1968=2300)
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00138)	; &ZOB-0138;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x9091)	; 邑
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((=ucs		      . #x7F8A)	; 羊
+	  )
+	 ((=ucs		      . #x571F)	; 土
+	  ))
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1834,16 +1827,16 @@
       ))
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00139)	; &ZOB-0139;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x65E5)	; 日
+       ((=ucs		    . #x9091)	; 邑
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1855,16 +1848,16 @@
     (sources		zob1968=0264 zob1968=0516 zob1968=1084 zob1968=3207)
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00140)	; &ZOB-0140;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x65CF)	; 族
+       ((=ucs		    . #x65E5)	; 日
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1876,16 +1869,16 @@
     (sources		zob1968=2534)
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00141)	; &ZOB-0141;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x6708)	; 月
+       ((=ucs		    . #x65CF)	; 族
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1899,6 +1892,13 @@
 			zob1968=3101 zob1968=3111 zob1968=3237)
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00142)	; &ZOB-0142;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x4E09)	; 三
+	)
+       ((=ucs		    . #x6708)	; 月
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1919,15 +1919,6 @@
     ))
 (define-char
   '((shuowen-radical	. 4)	; 三
-    (<-Oracle-Bones
-     ((ideographic-combination
-       ((=ucs		    . #x4E09)	; 三
-	)
-       ((=ucs		    . #x767D)	; 白
-	)
-       ((=ucs		    . #x8C55)	; 豕
-	))
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1945,16 +1936,18 @@
       ))
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00144)	; &ZOB-0144;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x4EBA)	; 人
+       ((=ucs		    . #x767D)	; 白
+	)
+       ((=ucs		    . #x8C55)	; 豕
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1965,16 +1958,16 @@
       ))
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00145)	; &ZOB-0145;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x65EC)	; 旬
+       ((=ucs		    . #x4EBA)	; 人
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1985,16 +1978,16 @@
       ))
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00146)	; &ZOB-0146;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x8C55)	; 豕
+       ((=ucs		    . #x65EC)	; 旬
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2006,16 +1999,16 @@
     (sources		zob1968=0096)
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00147)	; &ZOB-0147;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x72AC)	; 犬
+       ((=ucs		    . #x8C55)	; 豕
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2026,28 +2019,28 @@
       ))
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00148)	; &ZOB-0148;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x5831)	; å ±
+       ((=ucs		    . #x72AC)	; 犬
 	))
       ))
-    (zinbun-oracle-page . 8)
-    (=zinbun-oracle	. 00149)	; &ZOB-0149;
     ))
 (define-char
   '((shuowen-radical	. 4)	; 三
+    (zinbun-oracle-page . 8)
+    (=zinbun-oracle	. 00149)	; &ZOB-0149;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x9580)	; 門
+       ((=ucs		    . #x5831)	; å ±
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2058,16 +2051,16 @@
       ))
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00150)	; &ZOB-0150;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x5C01)	; 封
+       ((=ucs		    . #x9580)	; 門
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2078,18 +2071,16 @@
       ))
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00151)	; &ZOB-0151;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x4E14)	; 且
-	)
-       ((=ucs		    . #x4E01)	; 丁
+       ((=ucs		    . #x5C01)	; 封
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2107,18 +2098,18 @@
       ))
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00152)	; &ZOB-0152;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
        ((=ucs		    . #x4E14)	; 且
 	)
-       ((=ucs		    . #x5E9A)	; 庚
+       ((=ucs		    . #x4E01)	; 丁
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2136,18 +2127,18 @@
       ))
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00153)	; &ZOB-0153;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
        ((=ucs		    . #x4E14)	; 且
 	)
-       ((=ucs		    . #x8F9B)	; 辛
+       ((=ucs		    . #x5E9A)	; 庚
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (=ucs		  . #x2FF3)	; ⿳
@@ -2160,16 +2151,18 @@
       ))
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00154)	; &ZOB-0154;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x77DB)	; 矛
+       ((=ucs		    . #x4E14)	; 且
+	)
+       ((=ucs		    . #x8F9B)	; 辛
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2181,16 +2174,16 @@
     (sources		zob1968=1091 zob1968=1092)
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00155)	; &ZOB-0155;
-    ))
-(define-char
-  '((shuowen-radical	. 4)	; 三
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=ucs		    . #x842C)	; 萬
+       ((=ucs		    . #x77DB)	; 矛
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 4)	; 三
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2201,6 +2194,13 @@
       ))
     (zinbun-oracle-page . 8)
     (=zinbun-oracle	. 00156)	; &ZOB-0156;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x4E09)	; 三
+	)
+       ((=ucs		    . #x842C)	; 萬
+	))
+      ))
     ))
 (define-char
   '((shuowen-radical	. 4)	; 三
@@ -2209,15 +2209,15 @@
     ))
 (define-char
   '((shuowen-radical	. 4)	; 三
-    (<-Oracle-Bones
-     ((=ucs		  . #x6C14)	; 气
-      ))
     (sources		zob1968=0276 zob1968=0278 zob1968=0607 zob1968=0897
 			zob1968=0949 zob1968=0951 zob1968=1086 zob1968=1096
 			zob1968=1150 zob1968=1223 zob1968=1514 zob1968=1543
 			zob1968=2370)
     (zinbun-oracle-page . 9)
     (=zinbun-oracle	. 00158)	; &ZOB-0158;
+    (<-Oracle-Bones
+     ((=ucs		  . #x6C14)	; 气
+      ))
     ))
 (define-char
   '((shuowen-radical	. 4)	; 三
@@ -2231,22 +2231,15 @@
     ))
 (define-char
   '((shuowen-radical	. 5)	; 王
-    (<-Oracle-Bones
-     ((=ucs		  . #x738B)	; 王
-      ))
     (sources		zob1968=3028 zob1968=3241)
     (zinbun-oracle-page . 9)
     (=zinbun-oracle	. 00161)	; &ZOB-0161;
+    (<-Oracle-Bones
+     ((=ucs		  . #x738B)	; 王
+      ))
     ))
 (define-char
   '((shuowen-radical	. 5)	; 王
-    (<-Oracle-Bones
-     ((ideographic-combination
-       ((=ucs		    . #x738B)	; 王
-	)
-       ((=ucs		    . #x6052)	; 恒
-	))
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2258,16 +2251,16 @@
     (sources		zob1968=0715)
     (zinbun-oracle-page . 9)
     (=zinbun-oracle	. 00162)	; &ZOB-0162;
-    ))
-(define-char
-  '((shuowen-radical	. 5)	; 王
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x738B)	; 王
 	)
-       ((=ucs		    . #x65CF)	; 族
+       ((=ucs		    . #x6052)	; 恒
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 5)	; 王
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2276,8 +2269,15 @@
       )
      ((=ucs		  . #x65CF)	; 族
       ))
-    (zinbun-oracle-page . 9)
-    (=zinbun-oracle	. 00163)	; &ZOB-0163;
+    (zinbun-oracle-page . 9)
+    (=zinbun-oracle	. 00163)	; &ZOB-0163;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x738B)	; 王
+	)
+       ((=ucs		    . #x65CF)	; 族
+	))
+      ))
     ))
 (define-char
   '((shuowen-radical	. 5)	; 王
@@ -2286,13 +2286,6 @@
     ))
 (define-char
   '((shuowen-radical	. 5)	; 王
-    (<-Oracle-Bones
-     ((ideographic-combination
-       ((=ucs		    . #x738B)	; 王
-	)
-       ((=ucs		    . #x5449)	; 呉
-	))
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2303,16 +2296,16 @@
       ))
     (zinbun-oracle-page . 9)
     (=zinbun-oracle	. 00165)	; &ZOB-0165;
-    ))
-(define-char
-  '((shuowen-radical	. 5)	; 王
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x738B)	; 王
 	)
-       ((=ucs		    . #x4EA5)	; 亥
+       ((=ucs		    . #x5449)	; 呉
 	))
       ))
+    ))
+(define-char
+  '((shuowen-radical	. 5)	; 王
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2324,6 +2317,13 @@
     (sources		zob1968=0007 zob1968=0129 zob1968=0713 zob1968=0714)
     (zinbun-oracle-page . 9)
     (=zinbun-oracle	. 00166)	; &ZOB-0166;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x738B)	; 王
+	)
+       ((=ucs		    . #x4EA5)	; 亥
+	))
+      ))
     ))
 (define-char
   '((shuowen-radical	. 5)	; 王
@@ -2347,22 +2347,24 @@
     ))
 (define-char
   '((shuowen-radical	. 6)	; 玉
+    (zinbun-oracle-page . 9)
+    (=zinbun-oracle	. 00171)	; &ZOB-0171;
     (<-Oracle-Bones
      ((=ucs		  . #x7389)	; 玉
       ))
-    (zinbun-oracle-page . 9)
-    (=zinbun-oracle	. 00171)	; &ZOB-0171;
     ))
 (define-char
   '((shuowen-radical	. 6)	; 玉
+    (zinbun-oracle-page . 9)
+    (=zinbun-oracle	. 00172)	; &ZOB-0172;
     (<-Oracle-Bones
      ((=ucs		  . #x73CD)	; 珍
       ))
-    (zinbun-oracle-page . 9)
-    (=zinbun-oracle	. 00172)	; &ZOB-0172;
     ))
 (define-char
   '((shuowen-radical	. 6)	; 玉
+    (zinbun-oracle-page . 9)
+    (=zinbun-oracle	. 00173)	; &ZOB-0173;
     (<-Oracle-Bones
      ((ideographic-combination
        ((ideographic-structure
@@ -2386,14 +2388,9 @@
 	  ))
 	))
       ))
-    (zinbun-oracle-page . 9)
-    (=zinbun-oracle	. 00173)	; &ZOB-0173;
     ))
 (define-char
   '((shuowen-radical	. 6)	; 玉
-    (<-Oracle-Bones
-     ((=ucs		  . #x73AB)	; 玫
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -2404,9 +2401,22 @@
       ))
     (zinbun-oracle-page . 9)
     (=zinbun-oracle	. 00174)	; &ZOB-0174;
+    (<-Oracle-Bones
+     ((=ucs		  . #x73AB)	; 玫
+      ))
     ))
 (define-char
   '((shuowen-radical	. 6)	; 玉
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x248E9)	; 𤣩
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (zinbun-oracle-page . 9)
+    (=zinbun-oracle	. 00175)	; &ZOB-0175;
     (<-Oracle-Bones
      ((ideographic-combination
        ((ideographic-structure
@@ -2420,22 +2430,9 @@
 	  ))
 	))
       ))
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x248E9)	; 𤣩
-      )
-     ((=ucs		  . #x53C8)	; 又
-      ))
-    (zinbun-oracle-page . 9)
-    (=zinbun-oracle	. 00175)	; &ZOB-0175;
     ))
 (define-char
   '((shuowen-radical	. 7)	; 玨
-    (<-Oracle-Bones
-     ((=ucs		  . #x73A8)	; 玨
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -2447,9 +2444,22 @@
     (sources		zob1968=0775 zob1968=2894)
     (zinbun-oracle-page . 9)
     (=zinbun-oracle	. 00176)	; &ZOB-0176;
+    (<-Oracle-Bones
+     ((=ucs		  . #x73A8)	; 玨
+      ))
     ))
 (define-char
   '((shuowen-radical	. 7)	; 玨
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=zinbun-oracle	  . 00176)	; &ZOB-0176;
+      )
+     ((=ucs		  . #x53E3)	; 口
+      ))
+    (zinbun-oracle-page . 9)
+    (=zinbun-oracle	. 00177)	; &ZOB-0177;
     (<-Oracle-Bones
      ((ideographic-combination
        ((ideographic-structure
@@ -2462,16 +2472,6 @@
 	  ))
 	))
       ))
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=zinbun-oracle	  . 00176)	; &ZOB-0176;
-      )
-     ((=ucs		  . #x53E3)	; 口
-      ))
-    (zinbun-oracle-page . 9)
-    (=zinbun-oracle	. 00177)	; &ZOB-0177;
     ))
 (define-char
   '((shuowen-radical	. 7)	; 玨
@@ -2480,20 +2480,20 @@
     ))
 (define-char
   '((shuowen-radical	. 9)	; 士
+    (zinbun-oracle-page . 9)
+    (=zinbun-oracle	. 00179)	; &ZOB-0179;
     (<-Oracle-Bones
      ((=ucs		  . #x58EB)	; 士
       ))
-    (zinbun-oracle-page . 9)
-    (=zinbun-oracle	. 00179)	; &ZOB-0179;
     ))
 (define-char
   '((shuowen-radical	. 10)	; 丨
-    (<-Oracle-Bones
-     ((=ucs		  . #x4E2D)	; 中
-      ))
     (sources		zob1968=0972)
     (zinbun-oracle-page . 9)
     (=zinbun-oracle	. 00180)	; &ZOB-0180;
+    (<-Oracle-Bones
+     ((=ucs		  . #x4E2D)	; 中
+      ))
     ))
 (define-char
   '((<-denotational
@@ -2515,6 +2515,8 @@
     ))
 (define-char
   '((shuowen-radical	. 10)	; 丨
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00183)	; &ZOB-0183;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E2D)	; 中
@@ -2522,11 +2524,11 @@
        ((=ucs		    . #x793A)	; 示
 	))
       ))
-    (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00183)	; &ZOB-0183;
     ))
 (define-char
   '((shuowen-radical	. 10)	; 丨
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00184)	; &ZOB-0184;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E2D)	; 中
@@ -2534,11 +2536,12 @@
        ((=ucs		    . #x5546)	; 商
 	))
       ))
-    (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00184)	; &ZOB-0184;
     ))
 (define-char
   '((shuowen-radical	. 10)	; 丨
+    (sources		zob1968=3114)
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00185)	; &ZOB-0185;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E2D)	; 中
@@ -2546,12 +2549,11 @@
        ((=ucs		    . #x65E5)	; 日
 	))
       ))
-    (sources		zob1968=3114)
-    (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00185)	; &ZOB-0185;
     ))
 (define-char
   '((shuowen-radical	. 10)	; 丨
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00186)	; &ZOB-0186;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E2D)	; 中
@@ -2559,11 +2561,11 @@
        ((=ucs		    . #x5B97)	; 宗
 	))
       ))
-    (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00186)	; &ZOB-0186;
     ))
 (define-char
   '((shuowen-radical	. 10)	; 丨
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00187)	; &ZOB-0187;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E2D)	; 中
@@ -2571,11 +2573,11 @@
        ((=ucs		    . #x6BCD)	; 母
 	))
       ))
-    (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00187)	; &ZOB-0187;
     ))
 (define-char
   '((shuowen-radical	. 10)	; 丨
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00188)	; &ZOB-0188;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E2D)	; 中
@@ -2585,11 +2587,12 @@
        ((=ucs		    . #x5DF1)	; å·±
 	))
       ))
-    (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00188)	; &ZOB-0188;
     ))
 (define-char
   '((shuowen-radical	. 10)	; 丨
+    (sources		zob1968=3000)
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00189)	; &ZOB-0189;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E2D)	; 中
@@ -2597,9 +2600,6 @@
        ((=ucs		    . #x4E01)	; 丁
 	))
       ))
-    (sources		zob1968=3000)
-    (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00189)	; &ZOB-0189;
     ))
 (define-char
   '((<-denotational
@@ -2612,6 +2612,8 @@
     ))
 (define-char
   '((shuowen-radical	. 10)	; 丨
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00191)	; &ZOB-0191;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E2D)	; 中
@@ -2619,11 +2621,12 @@
        ((=ucs		    . #x5DF1)	; å·±
 	))
       ))
-    (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00191)	; &ZOB-0191;
     ))
 (define-char
   '((shuowen-radical	. 10)	; 丨
+    (sources		zob1968=1270 zob1968=1634 zob1968=3028)
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00192)	; &ZOB-0192;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E2D)	; 中
@@ -2631,19 +2634,16 @@
        ((=ucs		    . #x5B50)	; 子
 	))
       ))
-    (sources		zob1968=1270 zob1968=1634 zob1968=3028)
-    (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00192)	; &ZOB-0192;
     ))
 (define-char
   '((shuowen-radical	. 11)	; å±®
-    (<-Oracle-Bones
-     ((=ucs		  . #x6BCE)	; 毎
-      ))
     (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;
+    (<-Oracle-Bones
+     ((=ucs		  . #x6BCE)	; 毎
+      ))
     ))
 (define-char
   '((<-denotational
@@ -2702,6 +2702,9 @@
     ))
 (define-char
   '((shuowen-radical	. 11)	; å±®
+    (sources		zob1968=2297)
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00200)	; &ZOB-0200;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x6BCE)	; 毎
@@ -2709,58 +2712,48 @@
        ((=ucs		    . #x620A)	; 戊
 	))
       ))
-    (sources		zob1968=2297)
-    (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00200)	; &ZOB-0200;
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
-    (<-Oracle-Bones
-     ((=ucs		  . #x82BD)	; 芽
-      ))
     (sources		zob1968=1978)
     (zinbun-oracle-page . 10)
     (=zinbun-oracle	. 00201)	; &ZOB-0201;
+    (<-Oracle-Bones
+     ((=ucs		  . #x82BD)	; 芽
+      ))
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00202)	; &ZOB-0202;
     (<-Oracle-Bones
      ((=ucs		  . #x840C)	; 萌
       ))
-    (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00202)	; &ZOB-0202;
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00203)	; &ZOB-0203;
     (<-Oracle-Bones
      ((=ucs		  . #x221B6)	; 𢆶
       )
      ((=ucs		  . #x8332)	; 茲
       ))
-    (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00203)	; &ZOB-0203;
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
-    (<-Oracle-Bones
-     ((=ucs		  . #x82E5)	; 若
-      ))
     (sources		zob1968=0029 zob1968=0042 zob1968=0060 zob1968=0065
 			zob1968=0068 zob1968=0069 zob1968=0071 zob1968=0072
 			zob1968=0123 zob1968=0305 zob1968=0334 zob1968=0460
 			zob1968=0741 zob1968=0743 zob1968=0744)
     (zinbun-oracle-page . 10)
     (=zinbun-oracle	. 00204)	; &ZOB-0204;
+    (<-Oracle-Bones
+     ((=ucs		  . #x82E5)	; 若
+      ))
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
-    (<-Oracle-Bones
-     ((ideographic-combination
-       ((=ucs		    . #x82E5)	; 若
-	)
-       ((=ucs		    . #x798D)	; 禍
-	))
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2772,41 +2765,48 @@
     (sources		zob1968=0067)
     (zinbun-oracle-page . 10)
     (=zinbun-oracle	. 00205)	; &ZOB-0205;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x82E5)	; 若
+	)
+       ((=ucs		    . #x798D)	; 禍
+	))
+      ))
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00206)	; &ZOB-0206;
     (<-Oracle-Bones
      ((=ucs		  . #x82F4)	; 苴
       ))
-    (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00206)	; &ZOB-0206;
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
-    (<-Oracle-Bones
-     ((=ucs		  . #x82BB)	; 芻
-      ))
     (sources		zob1968=0289 zob1968=0424 zob1968=0737 zob1968=2369
 			zob1968=2512)
     (zinbun-oracle-page . 10)
     (=zinbun-oracle	. 00207)	; &ZOB-0207;
+    (<-Oracle-Bones
+     ((=ucs		  . #x82BB)	; 芻
+      ))
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00208)	; &ZOB-0208;
     (<-Oracle-Bones
      ((=ucs		  . #x82E3)	; 苣
       ))
-    (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00208)	; &ZOB-0208;
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
-    (<-Oracle-Bones
-     ((=ucs		  . #x84B8)	; 蒸
-      ))
     (sources		zob1968=2311)
     (zinbun-oracle-page . 11)
     (=zinbun-oracle	. 00209)	; &ZOB-0209;
+    (<-Oracle-Bones
+     ((=ucs		  . #x84B8)	; 蒸
+      ))
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
@@ -2820,19 +2820,19 @@
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
+    (zinbun-oracle-page . 11)
+    (=zinbun-oracle	. 00212)	; &ZOB-0212;
     (<-Oracle-Bones
      ((=ucs		  . #x26CCA)	; 𦳊
       ))
-    (zinbun-oracle-page . 11)
-    (=zinbun-oracle	. 00212)	; &ZOB-0212;
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
+    (zinbun-oracle-page . 11)
+    (=zinbun-oracle	. 00213)	; &ZOB-0213;
     (<-Oracle-Bones
      ((=ucs		  . #x85B6)	; 薶
       ))
-    (zinbun-oracle-page . 11)
-    (=zinbun-oracle	. 00213)	; &ZOB-0213;
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
@@ -2846,15 +2846,17 @@
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
-    (<-Oracle-Bones
-     ((=ucs		  . #x6298)	; 折
-      ))
     (sources		zob1968=3131)
     (zinbun-oracle-page . 11)
     (=zinbun-oracle	. 00216)	; &ZOB-0216;
+    (<-Oracle-Bones
+     ((=ucs		  . #x6298)	; 折
+      ))
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
+    (zinbun-oracle-page . 11)
+    (=zinbun-oracle	. 00217)	; &ZOB-0217;
     (<-Oracle-Bones
      ((ideographic-combination
        ((ideographic-structure
@@ -2869,19 +2871,19 @@
 	  ))
 	))
       ))
-    (zinbun-oracle-page . 11)
-    (=zinbun-oracle	. 00217)	; &ZOB-0217;
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
+    (zinbun-oracle-page . 11)
+    (=zinbun-oracle	. 00218)	; &ZOB-0218;
     (<-Oracle-Bones
      ((=ucs		  . #x8499)	; 蒙
       ))
-    (zinbun-oracle-page . 11)
-    (=zinbun-oracle	. 00218)	; &ZOB-0218;
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
+    (zinbun-oracle-page . 11)
+    (=zinbun-oracle	. 00219)	; &ZOB-0219;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x8499)	; 蒙
@@ -2889,26 +2891,24 @@
        ((=ucs		    . #x65B9)	; 方
 	))
       ))
-    (zinbun-oracle-page . 11)
-    (=zinbun-oracle	. 00219)	; &ZOB-0219;
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
+    (zinbun-oracle-page . 11)
+    (=zinbun-oracle	. 00220)	; &ZOB-0220;
     (<-Oracle-Bones
      ((=ucs		  . #x84BF)	; 蒿
       ))
-    (zinbun-oracle-page . 11)
-    (=zinbun-oracle	. 00220)	; &ZOB-0220;
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
-    (<-Oracle-Bones
-     ((=ucs		  . #x6625)	; 春
-      ))
     (sources		zob1968=0615 zob1968=0721 zob1968=0915 zob1968=0919
 			zob1968=1103)
     (zinbun-oracle-page . 11)
     (=zinbun-oracle	. 00221)	; &ZOB-0221;
+    (<-Oracle-Bones
+     ((=ucs		  . #x6625)	; 春
+      ))
     ))
 (define-char
   '((shuowen-radical	. 12)	; 艸
@@ -2917,14 +2917,14 @@
     ))
 (define-char
   '((shuowen-radical	. 13)	; 茻
+    (sources		zob1968=0278 zob1968=2039 zob1968=2075)
+    (zinbun-oracle-page . 11)
+    (=zinbun-oracle	. 00223)	; &ZOB-0223;
     (<-Oracle-Bones
      ((=ucs		  . #x26D9B)	; 𦶛
       )
      ((=ucs		  . #x66AE)	; 暮
       ))
-    (sources		zob1968=0278 zob1968=2039 zob1968=2075)
-    (zinbun-oracle-page . 11)
-    (=zinbun-oracle	. 00223)	; &ZOB-0223;
     ))
 (define-char
   '((shuowen-radical	. 13)	; 茻
@@ -2939,12 +2939,12 @@
     ))
 (define-char
   '((shuowen-radical	. 13)	; 茻
-    (<-Oracle-Bones
-     ((=ucs		  . #x846C)	; 葬
-      ))
     (sources		zob1968=0451)
     (zinbun-oracle-page . 11)
     (=zinbun-oracle	. 00226)	; &ZOB-0226;
+    (<-Oracle-Bones
+     ((=ucs		  . #x846C)	; 葬
+      ))
     ))
 (define-char
   '((shuowen-radical	. 13)	; 茻
diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index cbe713b..9a51977 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -107,6 +107,22 @@
    ((and (symbolp kb)
 	 (string-match "^->" (symbol-name kb)))
     t)
+   ((and (symbolp ka)
+	 (string-match "^<-" (symbol-name ka)))
+    (cond ((symbolp kb)
+	   (cond ((string-match "^<-" (symbol-name kb))
+		  (string< (symbol-name ka)
+			   (symbol-name kb))
+		  )
+                 ;; ((string-match "^->" (symbol-name kb))
+                 ;;  t)
+		 )))
+    )
+   ((and (symbolp kb)
+	 (string-match "^<-" (symbol-name kb)))
+    t
+    ;; (not (string-match "^->" (symbol-name ka)))
+    )
    ((find-charset ka)
     (if (find-charset kb)
 	(if (<= (charset-id ka) 1)
@@ -151,6 +167,7 @@
     =jis-x0208@1983
     japanese-jisx0212
     chinese-gb2312
+    =jis-x0208@1990
     chinese-cns11643-1
     chinese-cns11643-2
     chinese-cns11643-3
@@ -158,7 +175,6 @@
     chinese-cns11643-5
     chinese-cns11643-6
     chinese-cns11643-7
-    =jis-x0208@1990
     =jis-x0213-1-2000
     =jis-x0213-2-2000
     korean-ksc5601
@@ -227,6 +243,7 @@
 				       '(=daikanwa
 					 =daikanwa@rev2
 					 ;; =gt-k
+					 =jis-x0208@1997
 					 )))
 			     (setq ccs (charset-name ccs))
 			     (null (assq ccs char-spec))
@@ -422,9 +439,10 @@
 (defun char-db-insert-ccs-feature (name value line-breaking)
   (insert
    (format
-    (cond ((memq name '(=daikanwa
-			=daikanwa@rev1 =daikanwa@rev2
-			=gt =gt-k =cbeta =zinbun-oracle))
+    (cond ((or (memq name '(=daikanwa
+			    =daikanwa@rev1 =daikanwa@rev2
+			    =gt =gt-k =cbeta =zinbun-oracle))
+	       (string-match "^=adobe-" (symbol-name name)))
 	   "(%-18s . %05d)\t; %c")
 	  ((eq name 'mojikyo)
 	   "(%-18s . %06d)\t; %c")
diff --git a/lisp/utf-2000/isolated-char.el b/lisp/utf-2000/isolated-char.el
index 37209ca..e3b108b 100644
--- a/lisp/utf-2000/isolated-char.el
+++ b/lisp/utf-2000/isolated-char.el
@@ -1,24 +1,24 @@
 ;;; isolated-char.el --- Set up isolated-characters.
 
-;; Copyright (C) 2001,2002,2003 MORIOKA Tomohiko
+;; Copyright (C) 2001,2002,2003,2005 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: UTF-2000, UCS-4, character, CCS, multiscript, multilingual
 
-;; This file is part of XEmacs UTF-2000.
+;; This file is part of XEmacs CHISE.
 
-;; XEmacs UTF-2000 is free software; you can redistribute it and/or
+;; XEmacs CHISE is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
 ;; published by the Free Software Foundation; either version 2, or (at
 ;; your option) any later version.
 
-;; XEmacs UTF-2000 is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; XEmacs CHISE is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with XEmacs UTF-2000; see the file COPYING.  If not, write to
+;; along with XEmacs CHISE; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
@@ -176,7 +176,7 @@
   (insert-file-contents "../etc/char-data/GT-RS.txt")
     (goto-char (point-min))
     (let (gt-code radical strokes plane code)
-      (while (re-search-forward "\\([0-9]+\\),\\([0-9]+\\)?,\\([0-9]+\\)?,GT\\([0-9]+\\),....,\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)" nil t)
+      (while (re-search-forward "\\([0-9]+\\),\\([0-9]+\\|---\\)?,\\([0-9]+\\)?,GT\\([0-9]+\\),....,\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)" nil t)
 	(setq gt-code (string-to-int (match-string 1))
 	      plane (string-to-int (match-string 4))
 	      code (string-to-int (match-string 5) 16))
diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index 4b5a052..1725098 100644
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -54,7 +54,8 @@
 ;;                      #x5379 #x5879 #x3D5D #x3C21 #x4C60
 ;;                      #x5267 #x722F #x3C39 #x3848 #x5578
 ;;                      #x4742 #x6950 #x697C #x6A24 #x5350
-;;                      #x3326 #x5575))
+;;                      #x3326 #x5575 #x5A4B #x3647 #x343F
+;;                      #x4337 #x492D #x3F6C #x6E4D #x4F3F))
 ;;      (put-char-attribute (decode-char 'japanese-jisx0208-1990 v)
 ;;                          '=gt-pj-1 v))
 ;;    nil)
diff --git a/lisp/utf-2000/ruimoku6.el b/lisp/utf-2000/ruimoku6.el
index 8c0456d..001147e 100644
--- a/lisp/utf-2000/ruimoku6.el
+++ b/lisp/utf-2000/ruimoku6.el
@@ -38,20 +38,17 @@
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
-    (<-unknown
-     ((=ucs		  . #x215DB)	; 𡗛
-      ))
     (sources		bos=A016462-00003 bos=A016430-00004
 			bos=A016594-00007)
     (=ruimoku-v6	. #xE006)	; &RUI6-E006;
+    (<-unknown
+     ((=ucs		  . #x215DB)	; 𡗛
+      ))
     ))
 (define-char
   '((ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (<-error@abos/2001
-     ((=ruimoku-v6	  . #xE00F)	; &RUI6-E00F;
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -61,6 +58,9 @@
      ((=ucs		  . #x5369)	; 卩
       ))
     (=ruimoku-v6	. #xE007)	; &RUI6-E007;
+    (<-error@abos/2001
+     ((=ruimoku-v6	  . #xE00F)	; &RUI6-E00F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
@@ -72,13 +72,24 @@
       )
      ((=ucs		  . #x5C71)	; å±±
       )
-     ((=ucs		  . #x96A0)	; 隠
+     ((=jis-x0208	  . #x3123)	; &GT-56168; [17-03]
       ))
     (sources		bos=A015330-00006)
     (=ruimoku-v6	. #xE008)	; &RUI6-E008;
     ))
 (define-char
-  '((sources		bos=A015412-00003)
+  '((ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=jis-x0208	  . #x555F)	; &GT-08869; [53-63]
+      (=daikanwa	  . 07054)	; &I-M-07054;
+      )
+     ((=ucs		  . #x9FB6)	; 龶
+      )
+     ((=big5-cdp	  . #x8B48)	; &GT-36329;
+      ))
+    (sources		bos=A015412-00003)
     (=ruimoku-v6	. #xE009)	; &RUI6-E009;
     ))
 (define-char
@@ -87,7 +98,18 @@
     (=ucs@unicode	. #x29C2C)	; &RUI6-E00A;
     ))
 (define-char
-  '((sources		bos=A2001-16138-00013)
+  '((ideographic-radical . 69)	; ⽄
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x211A5)	; 𡆥
+      )
+     ((=ucs		  . #x65A4)	; 斤
+      ))
+    (sources		bos=A2001-16138-00013)
     (=ruimoku-v6	. #xE00B)	; &RUI6-E00B;
     ))
 (define-char
@@ -122,12 +144,12 @@
   '((ideographic-radical . 24)	; ⼗
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (<-simplified
-     ((=ucs		  . #x5C70)	; å±°
-      ))
     (sources		bos=A016219-00020)
     (=big5-cdp		. #x8B75)	; &RUI6-E00E;
     (=ruimoku-v6	. #xE00E)	; &I-RUI6-E00E;
+    (<-simplified
+     ((=ucs		  . #x5C70)	; å±°
+      ))
     ))
 (define-char
   '((ideographic-radical . 26)	; ⼙
@@ -144,3 +166,189 @@
     (sources		bos=A016728-00002)
     (=ruimoku-v6	. #xE00F)	; &RUI6-E00F;
     ))
+(define-char
+  '((ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+      (=ucs		  . #x2FFA)	; ⿺
+      )
+     ((=ucs		  . #x8FB6)	; 辶
+      )
+     ((=ruimoku-v6	  . #xE011)	; &RUI6-E011;
+      ))
+    (sources		bos=A021239-00010)
+    (=ruimoku-v6	. #xE010)	; &RUI6-E010;
+    ))
+(define-char
+  '((sources		bos=A022115-00007)
+    (=ruimoku-v6	. #xE011)	; &RUI6-E011;
+    ))
+(define-char
+  '((sources		bos=A2003-10051-00010)
+    (=ruimoku-v6	. #xE012)	; &RUI6-E012;
+    ))
+(define-char
+  '((sources		bos=A021610-00006)
+    (=ruimoku-v6	. #xE013)	; &RUI6-E013;
+    ))
+(define-char
+  '((ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ruimoku-v6	  . #xE013)	; &RUI6-E013;
+      )
+     ((=ucs		  . #x9801)	; 頁
+      ))
+    (sources		bos=A021610-00006)
+    (=ruimoku-v6	. #xE014)	; &RUI6-E014;
+    ))
+(define-char
+  '((sources		bos=A2002-21879-00012)
+    (=ruimoku-v6	. #xE015)	; &RUI6-E015;
+    ))
+(define-char
+  '((ideographic-radical . 104)	; ⽧
+    (ideographic-strokes . 16)
+    (total-strokes	 . 21)
+    (sources		bos=A2003-10051-00005)
+    (=ucs		. #x24F08)	; 𤼈
+    (=ruimoku-v6	. #xE016)	; &I-RUI6-E016;
+    ))
+(define-char
+  '((sources		bos=A021003-00010 bos=A2003-10164-00008)
+    (=ruimoku-v6	. #xE017)	; &RUI6-E017;
+    ))
+(define-char
+  '((sources		bos=A2003-10320-00001 bos=A2003-10320-00002
+			bos=A2003-10320-00004 bos=A2003-10620-00005
+			bos=A2003-10693-00007 bos=A2003-11142-00007)
+    (=ruimoku-v6	. #xE018)	; &RUI6-E018;
+    ))
+(define-char
+  '((sources		bos=A021708-00010)
+    (=ruimoku-v6	. #xE019)	; &RUI6-E019;
+    ))
+(define-char
+  '((ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=daikanwa	  . 30808)	; &M-30808;
+      ))
+    (sources		bos=A021761-00005)
+    (=ruimoku-v6	. #xE01A)	; &RUI6-E01A;
+    ))
+(define-char
+  '((ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
+      )
+     ((=daikanwa	  . 30426)	; &M-30426;
+      ))
+    (sources		bos=A021894-00009)
+    (=ruimoku-v6	. #xE01B)	; &RUI6-E01B;
+    ))
+(define-char
+  '((ideographic-radical . 37)	; ⼤
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (sources		bos=A2003-10837-00013)
+    (=ucs		. #x3694)	; 㚔
+    (=cns11643-4	. #x2571)	; &I-C4-2571; [05-81]
+    (=daikanwa		. 05884)	; &I-M-05884;
+    (=ruimoku-v6	. #xE01C)	; &I-RUI6-E01C;
+    ))
+(define-char
+  '((ideographic-radical . 169)	; ⾨
+    (ideographic-strokes . 7)
+    (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+      (=ucs		  . #x2FF5)	; ⿵
+      )
+     ((=jis-x0208	  . #x4C67)	; &GT-55423; [44-71]
+      (=ks-x1001	  . #x5A26)	; &I-K0-5A26; [58-06]
+      (=cns11643-1	  . #x4F5C)	; &I-C1-4F5C; [47-60]
+      )
+     ((=ucs		  . #x4E32)	; 串
+      ))
+    (sources		bos=A2003-10922-00012)
+    (=ruimoku-v6	. #xE01D)	; &RUI6-E01D;
+    ))
+(define-char
+  '((ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x81FC)	; 臼
+	)
+       ((=ucs		    . #x6BB3)	; 殳
+	))
+      )
+     ((=ucs		  . #x53B6)	; 厶
+      ))
+    (sources		bos=A2003-10440-00005)
+    (=ruimoku-v6	. #xE01E)	; &RUI6-E01E;
+    ))
+(define-char
+  '((ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 19)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=jis-x0208	  . #x3840)	; &GT-47348; [24-32]
+      (=ks-x1001	  . #x656B)	; &I-K0-656B; [69-75]
+      (=daikanwa	  . 35205)	; &I-M-35205;
+      )
+     ((=jis-x0212	  . #x583A)	; &CDP-8D48; [56-26]
+      (=jis-x0213-2-2000  . #x763C)	; &I-JX2-763C; [86-28]
+      (=daikanwa	  . 31164)	; &I-M-31164;
+      ))
+    (sources		bos=A2003-10165-00011 bos=A2003-00594-00003)
+    (=ruimoku-v6	. #xE01F)	; &RUI6-E01F;
+    ))
+(define-char
+  '((sources		bos=A2003-00092-00005)
+    (=ruimoku-v6	. #xE020)	; &RUI6-E020;
+    ))
+(define-char
+  '((sources		bos=A2003-00092-00012 bos=A2003-11145-00003)
+    (=ruimoku-v6	. #xE021)	; &RUI6-E021;
+    ))
+(define-char
+  '((ideographic-radical . 27)	; ⼚
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs		  . #x5382)	; 厂
+      )
+     ((=ucs		  . #x653C)	; 攼
+      ))
+    (sources		bos=A2003-10271-00006)
+    (=ruimoku-v6	. #xE022)	; &RUI6-E022;
+    ))
+(define-char
+  '((sources		bos=A2003-10525-00013)
+    (=ruimoku-v6	. #xE023)	; &RUI6-E023;
+    ))
+(define-char
+  '((sources		bos=A2004-30015-00022)
+    (=ruimoku-v6	. #xE024)	; &RUI6-E024;
+    ))
diff --git a/lisp/utf-2000/u000A0-Latin-1-Supplement.el b/lisp/utf-2000/u000A0-Latin-1-Supplement.el
index 2e45748..78775e3 100755
--- a/lisp/utf-2000/u000A0-Latin-1-Supplement.el
+++ b/lisp/utf-2000/u000A0-Latin-1-Supplement.el
@@ -4,10 +4,6 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "CS")
     (mirrored		. nil)
-    (<-noBreak
-     ((name		  . "SPACE")
-      (=ucs		  . #x0020)	;
-      ))
     (=ucs		. #x00A0)	;  
     (latin-iso8859-1	. #xA0)	; &I-LATIN1-20;
     (latin-iso8859-2	. #xA0)	; &I-LATIN2-20;
@@ -18,18 +14,22 @@
     (cyrillic-iso8859-5 . #xA0)	; &I-CYRILLIC-20;
     (latin-iso8859-9	. #xA0)	; &I-LATIN5-20;
     (latin-tcvn5712	. #xA0)	; &I-VSCII2-20;
+    (<-noBreak
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      ))
     ))
 (define-char
   '((<-denotational
      ((name		  . "NO-BREAK SPACE")
       (=ucs		  . #x00A0)	;  
       ))
+    (=jis-x0213-1-2000	. #x2922)	; &JX1-2922; [09-02]
+    (=ucs@jis/fw	. #x00A0)	; &JX1-2922;
     (<-fullwidth
      ((name		  . "NO-BREAK SPACE")
       (=ucs		  . #x00A0)	;  
       ))
-    (=jis-x0213-1-2000	. #x2922)	; &JX1-2922; [09-02]
-    (=ucs@jis/fw	. #x00A0)	; &JX1-2922;
     ))
 (define-char
   '((name		. "INVERTED EXCLAMATION MARK")
@@ -45,14 +45,14 @@
      ((name		  . "INVERTED EXCLAMATION MARK")
       (=ucs		  . #x00A1)	; ¡
       ))
-    (<-fullwidth
-     ((name		  . "INVERTED EXCLAMATION MARK")
-      (=ucs		  . #x00A1)	; ¡
-      ))
     (=ks-x1001		. #x222E)	; &JX1-2923; [02-14]
     (=jis-x0212		. #x2242)	; &I-JSP-2242; [02-34]
     (=jis-x0213-1-2000	. #x2923)	; &I-JX1-2923; [09-03]
     (=ucs@jis/fw	. #x00A1)	; &JX1-2923;
+    (<-fullwidth
+     ((name		  . "INVERTED EXCLAMATION MARK")
+      (=ucs		  . #x00A1)	; ¡
+      ))
     ))
 (define-char
   '((name		. "CENT SIGN")
@@ -102,16 +102,16 @@
      ((name		  . "CURRENCY SIGN")
       (=ucs		  . #x00A4)	; ¤
       ))
-    (<-fullwidth
-     ((name		  . "CURRENCY SIGN")
-      (=ucs		  . #x00A4)	; ¤
-      ))
     (=gb2312		. #x2168)	; &JX1-2924; [01-72]
     (=ks-x1001		. #x2234)	; &I-K0-2234; [02-20]
     (=jis-x0212		. #x2270)	; &I-JSP-2270; [02-80]
     (=jis-x0213-1-2000	. #x2924)	; &I-JX1-2924; [09-04]
     (=ucs@gb		. #x00A4)	; &JX1-2924;
     (=ucs@jis		. #x00A4)	; &JX1-2924;
+    (<-fullwidth
+     ((name		  . "CURRENCY SIGN")
+      (=ucs		  . #x00A4)	; ¤
+      ))
     ))
 (define-char
   '((name		. "YEN SIGN")
@@ -163,10 +163,6 @@
      ((name		  . "SECTION SIGN")
       (=ucs		  . #x00A7)	; §
       ))
-    (<-fullwidth
-     ((name		  . "SECTION SIGN")
-      (=ucs		  . #x00A7)	; §
-      ))
     (=jis-x0208		. #x2178)	; &J90-2178; [01-88]
     (=gb2312		. #x216C)	; &I-G0-216C; [01-76]
     (=ks-x1001		. #x2157)	; &I-K0-2157; [01-55]
@@ -174,6 +170,10 @@
     (=big5		. #xA1B1)	; &I-B-A1B1;
     (=ucs@gb		. #x00A7)	; &J90-2178;
     (=ucs@jis		. #x00A7)	; &J90-2178;
+    (<-fullwidth
+     ((name		  . "SECTION SIGN")
+      (=ucs		  . #x00A7)	; §
+      ))
     ))
 (define-char
   '((name		. "DIAERESIS")
@@ -201,10 +201,6 @@
      ((name		  . "DIAERESIS")
       (=ucs		  . #x00A8)	; ¨
       ))
-    (<-fullwidth
-     ((name		  . "DIAERESIS")
-      (=ucs		  . #x00A8)	; ¨
-      ))
     (=jis-x0208		. #x212F)	; &J90-212F; [01-15]
     (=gb2312		. #x2127)	; &I-G0-2127; [01-07]
     (=ks-x1001		. #x2127)	; &I-K0-2127; [01-07]
@@ -212,6 +208,10 @@
     (=jef-china3	. #x81AA)	; &I-JC3-81AA;
     (=ucs@gb		. #x00A8)	; &J90-212F;
     (=ucs@jis		. #x00A8)	; &J90-212F;
+    (<-fullwidth
+     ((name		  . "DIAERESIS")
+      (=ucs		  . #x00A8)	; ¨
+      ))
     ))
 (define-char
   '((name		. "COPYRIGHT SIGN")
@@ -229,40 +229,40 @@
      ((name		  . "COPYRIGHT SIGN")
       (=ucs		  . #x00A9)	; ©
       ))
+    (=jis-x0212		. #x226D)	; &JX1-2926; [02-77]
+    (=jis-x0213-1-2000	. #x2926)	; &I-JX1-2926; [09-06]
+    (=ucs@jis		. #x00A9)	; &JX1-2926;
     (<-fullwidth
      ((name		  . "COPYRIGHT SIGN")
       (=ucs		  . #x00A9)	; ©
       ))
-    (=jis-x0212		. #x226D)	; &JX1-2926; [02-77]
-    (=jis-x0213-1-2000	. #x2926)	; &I-JX1-2926; [09-06]
-    (=ucs@jis		. #x00A9)	; &JX1-2926;
     ))
 (define-char
   '((name		. "FEMININE ORDINAL INDICATOR")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x00AA)	; ª
+    (latin-iso8859-1	. #xAA)	; &I-LATIN1-2A;
+    (latin-iso8859-9	. #xAA)	; &I-LATIN5-2A;
     (<-superscript
      ((name		  . "LATIN SMALL LETTER A")
       (=ucs		  . #x0061)	; a
       ))
-    (=ucs		. #x00AA)	; ª
-    (latin-iso8859-1	. #xAA)	; &I-LATIN1-2A;
-    (latin-iso8859-9	. #xAA)	; &I-LATIN5-2A;
     ))
 (define-char
   '((<-denotational
      ((name		  . "FEMININE ORDINAL INDICATOR")
       (=ucs		  . #x00AA)	; ª
       ))
-    (<-fullwidth
-     ((name		  . "FEMININE ORDINAL INDICATOR")
-      (=ucs		  . #x00AA)	; ª
-      ))
     (=ks-x1001		. #x2823)	; &JX1-2927; [08-03]
     (=jis-x0212		. #x226C)	; &I-JSP-226C; [02-76]
     (=jis-x0213-1-2000	. #x2927)	; &I-JX1-2927; [09-07]
     (=ucs@jis/fw	. #x00AA)	; &JX1-2927;
+    (<-fullwidth
+     ((name		  . "FEMININE ORDINAL INDICATOR")
+      (=ucs		  . #x00AA)	; ª
+      ))
     ))
 (define-char
   '((name		. "LEFT-POINTING DOUBLE ANGLE QUOTATION MARK")
@@ -281,12 +281,12 @@
      ((name		  . "LEFT-POINTING DOUBLE ANGLE QUOTATION MARK")
       (=ucs		  . #x00AB)	; «
       ))
+    (=jis-x0213-1-2000	. #x2928)	; &JX1-2928; [09-08]
+    (=ucs@jis/fw	. #x00AB)	; &JX1-2928;
     (<-fullwidth
      ((name		  . "LEFT-POINTING DOUBLE ANGLE QUOTATION MARK")
       (=ucs		  . #x00AB)	; «
       ))
-    (=jis-x0213-1-2000	. #x2928)	; &JX1-2928; [09-08]
-    (=ucs@jis/fw	. #x00AB)	; &JX1-2928;
     ))
 (define-char
   '((name		. "NOT SIGN")
@@ -323,13 +323,13 @@
      ((name		  . "SOFT HYPHEN")
       (=ucs		  . #x00AD)	; ­
       ))
+    (=ks-x1001		. #x2129)	; &JX1-2929; [01-09]
+    (=jis-x0213-1-2000	. #x2929)	; &I-JX1-2929; [09-09]
+    (=ucs@jis/fw	. #x00AD)	; &JX1-2929;
     (<-fullwidth
      ((name		  . "SOFT HYPHEN")
       (=ucs		  . #x00AD)	; ­
       ))
-    (=ks-x1001		. #x2129)	; &JX1-2929; [01-09]
-    (=jis-x0213-1-2000	. #x2929)	; &I-JX1-2929; [09-09]
-    (=ucs@jis/fw	. #x00AD)	; &JX1-2929;
     ))
 (define-char
   '((name		. "REGISTERED SIGN")
@@ -346,14 +346,14 @@
      ((name		  . "REGISTERED SIGN")
       (=ucs		  . #x00AE)	; ®
       ))
-    (<-fullwidth
-     ((name		  . "REGISTERED SIGN")
-      (=ucs		  . #x00AE)	; ®
-      ))
     (=jis-x0212		. #x226E)	; &JX1-292A; [02-78]
     (=jis-x0213-1-2000	. #x292A)	; &I-JX1-292A; [09-10]
     (=jef-china3	. #x81A1)	; &I-JC3-81A1;
     (=ucs@jis		. #x00AE)	; &JX1-292A;
+    (<-fullwidth
+     ((name		  . "REGISTERED SIGN")
+      (=ucs		  . #x00AE)	; ®
+      ))
     ))
 (define-char
   '((name		. "MACRON")
@@ -395,10 +395,6 @@
      ((name		  . "DEGREE SIGN")
       (=ucs		  . #x00B0)	; °
       ))
-    (<-fullwidth
-     ((name		  . "DEGREE SIGN")
-      (=ucs		  . #x00B0)	; °
-      ))
     (=jis-x0208		. #x216B)	; &J90-216B; [01-75]
     (=gb2312		. #x2163)	; &I-G0-2163; [01-67]
     (=ks-x1001		. #x2146)	; &I-K0-2146; [01-38]
@@ -406,6 +402,10 @@
     (=big5		. #xA258)	; &I-B-A258;
     (=ucs@gb		. #x00B0)	; &J90-216B;
     (=ucs@jis		. #x00B0)	; &J90-216B;
+    (<-fullwidth
+     ((name		  . "DEGREE SIGN")
+      (=ucs		  . #x00B0)	; °
+      ))
     ))
 (define-char
   '((name		. "PLUS-MINUS SIGN")
@@ -423,10 +423,6 @@
      ((name		  . "PLUS-MINUS SIGN")
       (=ucs		  . #x00B1)	; ±
       ))
-    (<-fullwidth
-     ((name		  . "PLUS-MINUS SIGN")
-      (=ucs		  . #x00B1)	; ±
-      ))
     (=jis-x0208		. #x215E)	; &J90-215E; [01-62]
     (=gb2312		. #x2140)	; &I-G0-2140; [01-32]
     (=ks-x1001		. #x213E)	; &I-K0-213E; [01-30]
@@ -434,6 +430,10 @@
     (=big5		. #xA1D3)	; &I-B-A1D3;
     (=ucs@gb		. #x00B1)	; &J90-215E;
     (=ucs@jis		. #x00B1)	; &J90-215E;
+    (<-fullwidth
+     ((name		  . "PLUS-MINUS SIGN")
+      (=ucs		  . #x00B1)	; ±
+      ))
     ))
 (define-char
   '((name		. "SUPERSCRIPT TWO")
@@ -443,29 +443,29 @@
     (decimal-digit-value . 2)
     (digit-value	 . 2)
     (numeric-value	 . 2)
-    (<-superscript
-     ((name		  . "DIGIT TWO")
-      (=ucs		  . #x0032)	; 2
-      ))
     (=ucs		. #x00B2)	; ²
     (latin-iso8859-1	. #xB2)	; &I-LATIN1-32;
     (latin-iso8859-3	. #xB2)	; &I-LATIN3-32;
     (greek-iso8859-7	. #xB2)	; &I-GREEK-32;
     (hebrew-iso8859-8	. #xB2)	; &I-HEBREW-32;
     (latin-iso8859-9	. #xB2)	; &I-LATIN5-32;
+    (<-superscript
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      ))
     ))
 (define-char
   '((<-denotational
      ((name		  . "SUPERSCRIPT TWO")
       (=ucs		  . #x00B2)	; ²
       ))
+    (=ks-x1001		. #x2977)	; &JX1-292C; [09-87]
+    (=jis-x0213-1-2000	. #x292C)	; &I-JX1-292C; [09-12]
+    (=ucs@jis/fw	. #x00B2)	; &JX1-292C;
     (<-fullwidth
      ((name		  . "SUPERSCRIPT TWO")
       (=ucs		  . #x00B2)	; ²
       ))
-    (=ks-x1001		. #x2977)	; &JX1-292C; [09-87]
-    (=jis-x0213-1-2000	. #x292C)	; &I-JX1-292C; [09-12]
-    (=ucs@jis/fw	. #x00B2)	; &JX1-292C;
     ))
 (define-char
   '((name		. "SUPERSCRIPT THREE")
@@ -475,29 +475,29 @@
     (decimal-digit-value . 3)
     (digit-value	 . 3)
     (numeric-value	 . 3)
-    (<-superscript
-     ((name		  . "DIGIT THREE")
-      (=ucs		  . #x0033)	; 3
-      ))
     (=ucs		. #x00B3)	; ³
     (latin-iso8859-1	. #xB3)	; &I-LATIN1-33;
     (latin-iso8859-3	. #xB3)	; &I-LATIN3-33;
     (greek-iso8859-7	. #xB3)	; &I-GREEK-33;
     (hebrew-iso8859-8	. #xB3)	; &I-HEBREW-33;
     (latin-iso8859-9	. #xB3)	; &I-LATIN5-33;
+    (<-superscript
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      ))
     ))
 (define-char
   '((<-denotational
      ((name		  . "SUPERSCRIPT THREE")
       (=ucs		  . #x00B3)	; ³
       ))
+    (=ks-x1001		. #x2978)	; &JX1-292D; [09-88]
+    (=jis-x0213-1-2000	. #x292D)	; &I-JX1-292D; [09-13]
+    (=ucs@jis/fw	. #x00B3)	; &JX1-292D;
     (<-fullwidth
      ((name		  . "SUPERSCRIPT THREE")
       (=ucs		  . #x00B3)	; ³
       ))
-    (=ks-x1001		. #x2978)	; &JX1-292D; [09-88]
-    (=jis-x0213-1-2000	. #x292D)	; &I-JX1-292D; [09-13]
-    (=ucs@jis/fw	. #x00B3)	; &JX1-292D;
     ))
 (define-char
   '((name		. "ACUTE ACCENT")
@@ -524,29 +524,29 @@
      ((name		  . "ACUTE ACCENT")
       (=ucs		  . #x00B4)	; ´
       ))
-    (<-fullwidth
-     ((name		  . "ACUTE ACCENT")
-      (=ucs		  . #x00B4)	; ´
-      ))
     (=jis-x0208		. #x212D)	; &J90-212D; [01-13]
     (=ks-x1001		. #x2225)	; &I-K0-2225; [02-05]
     (=jef-china3	. #x81A4)	; &I-JC3-81A4;
     (=ucs@jis		. #x00B4)	; &J90-212D;
+    (<-fullwidth
+     ((name		  . "ACUTE ACCENT")
+      (=ucs		  . #x00B4)	; ´
+      ))
     ))
 (define-char
   '((name		. "MICRO SIGN")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-compat/unit
-     ((name		  . "GREEK SMALL LETTER MU")
-      (=ucs		  . #x03BC)	; μ
-      ))
     (=ucs		. #x00B5)	; µ
     (latin-iso8859-1	. #xB5)	; &I-LATIN1-35;
     (latin-iso8859-3	. #xB5)	; &I-LATIN3-35;
     (hebrew-iso8859-8	. #xB5)	; &I-HEBREW-35;
     (latin-iso8859-9	. #xB5)	; &I-LATIN5-35;
+    (<-compat/unit
+     ((name		  . "GREEK SMALL LETTER MU")
+      (=ucs		  . #x03BC)	; μ
+      ))
     ))
 (define-char
   '((name		. "PILCROW SIGN")
@@ -563,14 +563,14 @@
      ((name		  . "PILCROW SIGN")
       (=ucs		  . #x00B6)	; ¶
       ))
-    (<-fullwidth
-     ((name		  . "PILCROW SIGN")
-      (=ucs		  . #x00B6)	; ¶
-      ))
     (=jis-x0208@1983	. #x2279)	; &J90-2279; [02-89]
     (=ks-x1001		. #x2252)	; &I-K0-2252; [02-50]
     (=jis-x0208@1990	. #x2279)	; &I-J90-2279; [02-89]
     (=ucs@jis		. #x00B6)	; &J90-2279;
+    (<-fullwidth
+     ((name		  . "PILCROW SIGN")
+      (=ucs		  . #x00B6)	; ¶
+      ))
     ))
 (define-char
   '((name		. "MIDDLE DOT")
@@ -589,15 +589,15 @@
      ((name		  . "MIDDLE DOT")
       (=ucs		  . #x00B7)	; ·
       ))
-    (<-fullwidth
-     ((name		  . "MIDDLE DOT")
-      (=ucs		  . #x00B7)	; ·
-      ))
     (=ks-x1001		. #x2124)	; &JX1-292E; [01-04]
     (=cns11643-1	. #x2131)	; &I-C1-2131; [01-17]
     (=jis-x0213-1-2000	. #x292E)	; &I-JX1-292E; [09-14]
     (=big5		. #xA150)	; &I-B-A150;
     (=ucs@jis/fw	. #x00B7)	; &JX1-292E;
+    (<-fullwidth
+     ((name		  . "MIDDLE DOT")
+      (=ucs		  . #x00B7)	; ·
+      ))
     ))
 (define-char
   '((name		. "CEDILLA")
@@ -624,15 +624,15 @@
      ((name		  . "CEDILLA")
       (=ucs		  . #x00B8)	; ¸
       ))
-    (<-fullwidth
-     ((name		  . "CEDILLA")
-      (=ucs		  . #x00B8)	; ¸
-      ))
     (=ks-x1001		. #x222C)	; &JX1-292F; [02-12]
     (=jis-x0212		. #x2231)	; &I-JSP-2231; [02-17]
     (=jis-x0213-1-2000	. #x292F)	; &I-JX1-292F; [09-15]
     (=jef-china3	. #x81B2)	; &I-JC3-81B2;
     (=ucs@jis/fw	. #x00B8)	; &JX1-292F;
+    (<-fullwidth
+     ((name		  . "CEDILLA")
+      (=ucs		  . #x00B8)	; ¸
+      ))
     ))
 (define-char
   '((name		. "SUPERSCRIPT ONE")
@@ -642,54 +642,54 @@
     (decimal-digit-value . 1)
     (digit-value	 . 1)
     (numeric-value	 . 1)
-    (<-superscript
-     ((name		  . "DIGIT ONE")
-      (=ucs		  . #x0031)	; 1
-      ))
     (=ucs		. #x00B9)	; ¹
     (latin-iso8859-1	. #xB9)	; &I-LATIN1-39;
     (hebrew-iso8859-8	. #xB9)	; &I-HEBREW-39;
     (latin-iso8859-9	. #xB9)	; &I-LATIN5-39;
+    (<-superscript
+     ((name		  . "DIGIT ONE")
+      (=ucs		  . #x0031)	; 1
+      ))
     ))
 (define-char
   '((<-denotational
      ((name		  . "SUPERSCRIPT ONE")
       (=ucs		  . #x00B9)	; ¹
       ))
+    (=ks-x1001		. #x2976)	; &JX1-2930; [09-86]
+    (=jis-x0213-1-2000	. #x2930)	; &I-JX1-2930; [09-16]
+    (=ucs@jis/fw	. #x00B9)	; &JX1-2930;
     (<-fullwidth
      ((name		  . "SUPERSCRIPT ONE")
       (=ucs		  . #x00B9)	; ¹
       ))
-    (=ks-x1001		. #x2976)	; &JX1-2930; [09-86]
-    (=jis-x0213-1-2000	. #x2930)	; &I-JX1-2930; [09-16]
-    (=ucs@jis/fw	. #x00B9)	; &JX1-2930;
     ))
 (define-char
   '((name		. "MASCULINE ORDINAL INDICATOR")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x00BA)	; º
+    (latin-iso8859-1	. #xBA)	; &I-LATIN1-3A;
+    (latin-iso8859-9	. #xBA)	; &I-LATIN5-3A;
     (<-superscript
      ((name		  . "LATIN SMALL LETTER O")
       (=ucs		  . #x006F)	; o
       ))
-    (=ucs		. #x00BA)	; º
-    (latin-iso8859-1	. #xBA)	; &I-LATIN1-3A;
-    (latin-iso8859-9	. #xBA)	; &I-LATIN5-3A;
     ))
 (define-char
   '((<-denotational
      ((name		  . "MASCULINE ORDINAL INDICATOR")
       (=ucs		  . #x00BA)	; º
       ))
-    (<-fullwidth
-     ((name		  . "MASCULINE ORDINAL INDICATOR")
-      (=ucs		  . #x00BA)	; º
-      ))
     (=ks-x1001		. #x282C)	; &JX1-2931; [08-12]
     (=jis-x0212		. #x226B)	; &I-JSP-226B; [02-75]
     (=jis-x0213-1-2000	. #x2931)	; &I-JX1-2931; [09-17]
     (=ucs@jis/fw	. #x00BA)	; &JX1-2931;
+    (<-fullwidth
+     ((name		  . "MASCULINE ORDINAL INDICATOR")
+      (=ucs		  . #x00BA)	; º
+      ))
     ))
 (define-char
   '((name		. "RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK")
@@ -708,12 +708,12 @@
      ((name		  . "RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK")
       (=ucs		  . #x00BB)	; »
       ))
+    (=jis-x0213-1-2000	. #x2932)	; &JX1-2932; [09-18]
+    (=ucs@jis/fw	. #x00BB)	; &JX1-2932;
     (<-fullwidth
      ((name		  . "RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK")
       (=ucs		  . #x00BB)	; »
       ))
-    (=jis-x0213-1-2000	. #x2932)	; &JX1-2932; [09-18]
-    (=ucs@jis/fw	. #x00BB)	; &JX1-2932;
     ))
 (define-char
   '((name		. "VULGAR FRACTION ONE QUARTER")
@@ -741,13 +741,13 @@
      ((name		  . "VULGAR FRACTION ONE QUARTER")
       (=ucs		  . #x00BC)	; ¼
       ))
+    (=ks-x1001		. #x2879)	; &JX1-2933; [08-89]
+    (=jis-x0213-1-2000	. #x2933)	; &I-JX1-2933; [09-19]
+    (=ucs@jis		. #x00BC)	; &JX1-2933;
     (<-fullwidth
      ((name		  . "VULGAR FRACTION ONE QUARTER")
       (=ucs		  . #x00BC)	; ¼
       ))
-    (=ks-x1001		. #x2879)	; &JX1-2933; [08-89]
-    (=jis-x0213-1-2000	. #x2933)	; &I-JX1-2933; [09-19]
-    (=ucs@jis		. #x00BC)	; &JX1-2933;
     ))
 (define-char
   '((name		. "VULGAR FRACTION ONE HALF")
@@ -777,13 +777,13 @@
      ((name		  . "VULGAR FRACTION ONE HALF")
       (=ucs		  . #x00BD)	; ½
       ))
+    (=ks-x1001		. #x2876)	; &JX1-2934; [08-86]
+    (=jis-x0213-1-2000	. #x2934)	; &I-JX1-2934; [09-20]
+    (=ucs@jis		. #x00BD)	; &JX1-2934;
     (<-fullwidth
      ((name		  . "VULGAR FRACTION ONE HALF")
       (=ucs		  . #x00BD)	; ½
       ))
-    (=ks-x1001		. #x2876)	; &JX1-2934; [08-86]
-    (=jis-x0213-1-2000	. #x2934)	; &I-JX1-2934; [09-20]
-    (=ucs@jis		. #x00BD)	; &JX1-2934;
     ))
 (define-char
   '((name		. "VULGAR FRACTION THREE QUARTERS")
@@ -811,13 +811,13 @@
      ((name		  . "VULGAR FRACTION THREE QUARTERS")
       (=ucs		  . #x00BE)	; ¾
       ))
+    (=ks-x1001		. #x287A)	; &JX1-2935; [08-90]
+    (=jis-x0213-1-2000	. #x2935)	; &I-JX1-2935; [09-21]
+    (=ucs@jis		. #x00BE)	; &JX1-2935;
     (<-fullwidth
      ((name		  . "VULGAR FRACTION THREE QUARTERS")
       (=ucs		  . #x00BE)	; ¾
       ))
-    (=ks-x1001		. #x287A)	; &JX1-2935; [08-90]
-    (=jis-x0213-1-2000	. #x2935)	; &I-JX1-2935; [09-21]
-    (=ucs@jis		. #x00BE)	; &JX1-2935;
     ))
 (define-char
   '((name		. "INVERTED QUESTION MARK")
@@ -833,14 +833,14 @@
      ((name		  . "INVERTED QUESTION MARK")
       (=ucs		  . #x00BF)	; ¿
       ))
-    (<-fullwidth
-     ((name		  . "INVERTED QUESTION MARK")
-      (=ucs		  . #x00BF)	; ¿
-      ))
     (=ks-x1001		. #x222F)	; &JX1-2936; [02-15]
     (=jis-x0212		. #x2244)	; &I-JSP-2244; [02-36]
     (=jis-x0213-1-2000	. #x2936)	; &I-JX1-2936; [09-22]
     (=ucs@jis/fw	. #x00BF)	; &JX1-2936;
+    (<-fullwidth
+     ((name		  . "INVERTED QUESTION MARK")
+      (=ucs		  . #x00BF)	; ¿
+      ))
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER A WITH GRAVE")
@@ -870,10 +870,6 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH GRAVE")
       (=ucs		  . #x00C0)	; À
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER A WITH GRAVE")
-      (=ucs		  . #x00C0)	; À
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER A")
       (=ucs		  . #xFF21)	; Ａ
@@ -885,6 +881,10 @@
     (=jis-x0213-1-2000	. #x2937)	; &I-JX1-2937; [09-23]
     (=jef-china3	. #x85B9)	; &I-JC3-85B9;
     (=ucs@jis/fw	. #x00C0)	; &JX1-2937;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER A WITH GRAVE")
+      (=ucs		  . #x00C0)	; À
+      ))
     (->lowercase
      ((=gb2312		  . #x2824)	; &JX1-2956; [08-04]
       (=jis-x0212	  . #x2B22)	; &I-JSP-2B22; [11-02]
@@ -921,10 +921,6 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH ACUTE")
       (=ucs		  . #x00C1)	; Á
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER A WITH ACUTE")
-      (=ucs		  . #x00C1)	; Á
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER A")
       (=ucs		  . #xFF21)	; Ａ
@@ -936,6 +932,10 @@
     (=jis-x0213-1-2000	. #x2938)	; &I-JX1-2938; [09-24]
     (=jef-china3	. #x85D5)	; &I-JC3-85D5;
     (=ucs@jis/fw	. #x00C1)	; &JX1-2938;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER A WITH ACUTE")
+      (=ucs		  . #x00C1)	; Á
+      ))
     (->lowercase
      ((=gb2312		  . #x2822)	; &JX1-2957; [08-02]
       (=jis-x0212	  . #x2B21)	; &I-JSP-2B21; [11-01]
@@ -973,10 +973,6 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX")
       (=ucs		  . #x00C2)	; Â
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX")
-      (=ucs		  . #x00C2)	; Â
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER A")
       (=ucs		  . #xFF21)	; Ａ
@@ -988,6 +984,10 @@
     (=jis-x0213-1-2000	. #x2939)	; &I-JX1-2939; [09-25]
     (=jef-china3	. #x86B7)	; &I-JC3-86B7;
     (=ucs@jis/fw	. #x00C2)	; &JX1-2939;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX")
+      (=ucs		  . #x00C2)	; Â
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B24)	; &JX1-2958; [11-04]
       (=jis-x0213-1-2000  . #x2958)	; &I-JX1-2958; [09-56]
@@ -1021,10 +1021,6 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH TILDE")
       (=ucs		  . #x00C3)	; Ã
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER A WITH TILDE")
-      (=ucs		  . #x00C3)	; Ã
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER A")
       (=ucs		  . #xFF21)	; Ａ
@@ -1036,6 +1032,10 @@
     (=jis-x0213-1-2000	. #x293A)	; &I-JX1-293A; [09-26]
     (=jef-china3	. #x86E2)	; &I-JC3-86E2;
     (=ucs@jis/fw	. #x00C3)	; &JX1-293A;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER A WITH TILDE")
+      (=ucs		  . #x00C3)	; Ã
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B2A)	; &JX1-2959; [11-10]
       (=jis-x0213-1-2000  . #x2959)	; &I-JX1-2959; [09-57]
@@ -1069,10 +1069,6 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH DIAERESIS")
       (=ucs		  . #x00C4)	; Ä
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER A WITH DIAERESIS")
-      (=ucs		  . #x00C4)	; Ä
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER A")
       (=ucs		  . #xFF21)	; Ａ
@@ -1084,6 +1080,10 @@
     (=jis-x0213-1-2000	. #x293B)	; &I-JX1-293B; [09-27]
     (=jef-china3	. #x88C5)	; &I-JC3-88C5;
     (=ucs@jis/fw	. #x00C4)	; &JX1-293B;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER A WITH DIAERESIS")
+      (=ucs		  . #x00C4)	; Ä
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B23)	; &JX1-295A; [11-03]
       (=jis-x0213-1-2000  . #x295A)	; &I-JX1-295A; [09-58]
@@ -1115,10 +1115,6 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH RING ABOVE")
       (=ucs		  . #x00C5)	; Å
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER A WITH RING ABOVE")
-      (=ucs		  . #x00C5)	; Å
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER A")
       (=ucs		  . #xFF21)	; Ａ
@@ -1130,6 +1126,10 @@
     (=jis-x0213-1-2000	. #x293C)	; &I-JX1-293C; [09-28]
     (=jef-china3	. #x88FD)	; &I-JC3-88FD;
     (=ucs@jis/fw	. #x00C5)	; &JX1-293C;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER A WITH RING ABOVE")
+      (=ucs		  . #x00C5)	; Å
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B29)	; &JX1-295B; [11-09]
       (=jis-x0213-1-2000  . #x295B)	; &I-JX1-295B; [09-59]
@@ -1155,15 +1155,15 @@
      ((name		  . "LATIN CAPITAL LETTER AE")
       (=ucs		  . #x00C6)	; Æ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER AE")
-      (=ucs		  . #x00C6)	; Æ
-      ))
     (=ks-x1001		. #x2821)	; &JX1-293D; [08-01]
     (=jis-x0212		. #x2921)	; &I-JSP-2921; [09-01]
     (=jis-x0213-1-2000	. #x293D)	; &I-JX1-293D; [09-29]
     (=jef-china3	. #x83A5)	; &I-JC3-83A5;
     (=ucs@jis/fw	. #x00C6)	; &JX1-293D;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER AE")
+      (=ucs		  . #x00C6)	; Æ
+      ))
     (->lowercase
      ((=ks-x1001	  . #x2921)	; &JX1-295C; [09-01]
       (=jis-x0212	  . #x2941)	; &I-JSP-2941; [09-33]
@@ -1197,10 +1197,6 @@
      ((name		  . "LATIN CAPITAL LETTER C WITH CEDILLA")
       (=ucs		  . #x00C7)	; Ç
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER C WITH CEDILLA")
-      (=ucs		  . #x00C7)	; Ç
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER C")
       (=ucs		  . #xFF23)	; ï¼£
@@ -1212,6 +1208,10 @@
     (=jis-x0213-1-2000	. #x293E)	; &I-JX1-293E; [09-30]
     (=jef-china3	. #x89F5)	; &I-JC3-89F5;
     (=ucs@jis/fw	. #x00C7)	; &JX1-293E;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER C WITH CEDILLA")
+      (=ucs		  . #x00C7)	; Ç
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B2E)	; &JX1-295D; [11-14]
       (=jis-x0213-1-2000  . #x295D)	; &I-JX1-295D; [09-61]
@@ -1245,10 +1245,6 @@
      ((name		  . "LATIN CAPITAL LETTER E WITH GRAVE")
       (=ucs		  . #x00C8)	; È
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER E WITH GRAVE")
-      (=ucs		  . #x00C8)	; È
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER E")
       (=ucs		  . #xFF25)	; ï¼¥
@@ -1260,6 +1256,10 @@
     (=jis-x0213-1-2000	. #x293F)	; &I-JX1-293F; [09-31]
     (=jef-china3	. #x85BA)	; &I-JC3-85BA;
     (=ucs@jis/fw	. #x00C8)	; &JX1-293F;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER E WITH GRAVE")
+      (=ucs		  . #x00C8)	; È
+      ))
     (->lowercase
      ((=gb2312		  . #x2828)	; &JX1-295E; [08-08]
       (=jis-x0212	  . #x2B32)	; &I-JSP-2B32; [11-18]
@@ -1296,10 +1296,6 @@
      ((name		  . "LATIN CAPITAL LETTER E WITH ACUTE")
       (=ucs		  . #x00C9)	; É
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER E WITH ACUTE")
-      (=ucs		  . #x00C9)	; É
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER E")
       (=ucs		  . #xFF25)	; ï¼¥
@@ -1311,6 +1307,10 @@
     (=jis-x0213-1-2000	. #x2940)	; &I-JX1-2940; [09-32]
     (=jef-china3	. #x85D8)	; &I-JC3-85D8;
     (=ucs@jis/fw	. #x00C9)	; &JX1-2940;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER E WITH ACUTE")
+      (=ucs		  . #x00C9)	; É
+      ))
     (->lowercase
      ((=gb2312		  . #x2826)	; &JX1-295F; [08-06]
       (=jis-x0212	  . #x2B31)	; &I-JSP-2B31; [11-17]
@@ -1346,10 +1346,6 @@
      ((name		  . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX")
       (=ucs		  . #x00CA)	; Ê
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX")
-      (=ucs		  . #x00CA)	; Ê
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER E")
       (=ucs		  . #xFF25)	; ï¼¥
@@ -1361,6 +1357,10 @@
     (=jis-x0213-1-2000	. #x2941)	; &I-JX1-2941; [09-33]
     (=jef-china3	. #x86B9)	; &I-JC3-86B9;
     (=ucs@jis/fw	. #x00CA)	; &JX1-2941;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX")
+      (=ucs		  . #x00CA)	; Ê
+      ))
     (->lowercase
      ((=gb2312		  . #x283A)	; &JX1-2960; [08-26]
       (=jis-x0212	  . #x2B34)	; &I-JSP-2B34; [11-20]
@@ -1395,10 +1395,6 @@
      ((name		  . "LATIN CAPITAL LETTER E WITH DIAERESIS")
       (=ucs		  . #x00CB)	; Ë
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER E WITH DIAERESIS")
-      (=ucs		  . #x00CB)	; Ë
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER E")
       (=ucs		  . #xFF25)	; ï¼¥
@@ -1410,6 +1406,10 @@
     (=jis-x0213-1-2000	. #x2942)	; &I-JX1-2942; [09-34]
     (=jef-china3	. #x88C7)	; &I-JC3-88C7;
     (=ucs@jis/fw	. #x00CB)	; &JX1-2942;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER E WITH DIAERESIS")
+      (=ucs		  . #x00CB)	; Ë
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B33)	; &JX1-2961; [11-19]
       (=jis-x0213-1-2000  . #x2961)	; &I-JX1-2961; [09-65]
@@ -1443,10 +1443,6 @@
      ((name		  . "LATIN CAPITAL LETTER I WITH GRAVE")
       (=ucs		  . #x00CC)	; Ì
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER I WITH GRAVE")
-      (=ucs		  . #x00CC)	; Ì
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER I")
       (=ucs		  . #xFF29)	; Ｉ
@@ -1458,6 +1454,10 @@
     (=jis-x0213-1-2000	. #x2943)	; &I-JX1-2943; [09-35]
     (=jef-china3	. #x85BB)	; &I-JC3-85BB;
     (=ucs@jis/fw	. #x00CC)	; &JX1-2943;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER I WITH GRAVE")
+      (=ucs		  . #x00CC)	; Ì
+      ))
     (->lowercase
      ((=gb2312		  . #x282C)	; &JX1-2962; [08-12]
       (=jis-x0212	  . #x2B40)	; &I-JSP-2B40; [11-32]
@@ -1494,10 +1494,6 @@
      ((name		  . "LATIN CAPITAL LETTER I WITH ACUTE")
       (=ucs		  . #x00CD)	; Í
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER I WITH ACUTE")
-      (=ucs		  . #x00CD)	; Í
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER I")
       (=ucs		  . #xFF29)	; Ｉ
@@ -1509,6 +1505,10 @@
     (=jis-x0213-1-2000	. #x2944)	; &I-JX1-2944; [09-36]
     (=jef-china3	. #x85DB)	; &I-JC3-85DB;
     (=ucs@jis/fw	. #x00CD)	; &JX1-2944;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER I WITH ACUTE")
+      (=ucs		  . #x00CD)	; Í
+      ))
     (->lowercase
      ((=gb2312		  . #x282A)	; &JX1-2963; [08-10]
       (=jis-x0212	  . #x2B3F)	; &I-JSP-2B3F; [11-31]
@@ -1543,10 +1543,6 @@
      ((name		  . "LATIN CAPITAL LETTER I WITH CIRCUMFLEX")
       (=ucs		  . #x00CE)	; Î
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER I WITH CIRCUMFLEX")
-      (=ucs		  . #x00CE)	; Î
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER I")
       (=ucs		  . #xFF29)	; Ｉ
@@ -1558,6 +1554,10 @@
     (=jis-x0213-1-2000	. #x2945)	; &I-JX1-2945; [09-37]
     (=jef-china3	. #x86BC)	; &I-JC3-86BC;
     (=ucs@jis/fw	. #x00CE)	; &JX1-2945;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER I WITH CIRCUMFLEX")
+      (=ucs		  . #x00CE)	; Î
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B42)	; &JX1-2964; [11-34]
       (=jis-x0213-1-2000  . #x2964)	; &I-JX1-2964; [09-68]
@@ -1589,10 +1589,6 @@
      ((name		  . "LATIN CAPITAL LETTER I WITH DIAERESIS")
       (=ucs		  . #x00CF)	; Ï
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER I WITH DIAERESIS")
-      (=ucs		  . #x00CF)	; Ï
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER I")
       (=ucs		  . #xFF29)	; Ｉ
@@ -1604,6 +1600,10 @@
     (=jis-x0213-1-2000	. #x2946)	; &I-JX1-2946; [09-38]
     (=jef-china3	. #x88C9)	; &I-JC3-88C9;
     (=ucs@jis/fw	. #x00CF)	; &JX1-2946;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER I WITH DIAERESIS")
+      (=ucs		  . #x00CF)	; Ï
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B41)	; &JX1-2965; [11-33]
       (=jis-x0213-1-2000  . #x2965)	; &I-JX1-2965; [09-69]
@@ -1627,13 +1627,13 @@
      ((name		  . "LATIN CAPITAL LETTER ETH")
       (=ucs		  . #x00D0)	; Ð
       ))
+    (=ks-x1001		. #x2822)	; &JX1-2947; [08-02]
+    (=jis-x0213-1-2000	. #x2947)	; &I-JX1-2947; [09-39]
+    (=ucs@jis/fw	. #x00D0)	; &JX1-2947;
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER ETH")
       (=ucs		  . #x00D0)	; Ð
       ))
-    (=ks-x1001		. #x2822)	; &JX1-2947; [08-02]
-    (=jis-x0213-1-2000	. #x2947)	; &I-JX1-2947; [09-39]
-    (=ucs@jis/fw	. #x00D0)	; &JX1-2947;
     (->lowercase
      ((=ks-x1001	  . #x2923)	; &JX1-2966; [09-03]
       (=jis-x0212	  . #x2943)	; &I-JSP-2943; [09-35]
@@ -1666,10 +1666,6 @@
      ((name		  . "LATIN CAPITAL LETTER N WITH TILDE")
       (=ucs		  . #x00D1)	; Ñ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER N WITH TILDE")
-      (=ucs		  . #x00D1)	; Ñ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER N")
       (=ucs		  . #xFF2E)	; ï¼®
@@ -1681,6 +1677,10 @@
     (=jis-x0213-1-2000	. #x2948)	; &I-JX1-2948; [09-40]
     (=jef-china3	. #x86E6)	; &I-JC3-86E6;
     (=ucs@jis/fw	. #x00D1)	; &JX1-2948;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER N WITH TILDE")
+      (=ucs		  . #x00D1)	; Ñ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B50)	; &JX1-2967; [11-48]
       (=jis-x0213-1-2000  . #x2967)	; &I-JX1-2967; [09-71]
@@ -1714,10 +1714,6 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH GRAVE")
       (=ucs		  . #x00D2)	; Ò
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER O WITH GRAVE")
-      (=ucs		  . #x00D2)	; Ò
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER O")
       (=ucs		  . #xFF2F)	; Ｏ
@@ -1729,6 +1725,10 @@
     (=jis-x0213-1-2000	. #x2949)	; &I-JX1-2949; [09-41]
     (=jef-china3	. #x85BD)	; &I-JC3-85BD;
     (=ucs@jis/fw	. #x00D2)	; &JX1-2949;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER O WITH GRAVE")
+      (=ucs		  . #x00D2)	; Ò
+      ))
     (->lowercase
      ((=gb2312		  . #x2830)	; &JX1-2968; [08-16]
       (=jis-x0212	  . #x2B52)	; &I-JSP-2B52; [11-50]
@@ -1764,10 +1764,6 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH ACUTE")
       (=ucs		  . #x00D3)	; Ó
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER O WITH ACUTE")
-      (=ucs		  . #x00D3)	; Ó
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER O")
       (=ucs		  . #xFF2F)	; Ｏ
@@ -1779,6 +1775,10 @@
     (=jis-x0213-1-2000	. #x294A)	; &I-JX1-294A; [09-42]
     (=jef-china3	. #x85E0)	; &I-JC3-85E0;
     (=ucs@jis/fw	. #x00D3)	; &JX1-294A;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER O WITH ACUTE")
+      (=ucs		  . #x00D3)	; Ó
+      ))
     (->lowercase
      ((=gb2312		  . #x282E)	; &JX1-2969; [08-14]
       (=jis-x0212	  . #x2B51)	; &I-JSP-2B51; [11-49]
@@ -1816,10 +1816,6 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX")
       (=ucs		  . #x00D4)	; Ô
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX")
-      (=ucs		  . #x00D4)	; Ô
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER O")
       (=ucs		  . #xFF2F)	; Ｏ
@@ -1831,6 +1827,10 @@
     (=jis-x0213-1-2000	. #x294B)	; &I-JX1-294B; [09-43]
     (=jef-china3	. #x86BF)	; &I-JC3-86BF;
     (=ucs@jis/fw	. #x00D4)	; &JX1-294B;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX")
+      (=ucs		  . #x00D4)	; Ô
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B54)	; &JX1-296A; [11-52]
       (=jis-x0213-1-2000  . #x296A)	; &I-JX1-296A; [09-74]
@@ -1864,10 +1864,6 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH TILDE")
       (=ucs		  . #x00D5)	; Õ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER O WITH TILDE")
-      (=ucs		  . #x00D5)	; Õ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER O")
       (=ucs		  . #xFF2F)	; Ｏ
@@ -1879,6 +1875,10 @@
     (=jis-x0213-1-2000	. #x294C)	; &I-JX1-294C; [09-44]
     (=jef-china3	. #x86E7)	; &I-JC3-86E7;
     (=ucs@jis/fw	. #x00D5)	; &JX1-294C;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER O WITH TILDE")
+      (=ucs		  . #x00D5)	; Õ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B58)	; &JX1-296B; [11-56]
       (=jis-x0213-1-2000  . #x296B)	; &I-JX1-296B; [09-75]
@@ -1912,10 +1912,6 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH DIAERESIS")
       (=ucs		  . #x00D6)	; Ö
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER O WITH DIAERESIS")
-      (=ucs		  . #x00D6)	; Ö
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER O")
       (=ucs		  . #xFF2F)	; Ｏ
@@ -1927,6 +1923,10 @@
     (=jis-x0213-1-2000	. #x294D)	; &I-JX1-294D; [09-45]
     (=jef-china3	. #x88CB)	; &I-JC3-88CB;
     (=ucs@jis/fw	. #x00D6)	; &JX1-294D;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER O WITH DIAERESIS")
+      (=ucs		  . #x00D6)	; Ö
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B53)	; &JX1-296C; [11-51]
       (=jis-x0213-1-2000  . #x296C)	; &I-JX1-296C; [09-76]
@@ -1950,10 +1950,6 @@
      ((name		  . "MULTIPLICATION SIGN")
       (=ucs		  . #x00D7)	; ×
       ))
-    (<-fullwidth
-     ((name		  . "MULTIPLICATION SIGN")
-      (=ucs		  . #x00D7)	; ×
-      ))
     (=jis-x0208		. #x215F)	; &J90-215F; [01-63]
     (=gb2312		. #x2141)	; &I-G0-2141; [01-33]
     (=ks-x1001		. #x213F)	; &I-K0-213F; [01-31]
@@ -1961,6 +1957,10 @@
     (=big5		. #xA1D1)	; &I-B-A1D1;
     (=ucs@gb		. #x00D7)	; &J90-215F;
     (=ucs@jis		. #x00D7)	; &J90-215F;
+    (<-fullwidth
+     ((name		  . "MULTIPLICATION SIGN")
+      (=ucs		  . #x00D7)	; ×
+      ))
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH STROKE")
@@ -1981,15 +1981,15 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH STROKE")
       (=ucs		  . #x00D8)	; Ø
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER O WITH STROKE")
-      (=ucs		  . #x00D8)	; Ø
-      ))
     (=ks-x1001		. #x282A)	; &JX1-294E; [08-10]
     (=jis-x0212		. #x292C)	; &I-JSP-292C; [09-12]
     (=jis-x0213-1-2000	. #x294E)	; &I-JX1-294E; [09-46]
     (=jef-china3	. #x83A2)	; &I-JC3-83A2;
     (=ucs@jis/fw	. #x00D8)	; &JX1-294E;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER O WITH STROKE")
+      (=ucs		  . #x00D8)	; Ø
+      ))
     (->lowercase
      ((=ks-x1001	  . #x292A)	; &JX1-296D; [09-10]
       (=jis-x0212	  . #x294C)	; &I-JSP-294C; [09-44]
@@ -2024,10 +2024,6 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH GRAVE")
       (=ucs		  . #x00D9)	; Ù
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U WITH GRAVE")
-      (=ucs		  . #x00D9)	; Ù
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER U")
       (=ucs		  . #xFF35)	; ï¼µ
@@ -2039,6 +2035,10 @@
     (=jis-x0213-1-2000	. #x294F)	; &I-JX1-294F; [09-47]
     (=jef-china3	. #x85BF)	; &I-JC3-85BF;
     (=ucs@jis/fw	. #x00D9)	; &JX1-294F;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER U WITH GRAVE")
+      (=ucs		  . #x00D9)	; Ù
+      ))
     (->lowercase
      ((=gb2312		  . #x2834)	; &JX1-296E; [08-20]
       (=jis-x0212	  . #x2B63)	; &I-JSP-2B63; [11-67]
@@ -2075,10 +2075,6 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH ACUTE")
       (=ucs		  . #x00DA)	; Ú
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U WITH ACUTE")
-      (=ucs		  . #x00DA)	; Ú
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER U")
       (=ucs		  . #xFF35)	; ï¼µ
@@ -2090,6 +2086,10 @@
     (=jis-x0213-1-2000	. #x2950)	; &I-JX1-2950; [09-48]
     (=jef-china3	. #x85E6)	; &I-JC3-85E6;
     (=ucs@jis/fw	. #x00DA)	; &JX1-2950;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER U WITH ACUTE")
+      (=ucs		  . #x00DA)	; Ú
+      ))
     (->lowercase
      ((=gb2312		  . #x2832)	; &JX1-296F; [08-18]
       (=jis-x0212	  . #x2B62)	; &I-JSP-2B62; [11-66]
@@ -2123,10 +2123,6 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH CIRCUMFLEX")
       (=ucs		  . #x00DB)	; Û
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U WITH CIRCUMFLEX")
-      (=ucs		  . #x00DB)	; Û
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER U")
       (=ucs		  . #xFF35)	; ï¼µ
@@ -2138,6 +2134,10 @@
     (=jis-x0213-1-2000	. #x2951)	; &I-JX1-2951; [09-49]
     (=jef-china3	. #x86C1)	; &I-JC3-86C1;
     (=ucs@jis/fw	. #x00DB)	; &JX1-2951;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER U WITH CIRCUMFLEX")
+      (=ucs		  . #x00DB)	; Û
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B65)	; &JX1-2970; [11-69]
       (=jis-x0213-1-2000  . #x2970)	; &I-JX1-2970; [09-80]
@@ -2171,10 +2171,6 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH DIAERESIS")
       (=ucs		  . #x00DC)	; Ü
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U WITH DIAERESIS")
-      (=ucs		  . #x00DC)	; Ü
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER U")
       (=ucs		  . #xFF35)	; ï¼µ
@@ -2186,6 +2182,10 @@
     (=jis-x0213-1-2000	. #x2952)	; &I-JX1-2952; [09-50]
     (=jef-china3	. #x88CE)	; &I-JC3-88CE;
     (=ucs@jis/fw	. #x00DC)	; &JX1-2952;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER U WITH DIAERESIS")
+      (=ucs		  . #x00DC)	; Ü
+      ))
     (->lowercase
      ((=gb2312		  . #x2839)	; &JX1-2971; [08-25]
       (=jis-x0212	  . #x2B64)	; &I-JSP-2B64; [11-68]
@@ -2219,10 +2219,6 @@
      ((name		  . "LATIN CAPITAL LETTER Y WITH ACUTE")
       (=ucs		  . #x00DD)	; Ý
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER Y WITH ACUTE")
-      (=ucs		  . #x00DD)	; Ý
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER Y")
       (=ucs		  . #xFF39)	; ï¼¹
@@ -2234,6 +2230,10 @@
     (=jis-x0213-1-2000	. #x2953)	; &I-JX1-2953; [09-51]
     (=jef-china3	. #x85E9)	; &I-JC3-85E9;
     (=ucs@jis/fw	. #x00DD)	; &JX1-2953;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER Y WITH ACUTE")
+      (=ucs		  . #x00DD)	; Ý
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B72)	; &JX1-2972; [11-82]
       (=jis-x0213-1-2000  . #x2972)	; &I-JX1-2972; [09-82]
@@ -2257,15 +2257,15 @@
      ((name		  . "LATIN CAPITAL LETTER THORN")
       (=ucs		  . #x00DE)	; Þ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER THORN")
-      (=ucs		  . #x00DE)	; Þ
-      ))
     (=ks-x1001		. #x282D)	; &JX1-2954; [08-13]
     (=jis-x0212		. #x2930)	; &I-JSP-2930; [09-16]
     (=jis-x0213-1-2000	. #x2954)	; &I-JX1-2954; [09-52]
     (=jef-china3	. #x83A4)	; &I-JC3-83A4;
     (=ucs@jis/fw	. #x00DE)	; &JX1-2954;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER THORN")
+      (=ucs		  . #x00DE)	; Þ
+      ))
     (->lowercase
      ((=ks-x1001	  . #x292D)	; &JX1-2973; [09-13]
       (=jis-x0212	  . #x2950)	; &I-JSP-2950; [09-48]
@@ -2290,15 +2290,15 @@
      ((name		  . "LATIN SMALL LETTER SHARP S")
       (=ucs		  . #x00DF)	; ß
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER SHARP S")
-      (=ucs		  . #x00DF)	; ß
-      ))
     (=ks-x1001		. #x292C)	; &JX1-2955; [09-12]
     (=jis-x0212		. #x294E)	; &I-JSP-294E; [09-46]
     (=jis-x0213-1-2000	. #x2955)	; &I-JX1-2955; [09-53]
     (=jef-china3	. #x83B7)	; &I-JC3-83B7;
     (=ucs@jis/fw	. #x00DF)	; &JX1-2955;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER SHARP S")
+      (=ucs		  . #x00DF)	; ß
+      ))
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER A WITH GRAVE")
@@ -2329,10 +2329,6 @@
      ((name		  . "LATIN SMALL LETTER A WITH GRAVE")
       (=ucs		  . #x00E0)	; à
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER A WITH GRAVE")
-      (=ucs		  . #x00E0)	; à
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER A")
       (=ucs		  . #xFF41)	; ａ
@@ -2346,6 +2342,10 @@
     (=jef-china3	. #x85C1)	; &I-JC3-85C1;
     (=ucs@gb/fw		. #x00E0)	; &JX1-2956;
     (=ucs@jis/fw	. #x00E0)	; &JX1-2956;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER A WITH GRAVE")
+      (=ucs		  . #x00E0)	; à
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A22)	; &JX1-2937; [10-02]
       (=jis-x0213-1-2000  . #x2937)	; &I-JX1-2937; [09-23]
@@ -2382,10 +2382,6 @@
      ((name		  . "LATIN SMALL LETTER A WITH ACUTE")
       (=ucs		  . #x00E1)	; á
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER A WITH ACUTE")
-      (=ucs		  . #x00E1)	; á
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER A")
       (=ucs		  . #xFF41)	; ａ
@@ -2399,6 +2395,10 @@
     (=jef-china3	. #x85EB)	; &I-JC3-85EB;
     (=ucs@gb/fw		. #x00E1)	; &JX1-2957;
     (=ucs@jis/fw	. #x00E1)	; &JX1-2957;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER A WITH ACUTE")
+      (=ucs		  . #x00E1)	; á
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A21)	; &JX1-2938; [10-01]
       (=jis-x0213-1-2000  . #x2938)	; &I-JX1-2938; [09-24]
@@ -2435,10 +2435,6 @@
      ((name		  . "LATIN SMALL LETTER A WITH CIRCUMFLEX")
       (=ucs		  . #x00E2)	; â
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER A WITH CIRCUMFLEX")
-      (=ucs		  . #x00E2)	; â
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER A")
       (=ucs		  . #xFF41)	; ａ
@@ -2450,6 +2446,10 @@
     (=jis-x0213-1-2000	. #x2958)	; &I-JX1-2958; [09-56]
     (=jef-china3	. #x86C4)	; &I-JC3-86C4;
     (=ucs@jis/fw	. #x00E2)	; &JX1-2958;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER A WITH CIRCUMFLEX")
+      (=ucs		  . #x00E2)	; â
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A24)	; &JX1-2939; [10-04]
       (=jis-x0213-1-2000  . #x2939)	; &I-JX1-2939; [09-25]
@@ -2484,10 +2484,6 @@
      ((name		  . "LATIN SMALL LETTER A WITH TILDE")
       (=ucs		  . #x00E3)	; ã
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER A WITH TILDE")
-      (=ucs		  . #x00E3)	; ã
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER A")
       (=ucs		  . #xFF41)	; ａ
@@ -2499,6 +2495,10 @@
     (=jis-x0213-1-2000	. #x2959)	; &I-JX1-2959; [09-57]
     (=jef-china3	. #x86EF)	; &I-JC3-86EF;
     (=ucs@jis/fw	. #x00E3)	; &JX1-2959;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER A WITH TILDE")
+      (=ucs		  . #x00E3)	; ã
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A2A)	; &JX1-293A; [10-10]
       (=jis-x0213-1-2000  . #x293A)	; &I-JX1-293A; [09-26]
@@ -2532,10 +2532,6 @@
      ((name		  . "LATIN SMALL LETTER A WITH DIAERESIS")
       (=ucs		  . #x00E4)	; ä
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER A WITH DIAERESIS")
-      (=ucs		  . #x00E4)	; ä
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER A")
       (=ucs		  . #xFF41)	; ａ
@@ -2547,6 +2543,10 @@
     (=jis-x0213-1-2000	. #x295A)	; &I-JX1-295A; [09-58]
     (=jef-china3	. #x88D2)	; &I-JC3-88D2;
     (=ucs@jis/fw	. #x00E4)	; &JX1-295A;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER A WITH DIAERESIS")
+      (=ucs		  . #x00E4)	; ä
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A23)	; &JX1-293B; [10-03]
       (=jis-x0213-1-2000  . #x293B)	; &I-JX1-293B; [09-27]
@@ -2578,10 +2578,6 @@
      ((name		  . "LATIN SMALL LETTER A WITH RING ABOVE")
       (=ucs		  . #x00E5)	; å
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER A WITH RING ABOVE")
-      (=ucs		  . #x00E5)	; å
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER A")
       (=ucs		  . #xFF41)	; ａ
@@ -2593,6 +2589,10 @@
     (=jis-x0213-1-2000	. #x295B)	; &I-JX1-295B; [09-59]
     (=jef-china3	. #x89A7)	; &I-JC3-89A7;
     (=ucs@jis/fw	. #x00E5)	; &JX1-295B;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER A WITH RING ABOVE")
+      (=ucs		  . #x00E5)	; å
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A29)	; &JX1-293C; [10-09]
       (=jis-x0213-1-2000  . #x293C)	; &I-JX1-293C; [09-28]
@@ -2619,15 +2619,15 @@
      ((name		  . "LATIN SMALL LETTER AE")
       (=ucs		  . #x00E6)	; æ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER AE")
-      (=ucs		  . #x00E6)	; æ
-      ))
     (=ks-x1001		. #x2921)	; &JX1-295C; [09-01]
     (=jis-x0212		. #x2941)	; &I-JSP-2941; [09-33]
     (=jis-x0213-1-2000	. #x295C)	; &I-JX1-295C; [09-60]
     (=jef-china3	. #x83B0)	; &I-JC3-83B0;
     (=ucs@jis/fw	. #x00E6)	; &JX1-295C;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER AE")
+      (=ucs		  . #x00E6)	; æ
+      ))
     (->uppercase
      ((=ks-x1001	  . #x2821)	; &JX1-293D; [08-01]
       (=jis-x0212	  . #x2921)	; &I-JSP-2921; [09-01]
@@ -2662,10 +2662,6 @@
      ((name		  . "LATIN SMALL LETTER C WITH CEDILLA")
       (=ucs		  . #x00E7)	; ç
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER C WITH CEDILLA")
-      (=ucs		  . #x00E7)	; ç
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER C")
       (=ucs		  . #xFF43)	; ｃ
@@ -2677,6 +2673,10 @@
     (=jis-x0213-1-2000	. #x295D)	; &I-JX1-295D; [09-61]
     (=jef-china3	. #x89FB)	; &I-JC3-89FB;
     (=ucs@jis/fw	. #x00E7)	; &JX1-295D;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER C WITH CEDILLA")
+      (=ucs		  . #x00E7)	; ç
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A2E)	; &JX1-293E; [10-14]
       (=jis-x0213-1-2000  . #x293E)	; &I-JX1-293E; [09-30]
@@ -2711,10 +2711,6 @@
      ((name		  . "LATIN SMALL LETTER E WITH GRAVE")
       (=ucs		  . #x00E8)	; è
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER E WITH GRAVE")
-      (=ucs		  . #x00E8)	; è
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER E")
       (=ucs		  . #xFF45)	; ｅ
@@ -2728,6 +2724,10 @@
     (=jef-china3	. #x85C2)	; &I-JC3-85C2;
     (=ucs@gb/fw		. #x00E8)	; &JX1-295E;
     (=ucs@jis/fw	. #x00E8)	; &JX1-295E;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER E WITH GRAVE")
+      (=ucs		  . #x00E8)	; è
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A32)	; &JX1-293F; [10-18]
       (=jis-x0213-1-2000  . #x293F)	; &I-JX1-293F; [09-31]
@@ -2764,10 +2764,6 @@
      ((name		  . "LATIN SMALL LETTER E WITH ACUTE")
       (=ucs		  . #x00E9)	; é
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER E WITH ACUTE")
-      (=ucs		  . #x00E9)	; é
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER E")
       (=ucs		  . #xFF45)	; ｅ
@@ -2781,6 +2777,10 @@
     (=jef-china3	. #x85EE)	; &I-JC3-85EE;
     (=ucs@gb/fw		. #x00E9)	; &JX1-295F;
     (=ucs@jis/fw	. #x00E9)	; &JX1-295F;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER E WITH ACUTE")
+      (=ucs		  . #x00E9)	; é
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A31)	; &JX1-2940; [10-17]
       (=jis-x0213-1-2000  . #x2940)	; &I-JX1-2940; [09-32]
@@ -2815,10 +2815,6 @@
      ((name		  . "LATIN SMALL LETTER E WITH CIRCUMFLEX")
       (=ucs		  . #x00EA)	; ê
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER E WITH CIRCUMFLEX")
-      (=ucs		  . #x00EA)	; ê
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER E")
       (=ucs		  . #xFF45)	; ｅ
@@ -2832,6 +2828,10 @@
     (=jef-china3	. #x86C6)	; &I-JC3-86C6;
     (=ucs@gb/fw		. #x00EA)	; &JX1-2960;
     (=ucs@jis/fw	. #x00EA)	; &JX1-2960;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER E WITH CIRCUMFLEX")
+      (=ucs		  . #x00EA)	; ê
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A34)	; &JX1-2941; [10-20]
       (=jis-x0213-1-2000  . #x2941)	; &I-JX1-2941; [09-33]
@@ -2865,10 +2865,6 @@
      ((name		  . "LATIN SMALL LETTER E WITH DIAERESIS")
       (=ucs		  . #x00EB)	; ë
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER E WITH DIAERESIS")
-      (=ucs		  . #x00EB)	; ë
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER E")
       (=ucs		  . #xFF45)	; ｅ
@@ -2880,6 +2876,10 @@
     (=jis-x0213-1-2000	. #x2961)	; &I-JX1-2961; [09-65]
     (=jef-china3	. #x88D4)	; &I-JC3-88D4;
     (=ucs@jis/fw	. #x00EB)	; &JX1-2961;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER E WITH DIAERESIS")
+      (=ucs		  . #x00EB)	; ë
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A33)	; &JX1-2942; [10-19]
       (=jis-x0213-1-2000  . #x2942)	; &I-JX1-2942; [09-34]
@@ -2914,10 +2914,6 @@
      ((name		  . "LATIN SMALL LETTER I WITH GRAVE")
       (=ucs		  . #x00EC)	; ì
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER I WITH GRAVE")
-      (=ucs		  . #x00EC)	; ì
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER I")
       (=ucs		  . #xFF49)	; ｉ
@@ -2930,6 +2926,10 @@
     (=jis-x0213-1-2000	. #x2962)	; &I-JX1-2962; [09-66]
     (=ucs@gb/fw		. #x00EC)	; &JX1-2962;
     (=ucs@jis/fw	. #x00EC)	; &JX1-2962;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER I WITH GRAVE")
+      (=ucs		  . #x00EC)	; ì
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A40)	; &JX1-2943; [10-32]
       (=jis-x0213-1-2000  . #x2943)	; &I-JX1-2943; [09-35]
@@ -2966,10 +2966,6 @@
      ((name		  . "LATIN SMALL LETTER I WITH ACUTE")
       (=ucs		  . #x00ED)	; í
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER I WITH ACUTE")
-      (=ucs		  . #x00ED)	; í
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER I")
       (=ucs		  . #xFF49)	; ｉ
@@ -2982,6 +2978,10 @@
     (=jis-x0213-1-2000	. #x2963)	; &I-JX1-2963; [09-67]
     (=ucs@gb/fw		. #x00ED)	; &JX1-2963;
     (=ucs@jis/fw	. #x00ED)	; &JX1-2963;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER I WITH ACUTE")
+      (=ucs		  . #x00ED)	; í
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A3F)	; &JX1-2944; [10-31]
       (=jis-x0213-1-2000  . #x2944)	; &I-JX1-2944; [09-36]
@@ -3015,10 +3015,6 @@
      ((name		  . "LATIN SMALL LETTER I WITH CIRCUMFLEX")
       (=ucs		  . #x00EE)	; î
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER I WITH CIRCUMFLEX")
-      (=ucs		  . #x00EE)	; î
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER I")
       (=ucs		  . #xFF49)	; ｉ
@@ -3029,6 +3025,10 @@
     (=jis-x0212		. #x2B42)	; &JX1-2964; [11-34]
     (=jis-x0213-1-2000	. #x2964)	; &I-JX1-2964; [09-68]
     (=ucs@jis/fw	. #x00EE)	; &JX1-2964;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER I WITH CIRCUMFLEX")
+      (=ucs		  . #x00EE)	; î
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A42)	; &JX1-2945; [10-34]
       (=jis-x0213-1-2000  . #x2945)	; &I-JX1-2945; [09-37]
@@ -3060,10 +3060,6 @@
      ((name		  . "LATIN SMALL LETTER I WITH DIAERESIS")
       (=ucs		  . #x00EF)	; ï
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER I WITH DIAERESIS")
-      (=ucs		  . #x00EF)	; ï
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER I")
       (=ucs		  . #xFF49)	; ｉ
@@ -3075,6 +3071,10 @@
     (=jis-x0213-1-2000	. #x2965)	; &I-JX1-2965; [09-69]
     (=jef-china3	. #x88D6)	; &I-JC3-88D6;
     (=ucs@jis/fw	. #x00EF)	; &JX1-2965;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER I WITH DIAERESIS")
+      (=ucs		  . #x00EF)	; ï
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A41)	; &JX1-2946; [10-33]
       (=jis-x0213-1-2000  . #x2946)	; &I-JX1-2946; [09-38]
@@ -3099,15 +3099,15 @@
      ((name		  . "LATIN SMALL LETTER ETH")
       (=ucs		  . #x00F0)	; ð
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER ETH")
-      (=ucs		  . #x00F0)	; ð
-      ))
     (=ks-x1001		. #x2923)	; &JX1-2966; [09-03]
     (=jis-x0212		. #x2943)	; &I-JSP-2943; [09-35]
     (=jis-x0213-1-2000	. #x2966)	; &I-JX1-2966; [09-70]
     (=jef-china3	. #x83B4)	; &I-JC3-83B4;
     (=ucs@jis/fw	. #x00F0)	; &JX1-2966;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER ETH")
+      (=ucs		  . #x00F0)	; ð
+      ))
     (->uppercase
      ((=ks-x1001	  . #x2822)	; &JX1-2947; [08-02]
       (=jis-x0213-1-2000  . #x2947)	; &I-JX1-2947; [09-39]
@@ -3139,10 +3139,6 @@
      ((name		  . "LATIN SMALL LETTER N WITH TILDE")
       (=ucs		  . #x00F1)	; ñ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER N WITH TILDE")
-      (=ucs		  . #x00F1)	; ñ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER N")
       (=ucs		  . #xFF4E)	; ｎ
@@ -3154,6 +3150,10 @@
     (=jis-x0213-1-2000	. #x2967)	; &I-JX1-2967; [09-71]
     (=jef-china3	. #x86F3)	; &I-JC3-86F3;
     (=ucs@jis/fw	. #x00F1)	; &JX1-2967;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER N WITH TILDE")
+      (=ucs		  . #x00F1)	; ñ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A50)	; &JX1-2948; [10-48]
       (=jis-x0213-1-2000  . #x2948)	; &I-JX1-2948; [09-40]
@@ -3188,10 +3188,6 @@
      ((name		  . "LATIN SMALL LETTER O WITH GRAVE")
       (=ucs		  . #x00F2)	; ò
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER O WITH GRAVE")
-      (=ucs		  . #x00F2)	; ò
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER O")
       (=ucs		  . #xFF4F)	; ｏ
@@ -3205,6 +3201,10 @@
     (=jef-china3	. #x85C5)	; &I-JC3-85C5;
     (=ucs@gb/fw		. #x00F2)	; &JX1-2968;
     (=ucs@jis/fw	. #x00F2)	; &JX1-2968;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER O WITH GRAVE")
+      (=ucs		  . #x00F2)	; ò
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A52)	; &JX1-2949; [10-50]
       (=jis-x0213-1-2000  . #x2949)	; &I-JX1-2949; [09-41]
@@ -3240,10 +3240,6 @@
      ((name		  . "LATIN SMALL LETTER O WITH ACUTE")
       (=ucs		  . #x00F3)	; ó
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER O WITH ACUTE")
-      (=ucs		  . #x00F3)	; ó
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER O")
       (=ucs		  . #xFF4F)	; ｏ
@@ -3257,6 +3253,10 @@
     (=jef-china3	. #x85F6)	; &I-JC3-85F6;
     (=ucs@gb/fw		. #x00F3)	; &JX1-2969;
     (=ucs@jis/fw	. #x00F3)	; &JX1-2969;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER O WITH ACUTE")
+      (=ucs		  . #x00F3)	; ó
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A51)	; &JX1-294A; [10-49]
       (=jis-x0213-1-2000  . #x294A)	; &I-JX1-294A; [09-42]
@@ -3293,10 +3293,6 @@
      ((name		  . "LATIN SMALL LETTER O WITH CIRCUMFLEX")
       (=ucs		  . #x00F4)	; ô
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER O WITH CIRCUMFLEX")
-      (=ucs		  . #x00F4)	; ô
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER O")
       (=ucs		  . #xFF4F)	; ｏ
@@ -3308,6 +3304,10 @@
     (=jis-x0213-1-2000	. #x296A)	; &I-JX1-296A; [09-74]
     (=jef-china3	. #x86CC)	; &I-JC3-86CC;
     (=ucs@jis/fw	. #x00F4)	; &JX1-296A;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER O WITH CIRCUMFLEX")
+      (=ucs		  . #x00F4)	; ô
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A54)	; &JX1-294B; [10-52]
       (=jis-x0213-1-2000  . #x294B)	; &I-JX1-294B; [09-43]
@@ -3342,10 +3342,6 @@
      ((name		  . "LATIN SMALL LETTER O WITH TILDE")
       (=ucs		  . #x00F5)	; õ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER O WITH TILDE")
-      (=ucs		  . #x00F5)	; õ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER O")
       (=ucs		  . #xFF4F)	; ｏ
@@ -3357,6 +3353,10 @@
     (=jis-x0213-1-2000	. #x296B)	; &I-JX1-296B; [09-75]
     (=jef-china3	. #x86F4)	; &I-JC3-86F4;
     (=ucs@jis/fw	. #x00F5)	; &JX1-296B;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER O WITH TILDE")
+      (=ucs		  . #x00F5)	; õ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A58)	; &JX1-294C; [10-56]
       (=jis-x0213-1-2000  . #x294C)	; &I-JX1-294C; [09-44]
@@ -3390,10 +3390,6 @@
      ((name		  . "LATIN SMALL LETTER O WITH DIAERESIS")
       (=ucs		  . #x00F6)	; ö
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER O WITH DIAERESIS")
-      (=ucs		  . #x00F6)	; ö
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER O")
       (=ucs		  . #xFF4F)	; ｏ
@@ -3405,6 +3401,10 @@
     (=jis-x0213-1-2000	. #x296C)	; &I-JX1-296C; [09-76]
     (=jef-china3	. #x88D8)	; &I-JC3-88D8;
     (=ucs@jis/fw	. #x00F6)	; &JX1-296C;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER O WITH DIAERESIS")
+      (=ucs		  . #x00F6)	; ö
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A53)	; &JX1-294D; [10-51]
       (=jis-x0213-1-2000  . #x294D)	; &I-JX1-294D; [09-45]
@@ -3428,10 +3428,6 @@
      ((name		  . "DIVISION SIGN")
       (=ucs		  . #x00F7)	; ÷
       ))
-    (<-fullwidth
-     ((name		  . "DIVISION SIGN")
-      (=ucs		  . #x00F7)	; ÷
-      ))
     (=jis-x0208		. #x2160)	; &J90-2160; [01-64]
     (=gb2312		. #x2142)	; &I-G0-2142; [01-34]
     (=ks-x1001		. #x2140)	; &I-K0-2140; [01-32]
@@ -3439,6 +3435,10 @@
     (=big5		. #xA1D2)	; &I-B-A1D2;
     (=ucs@gb		. #x00F7)	; &J90-2160;
     (=ucs@jis		. #x00F7)	; &J90-2160;
+    (<-fullwidth
+     ((name		  . "DIVISION SIGN")
+      (=ucs		  . #x00F7)	; ÷
+      ))
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH STROKE")
@@ -3460,15 +3460,15 @@
      ((name		  . "LATIN SMALL LETTER O WITH STROKE")
       (=ucs		  . #x00F8)	; ø
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER O WITH STROKE")
-      (=ucs		  . #x00F8)	; ø
-      ))
     (=ks-x1001		. #x292A)	; &JX1-296D; [09-10]
     (=jis-x0212		. #x294C)	; &I-JSP-294C; [09-44]
     (=jis-x0213-1-2000	. #x296D)	; &I-JX1-296D; [09-77]
     (=jef-china3	. #x83AD)	; &I-JC3-83AD;
     (=ucs@jis/fw	. #x00F8)	; &JX1-296D;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER O WITH STROKE")
+      (=ucs		  . #x00F8)	; ø
+      ))
     (->uppercase
      ((=ks-x1001	  . #x282A)	; &JX1-294E; [08-10]
       (=jis-x0212	  . #x292C)	; &I-JSP-292C; [09-12]
@@ -3504,10 +3504,6 @@
      ((name		  . "LATIN SMALL LETTER U WITH GRAVE")
       (=ucs		  . #x00F9)	; ù
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH GRAVE")
-      (=ucs		  . #x00F9)	; ù
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER U")
       (=ucs		  . #xFF55)	; ｕ
@@ -3521,6 +3517,10 @@
     (=jef-china3	. #x85C7)	; &I-JC3-85C7;
     (=ucs@gb/fw		. #x00F9)	; &JX1-296E;
     (=ucs@jis/fw	. #x00F9)	; &JX1-296E;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER U WITH GRAVE")
+      (=ucs		  . #x00F9)	; ù
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A63)	; &JX1-294F; [10-67]
       (=jis-x0213-1-2000  . #x294F)	; &I-JX1-294F; [09-47]
@@ -3557,10 +3557,6 @@
      ((name		  . "LATIN SMALL LETTER U WITH ACUTE")
       (=ucs		  . #x00FA)	; ú
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH ACUTE")
-      (=ucs		  . #x00FA)	; ú
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER U")
       (=ucs		  . #xFF55)	; ｕ
@@ -3574,6 +3570,10 @@
     (=jef-china3	. #x85FC)	; &I-JC3-85FC;
     (=ucs@gb/fw		. #x00FA)	; &JX1-296F;
     (=ucs@jis/fw	. #x00FA)	; &JX1-296F;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER U WITH ACUTE")
+      (=ucs		  . #x00FA)	; ú
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A62)	; &JX1-2950; [10-66]
       (=jis-x0213-1-2000  . #x2950)	; &I-JX1-2950; [09-48]
@@ -3606,10 +3606,6 @@
      ((name		  . "LATIN SMALL LETTER U WITH CIRCUMFLEX")
       (=ucs		  . #x00FB)	; û
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH CIRCUMFLEX")
-      (=ucs		  . #x00FB)	; û
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER U")
       (=ucs		  . #xFF55)	; ｕ
@@ -3621,6 +3617,10 @@
     (=jis-x0213-1-2000	. #x2970)	; &I-JX1-2970; [09-80]
     (=jef-china3	. #x86CE)	; &I-JC3-86CE;
     (=ucs@jis/fw	. #x00FB)	; &JX1-2970;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER U WITH CIRCUMFLEX")
+      (=ucs		  . #x00FB)	; û
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A65)	; &JX1-2951; [10-69]
       (=jis-x0213-1-2000  . #x2951)	; &I-JX1-2951; [09-49]
@@ -3654,10 +3654,6 @@
      ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS")
       (=ucs		  . #x00FC)	; ü
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS")
-      (=ucs		  . #x00FC)	; ü
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER U")
       (=ucs		  . #xFF55)	; ｕ
@@ -3671,6 +3667,10 @@
     (=jef-china3	. #x88DB)	; &I-JC3-88DB;
     (=ucs@gb/fw		. #x00FC)	; &JX1-2971;
     (=ucs@jis/fw	. #x00FC)	; &JX1-2971;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS")
+      (=ucs		  . #x00FC)	; ü
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A64)	; &JX1-2952; [10-68]
       (=jis-x0213-1-2000  . #x2952)	; &I-JX1-2952; [09-50]
@@ -3704,10 +3704,6 @@
      ((name		  . "LATIN SMALL LETTER Y WITH ACUTE")
       (=ucs		  . #x00FD)	; ý
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER Y WITH ACUTE")
-      (=ucs		  . #x00FD)	; ý
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER Y")
       (=ucs		  . #xFF59)	; ｙ
@@ -3719,6 +3715,10 @@
     (=jis-x0213-1-2000	. #x2972)	; &I-JX1-2972; [09-82]
     (=jef-china3	. #x86A1)	; &I-JC3-86A1;
     (=ucs@jis/fw	. #x00FD)	; &JX1-2972;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER Y WITH ACUTE")
+      (=ucs		  . #x00FD)	; ý
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A72)	; &JX1-2953; [10-82]
       (=jis-x0213-1-2000  . #x2953)	; &I-JX1-2953; [09-51]
@@ -3742,15 +3742,15 @@
      ((name		  . "LATIN SMALL LETTER THORN")
       (=ucs		  . #x00FE)	; þ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER THORN")
-      (=ucs		  . #x00FE)	; þ
-      ))
     (=ks-x1001		. #x292D)	; &JX1-2973; [09-13]
     (=jis-x0212		. #x2950)	; &I-JSP-2950; [09-48]
     (=jis-x0213-1-2000	. #x2973)	; &I-JX1-2973; [09-83]
     (=jef-china3	. #x83AF)	; &I-JC3-83AF;
     (=ucs@jis/fw	. #x00FE)	; &JX1-2973;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER THORN")
+      (=ucs		  . #x00FE)	; þ
+      ))
     (->uppercase
      ((=ks-x1001	  . #x282D)	; &JX1-2954; [08-13]
       (=jis-x0212	  . #x2930)	; &I-JSP-2930; [09-16]
@@ -3782,10 +3782,6 @@
      ((name		  . "LATIN SMALL LETTER Y WITH DIAERESIS")
       (=ucs		  . #x00FF)	; ÿ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER Y WITH DIAERESIS")
-      (=ucs		  . #x00FF)	; ÿ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER Y")
       (=ucs		  . #xFF59)	; ｙ
@@ -3796,6 +3792,10 @@
     (=jis-x0212		. #x2B73)	; &JX1-2974; [11-83]
     (=jis-x0213-1-2000	. #x2974)	; &I-JX1-2974; [09-84]
     (=ucs@jis/fw	. #x00FF)	; &JX1-2974;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER Y WITH DIAERESIS")
+      (=ucs		  . #x00FF)	; ÿ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A73)	; &JSP-2A73; [10-83]
       ))
diff --git a/lisp/utf-2000/u00100-Latin-Extended-A.el b/lisp/utf-2000/u00100-Latin-Extended-A.el
index c2cb9bb..df20025 100644
--- a/lisp/utf-2000/u00100-Latin-Extended-A.el
+++ b/lisp/utf-2000/u00100-Latin-Extended-A.el
@@ -23,10 +23,6 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH MACRON")
       (=ucs		  . #x0100)	; Ā
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER A WITH MACRON")
-      (=ucs		  . #x0100)	; Ā
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER A")
       (=ucs		  . #xFF21)	; Ａ
@@ -38,6 +34,10 @@
     (=jis-x0213-1-2000	. #x2975)	; &I-JX1-2975; [09-85]
     (=jef-china3	. #x87A8)	; &I-JC3-87A8;
     (=ucs@jis/fw	. #x0100)	; &JX1-2975;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER A WITH MACRON")
+      (=ucs		  . #x0100)	; Ā
+      ))
     (->lowercase
      ((=gb2312		  . #x2821)	; &JX1-297A; [08-01]
       (=jis-x0212	  . #x2B27)	; &I-JSP-2B27; [11-07]
@@ -68,10 +68,6 @@
      ((name		  . "LATIN SMALL LETTER A WITH MACRON")
       (=ucs		  . #x0101)	; ā
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER A WITH MACRON")
-      (=ucs		  . #x0101)	; ā
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER A")
       (=ucs		  . #xFF41)	; ａ
@@ -85,6 +81,10 @@
     (=jef-china3	. #x87BC)	; &I-JC3-87BC;
     (=ucs@gb/fw		. #x0101)	; &JX1-297A;
     (=ucs@jis/fw	. #x0101)	; &JX1-297A;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER A WITH MACRON")
+      (=ucs		  . #x0101)	; ā
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A27)	; &JX1-2975; [10-07]
       (=jis-x0213-1-2000  . #x2975)	; &I-JX1-2975; [09-85]
@@ -117,10 +117,6 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH BREVE")
       (=ucs		  . #x0102)	; Ă
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER A WITH BREVE")
-      (=ucs		  . #x0102)	; Ă
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER A")
       (=ucs		  . #xFF21)	; Ａ
@@ -132,6 +128,10 @@
     (=jis-x0213-1-2000	. #x2A3A)	; &I-JX1-2A3A; [10-26]
     (=jef-china3	. #x87DE)	; &I-JC3-87DE;
     (=ucs@jis/fw	. #x0102)	; &JX1-2A3A;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER A WITH BREVE")
+      (=ucs		  . #x0102)	; Ă
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B25)	; &JX1-2A49; [11-05]
       (=jis-x0213-1-2000  . #x2A49)	; &I-JX1-2A49; [10-41]
@@ -164,10 +164,6 @@
      ((name		  . "LATIN SMALL LETTER A WITH BREVE")
       (=ucs		  . #x0103)	; ă
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER A WITH BREVE")
-      (=ucs		  . #x0103)	; ă
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER A")
       (=ucs		  . #xFF41)	; ａ
@@ -179,6 +175,10 @@
     (=jis-x0213-1-2000	. #x2A49)	; &I-JX1-2A49; [10-41]
     (=jef-china3	. #x87E8)	; &I-JC3-87E8;
     (=ucs@jis/fw	. #x0103)	; &JX1-2A49;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER A WITH BREVE")
+      (=ucs		  . #x0103)	; ă
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A25)	; &JX1-2A3A; [10-05]
       (=jis-x0213-1-2000  . #x2A3A)	; &I-JX1-2A3A; [10-26]
@@ -209,10 +209,6 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH OGONEK")
       (=ucs		  . #x0104)	; Ą
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER A WITH OGONEK")
-      (=ucs		  . #x0104)	; Ą
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER A")
       (=ucs		  . #xFF21)	; Ａ
@@ -224,6 +220,10 @@
     (=jis-x0213-1-2000	. #x2A21)	; &I-JX1-2A21; [10-01]
     (=jef-china3	. #x8AA3)	; &I-JC3-8AA3;
     (=ucs@jis/fw	. #x0104)	; &JX1-2A21;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER A WITH OGONEK")
+      (=ucs		  . #x0104)	; Ą
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B28)	; &JX1-2A2C; [11-08]
       (=jis-x0213-1-2000  . #x2A2C)	; &I-JX1-2A2C; [10-12]
@@ -254,10 +254,6 @@
      ((name		  . "LATIN SMALL LETTER A WITH OGONEK")
       (=ucs		  . #x0105)	; ą
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER A WITH OGONEK")
-      (=ucs		  . #x0105)	; ą
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER A")
       (=ucs		  . #xFF41)	; ａ
@@ -269,6 +265,10 @@
     (=jis-x0213-1-2000	. #x2A2C)	; &I-JX1-2A2C; [10-12]
     (=jef-china3	. #x8AAB)	; &I-JC3-8AAB;
     (=ucs@jis/fw	. #x0105)	; &JX1-2A2C;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER A WITH OGONEK")
+      (=ucs		  . #x0105)	; ą
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A28)	; &JX1-2A21; [10-08]
       (=jis-x0213-1-2000  . #x2A21)	; &I-JX1-2A21; [10-01]
@@ -298,10 +298,6 @@
      ((name		  . "LATIN CAPITAL LETTER C WITH ACUTE")
       (=ucs		  . #x0106)	; Ć
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER C WITH ACUTE")
-      (=ucs		  . #x0106)	; Ć
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER C")
       (=ucs		  . #xFF23)	; ï¼£
@@ -313,6 +309,10 @@
     (=jis-x0213-1-2000	. #x2A3C)	; &I-JX1-2A3C; [10-28]
     (=jef-china3	. #x85D6)	; &I-JC3-85D6;
     (=ucs@jis/fw	. #x0106)	; &JX1-2A3C;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER C WITH ACUTE")
+      (=ucs		  . #x0106)	; Ć
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B2B)	; &JX1-2A4B; [11-11]
       (=jis-x0213-1-2000  . #x2A4B)	; &I-JX1-2A4B; [10-43]
@@ -342,10 +342,6 @@
      ((name		  . "LATIN SMALL LETTER C WITH ACUTE")
       (=ucs		  . #x0107)	; ć
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER C WITH ACUTE")
-      (=ucs		  . #x0107)	; ć
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER C")
       (=ucs		  . #xFF43)	; ｃ
@@ -357,6 +353,10 @@
     (=jis-x0213-1-2000	. #x2A4B)	; &I-JX1-2A4B; [10-43]
     (=jef-china3	. #x85EC)	; &I-JC3-85EC;
     (=ucs@jis/fw	. #x0107)	; &JX1-2A4B;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER C WITH ACUTE")
+      (=ucs		  . #x0107)	; ć
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A2B)	; &JX1-2A3C; [10-11]
       (=jis-x0213-1-2000  . #x2A3C)	; &I-JX1-2A3C; [10-28]
@@ -386,10 +386,6 @@
      ((name		  . "LATIN CAPITAL LETTER C WITH CIRCUMFLEX")
       (=ucs		  . #x0108)	; Ĉ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER C WITH CIRCUMFLEX")
-      (=ucs		  . #x0108)	; Ĉ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER C")
       (=ucs		  . #xFF23)	; ï¼£
@@ -401,6 +397,10 @@
     (=jis-x0213-1-2000	. #x2A59)	; &I-JX1-2A59; [10-57]
     (=jef-china3	. #x86B8)	; &I-JC3-86B8;
     (=ucs@jis/fw	. #x0108)	; &JX1-2A59;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER C WITH CIRCUMFLEX")
+      (=ucs		  . #x0108)	; Ĉ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B2C)	; &JX1-2A5F; [11-12]
       (=jis-x0213-1-2000  . #x2A5F)	; &I-JX1-2A5F; [10-63]
@@ -430,10 +430,6 @@
      ((name		  . "LATIN SMALL LETTER C WITH CIRCUMFLEX")
       (=ucs		  . #x0109)	; ĉ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER C WITH CIRCUMFLEX")
-      (=ucs		  . #x0109)	; ĉ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER C")
       (=ucs		  . #xFF43)	; ｃ
@@ -445,6 +441,10 @@
     (=jis-x0213-1-2000	. #x2A5F)	; &I-JX1-2A5F; [10-63]
     (=jef-china3	. #x86C5)	; &I-JC3-86C5;
     (=ucs@jis/fw	. #x0109)	; &JX1-2A5F;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER C WITH CIRCUMFLEX")
+      (=ucs		  . #x0109)	; ĉ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A2C)	; &JX1-2A59; [10-12]
       (=jis-x0213-1-2000  . #x2A59)	; &I-JX1-2A59; [10-57]
@@ -474,10 +474,6 @@
      ((name		  . "LATIN CAPITAL LETTER C WITH DOT ABOVE")
       (=ucs		  . #x010A)	; Ċ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER C WITH DOT ABOVE")
-      (=ucs		  . #x010A)	; Ċ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER C")
       (=ucs		  . #xFF23)	; ï¼£
@@ -488,6 +484,10 @@
     (=jis-x0212		. #x2A2F)	; &JSP-2A2F; [10-15]
     (=jef-china3	. #x87FA)	; &I-JC3-87FA;
     (=ucs@jis/fw	. #x010A)	; &JSP-2A2F;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER C WITH DOT ABOVE")
+      (=ucs		  . #x010A)	; Ċ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B2F)	; &JSP-2B2F; [11-15]
       ))
@@ -516,10 +516,6 @@
      ((name		  . "LATIN SMALL LETTER C WITH DOT ABOVE")
       (=ucs		  . #x010B)	; ċ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER C WITH DOT ABOVE")
-      (=ucs		  . #x010B)	; ċ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER C")
       (=ucs		  . #xFF43)	; ｃ
@@ -530,6 +526,10 @@
     (=jis-x0212		. #x2B2F)	; &JSP-2B2F; [11-15]
     (=jef-china3	. #x88B2)	; &I-JC3-88B2;
     (=ucs@jis/fw	. #x010B)	; &JSP-2B2F;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER C WITH DOT ABOVE")
+      (=ucs		  . #x010B)	; ċ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A2F)	; &JSP-2A2F; [10-15]
       ))
@@ -559,10 +559,6 @@
      ((name		  . "LATIN CAPITAL LETTER C WITH CARON")
       (=ucs		  . #x010C)	; Č
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER C WITH CARON")
-      (=ucs		  . #x010C)	; Č
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER C")
       (=ucs		  . #xFF23)	; ï¼£
@@ -574,6 +570,10 @@
     (=jis-x0213-1-2000	. #x2A3D)	; &I-JX1-2A3D; [10-29]
     (=jef-china3	. #x88E0)	; &I-JC3-88E0;
     (=ucs@jis/fw	. #x010C)	; &JX1-2A3D;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER C WITH CARON")
+      (=ucs		  . #x010C)	; Č
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B2D)	; &JX1-2A4C; [11-13]
       (=jis-x0213-1-2000  . #x2A4C)	; &I-JX1-2A4C; [10-44]
@@ -604,10 +604,6 @@
      ((name		  . "LATIN SMALL LETTER C WITH CARON")
       (=ucs		  . #x010D)	; č
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER C WITH CARON")
-      (=ucs		  . #x010D)	; č
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER C")
       (=ucs		  . #xFF43)	; ｃ
@@ -619,6 +615,10 @@
     (=jis-x0213-1-2000	. #x2A4C)	; &I-JX1-2A4C; [10-44]
     (=jef-china3	. #x88EF)	; &I-JC3-88EF;
     (=ucs@jis/fw	. #x010D)	; &JX1-2A4C;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER C WITH CARON")
+      (=ucs		  . #x010D)	; č
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A2D)	; &JX1-2A3D; [10-13]
       (=jis-x0213-1-2000  . #x2A3D)	; &I-JX1-2A3D; [10-29]
@@ -648,10 +648,6 @@
      ((name		  . "LATIN CAPITAL LETTER D WITH CARON")
       (=ucs		  . #x010E)	; Ď
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER D WITH CARON")
-      (=ucs		  . #x010E)	; Ď
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER D")
       (=ucs		  . #xFF24)	; Ｄ
@@ -663,6 +659,10 @@
     (=jis-x0213-1-2000	. #x2A40)	; &I-JX1-2A40; [10-32]
     (=jef-china3	. #x88E1)	; &I-JC3-88E1;
     (=ucs@jis/fw	. #x010E)	; &JX1-2A40;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER D WITH CARON")
+      (=ucs		  . #x010E)	; Ď
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B30)	; &JX1-2A4F; [11-16]
       (=jis-x0213-1-2000  . #x2A4F)	; &I-JX1-2A4F; [10-47]
@@ -692,10 +692,6 @@
      ((name		  . "LATIN SMALL LETTER D WITH CARON")
       (=ucs		  . #x010F)	; ď
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER D WITH CARON")
-      (=ucs		  . #x010F)	; ď
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER D")
       (=ucs		  . #xFF44)	; ｄ
@@ -707,6 +703,10 @@
     (=jis-x0213-1-2000	. #x2A4F)	; &I-JX1-2A4F; [10-47]
     (=jef-china3	. #x88F0)	; &I-JC3-88F0;
     (=ucs@jis/fw	. #x010F)	; &JX1-2A4F;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER D WITH CARON")
+      (=ucs		  . #x010F)	; ď
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A30)	; &JX1-2A40; [10-16]
       (=jis-x0213-1-2000  . #x2A40)	; &I-JX1-2A40; [10-32]
@@ -733,13 +733,13 @@
      ((name		  . "LATIN CAPITAL LETTER D WITH STROKE")
       (=ucs		  . #x0110)	; Đ
       ))
+    (=jis-x0212		. #x2922)	; &JSP-2922; [09-02]
+    (=jef-china3	. #x83A3)	; &I-JC3-83A3;
+    (=ucs@jis/fw	. #x0110)	; &JSP-2922;
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER D WITH STROKE")
       (=ucs		  . #x0110)	; Đ
       ))
-    (=jis-x0212		. #x2922)	; &JSP-2922; [09-02]
-    (=jef-china3	. #x83A3)	; &I-JC3-83A3;
-    (=ucs@jis/fw	. #x0110)	; &JSP-2922;
     (->lowercase
      ((=ks-x1001	  . #x2922)	; &JX1-2A50; [09-02]
       (=jis-x0212	  . #x2942)	; &I-JSP-2942; [09-34]
@@ -767,15 +767,15 @@
      ((name		  . "LATIN SMALL LETTER D WITH STROKE")
       (=ucs		  . #x0111)	; đ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER D WITH STROKE")
-      (=ucs		  . #x0111)	; đ
-      ))
     (=ks-x1001		. #x2922)	; &JX1-2A50; [09-02]
     (=jis-x0212		. #x2942)	; &I-JSP-2942; [09-34]
     (=jis-x0213-1-2000	. #x2A50)	; &I-JX1-2A50; [10-48]
     (=jef-china3	. #x83AE)	; &I-JC3-83AE;
     (=ucs@jis/fw	. #x0111)	; &JX1-2A50;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER D WITH STROKE")
+      (=ucs		  . #x0111)	; đ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2922)	; &JSP-2922; [09-02]
       ))
@@ -804,10 +804,6 @@
      ((name		  . "LATIN CAPITAL LETTER E WITH MACRON")
       (=ucs		  . #x0112)	; Ē
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER E WITH MACRON")
-      (=ucs		  . #x0112)	; Ē
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER E")
       (=ucs		  . #xFF25)	; ï¼¥
@@ -819,6 +815,10 @@
     (=jis-x0213-1-2000	. #x2978)	; &I-JX1-2978; [09-88]
     (=jef-china3	. #x87AB)	; &I-JC3-87AB;
     (=ucs@jis/fw	. #x0112)	; &JX1-2978;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER E WITH MACRON")
+      (=ucs		  . #x0112)	; Ē
+      ))
     (->lowercase
      ((=gb2312		  . #x2825)	; &JX1-297D; [08-05]
       (=jis-x0212	  . #x2B37)	; &I-JSP-2B37; [11-23]
@@ -849,10 +849,6 @@
      ((name		  . "LATIN SMALL LETTER E WITH MACRON")
       (=ucs		  . #x0113)	; ē
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER E WITH MACRON")
-      (=ucs		  . #x0113)	; ē
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER E")
       (=ucs		  . #xFF45)	; ｅ
@@ -866,6 +862,10 @@
     (=jef-china3	. #x87BF)	; &I-JC3-87BF;
     (=ucs@gb/fw		. #x0113)	; &JX1-297D;
     (=ucs@jis/fw	. #x0113)	; &JX1-297D;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER E WITH MACRON")
+      (=ucs		  . #x0113)	; ē
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A37)	; &JX1-2978; [10-23]
       (=jis-x0213-1-2000  . #x2978)	; &I-JX1-2978; [09-88]
@@ -931,10 +931,6 @@
      ((name		  . "LATIN CAPITAL LETTER E WITH DOT ABOVE")
       (=ucs		  . #x0116)	; Ė
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER E WITH DOT ABOVE")
-      (=ucs		  . #x0116)	; Ė
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER E")
       (=ucs		  . #xFF25)	; ï¼¥
@@ -945,6 +941,10 @@
     (=jis-x0212		. #x2A36)	; &JSP-2A36; [10-22]
     (=jef-china3	. #x87FC)	; &I-JC3-87FC;
     (=ucs@jis/fw	. #x0116)	; &JSP-2A36;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER E WITH DOT ABOVE")
+      (=ucs		  . #x0116)	; Ė
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B36)	; &JSP-2B36; [11-22]
       ))
@@ -973,10 +973,6 @@
      ((name		  . "LATIN SMALL LETTER E WITH DOT ABOVE")
       (=ucs		  . #x0117)	; ė
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER E WITH DOT ABOVE")
-      (=ucs		  . #x0117)	; ė
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER E")
       (=ucs		  . #xFF45)	; ｅ
@@ -987,6 +983,10 @@
     (=jis-x0212		. #x2B36)	; &JSP-2B36; [11-22]
     (=jef-china3	. #x88B4)	; &I-JC3-88B4;
     (=ucs@jis/fw	. #x0117)	; &JSP-2B36;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER E WITH DOT ABOVE")
+      (=ucs		  . #x0117)	; ė
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A36)	; &JSP-2A36; [10-22]
       ))
@@ -1016,10 +1016,6 @@
      ((name		  . "LATIN CAPITAL LETTER E WITH OGONEK")
       (=ucs		  . #x0118)	; Ę
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER E WITH OGONEK")
-      (=ucs		  . #x0118)	; Ę
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER E")
       (=ucs		  . #xFF25)	; ï¼¥
@@ -1031,6 +1027,10 @@
     (=jis-x0213-1-2000	. #x2A3E)	; &I-JX1-2A3E; [10-30]
     (=jef-china3	. #x8AA4)	; &I-JC3-8AA4;
     (=ucs@jis/fw	. #x0118)	; &JX1-2A3E;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER E WITH OGONEK")
+      (=ucs		  . #x0118)	; Ę
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B38)	; &JX1-2A4D; [11-24]
       (=jis-x0213-1-2000  . #x2A4D)	; &I-JX1-2A4D; [10-45]
@@ -1061,10 +1061,6 @@
      ((name		  . "LATIN SMALL LETTER E WITH OGONEK")
       (=ucs		  . #x0119)	; ę
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER E WITH OGONEK")
-      (=ucs		  . #x0119)	; ę
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER E")
       (=ucs		  . #xFF45)	; ｅ
@@ -1076,6 +1072,10 @@
     (=jis-x0213-1-2000	. #x2A4D)	; &I-JX1-2A4D; [10-45]
     (=jef-china3	. #x8AAC)	; &I-JC3-8AAC;
     (=ucs@jis/fw	. #x0119)	; &JX1-2A4D;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER E WITH OGONEK")
+      (=ucs		  . #x0119)	; ę
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A38)	; &JX1-2A3E; [10-24]
       (=jis-x0213-1-2000  . #x2A3E)	; &I-JX1-2A3E; [10-30]
@@ -1105,10 +1105,6 @@
      ((name		  . "LATIN CAPITAL LETTER E WITH CARON")
       (=ucs		  . #x011A)	; Ě
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER E WITH CARON")
-      (=ucs		  . #x011A)	; Ě
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER E")
       (=ucs		  . #xFF25)	; ï¼¥
@@ -1120,6 +1116,10 @@
     (=jis-x0213-1-2000	. #x2A3F)	; &I-JX1-2A3F; [10-31]
     (=jef-china3	. #x88E2)	; &I-JC3-88E2;
     (=ucs@jis/fw	. #x011A)	; &JX1-2A3F;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER E WITH CARON")
+      (=ucs		  . #x011A)	; Ě
+      ))
     (->lowercase
      ((=gb2312		  . #x2827)	; &JX1-2A4E; [08-07]
       (=jis-x0212	  . #x2B35)	; &I-JSP-2B35; [11-21]
@@ -1150,10 +1150,6 @@
      ((name		  . "LATIN SMALL LETTER E WITH CARON")
       (=ucs		  . #x011B)	; ě
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER E WITH CARON")
-      (=ucs		  . #x011B)	; ě
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER E")
       (=ucs		  . #xFF45)	; ｅ
@@ -1167,6 +1163,10 @@
     (=jef-china3	. #x88F1)	; &I-JC3-88F1;
     (=ucs@gb/fw		. #x011B)	; &JX1-2A4E;
     (=ucs@jis/fw	. #x011B)	; &JX1-2A4E;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER E WITH CARON")
+      (=ucs		  . #x011B)	; ě
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A35)	; &JX1-2A3F; [10-21]
       (=jis-x0213-1-2000  . #x2A3F)	; &I-JX1-2A3F; [10-31]
@@ -1196,10 +1196,6 @@
      ((name		  . "LATIN CAPITAL LETTER G WITH CIRCUMFLEX")
       (=ucs		  . #x011C)	; Ĝ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER G WITH CIRCUMFLEX")
-      (=ucs		  . #x011C)	; Ĝ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER G")
       (=ucs		  . #xFF27)	; Ｇ
@@ -1211,6 +1207,10 @@
     (=jis-x0213-1-2000	. #x2A5A)	; &I-JX1-2A5A; [10-58]
     (=jef-china3	. #x86BA)	; &I-JC3-86BA;
     (=ucs@jis/fw	. #x011C)	; &JX1-2A5A;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER G WITH CIRCUMFLEX")
+      (=ucs		  . #x011C)	; Ĝ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B3A)	; &JX1-2A60; [11-26]
       (=jis-x0213-1-2000  . #x2A60)	; &I-JX1-2A60; [10-64]
@@ -1240,10 +1240,6 @@
      ((name		  . "LATIN SMALL LETTER G WITH CIRCUMFLEX")
       (=ucs		  . #x011D)	; ĝ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER G WITH CIRCUMFLEX")
-      (=ucs		  . #x011D)	; ĝ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER G")
       (=ucs		  . #xFF47)	; ｇ
@@ -1255,6 +1251,10 @@
     (=jis-x0213-1-2000	. #x2A60)	; &I-JX1-2A60; [10-64]
     (=jef-china3	. #x86C7)	; &I-JC3-86C7;
     (=ucs@jis/fw	. #x011D)	; &JX1-2A60;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER G WITH CIRCUMFLEX")
+      (=ucs		  . #x011D)	; ĝ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A3A)	; &JX1-2A5A; [10-26]
       (=jis-x0213-1-2000  . #x2A5A)	; &I-JX1-2A5A; [10-58]
@@ -1285,10 +1285,6 @@
      ((name		  . "LATIN CAPITAL LETTER G WITH BREVE")
       (=ucs		  . #x011E)	; Ğ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER G WITH BREVE")
-      (=ucs		  . #x011E)	; Ğ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER G")
       (=ucs		  . #xFF27)	; Ｇ
@@ -1299,6 +1295,10 @@
     (=jis-x0212		. #x2A3B)	; &JSP-2A3B; [10-27]
     (=jef-china3	. #x87E1)	; &I-JC3-87E1;
     (=ucs@jis/fw	. #x011E)	; &JSP-2A3B;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER G WITH BREVE")
+      (=ucs		  . #x011E)	; Ğ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B3B)	; &JSP-2B3B; [11-27]
       ))
@@ -1328,10 +1328,6 @@
      ((name		  . "LATIN SMALL LETTER G WITH BREVE")
       (=ucs		  . #x011F)	; ğ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER G WITH BREVE")
-      (=ucs		  . #x011F)	; ğ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER G")
       (=ucs		  . #xFF47)	; ｇ
@@ -1342,6 +1338,10 @@
     (=jis-x0212		. #x2B3B)	; &JSP-2B3B; [11-27]
     (=jef-china3	. #x87EB)	; &I-JC3-87EB;
     (=ucs@jis/fw	. #x011F)	; &JSP-2B3B;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER G WITH BREVE")
+      (=ucs		  . #x011F)	; ğ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A3B)	; &JSP-2A3B; [10-27]
       ))
@@ -1370,10 +1370,6 @@
      ((name		  . "LATIN CAPITAL LETTER G WITH DOT ABOVE")
       (=ucs		  . #x0120)	; Ä 
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER G WITH DOT ABOVE")
-      (=ucs		  . #x0120)	; Ä 
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER G")
       (=ucs		  . #xFF27)	; Ｇ
@@ -1384,6 +1380,10 @@
     (=jis-x0212		. #x2A3D)	; &JSP-2A3D; [10-29]
     (=jef-china3	. #x87FE)	; &I-JC3-87FE;
     (=ucs@jis/fw	. #x0120)	; &JSP-2A3D;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER G WITH DOT ABOVE")
+      (=ucs		  . #x0120)	; Ä 
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B3D)	; &JSP-2B3D; [11-29]
       ))
@@ -1412,10 +1412,6 @@
      ((name		  . "LATIN SMALL LETTER G WITH DOT ABOVE")
       (=ucs		  . #x0121)	; Ä¡
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER G WITH DOT ABOVE")
-      (=ucs		  . #x0121)	; Ä¡
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER G")
       (=ucs		  . #xFF47)	; ｇ
@@ -1426,6 +1422,10 @@
     (=jis-x0212		. #x2B3D)	; &JSP-2B3D; [11-29]
     (=jef-china3	. #x88B6)	; &I-JC3-88B6;
     (=ucs@jis/fw	. #x0121)	; &JSP-2B3D;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER G WITH DOT ABOVE")
+      (=ucs		  . #x0121)	; Ä¡
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A3D)	; &JSP-2A3D; [10-29]
       ))
@@ -1454,10 +1454,6 @@
      ((name		  . "LATIN CAPITAL LETTER G WITH CEDILLA")
       (=ucs		  . #x0122)	; Ģ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER G WITH CEDILLA")
-      (=ucs		  . #x0122)	; Ģ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER G")
       (=ucs		  . #xFF27)	; Ｇ
@@ -1467,6 +1463,10 @@
       ))
     (=jis-x0212		. #x2A3C)	; &JSP-2A3C; [10-28]
     (=ucs@jis/fw	. #x0122)	; &JSP-2A3C;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER G WITH CEDILLA")
+      (=ucs		  . #x0122)	; Ģ
+      ))
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER G WITH CEDILLA")
@@ -1511,10 +1511,6 @@
      ((name		  . "LATIN CAPITAL LETTER H WITH CIRCUMFLEX")
       (=ucs		  . #x0124)	; Ĥ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER H WITH CIRCUMFLEX")
-      (=ucs		  . #x0124)	; Ĥ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER H")
       (=ucs		  . #xFF28)	; Ｈ
@@ -1526,6 +1522,10 @@
     (=jis-x0213-1-2000	. #x2A5B)	; &I-JX1-2A5B; [10-59]
     (=jef-china3	. #x86BB)	; &I-JC3-86BB;
     (=ucs@jis/fw	. #x0124)	; &JX1-2A5B;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER H WITH CIRCUMFLEX")
+      (=ucs		  . #x0124)	; Ĥ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B3E)	; &JX1-2A61; [11-30]
       (=jis-x0213-1-2000  . #x2A61)	; &I-JX1-2A61; [10-65]
@@ -1555,10 +1555,6 @@
      ((name		  . "LATIN SMALL LETTER H WITH CIRCUMFLEX")
       (=ucs		  . #x0125)	; ĥ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER H WITH CIRCUMFLEX")
-      (=ucs		  . #x0125)	; ĥ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER H")
       (=ucs		  . #xFF48)	; ｈ
@@ -1570,6 +1566,10 @@
     (=jis-x0213-1-2000	. #x2A61)	; &I-JX1-2A61; [10-65]
     (=jef-china3	. #x86C8)	; &I-JC3-86C8;
     (=ucs@jis/fw	. #x0125)	; &JX1-2A61;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER H WITH CIRCUMFLEX")
+      (=ucs		  . #x0125)	; ĥ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A3E)	; &JX1-2A5B; [10-30]
       (=jis-x0213-1-2000  . #x2A5B)	; &I-JX1-2A5B; [10-59]
@@ -1592,13 +1592,13 @@
      ((name		  . "LATIN CAPITAL LETTER H WITH STROKE")
       (=ucs		  . #x0126)	; Ħ
       ))
+    (=ks-x1001		. #x2824)	; &JSP-2924; [08-04]
+    (=jis-x0212		. #x2924)	; &I-JSP-2924; [09-04]
+    (=ucs@jis/fw	. #x0126)	; &JSP-2924;
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER H WITH STROKE")
       (=ucs		  . #x0126)	; Ħ
       ))
-    (=ks-x1001		. #x2824)	; &JSP-2924; [08-04]
-    (=jis-x0212		. #x2924)	; &I-JSP-2924; [09-04]
-    (=ucs@jis/fw	. #x0126)	; &JSP-2924;
     (->lowercase
      ((=ks-x1001	  . #x2924)	; &JX1-2A7D; [09-04]
       (=jis-x0212	  . #x2944)	; &I-JSP-2944; [09-36]
@@ -1622,14 +1622,14 @@
      ((name		  . "LATIN SMALL LETTER H WITH STROKE")
       (=ucs		  . #x0127)	; ħ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER H WITH STROKE")
-      (=ucs		  . #x0127)	; ħ
-      ))
     (=ks-x1001		. #x2924)	; &JX1-2A7D; [09-04]
     (=jis-x0212		. #x2944)	; &I-JSP-2944; [09-36]
     (=jis-x0213-1-2000	. #x2A7D)	; &I-JX1-2A7D; [10-93]
     (=ucs@jis/fw	. #x0127)	; &JX1-2A7D;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER H WITH STROKE")
+      (=ucs		  . #x0127)	; ħ
+      ))
     (->uppercase
      ((=ks-x1001	  . #x2824)	; &JSP-2924; [08-04]
       (=jis-x0212	  . #x2924)	; &I-JSP-2924; [09-04]
@@ -1661,10 +1661,6 @@
      ((name		  . "LATIN CAPITAL LETTER I WITH TILDE")
       (=ucs		  . #x0128)	; Ĩ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER I WITH TILDE")
-      (=ucs		  . #x0128)	; Ĩ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER I")
       (=ucs		  . #xFF29)	; Ｉ
@@ -1675,6 +1671,10 @@
     (=jis-x0212		. #x2A47)	; &JSP-2A47; [10-39]
     (=jef-china3	. #x86E5)	; &I-JC3-86E5;
     (=ucs@jis/fw	. #x0128)	; &JSP-2A47;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER I WITH TILDE")
+      (=ucs		  . #x0128)	; Ĩ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B47)	; &JSP-2B47; [11-39]
       ))
@@ -1706,10 +1706,6 @@
      ((name		  . "LATIN SMALL LETTER I WITH TILDE")
       (=ucs		  . #x0129)	; Ä©
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER I WITH TILDE")
-      (=ucs		  . #x0129)	; Ä©
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER I")
       (=ucs		  . #xFF49)	; ｉ
@@ -1719,6 +1715,10 @@
       ))
     (=jis-x0212		. #x2B47)	; &JSP-2B47; [11-39]
     (=ucs@jis/fw	. #x0129)	; &JSP-2B47;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER I WITH TILDE")
+      (=ucs		  . #x0129)	; Ä©
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A47)	; &JSP-2A47; [10-39]
       ))
@@ -1747,10 +1747,6 @@
      ((name		  . "LATIN CAPITAL LETTER I WITH MACRON")
       (=ucs		  . #x012A)	; Ī
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER I WITH MACRON")
-      (=ucs		  . #x012A)	; Ī
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER I")
       (=ucs		  . #xFF29)	; Ｉ
@@ -1762,6 +1758,10 @@
     (=jis-x0213-1-2000	. #x2976)	; &I-JX1-2976; [09-86]
     (=jef-china3	. #x87AD)	; &I-JC3-87AD;
     (=ucs@jis/fw	. #x012A)	; &JX1-2976;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER I WITH MACRON")
+      (=ucs		  . #x012A)	; Ī
+      ))
     (->lowercase
      ((=gb2312		  . #x2829)	; &JX1-297B; [08-09]
       (=jis-x0212	  . #x2B45)	; &I-JSP-2B45; [11-37]
@@ -1792,10 +1792,6 @@
      ((name		  . "LATIN SMALL LETTER I WITH MACRON")
       (=ucs		  . #x012B)	; Ä«
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER I WITH MACRON")
-      (=ucs		  . #x012B)	; Ä«
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER I")
       (=ucs		  . #xFF49)	; ｉ
@@ -1808,6 +1804,10 @@
     (=jis-x0213-1-2000	. #x297B)	; &I-JX1-297B; [09-91]
     (=ucs@gb/fw		. #x012B)	; &JX1-297B;
     (=ucs@jis/fw	. #x012B)	; &JX1-297B;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER I WITH MACRON")
+      (=ucs		  . #x012B)	; Ä«
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A45)	; &JX1-2976; [10-37]
       (=jis-x0213-1-2000  . #x2976)	; &I-JX1-2976; [09-86]
@@ -1873,10 +1873,6 @@
      ((name		  . "LATIN CAPITAL LETTER I WITH OGONEK")
       (=ucs		  . #x012E)	; Ä®
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER I WITH OGONEK")
-      (=ucs		  . #x012E)	; Ä®
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER I")
       (=ucs		  . #xFF29)	; Ｉ
@@ -1887,6 +1883,10 @@
     (=jis-x0212		. #x2A46)	; &JSP-2A46; [10-38]
     (=jef-china3	. #x8AA6)	; &I-JC3-8AA6;
     (=ucs@jis/fw	. #x012E)	; &JSP-2A46;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER I WITH OGONEK")
+      (=ucs		  . #x012E)	; Ä®
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B46)	; &JSP-2B46; [11-38]
       ))
@@ -1915,10 +1915,6 @@
      ((name		  . "LATIN SMALL LETTER I WITH OGONEK")
       (=ucs		  . #x012F)	; į
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER I WITH OGONEK")
-      (=ucs		  . #x012F)	; į
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER I")
       (=ucs		  . #xFF49)	; ｉ
@@ -1929,6 +1925,10 @@
     (=jis-x0212		. #x2B46)	; &JSP-2B46; [11-38]
     (=jef-china3	. #x8AAE)	; &I-JC3-8AAE;
     (=ucs@jis/fw	. #x012F)	; &JSP-2B46;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER I WITH OGONEK")
+      (=ucs		  . #x012F)	; į
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A46)	; &JSP-2A46; [10-38]
       ))
@@ -1958,10 +1958,6 @@
      ((name		  . "LATIN CAPITAL LETTER I WITH DOT ABOVE")
       (=ucs		  . #x0130)	; Ä°
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER I WITH DOT ABOVE")
-      (=ucs		  . #x0130)	; Ä°
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER I")
       (=ucs		  . #xFF29)	; Ｉ
@@ -1972,6 +1968,10 @@
     (=jis-x0212		. #x2A44)	; &JSP-2A44; [10-36]
     (=jef-china3	. #x88A2)	; &I-JC3-88A2;
     (=ucs@jis/fw	. #x0130)	; &JSP-2A44;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER I WITH DOT ABOVE")
+      (=ucs		  . #x0130)	; Ä°
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER I")
       (=ucs		  . #xFF49)	; ｉ
@@ -1995,14 +1995,14 @@
      ((name		  . "LATIN SMALL LETTER DOTLESS I")
       (=ucs		  . #x0131)	; ı
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER DOTLESS I")
-      (=ucs		  . #x0131)	; ı
-      ))
     (=ks-x1001		. #x2925)	; &JSP-2945; [09-05]
     (=jis-x0212		. #x2945)	; &I-JSP-2945; [09-37]
     (=jef-china3	. #x83B3)	; &I-JC3-83B3;
     (=ucs@jis/fw	. #x0131)	; &JSP-2945;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER DOTLESS I")
+      (=ucs		  . #x0131)	; ı
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER I")
       (=ucs		  . #xFF29)	; Ｉ
@@ -2031,13 +2031,13 @@
      ((name		  . "LATIN CAPITAL LIGATURE IJ")
       (=ucs		  . #x0132)	; IJ
       ))
+    (=ks-x1001		. #x2826)	; &JSP-2926; [08-06]
+    (=jis-x0212		. #x2926)	; &I-JSP-2926; [09-06]
+    (=ucs@jis		. #x0132)	; &JSP-2926;
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LIGATURE IJ")
       (=ucs		  . #x0132)	; IJ
       ))
-    (=ks-x1001		. #x2826)	; &JSP-2926; [08-06]
-    (=jis-x0212		. #x2926)	; &I-JSP-2926; [09-06]
-    (=ucs@jis		. #x0132)	; &JSP-2926;
     (->lowercase
      ((=ks-x1001	  . #x2926)	; &JSP-2946; [09-06]
       (=jis-x0212	  . #x2946)	; &I-JSP-2946; [09-38]
@@ -2066,13 +2066,13 @@
      ((name		  . "LATIN SMALL LIGATURE IJ")
       (=ucs		  . #x0133)	; ij
       ))
+    (=ks-x1001		. #x2926)	; &JSP-2946; [09-06]
+    (=jis-x0212		. #x2946)	; &I-JSP-2946; [09-38]
+    (=ucs@jis/fw	. #x0133)	; &JSP-2946;
     (<-fullwidth
      ((name		  . "LATIN SMALL LIGATURE IJ")
       (=ucs		  . #x0133)	; ij
       ))
-    (=ks-x1001		. #x2926)	; &JSP-2946; [09-06]
-    (=jis-x0212		. #x2946)	; &I-JSP-2946; [09-38]
-    (=ucs@jis/fw	. #x0133)	; &JSP-2946;
     (->uppercase
      ((=ks-x1001	  . #x2826)	; &JSP-2926; [08-06]
       (=jis-x0212	  . #x2926)	; &I-JSP-2926; [09-06]
@@ -2102,10 +2102,6 @@
      ((name		  . "LATIN CAPITAL LETTER J WITH CIRCUMFLEX")
       (=ucs		  . #x0134)	; Ä´
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER J WITH CIRCUMFLEX")
-      (=ucs		  . #x0134)	; Ä´
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER J")
       (=ucs		  . #xFF2A)	; Ｊ
@@ -2117,6 +2113,10 @@
     (=jis-x0213-1-2000	. #x2A5C)	; &I-JX1-2A5C; [10-60]
     (=jef-china3	. #x86BD)	; &I-JC3-86BD;
     (=ucs@jis/fw	. #x0134)	; &JX1-2A5C;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER J WITH CIRCUMFLEX")
+      (=ucs		  . #x0134)	; Ä´
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B48)	; &JX1-2A62; [11-40]
       (=jis-x0213-1-2000  . #x2A62)	; &I-JX1-2A62; [10-66]
@@ -2146,10 +2146,6 @@
      ((name		  . "LATIN SMALL LETTER J WITH CIRCUMFLEX")
       (=ucs		  . #x0135)	; ĵ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER J WITH CIRCUMFLEX")
-      (=ucs		  . #x0135)	; ĵ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER J")
       (=ucs		  . #xFF4A)	; ｊ
@@ -2161,6 +2157,10 @@
     (=jis-x0213-1-2000	. #x2A62)	; &I-JX1-2A62; [10-66]
     (=jef-china3	. #x86CA)	; &I-JC3-86CA;
     (=ucs@jis/fw	. #x0135)	; &JX1-2A62;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER J WITH CIRCUMFLEX")
+      (=ucs		  . #x0135)	; ĵ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A48)	; &JX1-2A5C; [10-40]
       (=jis-x0213-1-2000  . #x2A5C)	; &I-JX1-2A5C; [10-60]
@@ -2190,10 +2190,6 @@
      ((name		  . "LATIN CAPITAL LETTER K WITH CEDILLA")
       (=ucs		  . #x0136)	; Ķ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER K WITH CEDILLA")
-      (=ucs		  . #x0136)	; Ķ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER K")
       (=ucs		  . #xFF2B)	; Ｋ
@@ -2203,6 +2199,10 @@
       ))
     (=jis-x0212		. #x2A49)	; &JSP-2A49; [10-41]
     (=ucs@jis/fw	. #x0136)	; &JSP-2A49;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER K WITH CEDILLA")
+      (=ucs		  . #x0136)	; Ķ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B49)	; &JSP-2B49; [11-41]
       ))
@@ -2231,10 +2231,6 @@
      ((name		  . "LATIN SMALL LETTER K WITH CEDILLA")
       (=ucs		  . #x0137)	; Ä·
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER K WITH CEDILLA")
-      (=ucs		  . #x0137)	; Ä·
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER K")
       (=ucs		  . #xFF4B)	; ｋ
@@ -2244,6 +2240,10 @@
       ))
     (=jis-x0212		. #x2B49)	; &JSP-2B49; [11-41]
     (=ucs@jis/fw	. #x0137)	; &JSP-2B49;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER K WITH CEDILLA")
+      (=ucs		  . #x0137)	; Ä·
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A49)	; &JSP-2A49; [10-41]
       ))
@@ -2262,13 +2262,13 @@
      ((name		  . "LATIN SMALL LETTER KRA")
       (=ucs		  . #x0138)	; ĸ
       ))
+    (=ks-x1001		. #x2927)	; &JSP-2947; [09-07]
+    (=jis-x0212		. #x2947)	; &I-JSP-2947; [09-39]
+    (=ucs@jis/fw	. #x0138)	; &JSP-2947;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER KRA")
       (=ucs		  . #x0138)	; ĸ
       ))
-    (=ks-x1001		. #x2927)	; &JSP-2947; [09-07]
-    (=jis-x0212		. #x2947)	; &I-JSP-2947; [09-39]
-    (=ucs@jis/fw	. #x0138)	; &JSP-2947;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER L WITH ACUTE")
@@ -2294,10 +2294,6 @@
      ((name		  . "LATIN CAPITAL LETTER L WITH ACUTE")
       (=ucs		  . #x0139)	; Ĺ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER L WITH ACUTE")
-      (=ucs		  . #x0139)	; Ĺ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER L")
       (=ucs		  . #xFF2C)	; Ｌ
@@ -2309,6 +2305,10 @@
     (=jis-x0213-1-2000	. #x2A3B)	; &I-JX1-2A3B; [10-27]
     (=jef-china3	. #x85DD)	; &I-JC3-85DD;
     (=ucs@jis/fw	. #x0139)	; &JX1-2A3B;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER L WITH ACUTE")
+      (=ucs		  . #x0139)	; Ĺ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B4A)	; &JX1-2A4A; [11-42]
       (=jis-x0213-1-2000  . #x2A4A)	; &I-JX1-2A4A; [10-42]
@@ -2338,10 +2338,6 @@
      ((name		  . "LATIN SMALL LETTER L WITH ACUTE")
       (=ucs		  . #x013A)	; ĺ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER L WITH ACUTE")
-      (=ucs		  . #x013A)	; ĺ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER L")
       (=ucs		  . #xFF4C)	; ｌ
@@ -2353,6 +2349,10 @@
     (=jis-x0213-1-2000	. #x2A4A)	; &I-JX1-2A4A; [10-42]
     (=jef-china3	. #x85F3)	; &I-JC3-85F3;
     (=ucs@jis/fw	. #x013A)	; &JX1-2A4A;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER L WITH ACUTE")
+      (=ucs		  . #x013A)	; ĺ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A4A)	; &JX1-2A3B; [10-42]
       (=jis-x0213-1-2000  . #x2A3B)	; &I-JX1-2A3B; [10-27]
@@ -2382,10 +2382,6 @@
      ((name		  . "LATIN CAPITAL LETTER L WITH CEDILLA")
       (=ucs		  . #x013B)	; Ä»
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER L WITH CEDILLA")
-      (=ucs		  . #x013B)	; Ä»
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER L")
       (=ucs		  . #xFF2C)	; Ｌ
@@ -2396,6 +2392,10 @@
     (=jis-x0212		. #x2A4C)	; &JSP-2A4C; [10-44]
     (=jef-china3	. #x89F8)	; &I-JC3-89F8;
     (=ucs@jis/fw	. #x013B)	; &JSP-2A4C;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER L WITH CEDILLA")
+      (=ucs		  . #x013B)	; Ä»
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B4C)	; &JSP-2B4C; [11-44]
       ))
@@ -2424,10 +2424,6 @@
      ((name		  . "LATIN SMALL LETTER L WITH CEDILLA")
       (=ucs		  . #x013C)	; ļ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER L WITH CEDILLA")
-      (=ucs		  . #x013C)	; ļ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER L")
       (=ucs		  . #xFF4C)	; ｌ
@@ -2438,6 +2434,10 @@
     (=jis-x0212		. #x2B4C)	; &JSP-2B4C; [11-44]
     (=jef-china3	. #x89FE)	; &I-JC3-89FE;
     (=ucs@jis/fw	. #x013C)	; &JSP-2B4C;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER L WITH CEDILLA")
+      (=ucs		  . #x013C)	; ļ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A4C)	; &JSP-2A4C; [10-44]
       ))
@@ -2466,10 +2466,6 @@
      ((name		  . "LATIN CAPITAL LETTER L WITH CARON")
       (=ucs		  . #x013D)	; Ľ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER L WITH CARON")
-      (=ucs		  . #x013D)	; Ľ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER L")
       (=ucs		  . #xFF2C)	; Ｌ
@@ -2481,6 +2477,10 @@
     (=jis-x0213-1-2000	. #x2A24)	; &I-JX1-2A24; [10-04]
     (=jef-china3	. #x88E6)	; &I-JC3-88E6;
     (=ucs@jis/fw	. #x013D)	; &JX1-2A24;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER L WITH CARON")
+      (=ucs		  . #x013D)	; Ľ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B4B)	; &JX1-2A2F; [11-43]
       (=jis-x0213-1-2000  . #x2A2F)	; &I-JX1-2A2F; [10-15]
@@ -2510,10 +2510,6 @@
      ((name		  . "LATIN SMALL LETTER L WITH CARON")
       (=ucs		  . #x013E)	; ľ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER L WITH CARON")
-      (=ucs		  . #x013E)	; ľ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER L")
       (=ucs		  . #xFF4C)	; ｌ
@@ -2525,6 +2521,10 @@
     (=jis-x0213-1-2000	. #x2A2F)	; &I-JX1-2A2F; [10-15]
     (=jef-china3	. #x88F5)	; &I-JC3-88F5;
     (=ucs@jis/fw	. #x013E)	; &JX1-2A2F;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER L WITH CARON")
+      (=ucs		  . #x013E)	; ľ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A4B)	; &JX1-2A24; [10-43]
       (=jis-x0213-1-2000  . #x2A24)	; &I-JX1-2A24; [10-04]
@@ -2553,10 +2553,6 @@
      ((name		  . "LATIN CAPITAL LETTER L WITH MIDDLE DOT")
       (=ucs		  . #x013F)	; Ä¿
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER L WITH MIDDLE DOT")
-      (=ucs		  . #x013F)	; Ä¿
-      ))
     (=>decomposition@compat
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER L")
       (=ucs		  . #xFF2C)	; Ｌ
@@ -2567,6 +2563,10 @@
     (=ks-x1001		. #x2828)	; &JSP-2929; [08-08]
     (=jis-x0212		. #x2929)	; &I-JSP-2929; [09-09]
     (=ucs@jis/fw	. #x013F)	; &JSP-2929;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER L WITH MIDDLE DOT")
+      (=ucs		  . #x013F)	; Ä¿
+      ))
     (->lowercase
      ((=ks-x1001	  . #x2928)	; &JSP-2949; [09-08]
       (=jis-x0212	  . #x2949)	; &I-JSP-2949; [09-41]
@@ -2595,10 +2595,6 @@
      ((name		  . "LATIN SMALL LETTER L WITH MIDDLE DOT")
       (=ucs		  . #x0140)	; ŀ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER L WITH MIDDLE DOT")
-      (=ucs		  . #x0140)	; ŀ
-      ))
     (=>decomposition@compat
      ((name		  . "FULLWIDTH LATIN SMALL LETTER L")
       (=ucs		  . #xFF4C)	; ｌ
@@ -2609,6 +2605,10 @@
     (=ks-x1001		. #x2928)	; &JSP-2949; [09-08]
     (=jis-x0212		. #x2949)	; &I-JSP-2949; [09-41]
     (=ucs@jis/fw	. #x0140)	; &JSP-2949;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER L WITH MIDDLE DOT")
+      (=ucs		  . #x0140)	; ŀ
+      ))
     (->uppercase
      ((=ks-x1001	  . #x2828)	; &JSP-2929; [08-08]
       (=jis-x0212	  . #x2929)	; &I-JSP-2929; [09-09]
@@ -2631,15 +2631,15 @@
      ((name		  . "LATIN CAPITAL LETTER L WITH STROKE")
       (=ucs		  . #x0141)	; Ł
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER L WITH STROKE")
-      (=ucs		  . #x0141)	; Ł
-      ))
     (=ks-x1001		. #x2829)	; &JX1-2A23; [08-09]
     (=jis-x0212		. #x2928)	; &I-JSP-2928; [09-08]
     (=jis-x0213-1-2000	. #x2A23)	; &I-JX1-2A23; [10-03]
     (=jef-china3	. #x83A1)	; &I-JC3-83A1;
     (=ucs@jis/fw	. #x0141)	; &JX1-2A23;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER L WITH STROKE")
+      (=ucs		  . #x0141)	; Ł
+      ))
     (->lowercase
      ((=ks-x1001	  . #x2929)	; &JX1-2A2E; [09-09]
       (=jis-x0212	  . #x2948)	; &I-JSP-2948; [09-40]
@@ -2663,14 +2663,14 @@
      ((name		  . "LATIN SMALL LETTER L WITH STROKE")
       (=ucs		  . #x0142)	; ł
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER L WITH STROKE")
-      (=ucs		  . #x0142)	; ł
-      ))
     (=ks-x1001		. #x2929)	; &JX1-2A2E; [09-09]
     (=jis-x0212		. #x2948)	; &I-JSP-2948; [09-40]
     (=jis-x0213-1-2000	. #x2A2E)	; &I-JX1-2A2E; [10-14]
     (=ucs@jis/fw	. #x0142)	; &JX1-2A2E;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER L WITH STROKE")
+      (=ucs		  . #x0142)	; ł
+      ))
     (->uppercase
      ((=ks-x1001	  . #x2829)	; &JX1-2A23; [08-09]
       (=jis-x0212	  . #x2928)	; &I-JSP-2928; [09-08]
@@ -2709,10 +2709,6 @@
      ((name		  . "LATIN CAPITAL LETTER N WITH ACUTE")
       (=ucs		  . #x0143)	; Ń
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER N WITH ACUTE")
-      (=ucs		  . #x0143)	; Ń
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER N")
       (=ucs		  . #xFF2E)	; ï¼®
@@ -2724,6 +2720,10 @@
     (=jis-x0213-1-2000	. #x2A41)	; &I-JX1-2A41; [10-33]
     (=jef-china3	. #x85DF)	; &I-JC3-85DF;
     (=ucs@jis/fw	. #x0143)	; &JX1-2A41;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER N WITH ACUTE")
+      (=ucs		  . #x0143)	; Ń
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B4D)	; &JX1-2A51; [11-45]
       (=jis-x0213-1-2000  . #x2A51)	; &I-JX1-2A51; [10-49]
@@ -2753,10 +2753,6 @@
      ((name		  . "LATIN SMALL LETTER N WITH ACUTE")
       (=ucs		  . #x0144)	; ń
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER N WITH ACUTE")
-      (=ucs		  . #x0144)	; ń
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER N")
       (=ucs		  . #xFF4E)	; ｎ
@@ -2768,6 +2764,10 @@
     (=jis-x0213-1-2000	. #x2A51)	; &I-JX1-2A51; [10-49]
     (=jef-china3	. #x85F5)	; &I-JC3-85F5;
     (=ucs@jis/fw	. #x0144)	; &JX1-2A51;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER N WITH ACUTE")
+      (=ucs		  . #x0144)	; ń
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A4D)	; &JX1-2A41; [10-45]
       (=jis-x0213-1-2000  . #x2A41)	; &I-JX1-2A41; [10-33]
@@ -2797,10 +2797,6 @@
      ((name		  . "LATIN CAPITAL LETTER N WITH CEDILLA")
       (=ucs		  . #x0145)	; Ņ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER N WITH CEDILLA")
-      (=ucs		  . #x0145)	; Ņ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER N")
       (=ucs		  . #xFF2E)	; ï¼®
@@ -2811,6 +2807,10 @@
     (=jis-x0212		. #x2A4F)	; &JSP-2A4F; [10-47]
     (=jef-china3	. #x89F9)	; &I-JC3-89F9;
     (=ucs@jis/fw	. #x0145)	; &JSP-2A4F;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER N WITH CEDILLA")
+      (=ucs		  . #x0145)	; Ņ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B4F)	; &JSP-2B4F; [11-47]
       ))
@@ -2839,10 +2839,6 @@
      ((name		  . "LATIN SMALL LETTER N WITH CEDILLA")
       (=ucs		  . #x0146)	; ņ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER N WITH CEDILLA")
-      (=ucs		  . #x0146)	; ņ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER N")
       (=ucs		  . #xFF4E)	; ｎ
@@ -2853,6 +2849,10 @@
     (=jis-x0212		. #x2B4F)	; &JSP-2B4F; [11-47]
     (=jef-china3	. #x8AA1)	; &I-JC3-8AA1;
     (=ucs@jis/fw	. #x0146)	; &JSP-2B4F;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER N WITH CEDILLA")
+      (=ucs		  . #x0146)	; ņ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A4F)	; &JSP-2A4F; [10-47]
       ))
@@ -2881,10 +2881,6 @@
      ((name		  . "LATIN CAPITAL LETTER N WITH CARON")
       (=ucs		  . #x0147)	; Ň
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER N WITH CARON")
-      (=ucs		  . #x0147)	; Ň
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER N")
       (=ucs		  . #xFF2E)	; ï¼®
@@ -2896,6 +2892,10 @@
     (=jis-x0213-1-2000	. #x2A42)	; &I-JX1-2A42; [10-34]
     (=jef-china3	. #x88E7)	; &I-JC3-88E7;
     (=ucs@jis/fw	. #x0147)	; &JX1-2A42;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER N WITH CARON")
+      (=ucs		  . #x0147)	; Ň
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B4E)	; &JX1-2A52; [11-46]
       (=jis-x0213-1-2000  . #x2A52)	; &I-JX1-2A52; [10-50]
@@ -2925,10 +2925,6 @@
      ((name		  . "LATIN SMALL LETTER N WITH CARON")
       (=ucs		  . #x0148)	; ň
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER N WITH CARON")
-      (=ucs		  . #x0148)	; ň
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER N")
       (=ucs		  . #xFF4E)	; ｎ
@@ -2940,6 +2936,10 @@
     (=jis-x0213-1-2000	. #x2A52)	; &I-JX1-2A52; [10-50]
     (=jef-china3	. #x88F6)	; &I-JC3-88F6;
     (=ucs@jis/fw	. #x0148)	; &JX1-2A52;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER N WITH CARON")
+      (=ucs		  . #x0148)	; ň
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A4E)	; &JX1-2A42; [10-46]
       (=jis-x0213-1-2000  . #x2A42)	; &I-JX1-2A42; [10-34]
@@ -2964,10 +2964,6 @@
      ((name . "LATIN SMALL LETTER N PRECEDED BY APOSTROPHE")
       (=ucs		  . #x0149)	; ʼn
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER N PRECEDED BY APOSTROPHE")
-      (=ucs		  . #x0149)	; ʼn
-      ))
     (=>decomposition@compat
      ((name		  . "MODIFIER LETTER APOSTROPHE")
       (=ucs		  . #x02BC)	; ʼ
@@ -2978,6 +2974,10 @@
     (=ks-x1001		. #x2930)	; &JSP-294A; [09-16]
     (=jis-x0212		. #x294A)	; &I-JSP-294A; [09-42]
     (=ucs@jis/fw	. #x0149)	; &JSP-294A;
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER N PRECEDED BY APOSTROPHE")
+      (=ucs		  . #x0149)	; ʼn
+      ))
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER ENG")
@@ -2997,13 +2997,13 @@
      ((name		  . "LATIN CAPITAL LETTER ENG")
       (=ucs		  . #x014A)	; Ŋ
       ))
+    (=ks-x1001		. #x282F)	; &JSP-292B; [08-15]
+    (=jis-x0212		. #x292B)	; &I-JSP-292B; [09-11]
+    (=ucs@jis/fw	. #x014A)	; &JSP-292B;
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER ENG")
       (=ucs		  . #x014A)	; Ŋ
       ))
-    (=ks-x1001		. #x282F)	; &JSP-292B; [08-15]
-    (=jis-x0212		. #x292B)	; &I-JSP-292B; [09-11]
-    (=ucs@jis/fw	. #x014A)	; &JSP-292B;
     (->lowercase
      ((=ks-x1001	  . #x292F)	; &JX1-2A7A; [09-15]
       (=jis-x0212	  . #x294B)	; &I-JSP-294B; [09-43]
@@ -3029,14 +3029,14 @@
      ((name		  . "LATIN SMALL LETTER ENG")
       (=ucs		  . #x014B)	; ŋ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER ENG")
-      (=ucs		  . #x014B)	; ŋ
-      ))
     (=ks-x1001		. #x292F)	; &JX1-2A7A; [09-15]
     (=jis-x0212		. #x294B)	; &I-JSP-294B; [09-43]
     (=jis-x0213-1-2000	. #x2A7A)	; &I-JX1-2A7A; [10-90]
     (=ucs@jis/fw	. #x014B)	; &JX1-2A7A;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER ENG")
+      (=ucs		  . #x014B)	; ŋ
+      ))
     (->uppercase
      ((=ks-x1001	  . #x282F)	; &JSP-292B; [08-15]
       (=jis-x0212	  . #x292B)	; &I-JSP-292B; [09-11]
@@ -3066,10 +3066,6 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH MACRON")
       (=ucs		  . #x014C)	; Ō
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER O WITH MACRON")
-      (=ucs		  . #x014C)	; Ō
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER O")
       (=ucs		  . #xFF2F)	; Ｏ
@@ -3081,6 +3077,10 @@
     (=jis-x0213-1-2000	. #x2979)	; &I-JX1-2979; [09-89]
     (=jef-china3	. #x87B3)	; &I-JC3-87B3;
     (=ucs@jis/fw	. #x014C)	; &JX1-2979;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER O WITH MACRON")
+      (=ucs		  . #x014C)	; Ō
+      ))
     (->lowercase
      ((=gb2312		  . #x282D)	; &JX1-297E; [08-13]
       (=jis-x0212	  . #x2B57)	; &I-JSP-2B57; [11-55]
@@ -3111,10 +3111,6 @@
      ((name		  . "LATIN SMALL LETTER O WITH MACRON")
       (=ucs		  . #x014D)	; ō
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER O WITH MACRON")
-      (=ucs		  . #x014D)	; ō
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER O")
       (=ucs		  . #xFF4F)	; ｏ
@@ -3128,6 +3124,10 @@
     (=jef-china3	. #x87C7)	; &I-JC3-87C7;
     (=ucs@gb/fw		. #x014D)	; &JX1-297E;
     (=ucs@jis/fw	. #x014D)	; &JX1-297E;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER O WITH MACRON")
+      (=ucs		  . #x014D)	; ō
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A57)	; &JX1-2979; [10-55]
       (=jis-x0213-1-2000  . #x2979)	; &I-JX1-2979; [09-89]
@@ -3193,10 +3193,6 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH DOUBLE ACUTE")
       (=ucs		  . #x0150)	; Ő
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER O WITH DOUBLE ACUTE")
-      (=ucs		  . #x0150)	; Ő
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER O")
       (=ucs		  . #xFF2F)	; Ｏ
@@ -3208,6 +3204,10 @@
     (=jis-x0213-1-2000	. #x2A43)	; &I-JX1-2A43; [10-35]
     (=jef-china3	. #x89E2)	; &I-JC3-89E2;
     (=ucs@jis/fw	. #x0150)	; &JX1-2A43;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER O WITH DOUBLE ACUTE")
+      (=ucs		  . #x0150)	; Ő
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B56)	; &JX1-2A53; [11-54]
       (=jis-x0213-1-2000  . #x2A53)	; &I-JX1-2A53; [10-51]
@@ -3237,10 +3237,6 @@
      ((name		  . "LATIN SMALL LETTER O WITH DOUBLE ACUTE")
       (=ucs		  . #x0151)	; ő
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER O WITH DOUBLE ACUTE")
-      (=ucs		  . #x0151)	; ő
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER O")
       (=ucs		  . #xFF4F)	; ｏ
@@ -3252,6 +3248,10 @@
     (=jis-x0213-1-2000	. #x2A53)	; &I-JX1-2A53; [10-51]
     (=jef-china3	. #x89E5)	; &I-JC3-89E5;
     (=ucs@jis/fw	. #x0151)	; &JX1-2A53;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER O WITH DOUBLE ACUTE")
+      (=ucs		  . #x0151)	; ő
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A56)	; &JX1-2A43; [10-54]
       (=jis-x0213-1-2000  . #x2A43)	; &I-JX1-2A43; [10-35]
@@ -3273,15 +3273,15 @@
      ((name		  . "LATIN CAPITAL LIGATURE OE")
       (=ucs		  . #x0152)	; Œ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LIGATURE OE")
-      (=ucs		  . #x0152)	; Œ
-      ))
     (=ks-x1001		. #x282B)	; &JX1-2B2B; [08-11]
     (=jis-x0212		. #x292D)	; &I-JSP-292D; [09-13]
     (=jis-x0213-1-2000	. #x2B2B)	; &I-JX1-2B2B; [11-11]
     (=jef-china3	. #x83A6)	; &I-JC3-83A6;
     (=ucs@jis		. #x0152)	; &JX1-2B2B;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LIGATURE OE")
+      (=ucs		  . #x0152)	; Œ
+      ))
     (->lowercase
      ((=ks-x1001	  . #x292B)	; &JX1-2B2A; [09-11]
       (=jis-x0212	  . #x294D)	; &I-JSP-294D; [09-45]
@@ -3305,15 +3305,15 @@
      ((name		  . "LATIN SMALL LIGATURE OE")
       (=ucs		  . #x0153)	; œ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LIGATURE OE")
-      (=ucs		  . #x0153)	; œ
-      ))
     (=ks-x1001		. #x292B)	; &JX1-2B2A; [09-11]
     (=jis-x0212		. #x294D)	; &I-JSP-294D; [09-45]
     (=jis-x0213-1-2000	. #x2B2A)	; &I-JX1-2B2A; [11-10]
     (=jef-china3	. #x83B1)	; &I-JC3-83B1;
     (=ucs@jis		. #x0153)	; &JX1-2B2A;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LIGATURE OE")
+      (=ucs		  . #x0153)	; œ
+      ))
     (->uppercase
      ((=ks-x1001	  . #x282B)	; &JX1-2B2B; [08-11]
       (=jis-x0212	  . #x292D)	; &I-JSP-292D; [09-13]
@@ -3344,10 +3344,6 @@
      ((name		  . "LATIN CAPITAL LETTER R WITH ACUTE")
       (=ucs		  . #x0154)	; Ŕ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER R WITH ACUTE")
-      (=ucs		  . #x0154)	; Ŕ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER R")
       (=ucs		  . #xFF32)	; ï¼²
@@ -3359,6 +3355,10 @@
     (=jis-x0213-1-2000	. #x2A39)	; &I-JX1-2A39; [10-25]
     (=jef-china3	. #x85E3)	; &I-JC3-85E3;
     (=ucs@jis/fw	. #x0154)	; &JX1-2A39;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER R WITH ACUTE")
+      (=ucs		  . #x0154)	; Ŕ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B59)	; &JX1-2A48; [11-57]
       (=jis-x0213-1-2000  . #x2A48)	; &I-JX1-2A48; [10-40]
@@ -3388,10 +3388,6 @@
      ((name		  . "LATIN SMALL LETTER R WITH ACUTE")
       (=ucs		  . #x0155)	; ŕ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER R WITH ACUTE")
-      (=ucs		  . #x0155)	; ŕ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER R")
       (=ucs		  . #xFF52)	; ｒ
@@ -3403,6 +3399,10 @@
     (=jis-x0213-1-2000	. #x2A48)	; &I-JX1-2A48; [10-40]
     (=jef-china3	. #x85F9)	; &I-JC3-85F9;
     (=ucs@jis/fw	. #x0155)	; &JX1-2A48;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER R WITH ACUTE")
+      (=ucs		  . #x0155)	; ŕ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A59)	; &JX1-2A39; [10-57]
       (=jis-x0213-1-2000  . #x2A39)	; &I-JX1-2A39; [10-25]
@@ -3432,10 +3432,6 @@
      ((name		  . "LATIN CAPITAL LETTER R WITH CEDILLA")
       (=ucs		  . #x0156)	; Ŗ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER R WITH CEDILLA")
-      (=ucs		  . #x0156)	; Ŗ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER R")
       (=ucs		  . #xFF32)	; ï¼²
@@ -3445,6 +3441,10 @@
       ))
     (=jis-x0212		. #x2A5B)	; &JSP-2A5B; [10-59]
     (=ucs@jis/fw	. #x0156)	; &JSP-2A5B;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER R WITH CEDILLA")
+      (=ucs		  . #x0156)	; Ŗ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B5B)	; &JSP-2B5B; [11-59]
       ))
@@ -3473,10 +3473,6 @@
      ((name		  . "LATIN SMALL LETTER R WITH CEDILLA")
       (=ucs		  . #x0157)	; ŗ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER R WITH CEDILLA")
-      (=ucs		  . #x0157)	; ŗ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER R")
       (=ucs		  . #xFF52)	; ｒ
@@ -3486,6 +3482,10 @@
       ))
     (=jis-x0212		. #x2B5B)	; &JSP-2B5B; [11-59]
     (=ucs@jis/fw	. #x0157)	; &JSP-2B5B;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER R WITH CEDILLA")
+      (=ucs		  . #x0157)	; ŗ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A5B)	; &JSP-2A5B; [10-59]
       ))
@@ -3514,10 +3514,6 @@
      ((name		  . "LATIN CAPITAL LETTER R WITH CARON")
       (=ucs		  . #x0158)	; Ř
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER R WITH CARON")
-      (=ucs		  . #x0158)	; Ř
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER R")
       (=ucs		  . #xFF32)	; ï¼²
@@ -3529,6 +3525,10 @@
     (=jis-x0213-1-2000	. #x2A44)	; &I-JX1-2A44; [10-36]
     (=jef-china3	. #x88E9)	; &I-JC3-88E9;
     (=ucs@jis/fw	. #x0158)	; &JX1-2A44;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER R WITH CARON")
+      (=ucs		  . #x0158)	; Ř
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B5A)	; &JX1-2A54; [11-58]
       (=jis-x0213-1-2000  . #x2A54)	; &I-JX1-2A54; [10-52]
@@ -3558,10 +3558,6 @@
      ((name		  . "LATIN SMALL LETTER R WITH CARON")
       (=ucs		  . #x0159)	; ř
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER R WITH CARON")
-      (=ucs		  . #x0159)	; ř
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER R")
       (=ucs		  . #xFF52)	; ｒ
@@ -3573,6 +3569,10 @@
     (=jis-x0213-1-2000	. #x2A54)	; &I-JX1-2A54; [10-52]
     (=jef-china3	. #x88F8)	; &I-JC3-88F8;
     (=ucs@jis/fw	. #x0159)	; &JX1-2A54;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER R WITH CARON")
+      (=ucs		  . #x0159)	; ř
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A5A)	; &JX1-2A44; [10-58]
       (=jis-x0213-1-2000  . #x2A44)	; &I-JX1-2A44; [10-36]
@@ -3602,10 +3602,6 @@
      ((name		  . "LATIN CAPITAL LETTER S WITH ACUTE")
       (=ucs		  . #x015A)	; Ś
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER S WITH ACUTE")
-      (=ucs		  . #x015A)	; Ś
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER S")
       (=ucs		  . #xFF33)	; ï¼³
@@ -3617,6 +3613,10 @@
     (=jis-x0213-1-2000	. #x2A25)	; &I-JX1-2A25; [10-05]
     (=jef-china3	. #x85E4)	; &I-JC3-85E4;
     (=ucs@jis/fw	. #x015A)	; &JX1-2A25;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER S WITH ACUTE")
+      (=ucs		  . #x015A)	; Ś
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B5C)	; &JX1-2A30; [11-60]
       (=jis-x0213-1-2000  . #x2A30)	; &I-JX1-2A30; [10-16]
@@ -3646,10 +3646,6 @@
      ((name		  . "LATIN SMALL LETTER S WITH ACUTE")
       (=ucs		  . #x015B)	; ś
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER S WITH ACUTE")
-      (=ucs		  . #x015B)	; ś
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER S")
       (=ucs		  . #xFF53)	; ｓ
@@ -3661,6 +3657,10 @@
     (=jis-x0213-1-2000	. #x2A30)	; &I-JX1-2A30; [10-16]
     (=jef-china3	. #x85FA)	; &I-JC3-85FA;
     (=ucs@jis/fw	. #x015B)	; &JX1-2A30;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER S WITH ACUTE")
+      (=ucs		  . #x015B)	; ś
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A5C)	; &JX1-2A25; [10-60]
       (=jis-x0213-1-2000  . #x2A25)	; &I-JX1-2A25; [10-05]
@@ -3690,10 +3690,6 @@
      ((name		  . "LATIN CAPITAL LETTER S WITH CIRCUMFLEX")
       (=ucs		  . #x015C)	; Ŝ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER S WITH CIRCUMFLEX")
-      (=ucs		  . #x015C)	; Ŝ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER S")
       (=ucs		  . #xFF33)	; ï¼³
@@ -3705,6 +3701,10 @@
     (=jis-x0213-1-2000	. #x2A5D)	; &I-JX1-2A5D; [10-61]
     (=jef-china3	. #x86C0)	; &I-JC3-86C0;
     (=ucs@jis/fw	. #x015C)	; &JX1-2A5D;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER S WITH CIRCUMFLEX")
+      (=ucs		  . #x015C)	; Ŝ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B5D)	; &JX1-2A63; [11-61]
       (=jis-x0213-1-2000  . #x2A63)	; &I-JX1-2A63; [10-67]
@@ -3734,10 +3734,6 @@
      ((name		  . "LATIN SMALL LETTER S WITH CIRCUMFLEX")
       (=ucs		  . #x015D)	; ŝ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER S WITH CIRCUMFLEX")
-      (=ucs		  . #x015D)	; ŝ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER S")
       (=ucs		  . #xFF53)	; ｓ
@@ -3749,6 +3745,10 @@
     (=jis-x0213-1-2000	. #x2A63)	; &I-JX1-2A63; [10-67]
     (=jef-china3	. #x86CD)	; &I-JC3-86CD;
     (=ucs@jis/fw	. #x015D)	; &JX1-2A63;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER S WITH CIRCUMFLEX")
+      (=ucs		  . #x015D)	; ŝ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A5D)	; &JX1-2A5D; [10-61]
       (=jis-x0213-1-2000  . #x2A5D)	; &I-JX1-2A5D; [10-61]
@@ -3780,10 +3780,6 @@
      ((name		  . "LATIN CAPITAL LETTER S WITH CEDILLA")
       (=ucs		  . #x015E)	; Ş
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER S WITH CEDILLA")
-      (=ucs		  . #x015E)	; Ş
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER S")
       (=ucs		  . #xFF33)	; ï¼³
@@ -3794,6 +3790,10 @@
     (=jis-x0212		. #x2A5F)	; &JX1-2A27; [10-63]
     (=jis-x0213-1-2000	. #x2A27)	; &I-JX1-2A27; [10-07]
     (=ucs@jis/fw	. #x015E)	; &JX1-2A27;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER S WITH CEDILLA")
+      (=ucs		  . #x015E)	; Ş
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B5F)	; &JX1-2A33; [11-63]
       (=jis-x0213-1-2000  . #x2A33)	; &I-JX1-2A33; [10-19]
@@ -3830,10 +3830,6 @@
      ((name		  . "LATIN SMALL LETTER S WITH CEDILLA")
       (=ucs		  . #x015F)	; ş
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER S WITH CEDILLA")
-      (=ucs		  . #x015F)	; ş
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER S")
       (=ucs		  . #xFF53)	; ｓ
@@ -3845,6 +3841,10 @@
     (=jis-x0213-1-2000	. #x2A33)	; &I-JX1-2A33; [10-19]
     (=jef-china3	. #x8AA2)	; &I-JC3-8AA2;
     (=ucs@jis/fw	. #x015F)	; &JX1-2A33;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER S WITH CEDILLA")
+      (=ucs		  . #x015F)	; ş
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A5F)	; &JX1-2A27; [10-63]
       (=jis-x0213-1-2000  . #x2A27)	; &I-JX1-2A27; [10-07]
@@ -3875,10 +3875,6 @@
      ((name		  . "LATIN CAPITAL LETTER S WITH CARON")
       (=ucs		  . #x0160)	; Å 
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER S WITH CARON")
-      (=ucs		  . #x0160)	; Å 
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER S")
       (=ucs		  . #xFF33)	; ï¼³
@@ -3890,6 +3886,10 @@
     (=jis-x0213-1-2000	. #x2A26)	; &I-JX1-2A26; [10-06]
     (=jef-china3	. #x88EA)	; &I-JC3-88EA;
     (=ucs@jis/fw	. #x0160)	; &JX1-2A26;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER S WITH CARON")
+      (=ucs		  . #x0160)	; Å 
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B5E)	; &JX1-2A32; [11-62]
       (=jis-x0213-1-2000  . #x2A32)	; &I-JX1-2A32; [10-18]
@@ -3920,10 +3920,6 @@
      ((name		  . "LATIN SMALL LETTER S WITH CARON")
       (=ucs		  . #x0161)	; Å¡
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER S WITH CARON")
-      (=ucs		  . #x0161)	; Å¡
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER S")
       (=ucs		  . #xFF53)	; ｓ
@@ -3935,6 +3931,10 @@
     (=jis-x0213-1-2000	. #x2A32)	; &I-JX1-2A32; [10-18]
     (=jef-china3	. #x88F9)	; &I-JC3-88F9;
     (=ucs@jis/fw	. #x0161)	; &JX1-2A32;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER S WITH CARON")
+      (=ucs		  . #x0161)	; Å¡
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A5E)	; &JX1-2A26; [10-62]
       (=jis-x0213-1-2000  . #x2A26)	; &I-JX1-2A26; [10-06]
@@ -3964,10 +3964,6 @@
      ((name		  . "LATIN CAPITAL LETTER T WITH CEDILLA")
       (=ucs		  . #x0162)	; Ţ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER T WITH CEDILLA")
-      (=ucs		  . #x0162)	; Ţ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER T")
       (=ucs		  . #xFF34)	; ï¼´
@@ -3979,6 +3975,10 @@
     (=jis-x0213-1-2000	. #x2A47)	; &I-JX1-2A47; [10-39]
     (=jef-china3	. #x8BCC)	; &I-JC3-8BCC;
     (=ucs@jis/fw	. #x0162)	; &JX1-2A47;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER T WITH CEDILLA")
+      (=ucs		  . #x0162)	; Ţ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B61)	; &JX1-2A57; [11-65]
       (=jis-x0213-1-2000  . #x2A57)	; &I-JX1-2A57; [10-55]
@@ -4008,10 +4008,6 @@
      ((name		  . "LATIN SMALL LETTER T WITH CEDILLA")
       (=ucs		  . #x0163)	; ţ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER T WITH CEDILLA")
-      (=ucs		  . #x0163)	; ţ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER T")
       (=ucs		  . #xFF54)	; ｔ
@@ -4022,6 +4018,10 @@
     (=jis-x0212		. #x2B61)	; &JX1-2A57; [11-65]
     (=jis-x0213-1-2000	. #x2A57)	; &I-JX1-2A57; [10-55]
     (=ucs@jis/fw	. #x0163)	; &JX1-2A57;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER T WITH CEDILLA")
+      (=ucs		  . #x0163)	; ţ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A61)	; &JX1-2A47; [10-65]
       (=jis-x0213-1-2000  . #x2A47)	; &I-JX1-2A47; [10-39]
@@ -4051,10 +4051,6 @@
      ((name		  . "LATIN CAPITAL LETTER T WITH CARON")
       (=ucs		  . #x0164)	; Ť
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER T WITH CARON")
-      (=ucs		  . #x0164)	; Ť
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER T")
       (=ucs		  . #xFF34)	; ï¼´
@@ -4066,6 +4062,10 @@
     (=jis-x0213-1-2000	. #x2A28)	; &I-JX1-2A28; [10-08]
     (=jef-china3	. #x88EB)	; &I-JC3-88EB;
     (=ucs@jis/fw	. #x0164)	; &JX1-2A28;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER T WITH CARON")
+      (=ucs		  . #x0164)	; Ť
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B60)	; &JX1-2A34; [11-64]
       (=jis-x0213-1-2000  . #x2A34)	; &I-JX1-2A34; [10-20]
@@ -4095,10 +4095,6 @@
      ((name		  . "LATIN SMALL LETTER T WITH CARON")
       (=ucs		  . #x0165)	; ť
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER T WITH CARON")
-      (=ucs		  . #x0165)	; ť
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER T")
       (=ucs		  . #xFF54)	; ｔ
@@ -4110,6 +4106,10 @@
     (=jis-x0213-1-2000	. #x2A34)	; &I-JX1-2A34; [10-20]
     (=jef-china3	. #x88FA)	; &I-JC3-88FA;
     (=ucs@jis/fw	. #x0165)	; &JX1-2A34;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER T WITH CARON")
+      (=ucs		  . #x0165)	; ť
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A60)	; &JX1-2A28; [10-64]
       (=jis-x0213-1-2000  . #x2A28)	; &I-JX1-2A28; [10-08]
@@ -4132,13 +4132,13 @@
      ((name		  . "LATIN CAPITAL LETTER T WITH STROKE")
       (=ucs		  . #x0166)	; Ŧ
       ))
+    (=ks-x1001		. #x282E)	; &JSP-292F; [08-14]
+    (=jis-x0212		. #x292F)	; &I-JSP-292F; [09-15]
+    (=ucs@jis/fw	. #x0166)	; &JSP-292F;
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER T WITH STROKE")
       (=ucs		  . #x0166)	; Ŧ
       ))
-    (=ks-x1001		. #x282E)	; &JSP-292F; [08-14]
-    (=jis-x0212		. #x292F)	; &I-JSP-292F; [09-15]
-    (=ucs@jis/fw	. #x0166)	; &JSP-292F;
     (->lowercase
      ((=ks-x1001	  . #x292E)	; &JSP-294F; [09-14]
       (=jis-x0212	  . #x294F)	; &I-JSP-294F; [09-47]
@@ -4161,13 +4161,13 @@
      ((name		  . "LATIN SMALL LETTER T WITH STROKE")
       (=ucs		  . #x0167)	; ŧ
       ))
+    (=ks-x1001		. #x292E)	; &JSP-294F; [09-14]
+    (=jis-x0212		. #x294F)	; &I-JSP-294F; [09-47]
+    (=ucs@jis/fw	. #x0167)	; &JSP-294F;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER T WITH STROKE")
       (=ucs		  . #x0167)	; ŧ
       ))
-    (=ks-x1001		. #x292E)	; &JSP-294F; [09-14]
-    (=jis-x0212		. #x294F)	; &I-JSP-294F; [09-47]
-    (=ucs@jis/fw	. #x0167)	; &JSP-294F;
     (->uppercase
      ((=ks-x1001	  . #x282E)	; &JSP-292F; [08-14]
       (=jis-x0212	  . #x292F)	; &I-JSP-292F; [09-15]
@@ -4199,10 +4199,6 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH TILDE")
       (=ucs		  . #x0168)	; Ũ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U WITH TILDE")
-      (=ucs		  . #x0168)	; Ũ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER U")
       (=ucs		  . #xFF35)	; ï¼µ
@@ -4213,6 +4209,10 @@
     (=jis-x0212		. #x2A6C)	; &JSP-2A6C; [10-76]
     (=jef-china3	. #x86EB)	; &I-JC3-86EB;
     (=ucs@jis/fw	. #x0168)	; &JSP-2A6C;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER U WITH TILDE")
+      (=ucs		  . #x0168)	; Ũ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B6C)	; &JSP-2B6C; [11-76]
       ))
@@ -4244,10 +4244,6 @@
      ((name		  . "LATIN SMALL LETTER U WITH TILDE")
       (=ucs		  . #x0169)	; Å©
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH TILDE")
-      (=ucs		  . #x0169)	; Å©
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER U")
       (=ucs		  . #xFF55)	; ｕ
@@ -4258,6 +4254,10 @@
     (=jis-x0212		. #x2B6C)	; &JSP-2B6C; [11-76]
     (=jef-china3	. #x86F8)	; &I-JC3-86F8;
     (=ucs@jis/fw	. #x0169)	; &JSP-2B6C;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER U WITH TILDE")
+      (=ucs		  . #x0169)	; Å©
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A6C)	; &JSP-2A6C; [10-76]
       ))
@@ -4286,10 +4286,6 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH MACRON")
       (=ucs		  . #x016A)	; Ū
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U WITH MACRON")
-      (=ucs		  . #x016A)	; Ū
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER U")
       (=ucs		  . #xFF35)	; ï¼µ
@@ -4301,6 +4297,10 @@
     (=jis-x0213-1-2000	. #x2977)	; &I-JX1-2977; [09-87]
     (=jef-china3	. #x87B9)	; &I-JC3-87B9;
     (=ucs@jis/fw	. #x016A)	; &JX1-2977;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER U WITH MACRON")
+      (=ucs		  . #x016A)	; Ū
+      ))
     (->lowercase
      ((=gb2312		  . #x2831)	; &JX1-297C; [08-17]
       (=jis-x0212	  . #x2B69)	; &I-JSP-2B69; [11-73]
@@ -4331,10 +4331,6 @@
      ((name		  . "LATIN SMALL LETTER U WITH MACRON")
       (=ucs		  . #x016B)	; Å«
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH MACRON")
-      (=ucs		  . #x016B)	; Å«
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER U")
       (=ucs		  . #xFF55)	; ｕ
@@ -4348,6 +4344,10 @@
     (=jef-china3	. #x87CD)	; &I-JC3-87CD;
     (=ucs@gb/fw		. #x016B)	; &JX1-297C;
     (=ucs@jis/fw	. #x016B)	; &JX1-297C;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER U WITH MACRON")
+      (=ucs		  . #x016B)	; Å«
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A69)	; &JX1-2977; [10-73]
       (=jis-x0213-1-2000  . #x2977)	; &I-JX1-2977; [09-87]
@@ -4377,10 +4377,6 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH BREVE")
       (=ucs		  . #x016C)	; Ŭ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U WITH BREVE")
-      (=ucs		  . #x016C)	; Ŭ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER U")
       (=ucs		  . #xFF35)	; ï¼µ
@@ -4392,6 +4388,10 @@
     (=jis-x0213-1-2000	. #x2A5E)	; &I-JX1-2A5E; [10-62]
     (=jef-china3	. #x87E5)	; &I-JC3-87E5;
     (=ucs@jis/fw	. #x016C)	; &JX1-2A5E;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER U WITH BREVE")
+      (=ucs		  . #x016C)	; Ŭ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B66)	; &JX1-2A64; [11-70]
       (=jis-x0213-1-2000  . #x2A64)	; &I-JX1-2A64; [10-68]
@@ -4421,10 +4421,6 @@
      ((name		  . "LATIN SMALL LETTER U WITH BREVE")
       (=ucs		  . #x016D)	; Å­
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH BREVE")
-      (=ucs		  . #x016D)	; Å­
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER U")
       (=ucs		  . #xFF55)	; ｕ
@@ -4436,6 +4432,10 @@
     (=jis-x0213-1-2000	. #x2A64)	; &I-JX1-2A64; [10-68]
     (=jef-china3	. #x87EF)	; &I-JC3-87EF;
     (=ucs@jis/fw	. #x016D)	; &JX1-2A64;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER U WITH BREVE")
+      (=ucs		  . #x016D)	; Å­
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A66)	; &JX1-2A5E; [10-70]
       (=jis-x0213-1-2000  . #x2A5E)	; &I-JX1-2A5E; [10-62]
@@ -4465,10 +4465,6 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH RING ABOVE")
       (=ucs		  . #x016E)	; Å®
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U WITH RING ABOVE")
-      (=ucs		  . #x016E)	; Å®
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER U")
       (=ucs		  . #xFF35)	; ï¼µ
@@ -4480,6 +4476,10 @@
     (=jis-x0213-1-2000	. #x2A45)	; &I-JX1-2A45; [10-37]
     (=jef-china3	. #x89A5)	; &I-JC3-89A5;
     (=ucs@jis/fw	. #x016E)	; &JX1-2A45;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER U WITH RING ABOVE")
+      (=ucs		  . #x016E)	; Å®
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B6B)	; &JX1-2A55; [11-75]
       (=jis-x0213-1-2000  . #x2A55)	; &I-JX1-2A55; [10-53]
@@ -4509,10 +4509,6 @@
      ((name		  . "LATIN SMALL LETTER U WITH RING ABOVE")
       (=ucs		  . #x016F)	; ů
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH RING ABOVE")
-      (=ucs		  . #x016F)	; ů
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER U")
       (=ucs		  . #xFF55)	; ｕ
@@ -4524,6 +4520,10 @@
     (=jis-x0213-1-2000	. #x2A55)	; &I-JX1-2A55; [10-53]
     (=jef-china3	. #x89AD)	; &I-JC3-89AD;
     (=ucs@jis/fw	. #x016F)	; &JX1-2A55;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER U WITH RING ABOVE")
+      (=ucs		  . #x016F)	; ů
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A6B)	; &JX1-2A45; [10-75]
       (=jis-x0213-1-2000  . #x2A45)	; &I-JX1-2A45; [10-37]
@@ -4553,10 +4553,6 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH DOUBLE ACUTE")
       (=ucs		  . #x0170)	; Å°
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U WITH DOUBLE ACUTE")
-      (=ucs		  . #x0170)	; Å°
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER U")
       (=ucs		  . #xFF35)	; ï¼µ
@@ -4568,6 +4564,10 @@
     (=jis-x0213-1-2000	. #x2A46)	; &I-JX1-2A46; [10-38]
     (=jef-china3	. #x89E3)	; &I-JC3-89E3;
     (=ucs@jis/fw	. #x0170)	; &JX1-2A46;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER U WITH DOUBLE ACUTE")
+      (=ucs		  . #x0170)	; Å°
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B68)	; &JX1-2A56; [11-72]
       (=jis-x0213-1-2000  . #x2A56)	; &I-JX1-2A56; [10-54]
@@ -4597,10 +4597,6 @@
      ((name		  . "LATIN SMALL LETTER U WITH DOUBLE ACUTE")
       (=ucs		  . #x0171)	; ű
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH DOUBLE ACUTE")
-      (=ucs		  . #x0171)	; ű
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER U")
       (=ucs		  . #xFF55)	; ｕ
@@ -4612,6 +4608,10 @@
     (=jis-x0213-1-2000	. #x2A56)	; &I-JX1-2A56; [10-54]
     (=jef-china3	. #x89E6)	; &I-JC3-89E6;
     (=ucs@jis/fw	. #x0171)	; &JX1-2A56;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER U WITH DOUBLE ACUTE")
+      (=ucs		  . #x0171)	; ű
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A68)	; &JX1-2A46; [10-72]
       (=jis-x0213-1-2000  . #x2A46)	; &I-JX1-2A46; [10-38]
@@ -4641,10 +4641,6 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH OGONEK")
       (=ucs		  . #x0172)	; Ų
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U WITH OGONEK")
-      (=ucs		  . #x0172)	; Ų
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER U")
       (=ucs		  . #xFF35)	; ï¼µ
@@ -4655,6 +4651,10 @@
     (=jis-x0212		. #x2A6A)	; &JSP-2A6A; [10-74]
     (=jef-china3	. #x8AAA)	; &I-JC3-8AAA;
     (=ucs@jis/fw	. #x0172)	; &JSP-2A6A;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER U WITH OGONEK")
+      (=ucs		  . #x0172)	; Ų
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B6A)	; &JSP-2B6A; [11-74]
       ))
@@ -4683,10 +4683,6 @@
      ((name		  . "LATIN SMALL LETTER U WITH OGONEK")
       (=ucs		  . #x0173)	; ų
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH OGONEK")
-      (=ucs		  . #x0173)	; ų
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER U")
       (=ucs		  . #xFF55)	; ｕ
@@ -4697,6 +4693,10 @@
     (=jis-x0212		. #x2B6A)	; &JSP-2B6A; [11-74]
     (=jef-china3	. #x8AB2)	; &I-JC3-8AB2;
     (=ucs@jis/fw	. #x0173)	; &JSP-2B6A;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER U WITH OGONEK")
+      (=ucs		  . #x0173)	; ų
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A6A)	; &JSP-2A6A; [10-74]
       ))
@@ -4724,10 +4724,6 @@
      ((name		  . "LATIN CAPITAL LETTER W WITH CIRCUMFLEX")
       (=ucs		  . #x0174)	; Å´
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER W WITH CIRCUMFLEX")
-      (=ucs		  . #x0174)	; Å´
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER W")
       (=ucs		  . #xFF37)	; ï¼·
@@ -4738,6 +4734,10 @@
     (=jis-x0212		. #x2A71)	; &JSP-2A71; [10-81]
     (=jef-china3	. #x86C2)	; &I-JC3-86C2;
     (=ucs@jis/fw	. #x0174)	; &JSP-2A71;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER W WITH CIRCUMFLEX")
+      (=ucs		  . #x0174)	; Å´
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B71)	; &JSP-2B71; [11-81]
       ))
@@ -4765,10 +4765,6 @@
      ((name		  . "LATIN SMALL LETTER W WITH CIRCUMFLEX")
       (=ucs		  . #x0175)	; ŵ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER W WITH CIRCUMFLEX")
-      (=ucs		  . #x0175)	; ŵ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER W")
       (=ucs		  . #xFF57)	; ｗ
@@ -4779,6 +4775,10 @@
     (=jis-x0212		. #x2B71)	; &JSP-2B71; [11-81]
     (=jef-china3	. #x86CF)	; &I-JC3-86CF;
     (=ucs@jis/fw	. #x0175)	; &JSP-2B71;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER W WITH CIRCUMFLEX")
+      (=ucs		  . #x0175)	; ŵ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A71)	; &JSP-2A71; [10-81]
       ))
@@ -4806,10 +4806,6 @@
      ((name		  . "LATIN CAPITAL LETTER Y WITH CIRCUMFLEX")
       (=ucs		  . #x0176)	; Ŷ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER Y WITH CIRCUMFLEX")
-      (=ucs		  . #x0176)	; Ŷ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER Y")
       (=ucs		  . #xFF39)	; ï¼¹
@@ -4820,6 +4816,10 @@
     (=jis-x0212		. #x2A74)	; &JSP-2A74; [10-84]
     (=jef-china3	. #x86C3)	; &I-JC3-86C3;
     (=ucs@jis/fw	. #x0176)	; &JSP-2A74;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER Y WITH CIRCUMFLEX")
+      (=ucs		  . #x0176)	; Ŷ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B74)	; &JSP-2B74; [11-84]
       ))
@@ -4847,10 +4847,6 @@
      ((name		  . "LATIN SMALL LETTER Y WITH CIRCUMFLEX")
       (=ucs		  . #x0177)	; Å·
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER Y WITH CIRCUMFLEX")
-      (=ucs		  . #x0177)	; Å·
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER Y")
       (=ucs		  . #xFF59)	; ｙ
@@ -4861,6 +4857,10 @@
     (=jis-x0212		. #x2B74)	; &JSP-2B74; [11-84]
     (=jef-china3	. #x86D0)	; &I-JC3-86D0;
     (=ucs@jis/fw	. #x0177)	; &JSP-2B74;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER Y WITH CIRCUMFLEX")
+      (=ucs		  . #x0177)	; Å·
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A74)	; &JSP-2A74; [10-84]
       ))
@@ -4888,10 +4888,6 @@
      ((name		  . "LATIN CAPITAL LETTER Y WITH DIAERESIS")
       (=ucs		  . #x0178)	; Ÿ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER Y WITH DIAERESIS")
-      (=ucs		  . #x0178)	; Ÿ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER Y")
       (=ucs		  . #xFF39)	; ï¼¹
@@ -4901,6 +4897,10 @@
       ))
     (=jis-x0212		. #x2A73)	; &JSP-2A73; [10-83]
     (=ucs@jis/fw	. #x0178)	; &JSP-2A73;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER Y WITH DIAERESIS")
+      (=ucs		  . #x0178)	; Ÿ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B73)	; &JX1-2974; [11-83]
       (=jis-x0213-1-2000  . #x2974)	; &I-JX1-2974; [09-84]
@@ -4930,10 +4930,6 @@
      ((name		  . "LATIN CAPITAL LETTER Z WITH ACUTE")
       (=ucs		  . #x0179)	; Ź
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER Z WITH ACUTE")
-      (=ucs		  . #x0179)	; Ź
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER Z")
       (=ucs		  . #xFF3A)	; Ｚ
@@ -4945,6 +4941,10 @@
     (=jis-x0213-1-2000	. #x2A29)	; &I-JX1-2A29; [10-09]
     (=jef-china3	. #x85EA)	; &I-JC3-85EA;
     (=ucs@jis/fw	. #x0179)	; &JX1-2A29;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER Z WITH ACUTE")
+      (=ucs		  . #x0179)	; Ź
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B75)	; &JX1-2A35; [11-85]
       (=jis-x0213-1-2000  . #x2A35)	; &I-JX1-2A35; [10-21]
@@ -4974,10 +4974,6 @@
      ((name		  . "LATIN SMALL LETTER Z WITH ACUTE")
       (=ucs		  . #x017A)	; ź
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER Z WITH ACUTE")
-      (=ucs		  . #x017A)	; ź
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER Z")
       (=ucs		  . #xFF5A)	; ｚ
@@ -4989,6 +4985,10 @@
     (=jis-x0213-1-2000	. #x2A35)	; &I-JX1-2A35; [10-21]
     (=jef-china3	. #x86A2)	; &I-JC3-86A2;
     (=ucs@jis/fw	. #x017A)	; &JX1-2A35;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER Z WITH ACUTE")
+      (=ucs		  . #x017A)	; ź
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A75)	; &JX1-2A29; [10-85]
       (=jis-x0213-1-2000  . #x2A29)	; &I-JX1-2A29; [10-09]
@@ -5019,10 +5019,6 @@
      ((name		  . "LATIN CAPITAL LETTER Z WITH DOT ABOVE")
       (=ucs		  . #x017B)	; Å»
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER Z WITH DOT ABOVE")
-      (=ucs		  . #x017B)	; Å»
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER Z")
       (=ucs		  . #xFF3A)	; Ｚ
@@ -5034,6 +5030,10 @@
     (=jis-x0213-1-2000	. #x2A2B)	; &I-JX1-2A2B; [10-11]
     (=jef-china3	. #x88AF)	; &I-JC3-88AF;
     (=ucs@jis/fw	. #x017B)	; &JX1-2A2B;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER Z WITH DOT ABOVE")
+      (=ucs		  . #x017B)	; Å»
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B77)	; &JX1-2A38; [11-87]
       (=jis-x0213-1-2000  . #x2A38)	; &I-JX1-2A38; [10-24]
@@ -5064,10 +5064,6 @@
      ((name		  . "LATIN SMALL LETTER Z WITH DOT ABOVE")
       (=ucs		  . #x017C)	; ż
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER Z WITH DOT ABOVE")
-      (=ucs		  . #x017C)	; ż
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER Z")
       (=ucs		  . #xFF5A)	; ｚ
@@ -5079,6 +5075,10 @@
     (=jis-x0213-1-2000	. #x2A38)	; &I-JX1-2A38; [10-24]
     (=jef-china3	. #x88C4)	; &I-JC3-88C4;
     (=ucs@jis/fw	. #x017C)	; &JX1-2A38;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER Z WITH DOT ABOVE")
+      (=ucs		  . #x017C)	; ż
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A77)	; &JX1-2A2B; [10-87]
       (=jis-x0213-1-2000  . #x2A2B)	; &I-JX1-2A2B; [10-11]
@@ -5109,10 +5109,6 @@
      ((name		  . "LATIN CAPITAL LETTER Z WITH CARON")
       (=ucs		  . #x017D)	; Ž
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER Z WITH CARON")
-      (=ucs		  . #x017D)	; Ž
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER Z")
       (=ucs		  . #xFF3A)	; Ｚ
@@ -5124,6 +5120,10 @@
     (=jis-x0213-1-2000	. #x2A2A)	; &I-JX1-2A2A; [10-10]
     (=jef-china3	. #x88ED)	; &I-JC3-88ED;
     (=ucs@jis/fw	. #x017D)	; &JX1-2A2A;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER Z WITH CARON")
+      (=ucs		  . #x017D)	; Ž
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B76)	; &JX1-2A37; [11-86]
       (=jis-x0213-1-2000  . #x2A37)	; &I-JX1-2A37; [10-23]
@@ -5154,10 +5154,6 @@
      ((name		  . "LATIN SMALL LETTER Z WITH CARON")
       (=ucs		  . #x017E)	; ž
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER Z WITH CARON")
-      (=ucs		  . #x017E)	; ž
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER Z")
       (=ucs		  . #xFF5A)	; ｚ
@@ -5169,6 +5165,10 @@
     (=jis-x0213-1-2000	. #x2A37)	; &I-JX1-2A37; [10-23]
     (=jef-china3	. #x88FC)	; &I-JC3-88FC;
     (=ucs@jis/fw	. #x017E)	; &JX1-2A37;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER Z WITH CARON")
+      (=ucs		  . #x017E)	; ž
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A76)	; &JX1-2A2A; [10-86]
       (=jis-x0213-1-2000  . #x2A2A)	; &I-JX1-2A2A; [10-10]
@@ -5179,11 +5179,11 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x017F)	; Å¿
     (<-compat/formed
      ((name		  . "LATIN SMALL LETTER S")
       (=ucs		  . #x0073)	; s
       ))
-    (=ucs		. #x017F)	; Å¿
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER S")
       (=ucs		  . #x0053)	; S
diff --git a/lisp/utf-2000/u00180-Latin-Extended-B.el b/lisp/utf-2000/u00180-Latin-Extended-B.el
index c6fa708..9cd7b83 100644
--- a/lisp/utf-2000/u00180-Latin-Extended-B.el
+++ b/lisp/utf-2000/u00180-Latin-Extended-B.el
@@ -216,12 +216,12 @@
      ((name		  . "LATIN CAPITAL LETTER G WITH HOOK")
       (=ucs		  . #x0193)	; Ɠ
       ))
+    (=jis-x0213-1-2000	. #x2B29)	; &JX1-2B29; [11-09]
+    (=ucs@jis/fw	. #x0193)	; &JX1-2B29;
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER G WITH HOOK")
       (=ucs		  . #x0193)	; Ɠ
       ))
-    (=jis-x0213-1-2000	. #x2B29)	; &JX1-2B29; [11-09]
-    (=ucs@jis/fw	. #x0193)	; &JX1-2B29;
     (->lowercase
      ((=jis-x0213-1-2000  . #x2B28)	; &JX1-2B28; [11-08]
       ))
@@ -987,10 +987,6 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH CARON")
       (=ucs		  . #x01CD)	; Ǎ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER A WITH CARON")
-      (=ucs		  . #x01CD)	; Ǎ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER A")
       (=ucs		  . #xFF21)	; Ａ
@@ -1002,6 +998,10 @@
     (=jis-x0213-1-2000	. #x286F)	; &I-JX1-286F; [08-79]
     (=jef-china3	. #x88DF)	; &I-JC3-88DF;
     (=ucs@jis/fw	. #x01CD)	; &JX1-286F;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER A WITH CARON")
+      (=ucs		  . #x01CD)	; Ǎ
+      ))
     (->lowercase
      ((=gb2312		  . #x2823)	; &JX1-2870; [08-03]
       (=jis-x0212	  . #x2B26)	; &I-JSP-2B26; [11-06]
@@ -1031,10 +1031,6 @@
      ((name		  . "LATIN SMALL LETTER A WITH CARON")
       (=ucs		  . #x01CE)	; ǎ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER A WITH CARON")
-      (=ucs		  . #x01CE)	; ǎ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER A")
       (=ucs		  . #xFF41)	; ａ
@@ -1048,6 +1044,10 @@
     (=jef-china3	. #x88EE)	; &I-JC3-88EE;
     (=ucs@gb/fw		. #x01CE)	; &JX1-2870;
     (=ucs@jis/fw	. #x01CE)	; &JX1-2870;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER A WITH CARON")
+      (=ucs		  . #x01CE)	; ǎ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A26)	; &JX1-286F; [10-06]
       (=jis-x0213-1-2000  . #x286F)	; &I-JX1-286F; [08-79]
@@ -1076,10 +1076,6 @@
      ((name		  . "LATIN CAPITAL LETTER I WITH CARON")
       (=ucs		  . #x01CF)	; Ǐ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER I WITH CARON")
-      (=ucs		  . #x01CF)	; Ǐ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER I")
       (=ucs		  . #xFF29)	; Ｉ
@@ -1090,6 +1086,10 @@
     (=jis-x0212		. #x2A43)	; &JSP-2A43; [10-35]
     (=jef-china3	. #x88E4)	; &I-JC3-88E4;
     (=ucs@jis/fw	. #x01CF)	; &JSP-2A43;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER I WITH CARON")
+      (=ucs		  . #x01CF)	; Ǐ
+      ))
     (->lowercase
      ((=gb2312		  . #x282B)	; &JX1-2871; [08-11]
       (=jis-x0212	  . #x2B43)	; &I-JSP-2B43; [11-35]
@@ -1119,10 +1119,6 @@
      ((name		  . "LATIN SMALL LETTER I WITH CARON")
       (=ucs		  . #x01D0)	; ǐ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER I WITH CARON")
-      (=ucs		  . #x01D0)	; ǐ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER I")
       (=ucs		  . #xFF49)	; ｉ
@@ -1135,6 +1131,10 @@
     (=jis-x0213-1-2000	. #x2871)	; &I-JX1-2871; [08-81]
     (=ucs@gb/fw		. #x01D0)	; &JX1-2871;
     (=ucs@jis/fw	. #x01D0)	; &JX1-2871;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER I WITH CARON")
+      (=ucs		  . #x01D0)	; ǐ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A43)	; &JSP-2A43; [10-35]
       ))
@@ -1162,10 +1162,6 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH CARON")
       (=ucs		  . #x01D1)	; Ǒ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER O WITH CARON")
-      (=ucs		  . #x01D1)	; Ǒ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER O")
       (=ucs		  . #xFF2F)	; Ｏ
@@ -1177,6 +1173,10 @@
     (=jis-x0213-1-2000	. #x2876)	; &I-JX1-2876; [08-86]
     (=jef-china3	. #x88E8)	; &I-JC3-88E8;
     (=ucs@jis/fw	. #x01D1)	; &JX1-2876;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER O WITH CARON")
+      (=ucs		  . #x01D1)	; Ǒ
+      ))
     (->lowercase
      ((=gb2312		  . #x282F)	; &JX1-2877; [08-15]
       (=jis-x0212	  . #x2B55)	; &I-JSP-2B55; [11-53]
@@ -1206,10 +1206,6 @@
      ((name		  . "LATIN SMALL LETTER O WITH CARON")
       (=ucs		  . #x01D2)	; ǒ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER O WITH CARON")
-      (=ucs		  . #x01D2)	; ǒ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER O")
       (=ucs		  . #xFF4F)	; ｏ
@@ -1223,6 +1219,10 @@
     (=jef-china3	. #x88F7)	; &I-JC3-88F7;
     (=ucs@gb/fw		. #x01D2)	; &JX1-2877;
     (=ucs@jis/fw	. #x01D2)	; &JX1-2877;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER O WITH CARON")
+      (=ucs		  . #x01D2)	; ǒ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A55)	; &JX1-2876; [10-53]
       (=jis-x0213-1-2000  . #x2876)	; &I-JX1-2876; [08-86]
@@ -1251,10 +1251,6 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH CARON")
       (=ucs		  . #x01D3)	; Ǔ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U WITH CARON")
-      (=ucs		  . #x01D3)	; Ǔ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER U")
       (=ucs		  . #xFF35)	; ï¼µ
@@ -1265,6 +1261,10 @@
     (=jis-x0212		. #x2A67)	; &JSP-2A67; [10-71]
     (=jef-china3	. #x88EC)	; &I-JC3-88EC;
     (=ucs@jis/fw	. #x01D3)	; &JSP-2A67;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER U WITH CARON")
+      (=ucs		  . #x01D3)	; Ǔ
+      ))
     (->lowercase
      ((=gb2312		  . #x2833)	; &JX1-2878; [08-19]
       (=jis-x0212	  . #x2B67)	; &I-JSP-2B67; [11-71]
@@ -1294,10 +1294,6 @@
      ((name		  . "LATIN SMALL LETTER U WITH CARON")
       (=ucs		  . #x01D4)	; ǔ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH CARON")
-      (=ucs		  . #x01D4)	; ǔ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER U")
       (=ucs		  . #xFF55)	; ｕ
@@ -1311,6 +1307,10 @@
     (=jef-china3	. #x88FB)	; &I-JC3-88FB;
     (=ucs@gb/fw		. #x01D4)	; &JX1-2878;
     (=ucs@jis/fw	. #x01D4)	; &JX1-2878;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER U WITH CARON")
+      (=ucs		  . #x01D4)	; ǔ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A67)	; &JSP-2A67; [10-71]
       ))
@@ -1338,12 +1338,12 @@
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON")
       (=ucs		  . #x01D5)	; Ǖ
       ))
+    (=jis-x0212		. #x2A70)	; &JSP-2A70; [10-80]
+    (=ucs@jis/fw	. #x01D5)	; &JSP-2A70;
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON")
       (=ucs		  . #x01D5)	; Ǖ
       ))
-    (=jis-x0212		. #x2A70)	; &JSP-2A70; [10-80]
-    (=ucs@jis/fw	. #x01D5)	; &JSP-2A70;
     (->lowercase
      ((=gb2312		  . #x2835)	; &JX1-2879; [08-21]
       (=jis-x0212	  . #x2B70)	; &I-JSP-2B70; [11-80]
@@ -1373,15 +1373,15 @@
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
       (=ucs		  . #x01D6)	; ǖ
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
-      (=ucs		  . #x01D6)	; ǖ
-      ))
     (=gb2312		. #x2835)	; &JX1-2879; [08-21]
     (=jis-x0212		. #x2B70)	; &I-JSP-2B70; [11-80]
     (=jis-x0213-1-2000	. #x2879)	; &I-JX1-2879; [08-89]
     (=ucs@gb/fw		. #x01D6)	; &JX1-2879;
     (=ucs@jis/fw	. #x01D6)	; &JX1-2879;
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
+      (=ucs		  . #x01D6)	; ǖ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A70)	; &JSP-2A70; [10-80]
       ))
@@ -1409,12 +1409,12 @@
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
       (=ucs		  . #x01D7)	; Ǘ
       ))
+    (=jis-x0212		. #x2A6D)	; &JSP-2A6D; [10-77]
+    (=ucs@jis/fw	. #x01D7)	; &JSP-2A6D;
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
       (=ucs		  . #x01D7)	; Ǘ
       ))
-    (=jis-x0212		. #x2A6D)	; &JSP-2A6D; [10-77]
-    (=ucs@jis/fw	. #x01D7)	; &JSP-2A6D;
     (->lowercase
      ((=gb2312		  . #x2836)	; &JX1-287A; [08-22]
       (=jis-x0212	  . #x2B6D)	; &I-JSP-2B6D; [11-77]
@@ -1444,15 +1444,15 @@
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
       (=ucs		  . #x01D8)	; ǘ
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
-      (=ucs		  . #x01D8)	; ǘ
-      ))
     (=gb2312		. #x2836)	; &JX1-287A; [08-22]
     (=jis-x0212		. #x2B6D)	; &I-JSP-2B6D; [11-77]
     (=jis-x0213-1-2000	. #x287A)	; &I-JX1-287A; [08-90]
     (=ucs@gb/fw		. #x01D8)	; &JX1-287A;
     (=ucs@jis/fw	. #x01D8)	; &JX1-287A;
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
+      (=ucs		  . #x01D8)	; ǘ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A6D)	; &JSP-2A6D; [10-77]
       ))
@@ -1480,12 +1480,12 @@
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
       (=ucs		  . #x01D9)	; Ǚ
       ))
+    (=jis-x0212		. #x2A6F)	; &JSP-2A6F; [10-79]
+    (=ucs@jis/fw	. #x01D9)	; &JSP-2A6F;
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
       (=ucs		  . #x01D9)	; Ǚ
       ))
-    (=jis-x0212		. #x2A6F)	; &JSP-2A6F; [10-79]
-    (=ucs@jis/fw	. #x01D9)	; &JSP-2A6F;
     (->lowercase
      ((=gb2312		  . #x2837)	; &JX1-287B; [08-23]
       (=jis-x0212	  . #x2B6F)	; &I-JSP-2B6F; [11-79]
@@ -1515,15 +1515,15 @@
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
       (=ucs		  . #x01DA)	; ǚ
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
-      (=ucs		  . #x01DA)	; ǚ
-      ))
     (=gb2312		. #x2837)	; &JX1-287B; [08-23]
     (=jis-x0212		. #x2B6F)	; &I-JSP-2B6F; [11-79]
     (=jis-x0213-1-2000	. #x287B)	; &I-JX1-287B; [08-91]
     (=ucs@gb/fw		. #x01DA)	; &JX1-287B;
     (=ucs@jis/fw	. #x01DA)	; &JX1-287B;
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
+      (=ucs		  . #x01DA)	; ǚ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A6F)	; &JSP-2A6F; [10-79]
       ))
@@ -1551,12 +1551,12 @@
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
       (=ucs		  . #x01DB)	; Ǜ
       ))
+    (=jis-x0212		. #x2A6E)	; &JSP-2A6E; [10-78]
+    (=ucs@jis/fw	. #x01DB)	; &JSP-2A6E;
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
       (=ucs		  . #x01DB)	; Ǜ
       ))
-    (=jis-x0212		. #x2A6E)	; &JSP-2A6E; [10-78]
-    (=ucs@jis/fw	. #x01DB)	; &JSP-2A6E;
     (->lowercase
      ((=gb2312		  . #x2838)	; &JX1-287C; [08-24]
       (=jis-x0212	  . #x2B6E)	; &I-JSP-2B6E; [11-78]
@@ -1586,15 +1586,15 @@
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
       (=ucs		  . #x01DC)	; ǜ
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
-      (=ucs		  . #x01DC)	; ǜ
-      ))
     (=gb2312		. #x2838)	; &JX1-287C; [08-24]
     (=jis-x0212		. #x2B6E)	; &I-JSP-2B6E; [11-78]
     (=jis-x0213-1-2000	. #x287C)	; &I-JX1-287C; [08-92]
     (=ucs@gb/fw		. #x01DC)	; &JX1-287C;
     (=ucs@jis/fw	. #x01DC)	; &JX1-287C;
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
+      (=ucs		  . #x01DC)	; ǜ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2A6E)	; &JSP-2A6E; [10-78]
       ))
@@ -2025,10 +2025,6 @@
      ((name		  . "LATIN CAPITAL LETTER G WITH ACUTE")
       (=ucs		  . #x01F4)	; Ç´
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER G WITH ACUTE")
-      (=ucs		  . #x01F4)	; Ç´
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER G")
       (=ucs		  . #xFF27)	; Ｇ
@@ -2037,6 +2033,10 @@
       (=ucs		  . #x0301)	; ́
       ))
     (=jef-china3	. #x85D9)	; &JC3-85D9;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER G WITH ACUTE")
+      (=ucs		  . #x01F4)	; Ç´
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2B39)	; &JSP-2B39; [11-25]
       ))
@@ -2064,10 +2064,6 @@
      ((name		  . "LATIN SMALL LETTER G WITH ACUTE")
       (=ucs		  . #x01F5)	; ǵ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER G WITH ACUTE")
-      (=ucs		  . #x01F5)	; ǵ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER G")
       (=ucs		  . #xFF47)	; ｇ
@@ -2078,6 +2074,10 @@
     (=jis-x0212		. #x2B39)	; &JSP-2B39; [11-25]
     (=jef-china3	. #x85EF)	; &I-JC3-85EF;
     (=ucs@jis/fw	. #x01F5)	; &JSP-2B39;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER G WITH ACUTE")
+      (=ucs		  . #x01F5)	; ǵ
+      ))
     (->uppercase
      ((=jef-china3	  . #x85D9)	; &JC3-85D9;
       ))
@@ -2127,10 +2127,6 @@
      ((name		  . "LATIN CAPITAL LETTER N WITH GRAVE")
       (=ucs		  . #x01F8)	; Ǹ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER N WITH GRAVE")
-      (=ucs		  . #x01F8)	; Ǹ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER N")
       (=ucs		  . #xFF2E)	; ï¼®
@@ -2141,6 +2137,10 @@
     (=jis-x0213-1-2000	. #x2874)	; &JX1-2874; [08-84]
     (=jef-china3	. #x85BC)	; &I-JC3-85BC;
     (=ucs@jis/fw	. #x01F8)	; &JX1-2874;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER N WITH GRAVE")
+      (=ucs		  . #x01F8)	; Ǹ
+      ))
     (->lowercase
      ((=jis-x0213-1-2000  . #x2875)	; &JX1-2875; [08-85]
       ))
@@ -2168,10 +2168,6 @@
      ((name		  . "LATIN SMALL LETTER N WITH GRAVE")
       (=ucs		  . #x01F9)	; ǹ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER N WITH GRAVE")
-      (=ucs		  . #x01F9)	; ǹ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER N")
       (=ucs		  . #xFF4E)	; ｎ
@@ -2181,6 +2177,10 @@
       ))
     (=jis-x0213-1-2000	. #x2875)	; &JX1-2875; [08-85]
     (=ucs@jis/fw	. #x01F9)	; &JX1-2875;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER N WITH GRAVE")
+      (=ucs		  . #x01F9)	; ǹ
+      ))
     (->uppercase
      ((=jis-x0213-1-2000  . #x2874)	; &JX1-2874; [08-84]
       ))
@@ -2264,12 +2264,20 @@
      ((name		  . "LATIN SMALL LETTER AE WITH ACUTE")
       (=ucs		  . #x01FD)	; ǽ
       ))
+    (=decomposition
+     ((=ks-x1001	  . #x2921)	; &JX1-295C; [09-01]
+      (=jis-x0212	  . #x2941)	; &I-JSP-2941; [09-33]
+      (=jis-x0213-1-2000  . #x295C)	; &I-JX1-295C; [09-60]
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=jis-x0213-1-2000	. #x2B45)	; &JX1-2B45; [11-37]
+    (=ucs@jis/fw	. #x01FD)	; &JX1-2B45;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER AE WITH ACUTE")
       (=ucs		  . #x01FD)	; ǽ
       ))
-    (=jis-x0213-1-2000	. #x2B45)	; &JX1-2B45; [11-37]
-    (=ucs@jis/fw	. #x01FD)	; &JX1-2B45;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH STROKE AND ACUTE")
diff --git a/lisp/utf-2000/u00250-IPA-Extensions.el b/lisp/utf-2000/u00250-IPA-Extensions.el
index 403079b..21366bd 100644
--- a/lisp/utf-2000/u00250-IPA-Extensions.el
+++ b/lisp/utf-2000/u00250-IPA-Extensions.el
@@ -12,12 +12,12 @@
      ((name		  . "LATIN SMALL LETTER TURNED A")
       (=ucs		  . #x0250)	; ɐ
       ))
+    (=jis-x0213-1-2000	. #x2B33)	; &JX1-2B33; [11-19]
+    (=ucs@jis/fw	. #x0250)	; &JX1-2B33;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER TURNED A")
       (=ucs		  . #x0250)	; ɐ
       ))
-    (=jis-x0213-1-2000	. #x2B33)	; &JX1-2B33; [11-19]
-    (=ucs@jis/fw	. #x0250)	; &JX1-2B33;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER ALPHA")
@@ -32,12 +32,12 @@
      ((name		  . "LATIN SMALL LETTER ALPHA")
       (=ucs		  . #x0251)	; ɑ
       ))
+    (=jis-x0213-1-2000	. #x2B39)	; &JX1-2B39; [11-25]
+    (=ucs@jis/fw	. #x0251)	; &JX1-2B39;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER ALPHA")
       (=ucs		  . #x0251)	; ɑ
       ))
-    (=jis-x0213-1-2000	. #x2B39)	; &JX1-2B39; [11-25]
-    (=ucs@jis/fw	. #x0251)	; &JX1-2B39;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TURNED ALPHA")
@@ -52,12 +52,12 @@
      ((name		  . "LATIN SMALL LETTER TURNED ALPHA")
       (=ucs		  . #x0252)	; ɒ
       ))
+    (=jis-x0213-1-2000	. #x2B3A)	; &JX1-2B3A; [11-26]
+    (=ucs@jis/fw	. #x0252)	; &JX1-2B3A;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER TURNED ALPHA")
       (=ucs		  . #x0252)	; ɒ
       ))
-    (=jis-x0213-1-2000	. #x2B3A)	; &JX1-2B3A; [11-26]
-    (=ucs@jis/fw	. #x0252)	; &JX1-2B3A;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER B WITH HOOK")
@@ -75,12 +75,12 @@
      ((name		  . "LATIN SMALL LETTER B WITH HOOK")
       (=ucs		  . #x0253)	; ɓ
       ))
+    (=jis-x0213-1-2000	. #x2B25)	; &JX1-2B25; [11-05]
+    (=ucs@jis/fw	. #x0253)	; &JX1-2B25;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER B WITH HOOK")
       (=ucs		  . #x0253)	; ɓ
       ))
-    (=jis-x0213-1-2000	. #x2B25)	; &JX1-2B25; [11-05]
-    (=ucs@jis/fw	. #x0253)	; &JX1-2B25;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER OPEN O")
@@ -99,12 +99,12 @@
      ((name		  . "LATIN SMALL LETTER OPEN O")
       (=ucs		  . #x0254)	; ɔ
       ))
+    (=jis-x0213-1-2000	. #x2B38)	; &JX1-2B38; [11-24]
+    (=ucs@jis/fw	. #x0254)	; &JX1-2B38;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER OPEN O")
       (=ucs		  . #x0254)	; ɔ
       ))
-    (=jis-x0213-1-2000	. #x2B38)	; &JX1-2B38; [11-24]
-    (=ucs@jis/fw	. #x0254)	; &JX1-2B38;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER C WITH CURL")
@@ -118,12 +118,12 @@
      ((name		  . "LATIN SMALL LETTER C WITH CURL")
       (=ucs		  . #x0255)	; ɕ
       ))
+    (=jis-x0213-1-2000	. #x2B3F)	; &JX1-2B3F; [11-31]
+    (=ucs@jis/fw	. #x0255)	; &JX1-2B3F;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER C WITH CURL")
       (=ucs		  . #x0255)	; ɕ
       ))
-    (=jis-x0213-1-2000	. #x2B3F)	; &JX1-2B3F; [11-31]
-    (=ucs@jis/fw	. #x0255)	; &JX1-2B3F;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER D WITH TAIL")
@@ -141,12 +141,12 @@
      ((name		  . "LATIN SMALL LETTER D WITH TAIL")
       (=ucs		  . #x0256)	; ɖ
       ))
+    (=jis-x0213-1-2000	. #x2A6E)	; &JX1-2A6E; [10-78]
+    (=ucs@jis/fw	. #x0256)	; &JX1-2A6E;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER D WITH TAIL")
       (=ucs		  . #x0256)	; ɖ
       ))
-    (=jis-x0213-1-2000	. #x2A6E)	; &JX1-2A6E; [10-78]
-    (=ucs@jis/fw	. #x0256)	; &JX1-2A6E;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER D WITH HOOK")
@@ -164,12 +164,12 @@
      ((name		  . "LATIN SMALL LETTER D WITH HOOK")
       (=ucs		  . #x0257)	; ɗ
       ))
+    (=jis-x0213-1-2000	. #x2B26)	; &JX1-2B26; [11-06]
+    (=ucs@jis/fw	. #x0257)	; &JX1-2B26;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER D WITH HOOK")
       (=ucs		  . #x0257)	; ɗ
       ))
-    (=jis-x0213-1-2000	. #x2B26)	; &JX1-2B26; [11-06]
-    (=ucs@jis/fw	. #x0257)	; &JX1-2B26;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER REVERSED E")
@@ -183,12 +183,12 @@
      ((name		  . "LATIN SMALL LETTER REVERSED E")
       (=ucs		  . #x0258)	; ɘ
       ))
+    (=jis-x0213-1-2000	. #x2B2E)	; &JX1-2B2E; [11-14]
+    (=ucs@jis/fw	. #x0258)	; &JX1-2B2E;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER REVERSED E")
       (=ucs		  . #x0258)	; ɘ
       ))
-    (=jis-x0213-1-2000	. #x2B2E)	; &JX1-2B2E; [11-14]
-    (=ucs@jis/fw	. #x0258)	; &JX1-2B2E;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER SCHWA")
@@ -207,12 +207,12 @@
      ((name		  . "LATIN SMALL LETTER SCHWA")
       (=ucs		  . #x0259)	; ə
       ))
+    (=jis-x0213-1-2000	. #x2B30)	; &JX1-2B30; [11-16]
+    (=ucs@jis/fw	. #x0259)	; &JX1-2B30;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER SCHWA")
       (=ucs		  . #x0259)	; ə
       ))
-    (=jis-x0213-1-2000	. #x2B30)	; &JX1-2B30; [11-16]
-    (=ucs@jis/fw	. #x0259)	; &JX1-2B30;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER SCHWA WITH HOOK")
@@ -227,12 +227,12 @@
      ((name		  . "LATIN SMALL LETTER SCHWA WITH HOOK")
       (=ucs		  . #x025A)	; ɚ
       ))
+    (=jis-x0213-1-2000	. #x2B43)	; &JX1-2B43; [11-35]
+    (=ucs@jis/fw	. #x025A)	; &JX1-2B43;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER SCHWA WITH HOOK")
       (=ucs		  . #x025A)	; ɚ
       ))
-    (=jis-x0213-1-2000	. #x2B43)	; &JX1-2B43; [11-35]
-    (=ucs@jis/fw	. #x025A)	; &JX1-2B43;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER OPEN E")
@@ -258,12 +258,12 @@
      ((name		  . "LATIN SMALL LETTER REVERSED OPEN E")
       (=ucs		  . #x025C)	; ɜ
       ))
+    (=jis-x0213-1-2000	. #x2B31)	; &JX1-2B31; [11-17]
+    (=ucs@jis/fw	. #x025C)	; &JX1-2B31;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER REVERSED OPEN E")
       (=ucs		  . #x025C)	; ɜ
       ))
-    (=jis-x0213-1-2000	. #x2B31)	; &JX1-2B31; [11-17]
-    (=ucs@jis/fw	. #x025C)	; &JX1-2B31;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER REVERSED OPEN E WITH HOOK")
@@ -284,12 +284,12 @@
      ((name		  . "LATIN SMALL LETTER CLOSED REVERSED OPEN E")
       (=ucs		  . #x025E)	; ɞ
       ))
+    (=jis-x0213-1-2000	. #x2B32)	; &JX1-2B32; [11-18]
+    (=ucs@jis/fw	. #x025E)	; &JX1-2B32;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER CLOSED REVERSED OPEN E")
       (=ucs		  . #x025E)	; ɞ
       ))
-    (=jis-x0213-1-2000	. #x2B32)	; &JX1-2B32; [11-18]
-    (=ucs@jis/fw	. #x025E)	; &JX1-2B32;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER DOTLESS J WITH STROKE")
@@ -303,12 +303,12 @@
      ((name		  . "LATIN SMALL LETTER DOTLESS J WITH STROKE")
       (=ucs		  . #x025F)	; ɟ
       ))
+    (=jis-x0213-1-2000	. #x2A75)	; &JX1-2A75; [10-85]
+    (=ucs@jis/fw	. #x025F)	; &JX1-2A75;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER DOTLESS J WITH STROKE")
       (=ucs		  . #x025F)	; ɟ
       ))
-    (=jis-x0213-1-2000	. #x2A75)	; &JX1-2A75; [10-85]
-    (=ucs@jis/fw	. #x025F)	; &JX1-2A75;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER G WITH HOOK")
@@ -326,12 +326,12 @@
      ((name		  . "LATIN SMALL LETTER G WITH HOOK")
       (=ucs		  . #x0260)	; É 
       ))
+    (=jis-x0213-1-2000	. #x2B28)	; &JX1-2B28; [11-08]
+    (=ucs@jis/fw	. #x0260)	; &JX1-2B28;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER G WITH HOOK")
       (=ucs		  . #x0260)	; É 
       ))
-    (=jis-x0213-1-2000	. #x2B28)	; &JX1-2B28; [11-08]
-    (=ucs@jis/fw	. #x0260)	; &JX1-2B28;
     (->uppercase
      ((=jis-x0213-1-2000  . #x2B29)	; &JX1-2B29; [11-09]
       ))
@@ -348,12 +348,12 @@
      ((name		  . "LATIN SMALL LETTER SCRIPT G")
       (=ucs		  . #x0261)	; É¡
       ))
+    (=jis-x0213-1-2000	. #x2A79)	; &JX1-2A79; [10-89]
+    (=ucs@jis/fw	. #x0261)	; &JX1-2A79;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER SCRIPT G")
       (=ucs		  . #x0261)	; É¡
       ))
-    (=jis-x0213-1-2000	. #x2A79)	; &JX1-2A79; [10-89]
-    (=ucs@jis/fw	. #x0261)	; &JX1-2A79;
     ))
 (define-char
   '((name		. "LATIN LETTER SMALL CAPITAL G")
@@ -386,12 +386,12 @@
      ((name		  . "LATIN SMALL LETTER RAMS HORN")
       (=ucs		  . #x0264)	; ɤ
       ))
+    (=jis-x0213-1-2000	. #x2B36)	; &JX1-2B36; [11-22]
+    (=ucs@jis/fw	. #x0264)	; &JX1-2B36;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER RAMS HORN")
       (=ucs		  . #x0264)	; ɤ
       ))
-    (=jis-x0213-1-2000	. #x2B36)	; &JX1-2B36; [11-22]
-    (=ucs@jis/fw	. #x0264)	; &JX1-2B36;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TURNED H")
@@ -406,12 +406,12 @@
      ((name		  . "LATIN SMALL LETTER TURNED H")
       (=ucs		  . #x0265)	; ɥ
       ))
+    (=jis-x0213-1-2000	. #x2B3C)	; &JX1-2B3C; [11-28]
+    (=ucs@jis/fw	. #x0265)	; &JX1-2B3C;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER TURNED H")
       (=ucs		  . #x0265)	; ɥ
       ))
-    (=jis-x0213-1-2000	. #x2B3C)	; &JX1-2B3C; [11-28]
-    (=ucs@jis/fw	. #x0265)	; &JX1-2B3C;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER H WITH HOOK")
@@ -425,12 +425,12 @@
      ((name		  . "LATIN SMALL LETTER H WITH HOOK")
       (=ucs		  . #x0266)	; ɦ
       ))
+    (=jis-x0213-1-2000	. #x2B22)	; &JX1-2B22; [11-02]
+    (=ucs@jis/fw	. #x0266)	; &JX1-2B22;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER H WITH HOOK")
       (=ucs		  . #x0266)	; ɦ
       ))
-    (=jis-x0213-1-2000	. #x2B22)	; &JX1-2B22; [11-02]
-    (=ucs@jis/fw	. #x0266)	; &JX1-2B22;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER HENG WITH HOOK")
@@ -444,12 +444,12 @@
      ((name		  . "LATIN SMALL LETTER HENG WITH HOOK")
       (=ucs		  . #x0267)	; ɧ
       ))
+    (=jis-x0213-1-2000	. #x2B42)	; &JX1-2B42; [11-34]
+    (=ucs@jis/fw	. #x0267)	; &JX1-2B42;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER HENG WITH HOOK")
       (=ucs		  . #x0267)	; ɧ
       ))
-    (=jis-x0213-1-2000	. #x2B42)	; &JX1-2B42; [11-34]
-    (=ucs@jis/fw	. #x0267)	; &JX1-2B42;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER I WITH STROKE")
@@ -468,12 +468,12 @@
      ((name		  . "LATIN SMALL LETTER I WITH STROKE")
       (=ucs		  . #x0268)	; ɨ
       ))
+    (=jis-x0213-1-2000	. #x2B2C)	; &JX1-2B2C; [11-12]
+    (=ucs@jis/fw	. #x0268)	; &JX1-2B2C;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER I WITH STROKE")
       (=ucs		  . #x0268)	; ɨ
       ))
-    (=jis-x0213-1-2000	. #x2B2C)	; &JX1-2B2C; [11-12]
-    (=ucs@jis/fw	. #x0268)	; &JX1-2B2C;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER IOTA")
@@ -513,12 +513,12 @@
      ((name		  . "LATIN SMALL LETTER L WITH BELT")
       (=ucs		  . #x026C)	; ɬ
       ))
+    (=jis-x0213-1-2000	. #x2A6A)	; &JX1-2A6A; [10-74]
+    (=ucs@jis/fw	. #x026C)	; &JX1-2A6A;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER L WITH BELT")
       (=ucs		  . #x026C)	; ɬ
       ))
-    (=jis-x0213-1-2000	. #x2A6A)	; &JX1-2A6A; [10-74]
-    (=ucs@jis/fw	. #x026C)	; &JX1-2A6A;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER L WITH RETROFLEX HOOK")
@@ -532,12 +532,12 @@
      ((name		  . "LATIN SMALL LETTER L WITH RETROFLEX HOOK")
       (=ucs		  . #x026D)	; É­
       ))
+    (=jis-x0213-1-2000	. #x2A74)	; &JX1-2A74; [10-84]
+    (=ucs@jis/fw	. #x026D)	; &JX1-2A74;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER L WITH RETROFLEX HOOK")
       (=ucs		  . #x026D)	; É­
       ))
-    (=jis-x0213-1-2000	. #x2A74)	; &JX1-2A74; [10-84]
-    (=ucs@jis/fw	. #x026D)	; &JX1-2A74;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER LEZH")
@@ -551,12 +551,12 @@
      ((name		  . "LATIN SMALL LETTER LEZH")
       (=ucs		  . #x026E)	; É®
       ))
+    (=jis-x0213-1-2000	. #x2A6B)	; &JX1-2A6B; [10-75]
+    (=ucs@jis/fw	. #x026E)	; &JX1-2A6B;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER LEZH")
       (=ucs		  . #x026E)	; É®
       ))
-    (=jis-x0213-1-2000	. #x2A6B)	; &JX1-2A6B; [10-75]
-    (=ucs@jis/fw	. #x026E)	; &JX1-2A6B;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TURNED M")
@@ -575,12 +575,12 @@
      ((name		  . "LATIN SMALL LETTER TURNED M")
       (=ucs		  . #x026F)	; ɯ
       ))
+    (=jis-x0213-1-2000	. #x2B34)	; &JX1-2B34; [11-20]
+    (=ucs@jis/fw	. #x026F)	; &JX1-2B34;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER TURNED M")
       (=ucs		  . #x026F)	; ɯ
       ))
-    (=jis-x0213-1-2000	. #x2B34)	; &JX1-2B34; [11-20]
-    (=ucs@jis/fw	. #x026F)	; &JX1-2B34;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TURNED M WITH LONG LEG")
@@ -594,12 +594,12 @@
      ((name		  . "LATIN SMALL LETTER TURNED M WITH LONG LEG")
       (=ucs		  . #x0270)	; É°
       ))
+    (=jis-x0213-1-2000	. #x2A7B)	; &JX1-2A7B; [10-91]
+    (=ucs@jis/fw	. #x0270)	; &JX1-2A7B;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER TURNED M WITH LONG LEG")
       (=ucs		  . #x0270)	; É°
       ))
-    (=jis-x0213-1-2000	. #x2A7B)	; &JX1-2A7B; [10-91]
-    (=ucs@jis/fw	. #x0270)	; &JX1-2A7B;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER M WITH HOOK")
@@ -614,12 +614,12 @@
      ((name		  . "LATIN SMALL LETTER M WITH HOOK")
       (=ucs		  . #x0271)	; ɱ
       ))
+    (=jis-x0213-1-2000	. #x2A65)	; &JX1-2A65; [10-69]
+    (=ucs@jis/fw	. #x0271)	; &JX1-2A65;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER M WITH HOOK")
       (=ucs		  . #x0271)	; ɱ
       ))
-    (=jis-x0213-1-2000	. #x2A65)	; &JX1-2A65; [10-69]
-    (=ucs@jis/fw	. #x0271)	; &JX1-2A65;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER N WITH LEFT HOOK")
@@ -638,12 +638,12 @@
      ((name		  . "LATIN SMALL LETTER N WITH LEFT HOOK")
       (=ucs		  . #x0272)	; ɲ
       ))
+    (=jis-x0213-1-2000	. #x2A76)	; &JX1-2A76; [10-86]
+    (=ucs@jis/fw	. #x0272)	; &JX1-2A76;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER N WITH LEFT HOOK")
       (=ucs		  . #x0272)	; ɲ
       ))
-    (=jis-x0213-1-2000	. #x2A76)	; &JX1-2A76; [10-86]
-    (=ucs@jis/fw	. #x0272)	; &JX1-2A76;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER N WITH RETROFLEX HOOK")
@@ -657,12 +657,12 @@
      ((name		  . "LATIN SMALL LETTER N WITH RETROFLEX HOOK")
       (=ucs		  . #x0273)	; ɳ
       ))
+    (=jis-x0213-1-2000	. #x2A6F)	; &JX1-2A6F; [10-79]
+    (=ucs@jis/fw	. #x0273)	; &JX1-2A6F;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER N WITH RETROFLEX HOOK")
       (=ucs		  . #x0273)	; ɳ
       ))
-    (=jis-x0213-1-2000	. #x2A6F)	; &JX1-2A6F; [10-79]
-    (=ucs@jis/fw	. #x0273)	; &JX1-2A6F;
     ))
 (define-char
   '((name		. "LATIN LETTER SMALL CAPITAL N")
@@ -688,12 +688,12 @@
      ((name		  . "LATIN SMALL LETTER BARRED O")
       (=ucs		  . #x0275)	; ɵ
       ))
+    (=jis-x0213-1-2000	. #x2B2F)	; &JX1-2B2F; [11-15]
+    (=ucs@jis/fw	. #x0275)	; &JX1-2B2F;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER BARRED O")
       (=ucs		  . #x0275)	; ɵ
       ))
-    (=jis-x0213-1-2000	. #x2B2F)	; &JX1-2B2F; [11-15]
-    (=ucs@jis/fw	. #x0275)	; &JX1-2B2F;
     ))
 (define-char
   '((name		. "LATIN LETTER SMALL CAPITAL OE")
@@ -730,12 +730,12 @@
      ((name		  . "LATIN SMALL LETTER TURNED R")
       (=ucs		  . #x0279)	; ɹ
       ))
+    (=jis-x0213-1-2000	. #x2A6C)	; &JX1-2A6C; [10-76]
+    (=ucs@jis/fw	. #x0279)	; &JX1-2A6C;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER TURNED R")
       (=ucs		  . #x0279)	; ɹ
       ))
-    (=jis-x0213-1-2000	. #x2A6C)	; &JX1-2A6C; [10-76]
-    (=ucs@jis/fw	. #x0279)	; &JX1-2A6C;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TURNED R WITH LONG LEG")
@@ -749,12 +749,12 @@
      ((name		  . "LATIN SMALL LETTER TURNED R WITH LONG LEG")
       (=ucs		  . #x027A)	; ɺ
       ))
+    (=jis-x0213-1-2000	. #x2B41)	; &JX1-2B41; [11-33]
+    (=ucs@jis/fw	. #x027A)	; &JX1-2B41;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER TURNED R WITH LONG LEG")
       (=ucs		  . #x027A)	; ɺ
       ))
-    (=jis-x0213-1-2000	. #x2B41)	; &JX1-2B41; [11-33]
-    (=ucs@jis/fw	. #x027A)	; &JX1-2B41;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TURNED R WITH HOOK")
@@ -768,12 +768,12 @@
      ((name		  . "LATIN SMALL LETTER TURNED R WITH HOOK")
       (=ucs		  . #x027B)	; É»
       ))
+    (=jis-x0213-1-2000	. #x2A73)	; &JX1-2A73; [10-83]
+    (=ucs@jis/fw	. #x027B)	; &JX1-2A73;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER TURNED R WITH HOOK")
       (=ucs		  . #x027B)	; É»
       ))
-    (=jis-x0213-1-2000	. #x2A73)	; &JX1-2A73; [10-83]
-    (=ucs@jis/fw	. #x027B)	; &JX1-2A73;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER R WITH LONG LEG")
@@ -794,12 +794,12 @@
      ((name		  . "LATIN SMALL LETTER R WITH TAIL")
       (=ucs		  . #x027D)	; ɽ
       ))
+    (=jis-x0213-1-2000	. #x2A70)	; &JX1-2A70; [10-80]
+    (=ucs@jis/fw	. #x027D)	; &JX1-2A70;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER R WITH TAIL")
       (=ucs		  . #x027D)	; ɽ
       ))
-    (=jis-x0213-1-2000	. #x2A70)	; &JX1-2A70; [10-80]
-    (=ucs@jis/fw	. #x027D)	; &JX1-2A70;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER R WITH FISHHOOK")
@@ -813,12 +813,12 @@
      ((name		  . "LATIN SMALL LETTER R WITH FISHHOOK")
       (=ucs		  . #x027E)	; ɾ
       ))
+    (=jis-x0213-1-2000	. #x2A67)	; &JX1-2A67; [10-71]
+    (=ucs@jis/fw	. #x027E)	; &JX1-2A67;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER R WITH FISHHOOK")
       (=ucs		  . #x027E)	; ɾ
       ))
-    (=jis-x0213-1-2000	. #x2A67)	; &JX1-2A67; [10-71]
-    (=ucs@jis/fw	. #x027E)	; &JX1-2A67;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER REVERSED R WITH FISHHOOK")
@@ -852,12 +852,12 @@
      ((name		  . "LATIN LETTER SMALL CAPITAL INVERTED R")
       (=ucs		  . #x0281)	; ʁ
       ))
+    (=jis-x0213-1-2000	. #x2A7C)	; &JX1-2A7C; [10-92]
+    (=ucs@jis/fw	. #x0281)	; &JX1-2A7C;
     (<-fullwidth
      ((name		  . "LATIN LETTER SMALL CAPITAL INVERTED R")
       (=ucs		  . #x0281)	; ʁ
       ))
-    (=jis-x0213-1-2000	. #x2A7C)	; &JX1-2A7C; [10-92]
-    (=ucs@jis/fw	. #x0281)	; &JX1-2A7C;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER S WITH HOOK")
@@ -871,12 +871,12 @@
      ((name		  . "LATIN SMALL LETTER S WITH HOOK")
       (=ucs		  . #x0282)	; ʂ
       ))
+    (=jis-x0213-1-2000	. #x2A71)	; &JX1-2A71; [10-81]
+    (=ucs@jis/fw	. #x0282)	; &JX1-2A71;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER S WITH HOOK")
       (=ucs		  . #x0282)	; ʂ
       ))
-    (=jis-x0213-1-2000	. #x2A71)	; &JX1-2A71; [10-81]
-    (=ucs@jis/fw	. #x0282)	; &JX1-2A71;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER ESH")
@@ -895,12 +895,12 @@
      ((name		  . "LATIN SMALL LETTER ESH")
       (=ucs		  . #x0283)	; ʃ
       ))
+    (=jis-x0213-1-2000	. #x2A68)	; &JX1-2A68; [10-72]
+    (=ucs@jis/fw	. #x0283)	; &JX1-2A68;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER ESH")
       (=ucs		  . #x0283)	; ʃ
       ))
-    (=jis-x0213-1-2000	. #x2A68)	; &JX1-2A68; [10-72]
-    (=ucs@jis/fw	. #x0283)	; &JX1-2A68;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK")
@@ -914,12 +914,12 @@
      ((name . "LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK")
       (=ucs		  . #x0284)	; ʄ
       ))
+    (=jis-x0213-1-2000	. #x2B27)	; &JX1-2B27; [11-07]
+    (=ucs@jis/fw	. #x0284)	; &JX1-2B27;
     (<-fullwidth
      ((name . "LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK")
       (=ucs		  . #x0284)	; ʄ
       ))
-    (=jis-x0213-1-2000	. #x2B27)	; &JX1-2B27; [11-07]
-    (=ucs@jis/fw	. #x0284)	; &JX1-2B27;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER SQUAT REVERSED ESH")
@@ -958,12 +958,12 @@
      ((name		  . "LATIN SMALL LETTER T WITH RETROFLEX HOOK")
       (=ucs		  . #x0288)	; ʈ
       ))
+    (=jis-x0213-1-2000	. #x2A6D)	; &JX1-2A6D; [10-77]
+    (=ucs@jis/fw	. #x0288)	; &JX1-2A6D;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER T WITH RETROFLEX HOOK")
       (=ucs		  . #x0288)	; ʈ
       ))
-    (=jis-x0213-1-2000	. #x2A6D)	; &JX1-2A6D; [10-77]
-    (=ucs@jis/fw	. #x0288)	; &JX1-2A6D;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER U BAR")
@@ -978,12 +978,12 @@
      ((name		  . "LATIN SMALL LETTER U BAR")
       (=ucs		  . #x0289)	; ʉ
       ))
+    (=jis-x0213-1-2000	. #x2B2D)	; &JX1-2B2D; [11-13]
+    (=ucs@jis/fw	. #x0289)	; &JX1-2B2D;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER U BAR")
       (=ucs		  . #x0289)	; ʉ
       ))
-    (=jis-x0213-1-2000	. #x2B2D)	; &JX1-2B2D; [11-13]
-    (=ucs@jis/fw	. #x0289)	; &JX1-2B2D;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER UPSILON")
@@ -1002,12 +1002,12 @@
      ((name		  . "LATIN SMALL LETTER UPSILON")
       (=ucs		  . #x028A)	; ʊ
       ))
+    (=jis-x0213-1-2000	. #x2B35)	; &JX1-2B35; [11-21]
+    (=ucs@jis/fw	. #x028A)	; &JX1-2B35;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER UPSILON")
       (=ucs		  . #x028A)	; ʊ
       ))
-    (=jis-x0213-1-2000	. #x2B35)	; &JX1-2B35; [11-21]
-    (=ucs@jis/fw	. #x028A)	; &JX1-2B35;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER V WITH HOOK")
@@ -1025,12 +1025,12 @@
      ((name		  . "LATIN SMALL LETTER V WITH HOOK")
       (=ucs		  . #x028B)	; ʋ
       ))
+    (=jis-x0213-1-2000	. #x2A66)	; &JX1-2A66; [10-70]
+    (=ucs@jis/fw	. #x028B)	; &JX1-2A66;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER V WITH HOOK")
       (=ucs		  . #x028B)	; ʋ
       ))
-    (=jis-x0213-1-2000	. #x2A66)	; &JX1-2A66; [10-70]
-    (=ucs@jis/fw	. #x028B)	; &JX1-2A66;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TURNED V")
@@ -1045,12 +1045,12 @@
      ((name		  . "LATIN SMALL LETTER TURNED V")
       (=ucs		  . #x028C)	; ʌ
       ))
+    (=jis-x0213-1-2000	. #x2B37)	; &JX1-2B37; [11-23]
+    (=ucs@jis/fw	. #x028C)	; &JX1-2B37;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER TURNED V")
       (=ucs		  . #x028C)	; ʌ
       ))
-    (=jis-x0213-1-2000	. #x2B37)	; &JX1-2B37; [11-23]
-    (=ucs@jis/fw	. #x028C)	; &JX1-2B37;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TURNED W")
@@ -1065,12 +1065,12 @@
      ((name		  . "LATIN SMALL LETTER TURNED W")
       (=ucs		  . #x028D)	; ʍ
       ))
+    (=jis-x0213-1-2000	. #x2B3B)	; &JX1-2B3B; [11-27]
+    (=ucs@jis/fw	. #x028D)	; &JX1-2B3B;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER TURNED W")
       (=ucs		  . #x028D)	; ʍ
       ))
-    (=jis-x0213-1-2000	. #x2B3B)	; &JX1-2B3B; [11-27]
-    (=ucs@jis/fw	. #x028D)	; &JX1-2B3B;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TURNED Y")
@@ -1085,12 +1085,12 @@
      ((name		  . "LATIN SMALL LETTER TURNED Y")
       (=ucs		  . #x028E)	; ʎ
       ))
+    (=jis-x0213-1-2000	. #x2A78)	; &JX1-2A78; [10-88]
+    (=ucs@jis/fw	. #x028E)	; &JX1-2A78;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER TURNED Y")
       (=ucs		  . #x028E)	; ʎ
       ))
-    (=jis-x0213-1-2000	. #x2A78)	; &JX1-2A78; [10-88]
-    (=ucs@jis/fw	. #x028E)	; &JX1-2A78;
     ))
 (define-char
   '((name		. "LATIN LETTER SMALL CAPITAL Y")
@@ -1112,12 +1112,12 @@
      ((name		  . "LATIN SMALL LETTER Z WITH RETROFLEX HOOK")
       (=ucs		  . #x0290)	; ʐ
       ))
+    (=jis-x0213-1-2000	. #x2A72)	; &JX1-2A72; [10-82]
+    (=ucs@jis/fw	. #x0290)	; &JX1-2A72;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER Z WITH RETROFLEX HOOK")
       (=ucs		  . #x0290)	; ʐ
       ))
-    (=jis-x0213-1-2000	. #x2A72)	; &JX1-2A72; [10-82]
-    (=ucs@jis/fw	. #x0290)	; &JX1-2A72;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER Z WITH CURL")
@@ -1131,12 +1131,12 @@
      ((name		  . "LATIN SMALL LETTER Z WITH CURL")
       (=ucs		  . #x0291)	; ʑ
       ))
+    (=jis-x0213-1-2000	. #x2B40)	; &JX1-2B40; [11-32]
+    (=ucs@jis/fw	. #x0291)	; &JX1-2B40;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER Z WITH CURL")
       (=ucs		  . #x0291)	; ʑ
       ))
-    (=jis-x0213-1-2000	. #x2B40)	; &JX1-2B40; [11-32]
-    (=ucs@jis/fw	. #x0291)	; &JX1-2B40;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER EZH")
@@ -1155,12 +1155,12 @@
      ((name		  . "LATIN SMALL LETTER EZH")
       (=ucs		  . #x0292)	; ʒ
       ))
+    (=jis-x0213-1-2000	. #x2A69)	; &JX1-2A69; [10-73]
+    (=ucs@jis/fw	. #x0292)	; &JX1-2A69;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER EZH")
       (=ucs		  . #x0292)	; ʒ
       ))
-    (=jis-x0213-1-2000	. #x2A69)	; &JX1-2A69; [10-73]
-    (=ucs@jis/fw	. #x0292)	; &JX1-2A69;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER EZH WITH CURL")
@@ -1181,12 +1181,12 @@
      ((name		  . "LATIN LETTER GLOTTAL STOP")
       (=ucs		  . #x0294)	; ʔ
       ))
+    (=jis-x0213-1-2000	. #x2B21)	; &JX1-2B21; [11-01]
+    (=ucs@jis/fw	. #x0294)	; &JX1-2B21;
     (<-fullwidth
      ((name		  . "LATIN LETTER GLOTTAL STOP")
       (=ucs		  . #x0294)	; ʔ
       ))
-    (=jis-x0213-1-2000	. #x2B21)	; &JX1-2B21; [11-01]
-    (=ucs@jis/fw	. #x0294)	; &JX1-2B21;
     ))
 (define-char
   '((name		. "LATIN LETTER PHARYNGEAL VOICED FRICATIVE")
@@ -1200,12 +1200,12 @@
      ((name		  . "LATIN LETTER PHARYNGEAL VOICED FRICATIVE")
       (=ucs		  . #x0295)	; ʕ
       ))
+    (=jis-x0213-1-2000	. #x2A7E)	; &JX1-2A7E; [10-94]
+    (=ucs@jis/fw	. #x0295)	; &JX1-2A7E;
     (<-fullwidth
      ((name		  . "LATIN LETTER PHARYNGEAL VOICED FRICATIVE")
       (=ucs		  . #x0295)	; ʕ
       ))
-    (=jis-x0213-1-2000	. #x2A7E)	; &JX1-2A7E; [10-94]
-    (=ucs@jis/fw	. #x0295)	; &JX1-2A7E;
     ))
 (define-char
   '((name		. "LATIN LETTER INVERTED GLOTTAL STOP")
@@ -1233,12 +1233,12 @@
      ((name		  . "LATIN LETTER BILABIAL CLICK")
       (=ucs		  . #x0298)	; ʘ
       ))
+    (=jis-x0213-1-2000	. #x2B23)	; &JX1-2B23; [11-03]
+    (=ucs@jis/fw	. #x0298)	; &JX1-2B23;
     (<-fullwidth
      ((name		  . "LATIN LETTER BILABIAL CLICK")
       (=ucs		  . #x0298)	; ʘ
       ))
-    (=jis-x0213-1-2000	. #x2B23)	; &JX1-2B23; [11-03]
-    (=ucs@jis/fw	. #x0298)	; &JX1-2B23;
     ))
 (define-char
   '((name		. "LATIN LETTER SMALL CAPITAL B")
@@ -1280,12 +1280,12 @@
      ((name		  . "LATIN SMALL LETTER J WITH CROSSED-TAIL")
       (=ucs		  . #x029D)	; ʝ
       ))
+    (=jis-x0213-1-2000	. #x2A77)	; &JX1-2A77; [10-87]
+    (=ucs@jis/fw	. #x029D)	; &JX1-2A77;
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER J WITH CROSSED-TAIL")
       (=ucs		  . #x029D)	; ʝ
       ))
-    (=jis-x0213-1-2000	. #x2A77)	; &JX1-2A77; [10-87]
-    (=ucs@jis/fw	. #x029D)	; &JX1-2A77;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TURNED K")
@@ -1321,12 +1321,12 @@
      ((name		  . "LATIN LETTER GLOTTAL STOP WITH STROKE")
       (=ucs		  . #x02A1)	; Ê¡
       ))
+    (=jis-x0213-1-2000	. #x2B3E)	; &JX1-2B3E; [11-30]
+    (=ucs@jis/fw	. #x02A1)	; &JX1-2B3E;
     (<-fullwidth
      ((name		  . "LATIN LETTER GLOTTAL STOP WITH STROKE")
       (=ucs		  . #x02A1)	; Ê¡
       ))
-    (=jis-x0213-1-2000	. #x2B3E)	; &JX1-2B3E; [11-30]
-    (=ucs@jis/fw	. #x02A1)	; &JX1-2B3E;
     ))
 (define-char
   '((name . "LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE")
@@ -1340,12 +1340,12 @@
      ((name . "LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE")
       (=ucs		  . #x02A2)	; ʢ
       ))
+    (=jis-x0213-1-2000	. #x2B3D)	; &JX1-2B3D; [11-29]
+    (=ucs@jis/fw	. #x02A2)	; &JX1-2B3D;
     (<-fullwidth
      ((name . "LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE")
       (=ucs		  . #x02A2)	; ʢ
       ))
-    (=jis-x0213-1-2000	. #x2B3D)	; &JX1-2B3D; [11-29]
-    (=ucs@jis/fw	. #x02A2)	; &JX1-2B3D;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER DZ DIGRAPH")
diff --git a/lisp/utf-2000/u002B0-Spacing-Modifier-Letters.el b/lisp/utf-2000/u002B0-Spacing-Modifier-Letters.el
index a743f36..c129f4a 100644
--- a/lisp/utf-2000/u002B0-Spacing-Modifier-Letters.el
+++ b/lisp/utf-2000/u002B0-Spacing-Modifier-Letters.el
@@ -4,99 +4,99 @@
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x02B0)	; Ê°
     (<-superscript
      ((name		  . "LATIN SMALL LETTER H")
       (=ucs		  . #x0068)	; h
       ))
-    (=ucs		. #x02B0)	; Ê°
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL H WITH HOOK")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x02B1)	; ʱ
     (<-superscript
      ((name		  . "LATIN SMALL LETTER H WITH HOOK")
       (=ucs		  . #x0266)	; ɦ
       ))
-    (=ucs		. #x02B1)	; ʱ
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL J")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x02B2)	; ʲ
     (<-superscript
      ((name		  . "LATIN SMALL LETTER J")
       (=ucs		  . #x006A)	; j
       ))
-    (=ucs		. #x02B2)	; ʲ
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL R")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x02B3)	; ʳ
     (<-superscript
      ((name		  . "LATIN SMALL LETTER R")
       (=ucs		  . #x0072)	; r
       ))
-    (=ucs		. #x02B3)	; ʳ
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL TURNED R")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x02B4)	; Ê´
     (<-superscript
      ((name		  . "LATIN SMALL LETTER TURNED R")
       (=ucs		  . #x0279)	; ɹ
       ))
-    (=ucs		. #x02B4)	; Ê´
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL TURNED R WITH HOOK")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x02B5)	; ʵ
     (<-superscript
      ((name		  . "LATIN SMALL LETTER TURNED R WITH HOOK")
       (=ucs		  . #x027B)	; É»
       ))
-    (=ucs		. #x02B5)	; ʵ
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL CAPITAL INVERTED R")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x02B6)	; ʶ
     (<-superscript
      ((name		  . "LATIN LETTER SMALL CAPITAL INVERTED R")
       (=ucs		  . #x0281)	; ʁ
       ))
-    (=ucs		. #x02B6)	; ʶ
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL W")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x02B7)	; Ê·
     (<-superscript
      ((name		  . "LATIN SMALL LETTER W")
       (=ucs		  . #x0077)	; w
       ))
-    (=ucs		. #x02B7)	; Ê·
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL Y")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x02B8)	; ʸ
     (<-superscript
      ((name		  . "LATIN SMALL LETTER Y")
       (=ucs		  . #x0079)	; y
       ))
-    (=ucs		. #x02B8)	; ʸ
     ))
 (define-char
   '((name		. "MODIFIER LETTER PRIME")
@@ -214,10 +214,6 @@
      ((name		  . "CARON")
       (=ucs		  . #x02C7)	; ˇ
       ))
-    (<-fullwidth
-     ((name		  . "CARON")
-      (=ucs		  . #x02C7)	; ˇ
-      ))
     (=gb2312		. #x2126)	; &JX1-2A31; [01-06]
     (=ks-x1001		. #x2227)	; &I-K0-2227; [02-07]
     (=jis-x0212		. #x2230)	; &I-JSP-2230; [02-16]
@@ -227,6 +223,10 @@
     (=jef-china3	. #x81AB)	; &I-JC3-81AB;
     (=ucs@gb/fw		. #x02C7)	; &JX1-2A31;
     (=ucs@jis/fw	. #x02C7)	; &JX1-2A31;
+    (<-fullwidth
+     ((name		  . "CARON")
+      (=ucs		  . #x02C7)	; ˇ
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER VERTICAL LINE")
@@ -241,12 +241,12 @@
      ((name		  . "MODIFIER LETTER VERTICAL LINE")
       (=ucs		  . #x02C8)	; ˈ
       ))
+    (=jis-x0213-1-2000	. #x2B53)	; &JX1-2B53; [11-51]
+    (=ucs@jis/fw	. #x02C8)	; &JX1-2B53;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER VERTICAL LINE")
       (=ucs		  . #x02C8)	; ˈ
       ))
-    (=jis-x0213-1-2000	. #x2B53)	; &JX1-2B53; [11-51]
-    (=ucs@jis/fw	. #x02C8)	; &JX1-2B53;
     ))
 (define-char
   '((name		. "MODIFIER LETTER MACRON")
@@ -261,14 +261,14 @@
      ((name		  . "MODIFIER LETTER MACRON")
       (=ucs		  . #x02C9)	; ˉ
       ))
-    (<-fullwidth
-     ((name		  . "MODIFIER LETTER MACRON")
-      (=ucs		  . #x02C9)	; ˉ
-      ))
     (=gb2312		. #x2125)	; &I-C1-256D; [01-05]
     (=cns11643-1	. #x256D)	; &I-C1-256D; [05-77]
     (=big5		. #xA3BC)	; &I-B-A3BC;
     (=ucs@gb/fw		. #x02C9)	; &I-C1-256D;
+    (<-fullwidth
+     ((name		  . "MODIFIER LETTER MACRON")
+      (=ucs		  . #x02C9)	; ˉ
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER ACUTE ACCENT")
@@ -283,12 +283,12 @@
      ((name		  . "MODIFIER LETTER ACUTE ACCENT")
       (=ucs		  . #x02CA)	; ˊ
       ))
+    (=cns11643-1	. #x256E)	; &C1-256E; [05-78]
+    (=big5		. #xA3BD)	; &I-B-A3BD;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER ACUTE ACCENT")
       (=ucs		  . #x02CA)	; ˊ
       ))
-    (=cns11643-1	. #x256E)	; &C1-256E; [05-78]
-    (=big5		. #xA3BD)	; &I-B-A3BD;
     ))
 (define-char
   '((name		. "MODIFIER LETTER GRAVE ACCENT")
@@ -303,12 +303,12 @@
      ((name		  . "MODIFIER LETTER GRAVE ACCENT")
       (=ucs		  . #x02CB)	; ˋ
       ))
+    (=cns11643-1	. #x2570)	; &C1-2570; [05-80]
+    (=big5		. #xA3BF)	; &I-B-A3BF;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER GRAVE ACCENT")
       (=ucs		  . #x02CB)	; ˋ
       ))
-    (=cns11643-1	. #x2570)	; &C1-2570; [05-80]
-    (=big5		. #xA3BF)	; &I-B-A3BF;
     ))
 (define-char
   '((name		. "MODIFIER LETTER LOW VERTICAL LINE")
@@ -323,12 +323,12 @@
      ((name		  . "MODIFIER LETTER LOW VERTICAL LINE")
       (=ucs		  . #x02CC)	; ˌ
       ))
+    (=jis-x0213-1-2000	. #x2B54)	; &JX1-2B54; [11-52]
+    (=ucs@jis/fw	. #x02CC)	; &JX1-2B54;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER LOW VERTICAL LINE")
       (=ucs		  . #x02CC)	; ˌ
       ))
-    (=jis-x0213-1-2000	. #x2B54)	; &JX1-2B54; [11-52]
-    (=ucs@jis/fw	. #x02CC)	; &JX1-2B54;
     ))
 (define-char
   '((name		. "MODIFIER LETTER LOW MACRON")
@@ -373,13 +373,13 @@
      ((name		  . "MODIFIER LETTER TRIANGULAR COLON")
       (=ucs		  . #x02D0)	; ː
       ))
+    (=ks-x1001		. #x2230)	; &JX1-2B55; [02-16]
+    (=jis-x0213-1-2000	. #x2B55)	; &I-JX1-2B55; [11-53]
+    (=ucs@jis/fw	. #x02D0)	; &JX1-2B55;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER TRIANGULAR COLON")
       (=ucs		  . #x02D0)	; ː
       ))
-    (=ks-x1001		. #x2230)	; &JX1-2B55; [02-16]
-    (=jis-x0213-1-2000	. #x2B55)	; &I-JX1-2B55; [11-53]
-    (=ucs@jis/fw	. #x02D0)	; &JX1-2B55;
     ))
 (define-char
   '((name		. "MODIFIER LETTER HALF TRIANGULAR COLON")
@@ -393,12 +393,12 @@
      ((name		  . "MODIFIER LETTER HALF TRIANGULAR COLON")
       (=ucs		  . #x02D1)	; ˑ
       ))
+    (=jis-x0213-1-2000	. #x2B56)	; &JX1-2B56; [11-54]
+    (=ucs@jis/fw	. #x02D1)	; &JX1-2B56;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER HALF TRIANGULAR COLON")
       (=ucs		  . #x02D1)	; ˑ
       ))
-    (=jis-x0213-1-2000	. #x2B56)	; &JX1-2B56; [11-54]
-    (=ucs@jis/fw	. #x02D1)	; &JX1-2B56;
     ))
 (define-char
   '((name		. "MODIFIER LETTER CENTRED RIGHT HALF RING")
@@ -463,15 +463,15 @@
      ((name		  . "BREVE")
       (=ucs		  . #x02D8)	; ˘
       ))
-    (<-fullwidth
-     ((name		  . "BREVE")
-      (=ucs		  . #x02D8)	; ˘
-      ))
     (=ks-x1001		. #x2228)	; &JX1-2A22; [02-08]
     (=jis-x0212		. #x222F)	; &I-JSP-222F; [02-15]
     (=jis-x0213-1-2000	. #x2A22)	; &I-JX1-2A22; [10-02]
     (=jef-china3	. #x81A8)	; &I-JC3-81A8;
     (=ucs@jis/fw	. #x02D8)	; &JX1-2A22;
+    (<-fullwidth
+     ((name		  . "BREVE")
+      (=ucs		  . #x02D8)	; ˘
+      ))
     ))
 (define-char
   '((name		. "DOT ABOVE")
@@ -496,10 +496,6 @@
      ((name		  . "DOT ABOVE")
       (=ucs		  . #x02D9)	; ˙
       ))
-    (<-fullwidth
-     ((name		  . "DOT ABOVE")
-      (=ucs		  . #x02D9)	; ˙
-      ))
     (=ks-x1001		. #x222B)	; &JX1-2A58; [02-11]
     (=jis-x0212		. #x2232)	; &I-JSP-2232; [02-18]
     (=cns11643-1	. #x256C)	; &I-C1-256C; [05-76]
@@ -507,6 +503,10 @@
     (=big5		. #xA3BB)	; &I-B-A3BB;
     (=jef-china3	. #x81A9)	; &I-JC3-81A9;
     (=ucs@jis/fw	. #x02D9)	; &JX1-2A58;
+    (<-fullwidth
+     ((name		  . "DOT ABOVE")
+      (=ucs		  . #x02D9)	; ˙
+      ))
     ))
 (define-char
   '((name		. "RING ABOVE")
@@ -527,14 +527,14 @@
      ((name		  . "RING ABOVE")
       (=ucs		  . #x02DA)	; ˚
       ))
-    (<-fullwidth
-     ((name		  . "RING ABOVE")
-      (=ucs		  . #x02DA)	; ˚
-      ))
     (=ks-x1001		. #x222A)	; &JSP-2236; [02-10]
     (=jis-x0212		. #x2236)	; &I-JSP-2236; [02-22]
     (=jef-china3	. #x81AC)	; &I-JC3-81AC;
     (=ucs@jis/fw	. #x02DA)	; &JSP-2236;
+    (<-fullwidth
+     ((name		  . "RING ABOVE")
+      (=ucs		  . #x02DA)	; ˚
+      ))
     ))
 (define-char
   '((name		. "OGONEK")
@@ -557,15 +557,15 @@
      ((name		  . "OGONEK")
       (=ucs		  . #x02DB)	; ˛
       ))
-    (<-fullwidth
-     ((name		  . "OGONEK")
-      (=ucs		  . #x02DB)	; ˛
-      ))
     (=ks-x1001		. #x222D)	; &JX1-2A2D; [02-13]
     (=jis-x0212		. #x2235)	; &I-JSP-2235; [02-21]
     (=jis-x0213-1-2000	. #x2A2D)	; &I-JX1-2A2D; [10-13]
     (=jef-china3	. #x81B3)	; &I-JC3-81B3;
     (=ucs@jis/fw	. #x02DB)	; &JX1-2A2D;
+    (<-fullwidth
+     ((name		  . "OGONEK")
+      (=ucs		  . #x02DB)	; ˛
+      ))
     ))
 (define-char
   '((name		. "SMALL TILDE")
@@ -601,15 +601,15 @@
      ((name		  . "DOUBLE ACUTE ACCENT")
       (=ucs		  . #x02DD)	; ˝
       ))
-    (<-fullwidth
-     ((name		  . "DOUBLE ACUTE ACCENT")
-      (=ucs		  . #x02DD)	; ˝
-      ))
     (=ks-x1001		. #x2229)	; &JX1-2A36; [02-09]
     (=jis-x0212		. #x2233)	; &I-JSP-2233; [02-19]
     (=jis-x0213-1-2000	. #x2A36)	; &I-JX1-2A36; [10-22]
     (=jef-china3	. #x81B0)	; &I-JC3-81B0;
     (=ucs@jis/fw	. #x02DD)	; &JX1-2A36;
+    (<-fullwidth
+     ((name		  . "DOUBLE ACUTE ACCENT")
+      (=ucs		  . #x02DD)	; ˝
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER RHOTIC HOOK")
@@ -623,12 +623,12 @@
      ((name		  . "MODIFIER LETTER RHOTIC HOOK")
       (=ucs		  . #x02DE)	; ˞
       ))
+    (=jis-x0213-1-2000	. #x2B71)	; &JX1-2B71; [11-81]
+    (=ucs@jis/fw	. #x02DE)	; &JX1-2B71;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER RHOTIC HOOK")
       (=ucs		  . #x02DE)	; ˞
       ))
-    (=jis-x0213-1-2000	. #x2B71)	; &JX1-2B71; [11-81]
-    (=ucs@jis/fw	. #x02DE)	; &JX1-2B71;
     ))
 (define-char
   '((name		. "MODIFIER LETTER CROSS ACCENT")
@@ -642,55 +642,55 @@
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x02E0)	; Ë 
     (<-superscript
      ((name		  . "LATIN SMALL LETTER GAMMA")
       (=ucs		  . #x0263)	; ɣ
       ))
-    (=ucs		. #x02E0)	; Ë 
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL L")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x02E1)	; Ë¡
     (<-superscript
      ((name		  . "LATIN SMALL LETTER L")
       (=ucs		  . #x006C)	; l
       ))
-    (=ucs		. #x02E1)	; Ë¡
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL S")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x02E2)	; ˢ
     (<-superscript
      ((name		  . "LATIN SMALL LETTER S")
       (=ucs		  . #x0073)	; s
       ))
-    (=ucs		. #x02E2)	; ˢ
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL X")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x02E3)	; ˣ
     (<-superscript
      ((name		  . "LATIN SMALL LETTER X")
       (=ucs		  . #x0078)	; x
       ))
-    (=ucs		. #x02E3)	; ˣ
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL REVERSED GLOTTAL STOP")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x02E4)	; ˤ
     (<-superscript
      ((name		  . "LATIN LETTER PHARYNGEAL VOICED FRICATIVE")
       (=ucs		  . #x0295)	; ʕ
       ))
-    (=ucs		. #x02E4)	; ˤ
     ))
 (define-char
   '((name		. "MODIFIER LETTER EXTRA-HIGH TONE BAR")
@@ -704,12 +704,12 @@
      ((name		  . "MODIFIER LETTER EXTRA-HIGH TONE BAR")
       (=ucs		  . #x02E5)	; ˥
       ))
+    (=jis-x0213-1-2000	. #x2B60)	; &JX1-2B60; [11-64]
+    (=ucs@jis/fw	. #x02E5)	; &JX1-2B60;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER EXTRA-HIGH TONE BAR")
       (=ucs		  . #x02E5)	; ˥
       ))
-    (=jis-x0213-1-2000	. #x2B60)	; &JX1-2B60; [11-64]
-    (=ucs@jis/fw	. #x02E5)	; &JX1-2B60;
     ))
 (define-char
   '((name		. "MODIFIER LETTER HIGH TONE BAR")
@@ -723,12 +723,12 @@
      ((name		  . "MODIFIER LETTER HIGH TONE BAR")
       (=ucs		  . #x02E6)	; ˦
       ))
+    (=jis-x0213-1-2000	. #x2B61)	; &JX1-2B61; [11-65]
+    (=ucs@jis/fw	. #x02E6)	; &JX1-2B61;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER HIGH TONE BAR")
       (=ucs		  . #x02E6)	; ˦
       ))
-    (=jis-x0213-1-2000	. #x2B61)	; &JX1-2B61; [11-65]
-    (=ucs@jis/fw	. #x02E6)	; &JX1-2B61;
     ))
 (define-char
   '((name		. "MODIFIER LETTER MID TONE BAR")
@@ -742,12 +742,12 @@
      ((name		  . "MODIFIER LETTER MID TONE BAR")
       (=ucs		  . #x02E7)	; ˧
       ))
+    (=jis-x0213-1-2000	. #x2B62)	; &JX1-2B62; [11-66]
+    (=ucs@jis/fw	. #x02E7)	; &JX1-2B62;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER MID TONE BAR")
       (=ucs		  . #x02E7)	; ˧
       ))
-    (=jis-x0213-1-2000	. #x2B62)	; &JX1-2B62; [11-66]
-    (=ucs@jis/fw	. #x02E7)	; &JX1-2B62;
     ))
 (define-char
   '((name		. "MODIFIER LETTER LOW TONE BAR")
@@ -761,12 +761,12 @@
      ((name		  . "MODIFIER LETTER LOW TONE BAR")
       (=ucs		  . #x02E8)	; ˨
       ))
+    (=jis-x0213-1-2000	. #x2B63)	; &JX1-2B63; [11-67]
+    (=ucs@jis/fw	. #x02E8)	; &JX1-2B63;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER LOW TONE BAR")
       (=ucs		  . #x02E8)	; ˨
       ))
-    (=jis-x0213-1-2000	. #x2B63)	; &JX1-2B63; [11-67]
-    (=ucs@jis/fw	. #x02E8)	; &JX1-2B63;
     ))
 (define-char
   '((name		. "MODIFIER LETTER EXTRA-LOW TONE BAR")
@@ -780,12 +780,12 @@
      ((name		  . "MODIFIER LETTER EXTRA-LOW TONE BAR")
       (=ucs		  . #x02E9)	; Ë©
       ))
+    (=jis-x0213-1-2000	. #x2B64)	; &JX1-2B64; [11-68]
+    (=ucs@jis/fw	. #x02E9)	; &JX1-2B64;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER EXTRA-LOW TONE BAR")
       (=ucs		  . #x02E9)	; Ë©
       ))
-    (=jis-x0213-1-2000	. #x2B64)	; &JX1-2B64; [11-68]
-    (=ucs@jis/fw	. #x02E9)	; &JX1-2B64;
     ))
 (define-char
   '((name		. "MODIFIER LETTER YIN DEPARTING TONE MARK")
diff --git a/lisp/utf-2000/u00370-Greek.el b/lisp/utf-2000/u00370-Greek.el
index eb6da76..c7f6b9a 100644
--- a/lisp/utf-2000/u00370-Greek.el
+++ b/lisp/utf-2000/u00370-Greek.el
@@ -65,12 +65,12 @@
      ((name		  . "GREEK TONOS")
       (=ucs		  . #x0384)	; ΄
       ))
+    (=jis-x0212		. #x2238)	; &JSP-2238; [02-24]
+    (=ucs@jis/fw	. #x0384)	; &JSP-2238;
     (<-fullwidth
      ((name		  . "GREEK TONOS")
       (=ucs		  . #x0384)	; ΄
       ))
-    (=jis-x0212		. #x2238)	; &JSP-2238; [02-24]
-    (=ucs@jis/fw	. #x0384)	; &JSP-2238;
     ))
 (define-char
   '((name		. "GREEK DIALYTIKA TONOS")
@@ -92,12 +92,12 @@
      ((name		  . "GREEK DIALYTIKA TONOS")
       (=ucs		  . #x0385)	; ΅
       ))
+    (=jis-x0212		. #x2239)	; &JSP-2239; [02-25]
+    (=ucs@jis/fw	. #x0385)	; &JSP-2239;
     (<-fullwidth
      ((name		  . "GREEK DIALYTIKA TONOS")
       (=ucs		  . #x0385)	; ΅
       ))
-    (=jis-x0212		. #x2239)	; &JSP-2239; [02-25]
-    (=ucs@jis/fw	. #x0385)	; &JSP-2239;
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER ALPHA WITH TONOS")
@@ -123,10 +123,6 @@
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH TONOS")
       (=ucs		  . #x0386)	; Ά
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH TONOS")
-      (=ucs		  . #x0386)	; Ά
-      ))
     (=decomposition
      ((=jis-x0208	  . #x2621)	; &J90-2621; [06-01]
       (=gb2312		  . #x2621)	; &I-G0-2621; [06-01]
@@ -138,6 +134,10 @@
       ))
     (=jis-x0212		. #x2661)	; &JSP-2661; [06-65]
     (=ucs@jis/fw	. #x0386)	; &JSP-2661;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH TONOS")
+      (=ucs		  . #x0386)	; Ά
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2671)	; &JSP-2671; [06-81]
       ))
@@ -177,10 +177,6 @@
      ((name		  . "GREEK CAPITAL LETTER EPSILON WITH TONOS")
       (=ucs		  . #x0388)	; Έ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER EPSILON WITH TONOS")
-      (=ucs		  . #x0388)	; Έ
-      ))
     (=decomposition
      ((=jis-x0208	  . #x2625)	; &J90-2625; [06-05]
       (=gb2312		  . #x2625)	; &I-G0-2625; [06-05]
@@ -192,6 +188,10 @@
       ))
     (=jis-x0212		. #x2662)	; &JSP-2662; [06-66]
     (=ucs@jis/fw	. #x0388)	; &JSP-2662;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER EPSILON WITH TONOS")
+      (=ucs		  . #x0388)	; Έ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2672)	; &JSP-2672; [06-82]
       ))
@@ -220,10 +220,6 @@
      ((name		  . "GREEK CAPITAL LETTER ETA WITH TONOS")
       (=ucs		  . #x0389)	; Ή
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER ETA WITH TONOS")
-      (=ucs		  . #x0389)	; Ή
-      ))
     (=decomposition
      ((=jis-x0208	  . #x2627)	; &J90-2627; [06-07]
       (=gb2312		  . #x2627)	; &I-G0-2627; [06-07]
@@ -235,6 +231,10 @@
       ))
     (=jis-x0212		. #x2663)	; &JSP-2663; [06-67]
     (=ucs@jis/fw	. #x0389)	; &JSP-2663;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH TONOS")
+      (=ucs		  . #x0389)	; Ή
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2673)	; &JSP-2673; [06-83]
       ))
@@ -263,10 +263,6 @@
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH TONOS")
       (=ucs		  . #x038A)	; Ί
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER IOTA WITH TONOS")
-      (=ucs		  . #x038A)	; Ί
-      ))
     (=decomposition
      ((=jis-x0208	  . #x2629)	; &J90-2629; [06-09]
       (=gb2312		  . #x2629)	; &I-G0-2629; [06-09]
@@ -278,6 +274,10 @@
       ))
     (=jis-x0212		. #x2664)	; &JSP-2664; [06-68]
     (=ucs@jis/fw	. #x038A)	; &JSP-2664;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH TONOS")
+      (=ucs		  . #x038A)	; Ί
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2674)	; &JSP-2674; [06-84]
       ))
@@ -306,10 +306,6 @@
      ((name		  . "GREEK CAPITAL LETTER OMICRON WITH TONOS")
       (=ucs		  . #x038C)	; Ό
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER OMICRON WITH TONOS")
-      (=ucs		  . #x038C)	; Ό
-      ))
     (=decomposition
      ((=jis-x0208	  . #x262F)	; &J90-262F; [06-15]
       (=gb2312		  . #x262F)	; &I-G0-262F; [06-15]
@@ -321,6 +317,10 @@
       ))
     (=jis-x0212		. #x2667)	; &JSP-2667; [06-71]
     (=ucs@jis/fw	. #x038C)	; &JSP-2667;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER OMICRON WITH TONOS")
+      (=ucs		  . #x038C)	; Ό
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2677)	; &JSP-2677; [06-87]
       ))
@@ -349,10 +349,6 @@
      ((name		  . "GREEK CAPITAL LETTER UPSILON WITH TONOS")
       (=ucs		  . #x038E)	; Ύ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER UPSILON WITH TONOS")
-      (=ucs		  . #x038E)	; Ύ
-      ))
     (=decomposition
      ((=jis-x0208	  . #x2634)	; &J90-2634; [06-20]
       (=gb2312		  . #x2634)	; &I-G0-2634; [06-20]
@@ -364,6 +360,10 @@
       ))
     (=jis-x0212		. #x2669)	; &JSP-2669; [06-73]
     (=ucs@jis/fw	. #x038E)	; &JSP-2669;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER UPSILON WITH TONOS")
+      (=ucs		  . #x038E)	; Ύ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2679)	; &JSP-2679; [06-89]
       ))
@@ -392,10 +392,6 @@
      ((name		  . "GREEK CAPITAL LETTER OMEGA WITH TONOS")
       (=ucs		  . #x038F)	; Ώ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH TONOS")
-      (=ucs		  . #x038F)	; Ώ
-      ))
     (=decomposition
      ((=jis-x0208	  . #x2638)	; &J90-2638; [06-24]
       (=gb2312		  . #x2638)	; &I-G0-2638; [06-24]
@@ -407,6 +403,10 @@
       ))
     (=jis-x0212		. #x266C)	; &JSP-266C; [06-76]
     (=ucs@jis/fw	. #x038F)	; &JSP-266C;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH TONOS")
+      (=ucs		  . #x038F)	; Ώ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x267C)	; &JSP-267C; [06-92]
       ))
@@ -431,12 +431,12 @@
      ((name . "GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS")
       (=ucs		  . #x0390)	; ΐ
       ))
+    (=jis-x0212		. #x2676)	; &JSP-2676; [06-86]
+    (=ucs@jis/fw	. #x0390)	; &JSP-2676;
     (<-fullwidth
      ((name . "GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS")
       (=ucs		  . #x0390)	; ΐ
       ))
-    (=jis-x0212		. #x2676)	; &JSP-2676; [06-86]
-    (=ucs@jis/fw	. #x0390)	; &JSP-2676;
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER ALPHA")
@@ -455,10 +455,6 @@
      ((name		  . "GREEK CAPITAL LETTER ALPHA")
       (=ucs		  . #x0391)	; Α
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER ALPHA")
-      (=ucs		  . #x0391)	; Α
-      ))
     (=jis-x0208		. #x2621)	; &J90-2621; [06-01]
     (=gb2312		. #x2621)	; &I-G0-2621; [06-01]
     (=ks-x1001		. #x2541)	; &I-K0-2541; [05-33]
@@ -466,6 +462,10 @@
     (=big5		. #xA344)	; &I-B-A344;
     (=ucs@gb/fw		. #x0391)	; &J90-2621;
     (=ucs@jis/fw	. #x0391)	; &J90-2621;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER ALPHA")
+      (=ucs		  . #x0391)	; Α
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2641)	; &J90-2641; [06-33]
       (=gb2312		  . #x2641)	; &I-G0-2641; [06-33]
@@ -490,10 +490,6 @@
      ((name		  . "GREEK CAPITAL LETTER BETA")
       (=ucs		  . #x0392)	; Β
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER BETA")
-      (=ucs		  . #x0392)	; Β
-      ))
     (=jis-x0208		. #x2622)	; &J90-2622; [06-02]
     (=gb2312		. #x2622)	; &I-G0-2622; [06-02]
     (=ks-x1001		. #x2542)	; &I-K0-2542; [05-34]
@@ -501,6 +497,10 @@
     (=big5		. #xA345)	; &I-B-A345;
     (=ucs@gb/fw		. #x0392)	; &J90-2622;
     (=ucs@jis/fw	. #x0392)	; &J90-2622;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER BETA")
+      (=ucs		  . #x0392)	; Β
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2642)	; &J90-2642; [06-34]
       (=gb2312		  . #x2642)	; &I-G0-2642; [06-34]
@@ -525,10 +525,6 @@
      ((name		  . "GREEK CAPITAL LETTER GAMMA")
       (=ucs		  . #x0393)	; Γ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER GAMMA")
-      (=ucs		  . #x0393)	; Γ
-      ))
     (=jis-x0208		. #x2623)	; &J90-2623; [06-03]
     (=gb2312		. #x2623)	; &I-G0-2623; [06-03]
     (=ks-x1001		. #x2543)	; &I-K0-2543; [05-35]
@@ -536,6 +532,10 @@
     (=big5		. #xA346)	; &I-B-A346;
     (=ucs@gb/fw		. #x0393)	; &J90-2623;
     (=ucs@jis/fw	. #x0393)	; &J90-2623;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER GAMMA")
+      (=ucs		  . #x0393)	; Γ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2643)	; &J90-2643; [06-35]
       (=gb2312		  . #x2643)	; &I-G0-2643; [06-35]
@@ -560,10 +560,6 @@
      ((name		  . "GREEK CAPITAL LETTER DELTA")
       (=ucs		  . #x0394)	; Δ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER DELTA")
-      (=ucs		  . #x0394)	; Δ
-      ))
     (=jis-x0208		. #x2624)	; &J90-2624; [06-04]
     (=gb2312		. #x2624)	; &I-G0-2624; [06-04]
     (=ks-x1001		. #x2544)	; &I-K0-2544; [05-36]
@@ -571,6 +567,10 @@
     (=big5		. #xA347)	; &I-B-A347;
     (=ucs@gb/fw		. #x0394)	; &J90-2624;
     (=ucs@jis/fw	. #x0394)	; &J90-2624;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER DELTA")
+      (=ucs		  . #x0394)	; Δ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2644)	; &J90-2644; [06-36]
       (=gb2312		  . #x2644)	; &I-G0-2644; [06-36]
@@ -595,10 +595,6 @@
      ((name		  . "GREEK CAPITAL LETTER EPSILON")
       (=ucs		  . #x0395)	; Ε
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER EPSILON")
-      (=ucs		  . #x0395)	; Ε
-      ))
     (=jis-x0208		. #x2625)	; &J90-2625; [06-05]
     (=gb2312		. #x2625)	; &I-G0-2625; [06-05]
     (=ks-x1001		. #x2545)	; &I-K0-2545; [05-37]
@@ -606,6 +602,10 @@
     (=big5		. #xA348)	; &I-B-A348;
     (=ucs@gb/fw		. #x0395)	; &J90-2625;
     (=ucs@jis/fw	. #x0395)	; &J90-2625;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER EPSILON")
+      (=ucs		  . #x0395)	; Ε
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2645)	; &J90-2645; [06-37]
       (=gb2312		  . #x2645)	; &I-G0-2645; [06-37]
@@ -630,10 +630,6 @@
      ((name		  . "GREEK CAPITAL LETTER ZETA")
       (=ucs		  . #x0396)	; Ζ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER ZETA")
-      (=ucs		  . #x0396)	; Ζ
-      ))
     (=jis-x0208		. #x2626)	; &J90-2626; [06-06]
     (=gb2312		. #x2626)	; &I-G0-2626; [06-06]
     (=ks-x1001		. #x2546)	; &I-K0-2546; [05-38]
@@ -641,6 +637,10 @@
     (=big5		. #xA349)	; &I-B-A349;
     (=ucs@gb/fw		. #x0396)	; &J90-2626;
     (=ucs@jis/fw	. #x0396)	; &J90-2626;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER ZETA")
+      (=ucs		  . #x0396)	; Ζ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2646)	; &J90-2646; [06-38]
       (=gb2312		  . #x2646)	; &I-G0-2646; [06-38]
@@ -665,10 +665,6 @@
      ((name		  . "GREEK CAPITAL LETTER ETA")
       (=ucs		  . #x0397)	; Η
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER ETA")
-      (=ucs		  . #x0397)	; Η
-      ))
     (=jis-x0208		. #x2627)	; &J90-2627; [06-07]
     (=gb2312		. #x2627)	; &I-G0-2627; [06-07]
     (=ks-x1001		. #x2547)	; &I-K0-2547; [05-39]
@@ -676,6 +672,10 @@
     (=big5		. #xA34A)	; &I-B-A34A;
     (=ucs@gb/fw		. #x0397)	; &J90-2627;
     (=ucs@jis/fw	. #x0397)	; &J90-2627;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER ETA")
+      (=ucs		  . #x0397)	; Η
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2647)	; &J90-2647; [06-39]
       (=gb2312		  . #x2647)	; &I-G0-2647; [06-39]
@@ -700,10 +700,6 @@
      ((name		  . "GREEK CAPITAL LETTER THETA")
       (=ucs		  . #x0398)	; Θ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER THETA")
-      (=ucs		  . #x0398)	; Θ
-      ))
     (=jis-x0208		. #x2628)	; &J90-2628; [06-08]
     (=gb2312		. #x2628)	; &I-G0-2628; [06-08]
     (=ks-x1001		. #x2548)	; &I-K0-2548; [05-40]
@@ -711,6 +707,10 @@
     (=big5		. #xA34B)	; &I-B-A34B;
     (=ucs@gb/fw		. #x0398)	; &J90-2628;
     (=ucs@jis/fw	. #x0398)	; &J90-2628;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER THETA")
+      (=ucs		  . #x0398)	; Θ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2648)	; &J90-2648; [06-40]
       (=gb2312		  . #x2648)	; &I-G0-2648; [06-40]
@@ -735,10 +735,6 @@
      ((name		  . "GREEK CAPITAL LETTER IOTA")
       (=ucs		  . #x0399)	; Ι
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER IOTA")
-      (=ucs		  . #x0399)	; Ι
-      ))
     (=jis-x0208		. #x2629)	; &J90-2629; [06-09]
     (=gb2312		. #x2629)	; &I-G0-2629; [06-09]
     (=ks-x1001		. #x2549)	; &I-K0-2549; [05-41]
@@ -746,6 +742,10 @@
     (=big5		. #xA34C)	; &I-B-A34C;
     (=ucs@gb/fw		. #x0399)	; &J90-2629;
     (=ucs@jis/fw	. #x0399)	; &J90-2629;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER IOTA")
+      (=ucs		  . #x0399)	; Ι
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2649)	; &J90-2649; [06-41]
       (=gb2312		  . #x2649)	; &I-G0-2649; [06-41]
@@ -770,10 +770,6 @@
      ((name		  . "GREEK CAPITAL LETTER KAPPA")
       (=ucs		  . #x039A)	; Κ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER KAPPA")
-      (=ucs		  . #x039A)	; Κ
-      ))
     (=jis-x0208		. #x262A)	; &J90-262A; [06-10]
     (=gb2312		. #x262A)	; &I-G0-262A; [06-10]
     (=ks-x1001		. #x254A)	; &I-K0-254A; [05-42]
@@ -781,6 +777,10 @@
     (=big5		. #xA34D)	; &I-B-A34D;
     (=ucs@gb/fw		. #x039A)	; &J90-262A;
     (=ucs@jis/fw	. #x039A)	; &J90-262A;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER KAPPA")
+      (=ucs		  . #x039A)	; Κ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x264A)	; &J90-264A; [06-42]
       (=gb2312		  . #x264A)	; &I-G0-264A; [06-42]
@@ -805,10 +805,6 @@
      ((name		  . "GREEK CAPITAL LETTER LAMDA")
       (=ucs		  . #x039B)	; Λ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER LAMDA")
-      (=ucs		  . #x039B)	; Λ
-      ))
     (=jis-x0208		. #x262B)	; &J90-262B; [06-11]
     (=gb2312		. #x262B)	; &I-G0-262B; [06-11]
     (=ks-x1001		. #x254B)	; &I-K0-254B; [05-43]
@@ -816,6 +812,10 @@
     (=big5		. #xA34E)	; &I-B-A34E;
     (=ucs@gb/fw		. #x039B)	; &J90-262B;
     (=ucs@jis/fw	. #x039B)	; &J90-262B;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER LAMDA")
+      (=ucs		  . #x039B)	; Λ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x264B)	; &J90-264B; [06-43]
       (=gb2312		  . #x264B)	; &I-G0-264B; [06-43]
@@ -840,10 +840,6 @@
      ((name		  . "GREEK CAPITAL LETTER MU")
       (=ucs		  . #x039C)	; Μ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER MU")
-      (=ucs		  . #x039C)	; Μ
-      ))
     (=jis-x0208		. #x262C)	; &J90-262C; [06-12]
     (=gb2312		. #x262C)	; &I-G0-262C; [06-12]
     (=ks-x1001		. #x254C)	; &I-K0-254C; [05-44]
@@ -851,6 +847,10 @@
     (=big5		. #xA34F)	; &I-B-A34F;
     (=ucs@gb/fw		. #x039C)	; &J90-262C;
     (=ucs@jis/fw	. #x039C)	; &J90-262C;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER MU")
+      (=ucs		  . #x039C)	; Μ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x264C)	; &J90-264C; [06-44]
       (=gb2312		  . #x264C)	; &I-G0-264C; [06-44]
@@ -875,10 +875,6 @@
      ((name		  . "GREEK CAPITAL LETTER NU")
       (=ucs		  . #x039D)	; Ν
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER NU")
-      (=ucs		  . #x039D)	; Ν
-      ))
     (=jis-x0208		. #x262D)	; &J90-262D; [06-13]
     (=gb2312		. #x262D)	; &I-G0-262D; [06-13]
     (=ks-x1001		. #x254D)	; &I-K0-254D; [05-45]
@@ -886,6 +882,10 @@
     (=big5		. #xA350)	; &I-B-A350;
     (=ucs@gb/fw		. #x039D)	; &J90-262D;
     (=ucs@jis/fw	. #x039D)	; &J90-262D;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER NU")
+      (=ucs		  . #x039D)	; Ν
+      ))
     (->lowercase
      ((=jis-x0208	  . #x264D)	; &J90-264D; [06-45]
       (=gb2312		  . #x264D)	; &I-G0-264D; [06-45]
@@ -910,10 +910,6 @@
      ((name		  . "GREEK CAPITAL LETTER XI")
       (=ucs		  . #x039E)	; Ξ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER XI")
-      (=ucs		  . #x039E)	; Ξ
-      ))
     (=jis-x0208		. #x262E)	; &J90-262E; [06-14]
     (=gb2312		. #x262E)	; &I-G0-262E; [06-14]
     (=ks-x1001		. #x254E)	; &I-K0-254E; [05-46]
@@ -921,6 +917,10 @@
     (=big5		. #xA351)	; &I-B-A351;
     (=ucs@gb/fw		. #x039E)	; &J90-262E;
     (=ucs@jis/fw	. #x039E)	; &J90-262E;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER XI")
+      (=ucs		  . #x039E)	; Ξ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x264E)	; &J90-264E; [06-46]
       (=gb2312		  . #x264E)	; &I-G0-264E; [06-46]
@@ -945,10 +945,6 @@
      ((name		  . "GREEK CAPITAL LETTER OMICRON")
       (=ucs		  . #x039F)	; Ο
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER OMICRON")
-      (=ucs		  . #x039F)	; Ο
-      ))
     (=jis-x0208		. #x262F)	; &J90-262F; [06-15]
     (=gb2312		. #x262F)	; &I-G0-262F; [06-15]
     (=ks-x1001		. #x254F)	; &I-K0-254F; [05-47]
@@ -956,6 +952,10 @@
     (=big5		. #xA352)	; &I-B-A352;
     (=ucs@gb/fw		. #x039F)	; &J90-262F;
     (=ucs@jis/fw	. #x039F)	; &J90-262F;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER OMICRON")
+      (=ucs		  . #x039F)	; Ο
+      ))
     (->lowercase
      ((=jis-x0208	  . #x264F)	; &J90-264F; [06-47]
       (=gb2312		  . #x264F)	; &I-G0-264F; [06-47]
@@ -980,10 +980,6 @@
      ((name		  . "GREEK CAPITAL LETTER PI")
       (=ucs		  . #x03A0)	; Π
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER PI")
-      (=ucs		  . #x03A0)	; Π
-      ))
     (=jis-x0208		. #x2630)	; &J90-2630; [06-16]
     (=gb2312		. #x2630)	; &I-G0-2630; [06-16]
     (=ks-x1001		. #x2550)	; &I-K0-2550; [05-48]
@@ -991,6 +987,10 @@
     (=big5		. #xA353)	; &I-B-A353;
     (=ucs@gb/fw		. #x03A0)	; &J90-2630;
     (=ucs@jis/fw	. #x03A0)	; &J90-2630;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER PI")
+      (=ucs		  . #x03A0)	; Π
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2650)	; &J90-2650; [06-48]
       (=gb2312		  . #x2650)	; &I-G0-2650; [06-48]
@@ -1015,10 +1015,6 @@
      ((name		  . "GREEK CAPITAL LETTER RHO")
       (=ucs		  . #x03A1)	; Ρ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER RHO")
-      (=ucs		  . #x03A1)	; Ρ
-      ))
     (=jis-x0208		. #x2631)	; &J90-2631; [06-17]
     (=gb2312		. #x2631)	; &I-G0-2631; [06-17]
     (=ks-x1001		. #x2551)	; &I-K0-2551; [05-49]
@@ -1026,6 +1022,10 @@
     (=big5		. #xA354)	; &I-B-A354;
     (=ucs@gb/fw		. #x03A1)	; &J90-2631;
     (=ucs@jis/fw	. #x03A1)	; &J90-2631;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER RHO")
+      (=ucs		  . #x03A1)	; Ρ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2651)	; &J90-2651; [06-49]
       (=gb2312		  . #x2651)	; &I-G0-2651; [06-49]
@@ -1050,10 +1050,6 @@
      ((name		  . "GREEK CAPITAL LETTER SIGMA")
       (=ucs		  . #x03A3)	; Σ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER SIGMA")
-      (=ucs		  . #x03A3)	; Σ
-      ))
     (=jis-x0208		. #x2632)	; &J90-2632; [06-18]
     (=gb2312		. #x2632)	; &I-G0-2632; [06-18]
     (=ks-x1001		. #x2552)	; &I-K0-2552; [05-50]
@@ -1061,6 +1057,10 @@
     (=big5		. #xA355)	; &I-B-A355;
     (=ucs@gb/fw		. #x03A3)	; &J90-2632;
     (=ucs@jis/fw	. #x03A3)	; &J90-2632;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER SIGMA")
+      (=ucs		  . #x03A3)	; Σ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2652)	; &J90-2652; [06-50]
       (=gb2312		  . #x2652)	; &I-G0-2652; [06-50]
@@ -1085,10 +1085,6 @@
      ((name		  . "GREEK CAPITAL LETTER TAU")
       (=ucs		  . #x03A4)	; Τ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER TAU")
-      (=ucs		  . #x03A4)	; Τ
-      ))
     (=jis-x0208		. #x2633)	; &J90-2633; [06-19]
     (=gb2312		. #x2633)	; &I-G0-2633; [06-19]
     (=ks-x1001		. #x2553)	; &I-K0-2553; [05-51]
@@ -1096,6 +1092,10 @@
     (=big5		. #xA356)	; &I-B-A356;
     (=ucs@gb/fw		. #x03A4)	; &J90-2633;
     (=ucs@jis/fw	. #x03A4)	; &J90-2633;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER TAU")
+      (=ucs		  . #x03A4)	; Τ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2653)	; &J90-2653; [06-51]
       (=gb2312		  . #x2653)	; &I-G0-2653; [06-51]
@@ -1120,10 +1120,6 @@
      ((name		  . "GREEK CAPITAL LETTER UPSILON")
       (=ucs		  . #x03A5)	; Υ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER UPSILON")
-      (=ucs		  . #x03A5)	; Υ
-      ))
     (=jis-x0208		. #x2634)	; &J90-2634; [06-20]
     (=gb2312		. #x2634)	; &I-G0-2634; [06-20]
     (=ks-x1001		. #x2554)	; &I-K0-2554; [05-52]
@@ -1131,6 +1127,10 @@
     (=big5		. #xA357)	; &I-B-A357;
     (=ucs@gb/fw		. #x03A5)	; &J90-2634;
     (=ucs@jis/fw	. #x03A5)	; &J90-2634;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER UPSILON")
+      (=ucs		  . #x03A5)	; Υ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2654)	; &J90-2654; [06-52]
       (=gb2312		  . #x2654)	; &I-G0-2654; [06-52]
@@ -1155,10 +1155,6 @@
      ((name		  . "GREEK CAPITAL LETTER PHI")
       (=ucs		  . #x03A6)	; Φ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER PHI")
-      (=ucs		  . #x03A6)	; Φ
-      ))
     (=jis-x0208		. #x2635)	; &J90-2635; [06-21]
     (=gb2312		. #x2635)	; &I-G0-2635; [06-21]
     (=ks-x1001		. #x2555)	; &I-K0-2555; [05-53]
@@ -1166,6 +1162,10 @@
     (=big5		. #xA358)	; &I-B-A358;
     (=ucs@gb/fw		. #x03A6)	; &J90-2635;
     (=ucs@jis/fw	. #x03A6)	; &J90-2635;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER PHI")
+      (=ucs		  . #x03A6)	; Φ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2655)	; &J90-2655; [06-53]
       (=gb2312		  . #x2655)	; &I-G0-2655; [06-53]
@@ -1190,10 +1190,6 @@
      ((name		  . "GREEK CAPITAL LETTER CHI")
       (=ucs		  . #x03A7)	; Χ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER CHI")
-      (=ucs		  . #x03A7)	; Χ
-      ))
     (=jis-x0208		. #x2636)	; &J90-2636; [06-22]
     (=gb2312		. #x2636)	; &I-G0-2636; [06-22]
     (=ks-x1001		. #x2556)	; &I-K0-2556; [05-54]
@@ -1201,6 +1197,10 @@
     (=big5		. #xA359)	; &I-B-A359;
     (=ucs@gb/fw		. #x03A7)	; &J90-2636;
     (=ucs@jis/fw	. #x03A7)	; &J90-2636;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER CHI")
+      (=ucs		  . #x03A7)	; Χ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2656)	; &J90-2656; [06-54]
       (=gb2312		  . #x2656)	; &I-G0-2656; [06-54]
@@ -1225,10 +1225,6 @@
      ((name		  . "GREEK CAPITAL LETTER PSI")
       (=ucs		  . #x03A8)	; Ψ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER PSI")
-      (=ucs		  . #x03A8)	; Ψ
-      ))
     (=jis-x0208		. #x2637)	; &J90-2637; [06-23]
     (=gb2312		. #x2637)	; &I-G0-2637; [06-23]
     (=ks-x1001		. #x2557)	; &I-K0-2557; [05-55]
@@ -1236,6 +1232,10 @@
     (=big5		. #xA35A)	; &I-B-A35A;
     (=ucs@gb/fw		. #x03A8)	; &J90-2637;
     (=ucs@jis/fw	. #x03A8)	; &J90-2637;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER PSI")
+      (=ucs		  . #x03A8)	; Ψ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2657)	; &J90-2657; [06-55]
       (=gb2312		  . #x2657)	; &I-G0-2657; [06-55]
@@ -1260,10 +1260,6 @@
      ((name		  . "GREEK CAPITAL LETTER OMEGA")
       (=ucs		  . #x03A9)	; Ω
       ))
-    (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER OMEGA")
-      (=ucs		  . #x03A9)	; Ω
-      ))
     (=jis-x0208		. #x2638)	; &J90-2638; [06-24]
     (=gb2312		. #x2638)	; &I-G0-2638; [06-24]
     (=ks-x1001		. #x2558)	; &I-K0-2558; [05-56]
@@ -1271,6 +1267,10 @@
     (=big5		. #xA35B)	; &I-B-A35B;
     (=ucs@gb/fw		. #x03A9)	; &J90-2638;
     (=ucs@jis/fw	. #x03A9)	; &J90-2638;
+    (<-fullwidth
+     ((name		  . "GREEK CAPITAL LETTER OMEGA")
+      (=ucs		  . #x03A9)	; Ω
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2658)	; &J90-2658; [06-56]
       (=gb2312		  . #x2658)	; &I-G0-2658; [06-56]
@@ -1302,12 +1302,12 @@
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH DIALYTIKA")
       (=ucs		  . #x03AA)	; Ϊ
       ))
+    (=jis-x0212		. #x2665)	; &JSP-2665; [06-69]
+    (=ucs@jis/fw	. #x03AA)	; &JSP-2665;
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH DIALYTIKA")
       (=ucs		  . #x03AA)	; Ϊ
       ))
-    (=jis-x0212		. #x2665)	; &JSP-2665; [06-69]
-    (=ucs@jis/fw	. #x03AA)	; &JSP-2665;
     (->lowercase
      ((=jis-x0212	  . #x2675)	; &JSP-2675; [06-85]
       ))
@@ -1336,12 +1336,12 @@
      ((name . "GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA")
       (=ucs		  . #x03AB)	; Ϋ
       ))
+    (=jis-x0212		. #x266A)	; &JSP-266A; [06-74]
+    (=ucs@jis/fw	. #x03AB)	; &JSP-266A;
     (<-fullwidth
      ((name . "GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA")
       (=ucs		  . #x03AB)	; Ϋ
       ))
-    (=jis-x0212		. #x266A)	; &JSP-266A; [06-74]
-    (=ucs@jis/fw	. #x03AB)	; &JSP-266A;
     (->lowercase
      ((=jis-x0212	  . #x267A)	; &JSP-267A; [06-90]
       ))
@@ -1370,12 +1370,12 @@
      ((name		  . "GREEK SMALL LETTER ALPHA WITH TONOS")
       (=ucs		  . #x03AC)	; ά
       ))
+    (=jis-x0212		. #x2671)	; &JSP-2671; [06-81]
+    (=ucs@jis/fw	. #x03AC)	; &JSP-2671;
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER ALPHA WITH TONOS")
       (=ucs		  . #x03AC)	; ά
       ))
-    (=jis-x0212		. #x2671)	; &JSP-2671; [06-81]
-    (=ucs@jis/fw	. #x03AC)	; &JSP-2671;
     (->uppercase
      ((=jis-x0212	  . #x2661)	; &JSP-2661; [06-65]
       ))
@@ -1404,12 +1404,12 @@
      ((name		  . "GREEK SMALL LETTER EPSILON WITH TONOS")
       (=ucs		  . #x03AD)	; έ
       ))
+    (=jis-x0212		. #x2672)	; &JSP-2672; [06-82]
+    (=ucs@jis/fw	. #x03AD)	; &JSP-2672;
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER EPSILON WITH TONOS")
       (=ucs		  . #x03AD)	; έ
       ))
-    (=jis-x0212		. #x2672)	; &JSP-2672; [06-82]
-    (=ucs@jis/fw	. #x03AD)	; &JSP-2672;
     (->uppercase
      ((=jis-x0212	  . #x2662)	; &JSP-2662; [06-66]
       ))
@@ -1438,12 +1438,12 @@
      ((name		  . "GREEK SMALL LETTER ETA WITH TONOS")
       (=ucs		  . #x03AE)	; ή
       ))
+    (=jis-x0212		. #x2673)	; &JSP-2673; [06-83]
+    (=ucs@jis/fw	. #x03AE)	; &JSP-2673;
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER ETA WITH TONOS")
       (=ucs		  . #x03AE)	; ή
       ))
-    (=jis-x0212		. #x2673)	; &JSP-2673; [06-83]
-    (=ucs@jis/fw	. #x03AE)	; &JSP-2673;
     (->uppercase
      ((=jis-x0212	  . #x2663)	; &JSP-2663; [06-67]
       ))
@@ -1472,12 +1472,12 @@
      ((name		  . "GREEK SMALL LETTER IOTA WITH TONOS")
       (=ucs		  . #x03AF)	; ί
       ))
+    (=jis-x0212		. #x2674)	; &JSP-2674; [06-84]
+    (=ucs@jis/fw	. #x03AF)	; &JSP-2674;
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER IOTA WITH TONOS")
       (=ucs		  . #x03AF)	; ί
       ))
-    (=jis-x0212		. #x2674)	; &JSP-2674; [06-84]
-    (=ucs@jis/fw	. #x03AF)	; &JSP-2674;
     (->uppercase
      ((=jis-x0212	  . #x2664)	; &JSP-2664; [06-68]
       ))
@@ -1502,12 +1502,12 @@
      ((name . "GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS")
       (=ucs		  . #x03B0)	; ΰ
       ))
+    (=jis-x0212		. #x267B)	; &JSP-267B; [06-91]
+    (=ucs@jis/fw	. #x03B0)	; &JSP-267B;
     (<-fullwidth
      ((name . "GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS")
       (=ucs		  . #x03B0)	; ΰ
       ))
-    (=jis-x0212		. #x267B)	; &JSP-267B; [06-91]
-    (=ucs@jis/fw	. #x03B0)	; &JSP-267B;
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ALPHA")
@@ -1526,10 +1526,6 @@
      ((name		  . "GREEK SMALL LETTER ALPHA")
       (=ucs		  . #x03B1)	; α
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER ALPHA")
-      (=ucs		  . #x03B1)	; α
-      ))
     (=jis-x0208		. #x2641)	; &J90-2641; [06-33]
     (=gb2312		. #x2641)	; &I-G0-2641; [06-33]
     (=ks-x1001		. #x2561)	; &I-K0-2561; [05-65]
@@ -1537,6 +1533,10 @@
     (=big5		. #xA35C)	; &I-B-A35C;
     (=ucs@gb/fw		. #x03B1)	; &J90-2641;
     (=ucs@jis/fw	. #x03B1)	; &J90-2641;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER ALPHA")
+      (=ucs		  . #x03B1)	; α
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2621)	; &J90-2621; [06-01]
       (=gb2312		  . #x2621)	; &I-G0-2621; [06-01]
@@ -1561,10 +1561,6 @@
      ((name		  . "GREEK SMALL LETTER BETA")
       (=ucs		  . #x03B2)	; β
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER BETA")
-      (=ucs		  . #x03B2)	; β
-      ))
     (=jis-x0208		. #x2642)	; &J90-2642; [06-34]
     (=gb2312		. #x2642)	; &I-G0-2642; [06-34]
     (=ks-x1001		. #x2562)	; &I-K0-2562; [05-66]
@@ -1572,6 +1568,10 @@
     (=big5		. #xA35D)	; &I-B-A35D;
     (=ucs@gb/fw		. #x03B2)	; &J90-2642;
     (=ucs@jis/fw	. #x03B2)	; &J90-2642;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER BETA")
+      (=ucs		  . #x03B2)	; β
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2622)	; &J90-2622; [06-02]
       (=gb2312		  . #x2622)	; &I-G0-2622; [06-02]
@@ -1596,10 +1596,6 @@
      ((name		  . "GREEK SMALL LETTER GAMMA")
       (=ucs		  . #x03B3)	; γ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER GAMMA")
-      (=ucs		  . #x03B3)	; γ
-      ))
     (=jis-x0208		. #x2643)	; &J90-2643; [06-35]
     (=gb2312		. #x2643)	; &I-G0-2643; [06-35]
     (=ks-x1001		. #x2563)	; &I-K0-2563; [05-67]
@@ -1607,6 +1603,10 @@
     (=big5		. #xA35E)	; &I-B-A35E;
     (=ucs@gb/fw		. #x03B3)	; &J90-2643;
     (=ucs@jis/fw	. #x03B3)	; &J90-2643;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER GAMMA")
+      (=ucs		  . #x03B3)	; γ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2623)	; &J90-2623; [06-03]
       (=gb2312		  . #x2623)	; &I-G0-2623; [06-03]
@@ -1631,10 +1631,6 @@
      ((name		  . "GREEK SMALL LETTER DELTA")
       (=ucs		  . #x03B4)	; δ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER DELTA")
-      (=ucs		  . #x03B4)	; δ
-      ))
     (=jis-x0208		. #x2644)	; &J90-2644; [06-36]
     (=gb2312		. #x2644)	; &I-G0-2644; [06-36]
     (=ks-x1001		. #x2564)	; &I-K0-2564; [05-68]
@@ -1642,6 +1638,10 @@
     (=big5		. #xA35F)	; &I-B-A35F;
     (=ucs@gb/fw		. #x03B4)	; &J90-2644;
     (=ucs@jis/fw	. #x03B4)	; &J90-2644;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER DELTA")
+      (=ucs		  . #x03B4)	; δ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2624)	; &J90-2624; [06-04]
       (=gb2312		  . #x2624)	; &I-G0-2624; [06-04]
@@ -1666,10 +1666,6 @@
      ((name		  . "GREEK SMALL LETTER EPSILON")
       (=ucs		  . #x03B5)	; ε
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER EPSILON")
-      (=ucs		  . #x03B5)	; ε
-      ))
     (=jis-x0208		. #x2645)	; &J90-2645; [06-37]
     (=gb2312		. #x2645)	; &I-G0-2645; [06-37]
     (=ks-x1001		. #x2565)	; &I-K0-2565; [05-69]
@@ -1677,6 +1673,10 @@
     (=big5		. #xA360)	; &I-B-A360;
     (=ucs@gb/fw		. #x03B5)	; &J90-2645;
     (=ucs@jis/fw	. #x03B5)	; &J90-2645;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER EPSILON")
+      (=ucs		  . #x03B5)	; ε
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2625)	; &J90-2625; [06-05]
       (=gb2312		  . #x2625)	; &I-G0-2625; [06-05]
@@ -1701,10 +1701,6 @@
      ((name		  . "GREEK SMALL LETTER ZETA")
       (=ucs		  . #x03B6)	; ζ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER ZETA")
-      (=ucs		  . #x03B6)	; ζ
-      ))
     (=jis-x0208		. #x2646)	; &J90-2646; [06-38]
     (=gb2312		. #x2646)	; &I-G0-2646; [06-38]
     (=ks-x1001		. #x2566)	; &I-K0-2566; [05-70]
@@ -1712,6 +1708,10 @@
     (=big5		. #xA361)	; &I-B-A361;
     (=ucs@gb/fw		. #x03B6)	; &J90-2646;
     (=ucs@jis/fw	. #x03B6)	; &J90-2646;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER ZETA")
+      (=ucs		  . #x03B6)	; ζ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2626)	; &J90-2626; [06-06]
       (=gb2312		  . #x2626)	; &I-G0-2626; [06-06]
@@ -1736,10 +1736,6 @@
      ((name		  . "GREEK SMALL LETTER ETA")
       (=ucs		  . #x03B7)	; η
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER ETA")
-      (=ucs		  . #x03B7)	; η
-      ))
     (=jis-x0208		. #x2647)	; &J90-2647; [06-39]
     (=gb2312		. #x2647)	; &I-G0-2647; [06-39]
     (=ks-x1001		. #x2567)	; &I-K0-2567; [05-71]
@@ -1747,6 +1743,10 @@
     (=big5		. #xA362)	; &I-B-A362;
     (=ucs@gb/fw		. #x03B7)	; &J90-2647;
     (=ucs@jis/fw	. #x03B7)	; &J90-2647;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER ETA")
+      (=ucs		  . #x03B7)	; η
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2627)	; &J90-2627; [06-07]
       (=gb2312		  . #x2627)	; &I-G0-2627; [06-07]
@@ -1772,10 +1772,6 @@
      ((name		  . "GREEK SMALL LETTER THETA")
       (=ucs		  . #x03B8)	; θ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER THETA")
-      (=ucs		  . #x03B8)	; θ
-      ))
     (=jis-x0208		. #x2648)	; &J90-2648; [06-40]
     (=gb2312		. #x2648)	; &I-G0-2648; [06-40]
     (=ks-x1001		. #x2568)	; &I-K0-2568; [05-72]
@@ -1783,6 +1779,10 @@
     (=big5		. #xA363)	; &I-B-A363;
     (=ucs@gb/fw		. #x03B8)	; &J90-2648;
     (=ucs@jis/fw	. #x03B8)	; &J90-2648;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER THETA")
+      (=ucs		  . #x03B8)	; θ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2628)	; &J90-2628; [06-08]
       (=gb2312		  . #x2628)	; &I-G0-2628; [06-08]
@@ -1807,10 +1807,6 @@
      ((name		  . "GREEK SMALL LETTER IOTA")
       (=ucs		  . #x03B9)	; ι
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER IOTA")
-      (=ucs		  . #x03B9)	; ι
-      ))
     (=jis-x0208		. #x2649)	; &J90-2649; [06-41]
     (=gb2312		. #x2649)	; &I-G0-2649; [06-41]
     (=ks-x1001		. #x2569)	; &I-K0-2569; [05-73]
@@ -1818,6 +1814,10 @@
     (=big5		. #xA364)	; &I-B-A364;
     (=ucs@gb/fw		. #x03B9)	; &J90-2649;
     (=ucs@jis/fw	. #x03B9)	; &J90-2649;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2629)	; &J90-2629; [06-09]
       (=gb2312		  . #x2629)	; &I-G0-2629; [06-09]
@@ -1842,10 +1842,6 @@
      ((name		  . "GREEK SMALL LETTER KAPPA")
       (=ucs		  . #x03BA)	; κ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER KAPPA")
-      (=ucs		  . #x03BA)	; κ
-      ))
     (=jis-x0208		. #x264A)	; &J90-264A; [06-42]
     (=gb2312		. #x264A)	; &I-G0-264A; [06-42]
     (=ks-x1001		. #x256A)	; &I-K0-256A; [05-74]
@@ -1853,6 +1849,10 @@
     (=big5		. #xA365)	; &I-B-A365;
     (=ucs@gb/fw		. #x03BA)	; &J90-264A;
     (=ucs@jis/fw	. #x03BA)	; &J90-264A;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER KAPPA")
+      (=ucs		  . #x03BA)	; κ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x262A)	; &J90-262A; [06-10]
       (=gb2312		  . #x262A)	; &I-G0-262A; [06-10]
@@ -1877,10 +1877,6 @@
      ((name		  . "GREEK SMALL LETTER LAMDA")
       (=ucs		  . #x03BB)	; λ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER LAMDA")
-      (=ucs		  . #x03BB)	; λ
-      ))
     (=jis-x0208		. #x264B)	; &J90-264B; [06-43]
     (=gb2312		. #x264B)	; &I-G0-264B; [06-43]
     (=ks-x1001		. #x256B)	; &I-K0-256B; [05-75]
@@ -1888,6 +1884,10 @@
     (=big5		. #xA366)	; &I-B-A366;
     (=ucs@gb/fw		. #x03BB)	; &J90-264B;
     (=ucs@jis/fw	. #x03BB)	; &J90-264B;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER LAMDA")
+      (=ucs		  . #x03BB)	; λ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x262B)	; &J90-262B; [06-11]
       (=gb2312		  . #x262B)	; &I-G0-262B; [06-11]
@@ -1912,10 +1912,6 @@
      ((name		  . "GREEK SMALL LETTER MU")
       (=ucs		  . #x03BC)	; μ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER MU")
-      (=ucs		  . #x03BC)	; μ
-      ))
     (=jis-x0208		. #x264C)	; &J90-264C; [06-44]
     (=gb2312		. #x264C)	; &I-G0-264C; [06-44]
     (=ks-x1001		. #x256C)	; &I-K0-256C; [05-76]
@@ -1923,6 +1919,10 @@
     (=big5		. #xA367)	; &I-B-A367;
     (=ucs@gb/fw		. #x03BC)	; &J90-264C;
     (=ucs@jis/fw	. #x03BC)	; &J90-264C;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER MU")
+      (=ucs		  . #x03BC)	; μ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x262C)	; &J90-262C; [06-12]
       (=gb2312		  . #x262C)	; &I-G0-262C; [06-12]
@@ -1947,10 +1947,6 @@
      ((name		  . "GREEK SMALL LETTER NU")
       (=ucs		  . #x03BD)	; ν
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER NU")
-      (=ucs		  . #x03BD)	; ν
-      ))
     (=jis-x0208		. #x264D)	; &J90-264D; [06-45]
     (=gb2312		. #x264D)	; &I-G0-264D; [06-45]
     (=ks-x1001		. #x256D)	; &I-K0-256D; [05-77]
@@ -1958,6 +1954,10 @@
     (=big5		. #xA368)	; &I-B-A368;
     (=ucs@gb/fw		. #x03BD)	; &J90-264D;
     (=ucs@jis/fw	. #x03BD)	; &J90-264D;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER NU")
+      (=ucs		  . #x03BD)	; ν
+      ))
     (->uppercase
      ((=jis-x0208	  . #x262D)	; &J90-262D; [06-13]
       (=gb2312		  . #x262D)	; &I-G0-262D; [06-13]
@@ -1982,10 +1982,6 @@
      ((name		  . "GREEK SMALL LETTER XI")
       (=ucs		  . #x03BE)	; ξ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER XI")
-      (=ucs		  . #x03BE)	; ξ
-      ))
     (=jis-x0208		. #x264E)	; &J90-264E; [06-46]
     (=gb2312		. #x264E)	; &I-G0-264E; [06-46]
     (=ks-x1001		. #x256E)	; &I-K0-256E; [05-78]
@@ -1993,6 +1989,10 @@
     (=big5		. #xA369)	; &I-B-A369;
     (=ucs@gb/fw		. #x03BE)	; &J90-264E;
     (=ucs@jis/fw	. #x03BE)	; &J90-264E;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER XI")
+      (=ucs		  . #x03BE)	; ξ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x262E)	; &J90-262E; [06-14]
       (=gb2312		  . #x262E)	; &I-G0-262E; [06-14]
@@ -2017,10 +2017,6 @@
      ((name		  . "GREEK SMALL LETTER OMICRON")
       (=ucs		  . #x03BF)	; ο
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER OMICRON")
-      (=ucs		  . #x03BF)	; ο
-      ))
     (=jis-x0208		. #x264F)	; &J90-264F; [06-47]
     (=gb2312		. #x264F)	; &I-G0-264F; [06-47]
     (=ks-x1001		. #x256F)	; &I-K0-256F; [05-79]
@@ -2028,6 +2024,10 @@
     (=big5		. #xA36A)	; &I-B-A36A;
     (=ucs@gb/fw		. #x03BF)	; &J90-264F;
     (=ucs@jis/fw	. #x03BF)	; &J90-264F;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER OMICRON")
+      (=ucs		  . #x03BF)	; ο
+      ))
     (->uppercase
      ((=jis-x0208	  . #x262F)	; &J90-262F; [06-15]
       (=gb2312		  . #x262F)	; &I-G0-262F; [06-15]
@@ -2052,10 +2052,6 @@
      ((name		  . "GREEK SMALL LETTER PI")
       (=ucs		  . #x03C0)	; π
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER PI")
-      (=ucs		  . #x03C0)	; π
-      ))
     (=jis-x0208		. #x2650)	; &J90-2650; [06-48]
     (=gb2312		. #x2650)	; &I-G0-2650; [06-48]
     (=ks-x1001		. #x2570)	; &I-K0-2570; [05-80]
@@ -2063,6 +2059,10 @@
     (=big5		. #xA36B)	; &I-B-A36B;
     (=ucs@gb/fw		. #x03C0)	; &J90-2650;
     (=ucs@jis/fw	. #x03C0)	; &J90-2650;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER PI")
+      (=ucs		  . #x03C0)	; π
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2630)	; &J90-2630; [06-16]
       (=gb2312		  . #x2630)	; &I-G0-2630; [06-16]
@@ -2087,10 +2087,6 @@
      ((name		  . "GREEK SMALL LETTER RHO")
       (=ucs		  . #x03C1)	; ρ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER RHO")
-      (=ucs		  . #x03C1)	; ρ
-      ))
     (=jis-x0208		. #x2651)	; &J90-2651; [06-49]
     (=gb2312		. #x2651)	; &I-G0-2651; [06-49]
     (=ks-x1001		. #x2571)	; &I-K0-2571; [05-81]
@@ -2098,6 +2094,10 @@
     (=big5		. #xA36C)	; &I-B-A36C;
     (=ucs@gb/fw		. #x03C1)	; &J90-2651;
     (=ucs@jis/fw	. #x03C1)	; &J90-2651;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER RHO")
+      (=ucs		  . #x03C1)	; ρ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2631)	; &J90-2631; [06-17]
       (=gb2312		  . #x2631)	; &I-G0-2631; [06-17]
@@ -2122,13 +2122,13 @@
      ((name		  . "GREEK SMALL LETTER FINAL SIGMA")
       (=ucs		  . #x03C2)	; ς
       ))
+    (=jis-x0212		. #x2678)	; &JX1-2659; [06-88]
+    (=jis-x0213-1-2000	. #x2659)	; &I-JX1-2659; [06-57]
+    (=ucs@jis/fw	. #x03C2)	; &JX1-2659;
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER FINAL SIGMA")
       (=ucs		  . #x03C2)	; ς
       ))
-    (=jis-x0212		. #x2678)	; &JX1-2659; [06-88]
-    (=jis-x0213-1-2000	. #x2659)	; &I-JX1-2659; [06-57]
-    (=ucs@jis/fw	. #x03C2)	; &JX1-2659;
     (->uppercase
      ((=jis-x0208	  . #x2632)	; &J90-2632; [06-18]
       (=gb2312		  . #x2632)	; &I-G0-2632; [06-18]
@@ -2153,10 +2153,6 @@
      ((name		  . "GREEK SMALL LETTER SIGMA")
       (=ucs		  . #x03C3)	; σ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER SIGMA")
-      (=ucs		  . #x03C3)	; σ
-      ))
     (=jis-x0208		. #x2652)	; &J90-2652; [06-50]
     (=gb2312		. #x2652)	; &I-G0-2652; [06-50]
     (=ks-x1001		. #x2572)	; &I-K0-2572; [05-82]
@@ -2164,6 +2160,10 @@
     (=big5		. #xA36D)	; &I-B-A36D;
     (=ucs@gb/fw		. #x03C3)	; &J90-2652;
     (=ucs@jis/fw	. #x03C3)	; &J90-2652;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER SIGMA")
+      (=ucs		  . #x03C3)	; σ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2632)	; &J90-2632; [06-18]
       (=gb2312		  . #x2632)	; &I-G0-2632; [06-18]
@@ -2188,10 +2188,6 @@
      ((name		  . "GREEK SMALL LETTER TAU")
       (=ucs		  . #x03C4)	; τ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER TAU")
-      (=ucs		  . #x03C4)	; τ
-      ))
     (=jis-x0208		. #x2653)	; &J90-2653; [06-51]
     (=gb2312		. #x2653)	; &I-G0-2653; [06-51]
     (=ks-x1001		. #x2573)	; &I-K0-2573; [05-83]
@@ -2199,6 +2195,10 @@
     (=big5		. #xA36E)	; &I-B-A36E;
     (=ucs@gb/fw		. #x03C4)	; &J90-2653;
     (=ucs@jis/fw	. #x03C4)	; &J90-2653;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER TAU")
+      (=ucs		  . #x03C4)	; τ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2633)	; &J90-2633; [06-19]
       (=gb2312		  . #x2633)	; &I-G0-2633; [06-19]
@@ -2223,10 +2223,6 @@
      ((name		  . "GREEK SMALL LETTER UPSILON")
       (=ucs		  . #x03C5)	; υ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER UPSILON")
-      (=ucs		  . #x03C5)	; υ
-      ))
     (=jis-x0208		. #x2654)	; &J90-2654; [06-52]
     (=gb2312		. #x2654)	; &I-G0-2654; [06-52]
     (=ks-x1001		. #x2574)	; &I-K0-2574; [05-84]
@@ -2234,6 +2230,10 @@
     (=big5		. #xA36F)	; &I-B-A36F;
     (=ucs@gb/fw		. #x03C5)	; &J90-2654;
     (=ucs@jis/fw	. #x03C5)	; &J90-2654;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER UPSILON")
+      (=ucs		  . #x03C5)	; υ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2634)	; &J90-2634; [06-20]
       (=gb2312		  . #x2634)	; &I-G0-2634; [06-20]
@@ -2258,10 +2258,6 @@
      ((name		  . "GREEK SMALL LETTER PHI")
       (=ucs		  . #x03C6)	; φ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER PHI")
-      (=ucs		  . #x03C6)	; φ
-      ))
     (=jis-x0208		. #x2655)	; &J90-2655; [06-53]
     (=gb2312		. #x2655)	; &I-G0-2655; [06-53]
     (=ks-x1001		. #x2575)	; &I-K0-2575; [05-85]
@@ -2269,6 +2265,10 @@
     (=big5		. #xA370)	; &I-B-A370;
     (=ucs@gb/fw		. #x03C6)	; &J90-2655;
     (=ucs@jis/fw	. #x03C6)	; &J90-2655;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER PHI")
+      (=ucs		  . #x03C6)	; φ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2635)	; &J90-2635; [06-21]
       (=gb2312		  . #x2635)	; &I-G0-2635; [06-21]
@@ -2293,10 +2293,6 @@
      ((name		  . "GREEK SMALL LETTER CHI")
       (=ucs		  . #x03C7)	; χ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER CHI")
-      (=ucs		  . #x03C7)	; χ
-      ))
     (=jis-x0208		. #x2656)	; &J90-2656; [06-54]
     (=gb2312		. #x2656)	; &I-G0-2656; [06-54]
     (=ks-x1001		. #x2576)	; &I-K0-2576; [05-86]
@@ -2304,6 +2300,10 @@
     (=big5		. #xA371)	; &I-B-A371;
     (=ucs@gb/fw		. #x03C7)	; &J90-2656;
     (=ucs@jis/fw	. #x03C7)	; &J90-2656;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER CHI")
+      (=ucs		  . #x03C7)	; χ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2636)	; &J90-2636; [06-22]
       (=gb2312		  . #x2636)	; &I-G0-2636; [06-22]
@@ -2328,10 +2328,6 @@
      ((name		  . "GREEK SMALL LETTER PSI")
       (=ucs		  . #x03C8)	; ψ
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER PSI")
-      (=ucs		  . #x03C8)	; ψ
-      ))
     (=jis-x0208		. #x2657)	; &J90-2657; [06-55]
     (=gb2312		. #x2657)	; &I-G0-2657; [06-55]
     (=ks-x1001		. #x2577)	; &I-K0-2577; [05-87]
@@ -2339,6 +2335,10 @@
     (=big5		. #xA372)	; &I-B-A372;
     (=ucs@gb/fw		. #x03C8)	; &J90-2657;
     (=ucs@jis/fw	. #x03C8)	; &J90-2657;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER PSI")
+      (=ucs		  . #x03C8)	; ψ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2637)	; &J90-2637; [06-23]
       (=gb2312		  . #x2637)	; &I-G0-2637; [06-23]
@@ -2363,10 +2363,6 @@
      ((name		  . "GREEK SMALL LETTER OMEGA")
       (=ucs		  . #x03C9)	; ω
       ))
-    (<-fullwidth
-     ((name		  . "GREEK SMALL LETTER OMEGA")
-      (=ucs		  . #x03C9)	; ω
-      ))
     (=jis-x0208		. #x2658)	; &J90-2658; [06-56]
     (=gb2312		. #x2658)	; &I-G0-2658; [06-56]
     (=ks-x1001		. #x2578)	; &I-K0-2578; [05-88]
@@ -2374,6 +2370,10 @@
     (=big5		. #xA373)	; &I-B-A373;
     (=ucs@gb/fw		. #x03C9)	; &J90-2658;
     (=ucs@jis/fw	. #x03C9)	; &J90-2658;
+    (<-fullwidth
+     ((name		  . "GREEK SMALL LETTER OMEGA")
+      (=ucs		  . #x03C9)	; ω
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2638)	; &J90-2638; [06-24]
       (=gb2312		  . #x2638)	; &I-G0-2638; [06-24]
@@ -2405,12 +2405,12 @@
      ((name		  . "GREEK SMALL LETTER IOTA WITH DIALYTIKA")
       (=ucs		  . #x03CA)	; ϊ
       ))
+    (=jis-x0212		. #x2675)	; &JSP-2675; [06-85]
+    (=ucs@jis/fw	. #x03CA)	; &JSP-2675;
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER IOTA WITH DIALYTIKA")
       (=ucs		  . #x03CA)	; ϊ
       ))
-    (=jis-x0212		. #x2675)	; &JSP-2675; [06-85]
-    (=ucs@jis/fw	. #x03CA)	; &JSP-2675;
     (->uppercase
      ((=jis-x0212	  . #x2665)	; &JSP-2665; [06-69]
       ))
@@ -2439,12 +2439,12 @@
      ((name		  . "GREEK SMALL LETTER UPSILON WITH DIALYTIKA")
       (=ucs		  . #x03CB)	; ϋ
       ))
+    (=jis-x0212		. #x267A)	; &JSP-267A; [06-90]
+    (=ucs@jis/fw	. #x03CB)	; &JSP-267A;
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER UPSILON WITH DIALYTIKA")
       (=ucs		  . #x03CB)	; ϋ
       ))
-    (=jis-x0212		. #x267A)	; &JSP-267A; [06-90]
-    (=ucs@jis/fw	. #x03CB)	; &JSP-267A;
     (->uppercase
      ((=jis-x0212	  . #x266A)	; &JSP-266A; [06-74]
       ))
@@ -2473,12 +2473,12 @@
      ((name		  . "GREEK SMALL LETTER OMICRON WITH TONOS")
       (=ucs		  . #x03CC)	; ό
       ))
+    (=jis-x0212		. #x2677)	; &JSP-2677; [06-87]
+    (=ucs@jis/fw	. #x03CC)	; &JSP-2677;
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER OMICRON WITH TONOS")
       (=ucs		  . #x03CC)	; ό
       ))
-    (=jis-x0212		. #x2677)	; &JSP-2677; [06-87]
-    (=ucs@jis/fw	. #x03CC)	; &JSP-2677;
     (->uppercase
      ((=jis-x0212	  . #x2667)	; &JSP-2667; [06-71]
       ))
@@ -2507,12 +2507,12 @@
      ((name		  . "GREEK SMALL LETTER UPSILON WITH TONOS")
       (=ucs		  . #x03CD)	; ύ
       ))
+    (=jis-x0212		. #x2679)	; &JSP-2679; [06-89]
+    (=ucs@jis/fw	. #x03CD)	; &JSP-2679;
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER UPSILON WITH TONOS")
       (=ucs		  . #x03CD)	; ύ
       ))
-    (=jis-x0212		. #x2679)	; &JSP-2679; [06-89]
-    (=ucs@jis/fw	. #x03CD)	; &JSP-2679;
     (->uppercase
      ((=jis-x0212	  . #x2669)	; &JSP-2669; [06-73]
       ))
@@ -2541,12 +2541,12 @@
      ((name		  . "GREEK SMALL LETTER OMEGA WITH TONOS")
       (=ucs		  . #x03CE)	; ώ
       ))
+    (=jis-x0212		. #x267C)	; &JSP-267C; [06-92]
+    (=ucs@jis/fw	. #x03CE)	; &JSP-267C;
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER OMEGA WITH TONOS")
       (=ucs		  . #x03CE)	; ώ
       ))
-    (=jis-x0212		. #x267C)	; &JSP-267C; [06-92]
-    (=ucs@jis/fw	. #x03CE)	; &JSP-267C;
     (->uppercase
      ((=jis-x0212	  . #x266C)	; &JSP-266C; [06-76]
       ))
@@ -2556,11 +2556,11 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x03D0)	; ϐ
     (<-compat
      ((name		  . "GREEK SMALL LETTER BETA")
       (=ucs		  . #x03B2)	; β
       ))
-    (=ucs		. #x03D0)	; ϐ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER BETA")
       (=ucs		  . #x0392)	; Β
@@ -2571,11 +2571,11 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x03D1)	; ϑ
     (<-compat
      ((name		  . "GREEK SMALL LETTER THETA")
       (=ucs		  . #x03B8)	; θ
       ))
-    (=ucs		. #x03D1)	; ϑ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER THETA")
       (=ucs		  . #x0398)	; Θ
@@ -2586,11 +2586,11 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x03D2)	; ϒ
     (<-compat
      ((name		  . "GREEK CAPITAL LETTER UPSILON")
       (=ucs		  . #x03A5)	; Υ
       ))
-    (=ucs		. #x03D2)	; ϒ
     ))
 (define-char
   '((name		. "GREEK UPSILON WITH ACUTE AND HOOK SYMBOL")
@@ -2625,11 +2625,11 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x03D5)	; ϕ
     (<-compat
      ((name		  . "GREEK SMALL LETTER PHI")
       (=ucs		  . #x03C6)	; φ
       ))
-    (=ucs		. #x03D5)	; ϕ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER PHI")
       (=ucs		  . #x03A6)	; Φ
@@ -2640,11 +2640,11 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x03D6)	; ϖ
     (<-compat
      ((name		  . "GREEK SMALL LETTER PI")
       (=ucs		  . #x03C0)	; π
       ))
-    (=ucs		. #x03D6)	; ϖ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER PI")
       (=ucs		  . #x03A0)	; Π
@@ -2904,11 +2904,11 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x03F0)	; Ï°
     (<-compat
      ((name		  . "GREEK SMALL LETTER KAPPA")
       (=ucs		  . #x03BA)	; κ
       ))
-    (=ucs		. #x03F0)	; Ï°
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER KAPPA")
       (=ucs		  . #x039A)	; Κ
@@ -2919,11 +2919,11 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x03F1)	; ϱ
     (<-compat
      ((name		  . "GREEK SMALL LETTER RHO")
       (=ucs		  . #x03C1)	; ρ
       ))
-    (=ucs		. #x03F1)	; ϱ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER RHO")
       (=ucs		  . #x03A1)	; Ρ
@@ -2934,11 +2934,11 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x03F2)	; ϲ
     (<-compat
      ((name		  . "GREEK SMALL LETTER FINAL SIGMA")
       (=ucs		  . #x03C2)	; ς
       ))
-    (=ucs		. #x03F2)	; ϲ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER SIGMA")
       (=ucs		  . #x03A3)	; Σ
diff --git a/lisp/utf-2000/u00400-Cyrillic.el b/lisp/utf-2000/u00400-Cyrillic.el
index 6a9568b..7594ac6 100644
--- a/lisp/utf-2000/u00400-Cyrillic.el
+++ b/lisp/utf-2000/u00400-Cyrillic.el
@@ -41,10 +41,6 @@
      ((name		  . "CYRILLIC CAPITAL LETTER IO")
       (=ucs		  . #x0401)	; Ё
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER IO")
-      (=ucs		  . #x0401)	; Ё
-      ))
     (=decomposition
      ((=jis-x0208	  . #x2726)	; &J90-2726; [07-06]
       (=gb2312		  . #x2726)	; &I-G0-2726; [07-06]
@@ -59,6 +55,10 @@
     (=big5-eten		. #xC7F9)	; &B-C7F9;
     (=ucs@gb/fw		. #x0401)	; &J90-2727;
     (=ucs@jis/fw	. #x0401)	; &J90-2727;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER IO")
+      (=ucs		  . #x0401)	; Ё
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2757)	; &J90-2757; [07-55]
       (=gb2312		  . #x2757)	; &I-G0-2757; [07-55]
@@ -83,12 +83,12 @@
      ((name		  . "CYRILLIC CAPITAL LETTER DJE")
       (=ucs		  . #x0402)	; Ђ
       ))
+    (=jis-x0212		. #x2742)	; &JSP-2742; [07-34]
+    (=ucs@jis/fw	. #x0402)	; &JSP-2742;
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER DJE")
       (=ucs		  . #x0402)	; Ђ
       ))
-    (=jis-x0212		. #x2742)	; &JSP-2742; [07-34]
-    (=ucs@jis/fw	. #x0402)	; &JSP-2742;
     (->lowercase
      ((=jis-x0212	  . #x2772)	; &JSP-2772; [07-82]
       ))
@@ -117,10 +117,6 @@
      ((name		  . "CYRILLIC CAPITAL LETTER GJE")
       (=ucs		  . #x0403)	; Ѓ
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER GJE")
-      (=ucs		  . #x0403)	; Ѓ
-      ))
     (=decomposition
      ((=jis-x0208	  . #x2724)	; &J90-2724; [07-04]
       (=gb2312		  . #x2724)	; &I-G0-2724; [07-04]
@@ -131,6 +127,10 @@
       ))
     (=jis-x0212		. #x2743)	; &JSP-2743; [07-35]
     (=ucs@jis/fw	. #x0403)	; &JSP-2743;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER GJE")
+      (=ucs		  . #x0403)	; Ѓ
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2773)	; &JSP-2773; [07-83]
       ))
@@ -152,12 +152,12 @@
      ((name		  . "CYRILLIC CAPITAL LETTER UKRAINIAN IE")
       (=ucs		  . #x0404)	; Є
       ))
+    (=jis-x0212		. #x2744)	; &JSP-2744; [07-36]
+    (=ucs@jis/fw	. #x0404)	; &JSP-2744;
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER UKRAINIAN IE")
       (=ucs		  . #x0404)	; Є
       ))
-    (=jis-x0212		. #x2744)	; &JSP-2744; [07-36]
-    (=ucs@jis/fw	. #x0404)	; &JSP-2744;
     (->lowercase
      ((=jis-x0212	  . #x2774)	; &JSP-2774; [07-84]
       ))
@@ -179,12 +179,12 @@
      ((name		  . "CYRILLIC CAPITAL LETTER DZE")
       (=ucs		  . #x0405)	; Ѕ
       ))
+    (=jis-x0212		. #x2745)	; &JSP-2745; [07-37]
+    (=ucs@jis/fw	. #x0405)	; &JSP-2745;
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER DZE")
       (=ucs		  . #x0405)	; Ѕ
       ))
-    (=jis-x0212		. #x2745)	; &JSP-2745; [07-37]
-    (=ucs@jis/fw	. #x0405)	; &JSP-2745;
     (->lowercase
      ((=jis-x0212	  . #x2775)	; &JSP-2775; [07-85]
       ))
@@ -206,12 +206,12 @@
      ((name . "CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I")
       (=ucs		  . #x0406)	; І
       ))
+    (=jis-x0212		. #x2746)	; &JSP-2746; [07-38]
+    (=ucs@jis/fw	. #x0406)	; &JSP-2746;
     (<-fullwidth
      ((name . "CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I")
       (=ucs		  . #x0406)	; І
       ))
-    (=jis-x0212		. #x2746)	; &JSP-2746; [07-38]
-    (=ucs@jis/fw	. #x0406)	; &JSP-2746;
     (->lowercase
      ((=jis-x0212	  . #x2776)	; &JSP-2776; [07-86]
       ))
@@ -241,10 +241,6 @@
      ((name		  . "CYRILLIC CAPITAL LETTER YI")
       (=ucs		  . #x0407)	; Ї
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER YI")
-      (=ucs		  . #x0407)	; Ї
-      ))
     (=decomposition
      ((=jis-x0212	  . #x2746)	; &JSP-2746; [07-38]
       )
@@ -253,6 +249,10 @@
       ))
     (=jis-x0212		. #x2747)	; &JSP-2747; [07-39]
     (=ucs@jis/fw	. #x0407)	; &JSP-2747;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER YI")
+      (=ucs		  . #x0407)	; Ї
+      ))
     (->lowercase
      ((=jis-x0212	  . #x2777)	; &JSP-2777; [07-87]
       ))
@@ -274,12 +274,12 @@
      ((name		  . "CYRILLIC CAPITAL LETTER JE")
       (=ucs		  . #x0408)	; Ј
       ))
+    (=jis-x0212		. #x2748)	; &JSP-2748; [07-40]
+    (=ucs@jis/fw	. #x0408)	; &JSP-2748;
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER JE")
       (=ucs		  . #x0408)	; Ј
       ))
-    (=jis-x0212		. #x2748)	; &JSP-2748; [07-40]
-    (=ucs@jis/fw	. #x0408)	; &JSP-2748;
     (->lowercase
      ((=jis-x0212	  . #x2778)	; &JSP-2778; [07-88]
       ))
@@ -301,12 +301,12 @@
      ((name		  . "CYRILLIC CAPITAL LETTER LJE")
       (=ucs		  . #x0409)	; Љ
       ))
+    (=jis-x0212		. #x2749)	; &JSP-2749; [07-41]
+    (=ucs@jis/fw	. #x0409)	; &JSP-2749;
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER LJE")
       (=ucs		  . #x0409)	; Љ
       ))
-    (=jis-x0212		. #x2749)	; &JSP-2749; [07-41]
-    (=ucs@jis/fw	. #x0409)	; &JSP-2749;
     (->lowercase
      ((=jis-x0212	  . #x2779)	; &JSP-2779; [07-89]
       ))
@@ -328,12 +328,12 @@
      ((name		  . "CYRILLIC CAPITAL LETTER NJE")
       (=ucs		  . #x040A)	; Њ
       ))
+    (=jis-x0212		. #x274A)	; &JSP-274A; [07-42]
+    (=ucs@jis/fw	. #x040A)	; &JSP-274A;
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER NJE")
       (=ucs		  . #x040A)	; Њ
       ))
-    (=jis-x0212		. #x274A)	; &JSP-274A; [07-42]
-    (=ucs@jis/fw	. #x040A)	; &JSP-274A;
     (->lowercase
      ((=jis-x0212	  . #x277A)	; &JSP-277A; [07-90]
       ))
@@ -356,12 +356,12 @@
      ((name		  . "CYRILLIC CAPITAL LETTER TSHE")
       (=ucs		  . #x040B)	; Ћ
       ))
+    (=jis-x0212		. #x274B)	; &JSP-274B; [07-43]
+    (=ucs@jis/fw	. #x040B)	; &JSP-274B;
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER TSHE")
       (=ucs		  . #x040B)	; Ћ
       ))
-    (=jis-x0212		. #x274B)	; &JSP-274B; [07-43]
-    (=ucs@jis/fw	. #x040B)	; &JSP-274B;
     (->lowercase
      ((=jis-x0212	  . #x277B)	; &JSP-277B; [07-91]
       ))
@@ -390,12 +390,12 @@
      ((name		  . "CYRILLIC CAPITAL LETTER KJE")
       (=ucs		  . #x040C)	; Ќ
       ))
+    (=jis-x0212		. #x274C)	; &JSP-274C; [07-44]
+    (=ucs@jis/fw	. #x040C)	; &JSP-274C;
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER KJE")
       (=ucs		  . #x040C)	; Ќ
       ))
-    (=jis-x0212		. #x274C)	; &JSP-274C; [07-44]
-    (=ucs@jis/fw	. #x040C)	; &JSP-274C;
     (->lowercase
      ((=jis-x0212	  . #x277C)	; &JSP-277C; [07-92]
       ))
@@ -443,12 +443,12 @@
      ((name		  . "CYRILLIC CAPITAL LETTER SHORT U")
       (=ucs		  . #x040E)	; Ў
       ))
+    (=jis-x0212		. #x274D)	; &JSP-274D; [07-45]
+    (=ucs@jis/fw	. #x040E)	; &JSP-274D;
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER SHORT U")
       (=ucs		  . #x040E)	; Ў
       ))
-    (=jis-x0212		. #x274D)	; &JSP-274D; [07-45]
-    (=ucs@jis/fw	. #x040E)	; &JSP-274D;
     (->lowercase
      ((=jis-x0212	  . #x277D)	; &JSP-277D; [07-93]
       ))
@@ -470,12 +470,12 @@
      ((name		  . "CYRILLIC CAPITAL LETTER DZHE")
       (=ucs		  . #x040F)	; Џ
       ))
+    (=jis-x0212		. #x274E)	; &JSP-274E; [07-46]
+    (=ucs@jis/fw	. #x040F)	; &JSP-274E;
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER DZHE")
       (=ucs		  . #x040F)	; Џ
       ))
-    (=jis-x0212		. #x274E)	; &JSP-274E; [07-46]
-    (=ucs@jis/fw	. #x040F)	; &JSP-274E;
     (->lowercase
      ((=jis-x0212	  . #x277E)	; &JSP-277E; [07-94]
       ))
@@ -497,16 +497,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER A")
       (=ucs		  . #x0410)	; А
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER A")
-      (=ucs		  . #x0410)	; А
-      ))
     (=jis-x0208		. #x2721)	; &J90-2721; [07-01]
     (=gb2312		. #x2721)	; &I-G0-2721; [07-01]
     (=ks-x1001		. #x2C21)	; &I-K0-2C21; [12-01]
     (=big5-eten		. #xC7F3)	; &B-C7F3;
     (=ucs@gb/fw		. #x0410)	; &J90-2721;
     (=ucs@jis/fw	. #x0410)	; &J90-2721;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER A")
+      (=ucs		  . #x0410)	; А
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2751)	; &J90-2751; [07-49]
       (=gb2312		  . #x2751)	; &I-G0-2751; [07-49]
@@ -530,16 +530,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER BE")
       (=ucs		  . #x0411)	; Б
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER BE")
-      (=ucs		  . #x0411)	; Б
-      ))
     (=jis-x0208		. #x2722)	; &J90-2722; [07-02]
     (=gb2312		. #x2722)	; &I-G0-2722; [07-02]
     (=ks-x1001		. #x2C22)	; &I-K0-2C22; [12-02]
     (=big5-eten		. #xC7F4)	; &B-C7F4;
     (=ucs@gb/fw		. #x0411)	; &J90-2722;
     (=ucs@jis/fw	. #x0411)	; &J90-2722;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER BE")
+      (=ucs		  . #x0411)	; Б
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2752)	; &J90-2752; [07-50]
       (=gb2312		  . #x2752)	; &I-G0-2752; [07-50]
@@ -563,16 +563,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER VE")
       (=ucs		  . #x0412)	; В
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER VE")
-      (=ucs		  . #x0412)	; В
-      ))
     (=jis-x0208		. #x2723)	; &J90-2723; [07-03]
     (=gb2312		. #x2723)	; &I-G0-2723; [07-03]
     (=ks-x1001		. #x2C23)	; &I-K0-2C23; [12-03]
     (=big5-eten		. #xC7F5)	; &B-C7F5;
     (=ucs@gb/fw		. #x0412)	; &J90-2723;
     (=ucs@jis/fw	. #x0412)	; &J90-2723;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER VE")
+      (=ucs		  . #x0412)	; В
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2753)	; &J90-2753; [07-51]
       (=gb2312		  . #x2753)	; &I-G0-2753; [07-51]
@@ -596,16 +596,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER GHE")
       (=ucs		  . #x0413)	; Г
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER GHE")
-      (=ucs		  . #x0413)	; Г
-      ))
     (=jis-x0208		. #x2724)	; &J90-2724; [07-04]
     (=gb2312		. #x2724)	; &I-G0-2724; [07-04]
     (=ks-x1001		. #x2C24)	; &I-K0-2C24; [12-04]
     (=big5-eten		. #xC7F6)	; &B-C7F6;
     (=ucs@gb/fw		. #x0413)	; &J90-2724;
     (=ucs@jis/fw	. #x0413)	; &J90-2724;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER GHE")
+      (=ucs		  . #x0413)	; Г
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2754)	; &J90-2754; [07-52]
       (=gb2312		  . #x2754)	; &I-G0-2754; [07-52]
@@ -629,16 +629,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER DE")
       (=ucs		  . #x0414)	; Д
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER DE")
-      (=ucs		  . #x0414)	; Д
-      ))
     (=jis-x0208		. #x2725)	; &J90-2725; [07-05]
     (=gb2312		. #x2725)	; &I-G0-2725; [07-05]
     (=ks-x1001		. #x2C25)	; &I-K0-2C25; [12-05]
     (=big5-eten		. #xC7F7)	; &B-C7F7;
     (=ucs@gb/fw		. #x0414)	; &J90-2725;
     (=ucs@jis/fw	. #x0414)	; &J90-2725;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER DE")
+      (=ucs		  . #x0414)	; Д
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2755)	; &J90-2755; [07-53]
       (=gb2312		  . #x2755)	; &I-G0-2755; [07-53]
@@ -662,16 +662,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER IE")
       (=ucs		  . #x0415)	; Е
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER IE")
-      (=ucs		  . #x0415)	; Е
-      ))
     (=jis-x0208		. #x2726)	; &J90-2726; [07-06]
     (=gb2312		. #x2726)	; &I-G0-2726; [07-06]
     (=ks-x1001		. #x2C26)	; &I-K0-2C26; [12-06]
     (=big5-eten		. #xC7F8)	; &B-C7F8;
     (=ucs@gb/fw		. #x0415)	; &J90-2726;
     (=ucs@jis/fw	. #x0415)	; &J90-2726;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER IE")
+      (=ucs		  . #x0415)	; Е
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2756)	; &J90-2756; [07-54]
       (=gb2312		  . #x2756)	; &I-G0-2756; [07-54]
@@ -695,16 +695,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER ZHE")
       (=ucs		  . #x0416)	; Ж
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER ZHE")
-      (=ucs		  . #x0416)	; Ж
-      ))
     (=jis-x0208		. #x2728)	; &J90-2728; [07-08]
     (=gb2312		. #x2728)	; &I-G0-2728; [07-08]
     (=ks-x1001		. #x2C28)	; &I-K0-2C28; [12-08]
     (=big5-eten		. #xC7FA)	; &B-C7FA;
     (=ucs@gb/fw		. #x0416)	; &J90-2728;
     (=ucs@jis/fw	. #x0416)	; &J90-2728;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER ZHE")
+      (=ucs		  . #x0416)	; Ж
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2758)	; &J90-2758; [07-56]
       (=gb2312		  . #x2758)	; &I-G0-2758; [07-56]
@@ -728,16 +728,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER ZE")
       (=ucs		  . #x0417)	; З
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER ZE")
-      (=ucs		  . #x0417)	; З
-      ))
     (=jis-x0208		. #x2729)	; &J90-2729; [07-09]
     (=gb2312		. #x2729)	; &I-G0-2729; [07-09]
     (=ks-x1001		. #x2C29)	; &I-K0-2C29; [12-09]
     (=big5-eten		. #xC7FB)	; &B-C7FB;
     (=ucs@gb/fw		. #x0417)	; &J90-2729;
     (=ucs@jis/fw	. #x0417)	; &J90-2729;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER ZE")
+      (=ucs		  . #x0417)	; З
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2759)	; &J90-2759; [07-57]
       (=gb2312		  . #x2759)	; &I-G0-2759; [07-57]
@@ -761,16 +761,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER I")
       (=ucs		  . #x0418)	; И
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER I")
-      (=ucs		  . #x0418)	; И
-      ))
     (=jis-x0208		. #x272A)	; &J90-272A; [07-10]
     (=gb2312		. #x272A)	; &I-G0-272A; [07-10]
     (=ks-x1001		. #x2C2A)	; &I-K0-2C2A; [12-10]
     (=big5-eten		. #xC7FC)	; &B-C7FC;
     (=ucs@gb/fw		. #x0418)	; &J90-272A;
     (=ucs@jis/fw	. #x0418)	; &J90-272A;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER I")
+      (=ucs		  . #x0418)	; И
+      ))
     (->lowercase
      ((=jis-x0208	  . #x275A)	; &J90-275A; [07-58]
       (=gb2312		  . #x275A)	; &I-G0-275A; [07-58]
@@ -801,16 +801,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER SHORT I")
       (=ucs		  . #x0419)	; Й
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER SHORT I")
-      (=ucs		  . #x0419)	; Й
-      ))
     (=jis-x0208		. #x272B)	; &J90-272B; [07-11]
     (=gb2312		. #x272B)	; &I-G0-272B; [07-11]
     (=ks-x1001		. #x2C2B)	; &I-K0-2C2B; [12-11]
     (=big5-eten		. #xC7FD)	; &B-C7FD;
     (=ucs@gb/fw		. #x0419)	; &J90-272B;
     (=ucs@jis/fw	. #x0419)	; &J90-272B;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER SHORT I")
+      (=ucs		  . #x0419)	; Й
+      ))
     (->lowercase
      ((=jis-x0208	  . #x275B)	; &J90-275B; [07-59]
       (=gb2312		  . #x275B)	; &I-G0-275B; [07-59]
@@ -834,16 +834,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER KA")
       (=ucs		  . #x041A)	; К
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER KA")
-      (=ucs		  . #x041A)	; К
-      ))
     (=jis-x0208		. #x272C)	; &J90-272C; [07-12]
     (=gb2312		. #x272C)	; &I-G0-272C; [07-12]
     (=ks-x1001		. #x2C2C)	; &I-K0-2C2C; [12-12]
     (=big5-eten		. #xC7FE)	; &B-C7FE;
     (=ucs@gb/fw		. #x041A)	; &J90-272C;
     (=ucs@jis/fw	. #x041A)	; &J90-272C;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER KA")
+      (=ucs		  . #x041A)	; К
+      ))
     (->lowercase
      ((=jis-x0208	  . #x275C)	; &J90-275C; [07-60]
       (=gb2312		  . #x275C)	; &I-G0-275C; [07-60]
@@ -867,16 +867,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER EL")
       (=ucs		  . #x041B)	; Л
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER EL")
-      (=ucs		  . #x041B)	; Л
-      ))
     (=jis-x0208		. #x272D)	; &J90-272D; [07-13]
     (=gb2312		. #x272D)	; &I-G0-272D; [07-13]
     (=ks-x1001		. #x2C2D)	; &I-K0-2C2D; [12-13]
     (=big5-eten		. #xC840)	; &B-C840;
     (=ucs@gb/fw		. #x041B)	; &J90-272D;
     (=ucs@jis/fw	. #x041B)	; &J90-272D;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER EL")
+      (=ucs		  . #x041B)	; Л
+      ))
     (->lowercase
      ((=jis-x0208	  . #x275D)	; &J90-275D; [07-61]
       (=gb2312		  . #x275D)	; &I-G0-275D; [07-61]
@@ -900,16 +900,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER EM")
       (=ucs		  . #x041C)	; М
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER EM")
-      (=ucs		  . #x041C)	; М
-      ))
     (=jis-x0208		. #x272E)	; &J90-272E; [07-14]
     (=gb2312		. #x272E)	; &I-G0-272E; [07-14]
     (=ks-x1001		. #x2C2E)	; &I-K0-2C2E; [12-14]
     (=big5-eten		. #xC841)	; &B-C841;
     (=ucs@gb/fw		. #x041C)	; &J90-272E;
     (=ucs@jis/fw	. #x041C)	; &J90-272E;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER EM")
+      (=ucs		  . #x041C)	; М
+      ))
     (->lowercase
      ((=jis-x0208	  . #x275E)	; &J90-275E; [07-62]
       (=gb2312		  . #x275E)	; &I-G0-275E; [07-62]
@@ -933,16 +933,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER EN")
       (=ucs		  . #x041D)	; Н
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER EN")
-      (=ucs		  . #x041D)	; Н
-      ))
     (=jis-x0208		. #x272F)	; &J90-272F; [07-15]
     (=gb2312		. #x272F)	; &I-G0-272F; [07-15]
     (=ks-x1001		. #x2C2F)	; &I-K0-2C2F; [12-15]
     (=big5-eten		. #xC842)	; &B-C842;
     (=ucs@gb/fw		. #x041D)	; &J90-272F;
     (=ucs@jis/fw	. #x041D)	; &J90-272F;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER EN")
+      (=ucs		  . #x041D)	; Н
+      ))
     (->lowercase
      ((=jis-x0208	  . #x275F)	; &J90-275F; [07-63]
       (=gb2312		  . #x275F)	; &I-G0-275F; [07-63]
@@ -966,16 +966,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER O")
       (=ucs		  . #x041E)	; О
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER O")
-      (=ucs		  . #x041E)	; О
-      ))
     (=jis-x0208		. #x2730)	; &J90-2730; [07-16]
     (=gb2312		. #x2730)	; &I-G0-2730; [07-16]
     (=ks-x1001		. #x2C30)	; &I-K0-2C30; [12-16]
     (=big5-eten		. #xC843)	; &B-C843;
     (=ucs@gb/fw		. #x041E)	; &J90-2730;
     (=ucs@jis/fw	. #x041E)	; &J90-2730;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER O")
+      (=ucs		  . #x041E)	; О
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2760)	; &J90-2760; [07-64]
       (=gb2312		  . #x2760)	; &I-G0-2760; [07-64]
@@ -999,16 +999,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER PE")
       (=ucs		  . #x041F)	; П
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER PE")
-      (=ucs		  . #x041F)	; П
-      ))
     (=jis-x0208		. #x2731)	; &J90-2731; [07-17]
     (=gb2312		. #x2731)	; &I-G0-2731; [07-17]
     (=ks-x1001		. #x2C31)	; &I-K0-2C31; [12-17]
     (=big5-eten		. #xC844)	; &B-C844;
     (=ucs@gb/fw		. #x041F)	; &J90-2731;
     (=ucs@jis/fw	. #x041F)	; &J90-2731;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER PE")
+      (=ucs		  . #x041F)	; П
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2761)	; &J90-2761; [07-65]
       (=gb2312		  . #x2761)	; &I-G0-2761; [07-65]
@@ -1032,16 +1032,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER ER")
       (=ucs		  . #x0420)	; Р
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER ER")
-      (=ucs		  . #x0420)	; Р
-      ))
     (=jis-x0208		. #x2732)	; &J90-2732; [07-18]
     (=gb2312		. #x2732)	; &I-G0-2732; [07-18]
     (=ks-x1001		. #x2C32)	; &I-K0-2C32; [12-18]
     (=big5-eten		. #xC845)	; &B-C845;
     (=ucs@gb/fw		. #x0420)	; &J90-2732;
     (=ucs@jis/fw	. #x0420)	; &J90-2732;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER ER")
+      (=ucs		  . #x0420)	; Р
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2762)	; &J90-2762; [07-66]
       (=gb2312		  . #x2762)	; &I-G0-2762; [07-66]
@@ -1065,16 +1065,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER ES")
       (=ucs		  . #x0421)	; С
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER ES")
-      (=ucs		  . #x0421)	; С
-      ))
     (=jis-x0208		. #x2733)	; &J90-2733; [07-19]
     (=gb2312		. #x2733)	; &I-G0-2733; [07-19]
     (=ks-x1001		. #x2C33)	; &I-K0-2C33; [12-19]
     (=big5-eten		. #xC846)	; &B-C846;
     (=ucs@gb/fw		. #x0421)	; &J90-2733;
     (=ucs@jis/fw	. #x0421)	; &J90-2733;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER ES")
+      (=ucs		  . #x0421)	; С
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2763)	; &J90-2763; [07-67]
       (=gb2312		  . #x2763)	; &I-G0-2763; [07-67]
@@ -1098,16 +1098,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER TE")
       (=ucs		  . #x0422)	; Т
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER TE")
-      (=ucs		  . #x0422)	; Т
-      ))
     (=jis-x0208		. #x2734)	; &J90-2734; [07-20]
     (=gb2312		. #x2734)	; &I-G0-2734; [07-20]
     (=ks-x1001		. #x2C34)	; &I-K0-2C34; [12-20]
     (=big5-eten		. #xC847)	; &B-C847;
     (=ucs@gb/fw		. #x0422)	; &J90-2734;
     (=ucs@jis/fw	. #x0422)	; &J90-2734;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER TE")
+      (=ucs		  . #x0422)	; Т
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2764)	; &J90-2764; [07-68]
       (=gb2312		  . #x2764)	; &I-G0-2764; [07-68]
@@ -1131,16 +1131,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER U")
       (=ucs		  . #x0423)	; У
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER U")
-      (=ucs		  . #x0423)	; У
-      ))
     (=jis-x0208		. #x2735)	; &J90-2735; [07-21]
     (=gb2312		. #x2735)	; &I-G0-2735; [07-21]
     (=ks-x1001		. #x2C35)	; &I-K0-2C35; [12-21]
     (=big5-eten		. #xC848)	; &B-C848;
     (=ucs@gb/fw		. #x0423)	; &J90-2735;
     (=ucs@jis/fw	. #x0423)	; &J90-2735;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER U")
+      (=ucs		  . #x0423)	; У
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2765)	; &J90-2765; [07-69]
       (=gb2312		  . #x2765)	; &I-G0-2765; [07-69]
@@ -1164,16 +1164,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER EF")
       (=ucs		  . #x0424)	; Ф
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER EF")
-      (=ucs		  . #x0424)	; Ф
-      ))
     (=jis-x0208		. #x2736)	; &J90-2736; [07-22]
     (=gb2312		. #x2736)	; &I-G0-2736; [07-22]
     (=ks-x1001		. #x2C36)	; &I-K0-2C36; [12-22]
     (=big5-eten		. #xC849)	; &B-C849;
     (=ucs@gb/fw		. #x0424)	; &J90-2736;
     (=ucs@jis/fw	. #x0424)	; &J90-2736;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER EF")
+      (=ucs		  . #x0424)	; Ф
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2766)	; &J90-2766; [07-70]
       (=gb2312		  . #x2766)	; &I-G0-2766; [07-70]
@@ -1197,16 +1197,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER HA")
       (=ucs		  . #x0425)	; Х
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER HA")
-      (=ucs		  . #x0425)	; Х
-      ))
     (=jis-x0208		. #x2737)	; &J90-2737; [07-23]
     (=gb2312		. #x2737)	; &I-G0-2737; [07-23]
     (=ks-x1001		. #x2C37)	; &I-K0-2C37; [12-23]
     (=big5-eten		. #xC84A)	; &B-C84A;
     (=ucs@gb/fw		. #x0425)	; &J90-2737;
     (=ucs@jis/fw	. #x0425)	; &J90-2737;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER HA")
+      (=ucs		  . #x0425)	; Х
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2767)	; &J90-2767; [07-71]
       (=gb2312		  . #x2767)	; &I-G0-2767; [07-71]
@@ -1230,16 +1230,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER TSE")
       (=ucs		  . #x0426)	; Ц
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER TSE")
-      (=ucs		  . #x0426)	; Ц
-      ))
     (=jis-x0208		. #x2738)	; &J90-2738; [07-24]
     (=gb2312		. #x2738)	; &I-G0-2738; [07-24]
     (=ks-x1001		. #x2C38)	; &I-K0-2C38; [12-24]
     (=big5-eten		. #xC84B)	; &B-C84B;
     (=ucs@gb/fw		. #x0426)	; &J90-2738;
     (=ucs@jis/fw	. #x0426)	; &J90-2738;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER TSE")
+      (=ucs		  . #x0426)	; Ц
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2768)	; &J90-2768; [07-72]
       (=gb2312		  . #x2768)	; &I-G0-2768; [07-72]
@@ -1263,16 +1263,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER CHE")
       (=ucs		  . #x0427)	; Ч
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER CHE")
-      (=ucs		  . #x0427)	; Ч
-      ))
     (=jis-x0208		. #x2739)	; &J90-2739; [07-25]
     (=gb2312		. #x2739)	; &I-G0-2739; [07-25]
     (=ks-x1001		. #x2C39)	; &I-K0-2C39; [12-25]
     (=big5-eten		. #xC84C)	; &B-C84C;
     (=ucs@gb/fw		. #x0427)	; &J90-2739;
     (=ucs@jis/fw	. #x0427)	; &J90-2739;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER CHE")
+      (=ucs		  . #x0427)	; Ч
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2769)	; &J90-2769; [07-73]
       (=gb2312		  . #x2769)	; &I-G0-2769; [07-73]
@@ -1296,16 +1296,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER SHA")
       (=ucs		  . #x0428)	; Ш
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER SHA")
-      (=ucs		  . #x0428)	; Ш
-      ))
     (=jis-x0208		. #x273A)	; &J90-273A; [07-26]
     (=gb2312		. #x273A)	; &I-G0-273A; [07-26]
     (=ks-x1001		. #x2C3A)	; &I-K0-2C3A; [12-26]
     (=big5-eten		. #xC84D)	; &B-C84D;
     (=ucs@gb/fw		. #x0428)	; &J90-273A;
     (=ucs@jis/fw	. #x0428)	; &J90-273A;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER SHA")
+      (=ucs		  . #x0428)	; Ш
+      ))
     (->lowercase
      ((=jis-x0208	  . #x276A)	; &J90-276A; [07-74]
       (=gb2312		  . #x276A)	; &I-G0-276A; [07-74]
@@ -1329,16 +1329,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER SHCHA")
       (=ucs		  . #x0429)	; Щ
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER SHCHA")
-      (=ucs		  . #x0429)	; Щ
-      ))
     (=jis-x0208		. #x273B)	; &J90-273B; [07-27]
     (=gb2312		. #x273B)	; &I-G0-273B; [07-27]
     (=ks-x1001		. #x2C3B)	; &I-K0-2C3B; [12-27]
     (=big5-eten		. #xC84E)	; &B-C84E;
     (=ucs@gb/fw		. #x0429)	; &J90-273B;
     (=ucs@jis/fw	. #x0429)	; &J90-273B;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER SHCHA")
+      (=ucs		  . #x0429)	; Щ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x276B)	; &J90-276B; [07-75]
       (=gb2312		  . #x276B)	; &I-G0-276B; [07-75]
@@ -1362,16 +1362,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER HARD SIGN")
       (=ucs		  . #x042A)	; Ъ
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER HARD SIGN")
-      (=ucs		  . #x042A)	; Ъ
-      ))
     (=jis-x0208		. #x273C)	; &J90-273C; [07-28]
     (=gb2312		. #x273C)	; &I-G0-273C; [07-28]
     (=ks-x1001		. #x2C3C)	; &I-K0-2C3C; [12-28]
     (=big5-eten		. #xC84F)	; &B-C84F;
     (=ucs@gb/fw		. #x042A)	; &J90-273C;
     (=ucs@jis/fw	. #x042A)	; &J90-273C;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER HARD SIGN")
+      (=ucs		  . #x042A)	; Ъ
+      ))
     (->lowercase
      ((=jis-x0208	  . #x276C)	; &J90-276C; [07-76]
       (=gb2312		  . #x276C)	; &I-G0-276C; [07-76]
@@ -1395,16 +1395,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER YERU")
       (=ucs		  . #x042B)	; Ы
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER YERU")
-      (=ucs		  . #x042B)	; Ы
-      ))
     (=jis-x0208		. #x273D)	; &J90-273D; [07-29]
     (=gb2312		. #x273D)	; &I-G0-273D; [07-29]
     (=ks-x1001		. #x2C3D)	; &I-K0-2C3D; [12-29]
     (=big5-eten		. #xC850)	; &B-C850;
     (=ucs@gb/fw		. #x042B)	; &J90-273D;
     (=ucs@jis/fw	. #x042B)	; &J90-273D;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER YERU")
+      (=ucs		  . #x042B)	; Ы
+      ))
     (->lowercase
      ((=jis-x0208	  . #x276D)	; &J90-276D; [07-77]
       (=gb2312		  . #x276D)	; &I-G0-276D; [07-77]
@@ -1428,16 +1428,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER SOFT SIGN")
       (=ucs		  . #x042C)	; Ь
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER SOFT SIGN")
-      (=ucs		  . #x042C)	; Ь
-      ))
     (=jis-x0208		. #x273E)	; &J90-273E; [07-30]
     (=gb2312		. #x273E)	; &I-G0-273E; [07-30]
     (=ks-x1001		. #x2C3E)	; &I-K0-2C3E; [12-30]
     (=big5-eten		. #xC851)	; &B-C851;
     (=ucs@gb/fw		. #x042C)	; &J90-273E;
     (=ucs@jis/fw	. #x042C)	; &J90-273E;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER SOFT SIGN")
+      (=ucs		  . #x042C)	; Ь
+      ))
     (->lowercase
      ((=jis-x0208	  . #x276E)	; &J90-276E; [07-78]
       (=gb2312		  . #x276E)	; &I-G0-276E; [07-78]
@@ -1461,16 +1461,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER E")
       (=ucs		  . #x042D)	; Э
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER E")
-      (=ucs		  . #x042D)	; Э
-      ))
     (=jis-x0208		. #x273F)	; &J90-273F; [07-31]
     (=gb2312		. #x273F)	; &I-G0-273F; [07-31]
     (=ks-x1001		. #x2C3F)	; &I-K0-2C3F; [12-31]
     (=big5-eten		. #xC852)	; &B-C852;
     (=ucs@gb/fw		. #x042D)	; &J90-273F;
     (=ucs@jis/fw	. #x042D)	; &J90-273F;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER E")
+      (=ucs		  . #x042D)	; Э
+      ))
     (->lowercase
      ((=jis-x0208	  . #x276F)	; &J90-276F; [07-79]
       (=gb2312		  . #x276F)	; &I-G0-276F; [07-79]
@@ -1494,16 +1494,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER YU")
       (=ucs		  . #x042E)	; Ю
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER YU")
-      (=ucs		  . #x042E)	; Ю
-      ))
     (=jis-x0208		. #x2740)	; &J90-2740; [07-32]
     (=gb2312		. #x2740)	; &I-G0-2740; [07-32]
     (=ks-x1001		. #x2C40)	; &I-K0-2C40; [12-32]
     (=big5-eten		. #xC853)	; &B-C853;
     (=ucs@gb/fw		. #x042E)	; &J90-2740;
     (=ucs@jis/fw	. #x042E)	; &J90-2740;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER YU")
+      (=ucs		  . #x042E)	; Ю
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2770)	; &J90-2770; [07-80]
       (=gb2312		  . #x2770)	; &I-G0-2770; [07-80]
@@ -1527,16 +1527,16 @@
      ((name		  . "CYRILLIC CAPITAL LETTER YA")
       (=ucs		  . #x042F)	; Я
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC CAPITAL LETTER YA")
-      (=ucs		  . #x042F)	; Я
-      ))
     (=jis-x0208		. #x2741)	; &J90-2741; [07-33]
     (=gb2312		. #x2741)	; &I-G0-2741; [07-33]
     (=ks-x1001		. #x2C41)	; &I-K0-2C41; [12-33]
     (=big5-eten		. #xC854)	; &B-C854;
     (=ucs@gb/fw		. #x042F)	; &J90-2741;
     (=ucs@jis/fw	. #x042F)	; &J90-2741;
+    (<-fullwidth
+     ((name		  . "CYRILLIC CAPITAL LETTER YA")
+      (=ucs		  . #x042F)	; Я
+      ))
     (->lowercase
      ((=jis-x0208	  . #x2771)	; &J90-2771; [07-81]
       (=gb2312		  . #x2771)	; &I-G0-2771; [07-81]
@@ -1560,16 +1560,16 @@
      ((name		  . "CYRILLIC SMALL LETTER A")
       (=ucs		  . #x0430)	; а
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER A")
-      (=ucs		  . #x0430)	; а
-      ))
     (=jis-x0208		. #x2751)	; &J90-2751; [07-49]
     (=gb2312		. #x2751)	; &I-G0-2751; [07-49]
     (=ks-x1001		. #x2C51)	; &I-K0-2C51; [12-49]
     (=big5-eten		. #xC855)	; &B-C855;
     (=ucs@gb/fw		. #x0430)	; &J90-2751;
     (=ucs@jis/fw	. #x0430)	; &J90-2751;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER A")
+      (=ucs		  . #x0430)	; а
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2721)	; &J90-2721; [07-01]
       (=gb2312		  . #x2721)	; &I-G0-2721; [07-01]
@@ -1593,16 +1593,16 @@
      ((name		  . "CYRILLIC SMALL LETTER BE")
       (=ucs		  . #x0431)	; б
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER BE")
-      (=ucs		  . #x0431)	; б
-      ))
     (=jis-x0208		. #x2752)	; &J90-2752; [07-50]
     (=gb2312		. #x2752)	; &I-G0-2752; [07-50]
     (=ks-x1001		. #x2C52)	; &I-K0-2C52; [12-50]
     (=big5-eten		. #xC856)	; &B-C856;
     (=ucs@gb/fw		. #x0431)	; &J90-2752;
     (=ucs@jis/fw	. #x0431)	; &J90-2752;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER BE")
+      (=ucs		  . #x0431)	; б
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2722)	; &J90-2722; [07-02]
       (=gb2312		  . #x2722)	; &I-G0-2722; [07-02]
@@ -1626,16 +1626,16 @@
      ((name		  . "CYRILLIC SMALL LETTER VE")
       (=ucs		  . #x0432)	; в
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER VE")
-      (=ucs		  . #x0432)	; в
-      ))
     (=jis-x0208		. #x2753)	; &J90-2753; [07-51]
     (=gb2312		. #x2753)	; &I-G0-2753; [07-51]
     (=ks-x1001		. #x2C53)	; &I-K0-2C53; [12-51]
     (=big5-eten		. #xC857)	; &B-C857;
     (=ucs@gb/fw		. #x0432)	; &J90-2753;
     (=ucs@jis/fw	. #x0432)	; &J90-2753;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER VE")
+      (=ucs		  . #x0432)	; в
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2723)	; &J90-2723; [07-03]
       (=gb2312		  . #x2723)	; &I-G0-2723; [07-03]
@@ -1659,16 +1659,16 @@
      ((name		  . "CYRILLIC SMALL LETTER GHE")
       (=ucs		  . #x0433)	; г
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER GHE")
-      (=ucs		  . #x0433)	; г
-      ))
     (=jis-x0208		. #x2754)	; &J90-2754; [07-52]
     (=gb2312		. #x2754)	; &I-G0-2754; [07-52]
     (=ks-x1001		. #x2C54)	; &I-K0-2C54; [12-52]
     (=big5-eten		. #xC858)	; &B-C858;
     (=ucs@gb/fw		. #x0433)	; &J90-2754;
     (=ucs@jis/fw	. #x0433)	; &J90-2754;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER GHE")
+      (=ucs		  . #x0433)	; г
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2724)	; &J90-2724; [07-04]
       (=gb2312		  . #x2724)	; &I-G0-2724; [07-04]
@@ -1692,16 +1692,16 @@
      ((name		  . "CYRILLIC SMALL LETTER DE")
       (=ucs		  . #x0434)	; д
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER DE")
-      (=ucs		  . #x0434)	; д
-      ))
     (=jis-x0208		. #x2755)	; &J90-2755; [07-53]
     (=gb2312		. #x2755)	; &I-G0-2755; [07-53]
     (=ks-x1001		. #x2C55)	; &I-K0-2C55; [12-53]
     (=big5-eten		. #xC859)	; &B-C859;
     (=ucs@gb/fw		. #x0434)	; &J90-2755;
     (=ucs@jis/fw	. #x0434)	; &J90-2755;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER DE")
+      (=ucs		  . #x0434)	; д
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2725)	; &J90-2725; [07-05]
       (=gb2312		  . #x2725)	; &I-G0-2725; [07-05]
@@ -1725,16 +1725,16 @@
      ((name		  . "CYRILLIC SMALL LETTER IE")
       (=ucs		  . #x0435)	; е
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER IE")
-      (=ucs		  . #x0435)	; е
-      ))
     (=jis-x0208		. #x2756)	; &J90-2756; [07-54]
     (=gb2312		. #x2756)	; &I-G0-2756; [07-54]
     (=ks-x1001		. #x2C56)	; &I-K0-2C56; [12-54]
     (=big5-eten		. #xC85A)	; &B-C85A;
     (=ucs@gb/fw		. #x0435)	; &J90-2756;
     (=ucs@jis/fw	. #x0435)	; &J90-2756;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER IE")
+      (=ucs		  . #x0435)	; е
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2726)	; &J90-2726; [07-06]
       (=gb2312		  . #x2726)	; &I-G0-2726; [07-06]
@@ -1758,16 +1758,16 @@
      ((name		  . "CYRILLIC SMALL LETTER ZHE")
       (=ucs		  . #x0436)	; ж
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER ZHE")
-      (=ucs		  . #x0436)	; ж
-      ))
     (=jis-x0208		. #x2758)	; &J90-2758; [07-56]
     (=gb2312		. #x2758)	; &I-G0-2758; [07-56]
     (=ks-x1001		. #x2C58)	; &I-K0-2C58; [12-56]
     (=big5-eten		. #xC85C)	; &B-C85C;
     (=ucs@gb/fw		. #x0436)	; &J90-2758;
     (=ucs@jis/fw	. #x0436)	; &J90-2758;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER ZHE")
+      (=ucs		  . #x0436)	; ж
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2728)	; &J90-2728; [07-08]
       (=gb2312		  . #x2728)	; &I-G0-2728; [07-08]
@@ -1791,16 +1791,16 @@
      ((name		  . "CYRILLIC SMALL LETTER ZE")
       (=ucs		  . #x0437)	; з
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER ZE")
-      (=ucs		  . #x0437)	; з
-      ))
     (=jis-x0208		. #x2759)	; &J90-2759; [07-57]
     (=gb2312		. #x2759)	; &I-G0-2759; [07-57]
     (=ks-x1001		. #x2C59)	; &I-K0-2C59; [12-57]
     (=big5-eten		. #xC85D)	; &B-C85D;
     (=ucs@gb/fw		. #x0437)	; &J90-2759;
     (=ucs@jis/fw	. #x0437)	; &J90-2759;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER ZE")
+      (=ucs		  . #x0437)	; з
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2729)	; &J90-2729; [07-09]
       (=gb2312		  . #x2729)	; &I-G0-2729; [07-09]
@@ -1824,16 +1824,16 @@
      ((name		  . "CYRILLIC SMALL LETTER I")
       (=ucs		  . #x0438)	; и
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER I")
-      (=ucs		  . #x0438)	; и
-      ))
     (=jis-x0208		. #x275A)	; &J90-275A; [07-58]
     (=gb2312		. #x275A)	; &I-G0-275A; [07-58]
     (=ks-x1001		. #x2C5A)	; &I-K0-2C5A; [12-58]
     (=big5-eten		. #xC85E)	; &B-C85E;
     (=ucs@gb/fw		. #x0438)	; &J90-275A;
     (=ucs@jis/fw	. #x0438)	; &J90-275A;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER I")
+      (=ucs		  . #x0438)	; и
+      ))
     (->uppercase
      ((=jis-x0208	  . #x272A)	; &J90-272A; [07-10]
       (=gb2312		  . #x272A)	; &I-G0-272A; [07-10]
@@ -1864,10 +1864,6 @@
      ((name		  . "CYRILLIC SMALL LETTER SHORT I")
       (=ucs		  . #x0439)	; й
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER SHORT I")
-      (=ucs		  . #x0439)	; й
-      ))
     (=decomposition
      ((=jis-x0208	  . #x275A)	; &J90-275A; [07-58]
       (=gb2312		  . #x275A)	; &I-G0-275A; [07-58]
@@ -1882,6 +1878,10 @@
     (=big5-eten		. #xC85F)	; &B-C85F;
     (=ucs@gb/fw		. #x0439)	; &J90-275B;
     (=ucs@jis/fw	. #x0439)	; &J90-275B;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER SHORT I")
+      (=ucs		  . #x0439)	; й
+      ))
     (->uppercase
      ((=jis-x0208	  . #x272B)	; &J90-272B; [07-11]
       (=gb2312		  . #x272B)	; &I-G0-272B; [07-11]
@@ -1905,16 +1905,16 @@
      ((name		  . "CYRILLIC SMALL LETTER KA")
       (=ucs		  . #x043A)	; к
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER KA")
-      (=ucs		  . #x043A)	; к
-      ))
     (=jis-x0208		. #x275C)	; &J90-275C; [07-60]
     (=gb2312		. #x275C)	; &I-G0-275C; [07-60]
     (=ks-x1001		. #x2C5C)	; &I-K0-2C5C; [12-60]
     (=big5-eten		. #xC860)	; &B-C860;
     (=ucs@gb/fw		. #x043A)	; &J90-275C;
     (=ucs@jis/fw	. #x043A)	; &J90-275C;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER KA")
+      (=ucs		  . #x043A)	; к
+      ))
     (->uppercase
      ((=jis-x0208	  . #x272C)	; &J90-272C; [07-12]
       (=gb2312		  . #x272C)	; &I-G0-272C; [07-12]
@@ -1938,16 +1938,16 @@
      ((name		  . "CYRILLIC SMALL LETTER EL")
       (=ucs		  . #x043B)	; л
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER EL")
-      (=ucs		  . #x043B)	; л
-      ))
     (=jis-x0208		. #x275D)	; &J90-275D; [07-61]
     (=gb2312		. #x275D)	; &I-G0-275D; [07-61]
     (=ks-x1001		. #x2C5D)	; &I-K0-2C5D; [12-61]
     (=big5-eten		. #xC861)	; &B-C861;
     (=ucs@gb/fw		. #x043B)	; &J90-275D;
     (=ucs@jis/fw	. #x043B)	; &J90-275D;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER EL")
+      (=ucs		  . #x043B)	; л
+      ))
     (->uppercase
      ((=jis-x0208	  . #x272D)	; &J90-272D; [07-13]
       (=gb2312		  . #x272D)	; &I-G0-272D; [07-13]
@@ -1971,16 +1971,16 @@
      ((name		  . "CYRILLIC SMALL LETTER EM")
       (=ucs		  . #x043C)	; м
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER EM")
-      (=ucs		  . #x043C)	; м
-      ))
     (=jis-x0208		. #x275E)	; &J90-275E; [07-62]
     (=gb2312		. #x275E)	; &I-G0-275E; [07-62]
     (=ks-x1001		. #x2C5E)	; &I-K0-2C5E; [12-62]
     (=big5-eten		. #xC862)	; &B-C862;
     (=ucs@gb/fw		. #x043C)	; &J90-275E;
     (=ucs@jis/fw	. #x043C)	; &J90-275E;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER EM")
+      (=ucs		  . #x043C)	; м
+      ))
     (->uppercase
      ((=jis-x0208	  . #x272E)	; &J90-272E; [07-14]
       (=gb2312		  . #x272E)	; &I-G0-272E; [07-14]
@@ -2004,16 +2004,16 @@
      ((name		  . "CYRILLIC SMALL LETTER EN")
       (=ucs		  . #x043D)	; н
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER EN")
-      (=ucs		  . #x043D)	; н
-      ))
     (=jis-x0208		. #x275F)	; &J90-275F; [07-63]
     (=gb2312		. #x275F)	; &I-G0-275F; [07-63]
     (=ks-x1001		. #x2C5F)	; &I-K0-2C5F; [12-63]
     (=big5-eten		. #xC863)	; &B-C863;
     (=ucs@gb/fw		. #x043D)	; &J90-275F;
     (=ucs@jis/fw	. #x043D)	; &J90-275F;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER EN")
+      (=ucs		  . #x043D)	; н
+      ))
     (->uppercase
      ((=jis-x0208	  . #x272F)	; &J90-272F; [07-15]
       (=gb2312		  . #x272F)	; &I-G0-272F; [07-15]
@@ -2037,16 +2037,16 @@
      ((name		  . "CYRILLIC SMALL LETTER O")
       (=ucs		  . #x043E)	; о
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER O")
-      (=ucs		  . #x043E)	; о
-      ))
     (=jis-x0208		. #x2760)	; &J90-2760; [07-64]
     (=gb2312		. #x2760)	; &I-G0-2760; [07-64]
     (=ks-x1001		. #x2C60)	; &I-K0-2C60; [12-64]
     (=big5-eten		. #xC864)	; &B-C864;
     (=ucs@gb/fw		. #x043E)	; &J90-2760;
     (=ucs@jis/fw	. #x043E)	; &J90-2760;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER O")
+      (=ucs		  . #x043E)	; о
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2730)	; &J90-2730; [07-16]
       (=gb2312		  . #x2730)	; &I-G0-2730; [07-16]
@@ -2070,16 +2070,16 @@
      ((name		  . "CYRILLIC SMALL LETTER PE")
       (=ucs		  . #x043F)	; п
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER PE")
-      (=ucs		  . #x043F)	; п
-      ))
     (=jis-x0208		. #x2761)	; &J90-2761; [07-65]
     (=gb2312		. #x2761)	; &I-G0-2761; [07-65]
     (=ks-x1001		. #x2C61)	; &I-K0-2C61; [12-65]
     (=big5-eten		. #xC865)	; &B-C865;
     (=ucs@gb/fw		. #x043F)	; &J90-2761;
     (=ucs@jis/fw	. #x043F)	; &J90-2761;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER PE")
+      (=ucs		  . #x043F)	; п
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2731)	; &J90-2731; [07-17]
       (=gb2312		  . #x2731)	; &I-G0-2731; [07-17]
@@ -2103,16 +2103,16 @@
      ((name		  . "CYRILLIC SMALL LETTER ER")
       (=ucs		  . #x0440)	; р
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER ER")
-      (=ucs		  . #x0440)	; р
-      ))
     (=jis-x0208		. #x2762)	; &J90-2762; [07-66]
     (=gb2312		. #x2762)	; &I-G0-2762; [07-66]
     (=ks-x1001		. #x2C62)	; &I-K0-2C62; [12-66]
     (=big5-eten		. #xC866)	; &B-C866;
     (=ucs@gb/fw		. #x0440)	; &J90-2762;
     (=ucs@jis/fw	. #x0440)	; &J90-2762;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER ER")
+      (=ucs		  . #x0440)	; р
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2732)	; &J90-2732; [07-18]
       (=gb2312		  . #x2732)	; &I-G0-2732; [07-18]
@@ -2136,16 +2136,16 @@
      ((name		  . "CYRILLIC SMALL LETTER ES")
       (=ucs		  . #x0441)	; с
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER ES")
-      (=ucs		  . #x0441)	; с
-      ))
     (=jis-x0208		. #x2763)	; &J90-2763; [07-67]
     (=gb2312		. #x2763)	; &I-G0-2763; [07-67]
     (=ks-x1001		. #x2C63)	; &I-K0-2C63; [12-67]
     (=big5-eten		. #xC867)	; &B-C867;
     (=ucs@gb/fw		. #x0441)	; &J90-2763;
     (=ucs@jis/fw	. #x0441)	; &J90-2763;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER ES")
+      (=ucs		  . #x0441)	; с
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2733)	; &J90-2733; [07-19]
       (=gb2312		  . #x2733)	; &I-G0-2733; [07-19]
@@ -2169,16 +2169,16 @@
      ((name		  . "CYRILLIC SMALL LETTER TE")
       (=ucs		  . #x0442)	; т
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER TE")
-      (=ucs		  . #x0442)	; т
-      ))
     (=jis-x0208		. #x2764)	; &J90-2764; [07-68]
     (=gb2312		. #x2764)	; &I-G0-2764; [07-68]
     (=ks-x1001		. #x2C64)	; &I-K0-2C64; [12-68]
     (=big5-eten		. #xC868)	; &B-C868;
     (=ucs@gb/fw		. #x0442)	; &J90-2764;
     (=ucs@jis/fw	. #x0442)	; &J90-2764;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER TE")
+      (=ucs		  . #x0442)	; т
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2734)	; &J90-2734; [07-20]
       (=gb2312		  . #x2734)	; &I-G0-2734; [07-20]
@@ -2202,16 +2202,16 @@
      ((name		  . "CYRILLIC SMALL LETTER U")
       (=ucs		  . #x0443)	; у
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER U")
-      (=ucs		  . #x0443)	; у
-      ))
     (=jis-x0208		. #x2765)	; &J90-2765; [07-69]
     (=gb2312		. #x2765)	; &I-G0-2765; [07-69]
     (=ks-x1001		. #x2C65)	; &I-K0-2C65; [12-69]
     (=big5-eten		. #xC869)	; &B-C869;
     (=ucs@gb/fw		. #x0443)	; &J90-2765;
     (=ucs@jis/fw	. #x0443)	; &J90-2765;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER U")
+      (=ucs		  . #x0443)	; у
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2735)	; &J90-2735; [07-21]
       (=gb2312		  . #x2735)	; &I-G0-2735; [07-21]
@@ -2235,16 +2235,16 @@
      ((name		  . "CYRILLIC SMALL LETTER EF")
       (=ucs		  . #x0444)	; ф
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER EF")
-      (=ucs		  . #x0444)	; ф
-      ))
     (=jis-x0208		. #x2766)	; &J90-2766; [07-70]
     (=gb2312		. #x2766)	; &I-G0-2766; [07-70]
     (=ks-x1001		. #x2C66)	; &I-K0-2C66; [12-70]
     (=big5-eten		. #xC86A)	; &B-C86A;
     (=ucs@gb/fw		. #x0444)	; &J90-2766;
     (=ucs@jis/fw	. #x0444)	; &J90-2766;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER EF")
+      (=ucs		  . #x0444)	; ф
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2736)	; &J90-2736; [07-22]
       (=gb2312		  . #x2736)	; &I-G0-2736; [07-22]
@@ -2268,16 +2268,16 @@
      ((name		  . "CYRILLIC SMALL LETTER HA")
       (=ucs		  . #x0445)	; х
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER HA")
-      (=ucs		  . #x0445)	; х
-      ))
     (=jis-x0208		. #x2767)	; &J90-2767; [07-71]
     (=gb2312		. #x2767)	; &I-G0-2767; [07-71]
     (=ks-x1001		. #x2C67)	; &I-K0-2C67; [12-71]
     (=big5-eten		. #xC86B)	; &B-C86B;
     (=ucs@gb/fw		. #x0445)	; &J90-2767;
     (=ucs@jis/fw	. #x0445)	; &J90-2767;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER HA")
+      (=ucs		  . #x0445)	; х
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2737)	; &J90-2737; [07-23]
       (=gb2312		  . #x2737)	; &I-G0-2737; [07-23]
@@ -2301,16 +2301,16 @@
      ((name		  . "CYRILLIC SMALL LETTER TSE")
       (=ucs		  . #x0446)	; ц
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER TSE")
-      (=ucs		  . #x0446)	; ц
-      ))
     (=jis-x0208		. #x2768)	; &J90-2768; [07-72]
     (=gb2312		. #x2768)	; &I-G0-2768; [07-72]
     (=ks-x1001		. #x2C68)	; &I-K0-2C68; [12-72]
     (=big5-eten		. #xC86C)	; &B-C86C;
     (=ucs@gb/fw		. #x0446)	; &J90-2768;
     (=ucs@jis/fw	. #x0446)	; &J90-2768;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER TSE")
+      (=ucs		  . #x0446)	; ц
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2738)	; &J90-2738; [07-24]
       (=gb2312		  . #x2738)	; &I-G0-2738; [07-24]
@@ -2334,16 +2334,16 @@
      ((name		  . "CYRILLIC SMALL LETTER CHE")
       (=ucs		  . #x0447)	; ч
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER CHE")
-      (=ucs		  . #x0447)	; ч
-      ))
     (=jis-x0208		. #x2769)	; &J90-2769; [07-73]
     (=gb2312		. #x2769)	; &I-G0-2769; [07-73]
     (=ks-x1001		. #x2C69)	; &I-K0-2C69; [12-73]
     (=big5-eten		. #xC86D)	; &B-C86D;
     (=ucs@gb/fw		. #x0447)	; &J90-2769;
     (=ucs@jis/fw	. #x0447)	; &J90-2769;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER CHE")
+      (=ucs		  . #x0447)	; ч
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2739)	; &J90-2739; [07-25]
       (=gb2312		  . #x2739)	; &I-G0-2739; [07-25]
@@ -2367,16 +2367,16 @@
      ((name		  . "CYRILLIC SMALL LETTER SHA")
       (=ucs		  . #x0448)	; ш
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER SHA")
-      (=ucs		  . #x0448)	; ш
-      ))
     (=jis-x0208		. #x276A)	; &J90-276A; [07-74]
     (=gb2312		. #x276A)	; &I-G0-276A; [07-74]
     (=ks-x1001		. #x2C6A)	; &I-K0-2C6A; [12-74]
     (=big5-eten		. #xC86E)	; &B-C86E;
     (=ucs@gb/fw		. #x0448)	; &J90-276A;
     (=ucs@jis/fw	. #x0448)	; &J90-276A;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER SHA")
+      (=ucs		  . #x0448)	; ш
+      ))
     (->uppercase
      ((=jis-x0208	  . #x273A)	; &J90-273A; [07-26]
       (=gb2312		  . #x273A)	; &I-G0-273A; [07-26]
@@ -2400,16 +2400,16 @@
      ((name		  . "CYRILLIC SMALL LETTER SHCHA")
       (=ucs		  . #x0449)	; щ
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER SHCHA")
-      (=ucs		  . #x0449)	; щ
-      ))
     (=jis-x0208		. #x276B)	; &J90-276B; [07-75]
     (=gb2312		. #x276B)	; &I-G0-276B; [07-75]
     (=ks-x1001		. #x2C6B)	; &I-K0-2C6B; [12-75]
     (=big5-eten		. #xC86F)	; &B-C86F;
     (=ucs@gb/fw		. #x0449)	; &J90-276B;
     (=ucs@jis/fw	. #x0449)	; &J90-276B;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER SHCHA")
+      (=ucs		  . #x0449)	; щ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x273B)	; &J90-273B; [07-27]
       (=gb2312		  . #x273B)	; &I-G0-273B; [07-27]
@@ -2433,16 +2433,16 @@
      ((name		  . "CYRILLIC SMALL LETTER HARD SIGN")
       (=ucs		  . #x044A)	; ъ
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER HARD SIGN")
-      (=ucs		  . #x044A)	; ъ
-      ))
     (=jis-x0208		. #x276C)	; &J90-276C; [07-76]
     (=gb2312		. #x276C)	; &I-G0-276C; [07-76]
     (=ks-x1001		. #x2C6C)	; &I-K0-2C6C; [12-76]
     (=big5-eten		. #xC870)	; &B-C870;
     (=ucs@gb/fw		. #x044A)	; &J90-276C;
     (=ucs@jis/fw	. #x044A)	; &J90-276C;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER HARD SIGN")
+      (=ucs		  . #x044A)	; ъ
+      ))
     (->uppercase
      ((=jis-x0208	  . #x273C)	; &J90-273C; [07-28]
       (=gb2312		  . #x273C)	; &I-G0-273C; [07-28]
@@ -2466,16 +2466,16 @@
      ((name		  . "CYRILLIC SMALL LETTER YERU")
       (=ucs		  . #x044B)	; ы
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER YERU")
-      (=ucs		  . #x044B)	; ы
-      ))
     (=jis-x0208		. #x276D)	; &J90-276D; [07-77]
     (=gb2312		. #x276D)	; &I-G0-276D; [07-77]
     (=ks-x1001		. #x2C6D)	; &I-K0-2C6D; [12-77]
     (=big5-eten		. #xC871)	; &B-C871;
     (=ucs@gb/fw		. #x044B)	; &J90-276D;
     (=ucs@jis/fw	. #x044B)	; &J90-276D;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER YERU")
+      (=ucs		  . #x044B)	; ы
+      ))
     (->uppercase
      ((=jis-x0208	  . #x273D)	; &J90-273D; [07-29]
       (=gb2312		  . #x273D)	; &I-G0-273D; [07-29]
@@ -2499,16 +2499,16 @@
      ((name		  . "CYRILLIC SMALL LETTER SOFT SIGN")
       (=ucs		  . #x044C)	; ь
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER SOFT SIGN")
-      (=ucs		  . #x044C)	; ь
-      ))
     (=jis-x0208		. #x276E)	; &J90-276E; [07-78]
     (=gb2312		. #x276E)	; &I-G0-276E; [07-78]
     (=ks-x1001		. #x2C6E)	; &I-K0-2C6E; [12-78]
     (=big5-eten		. #xC872)	; &B-C872;
     (=ucs@gb/fw		. #x044C)	; &J90-276E;
     (=ucs@jis/fw	. #x044C)	; &J90-276E;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER SOFT SIGN")
+      (=ucs		  . #x044C)	; ь
+      ))
     (->uppercase
      ((=jis-x0208	  . #x273E)	; &J90-273E; [07-30]
       (=gb2312		  . #x273E)	; &I-G0-273E; [07-30]
@@ -2532,16 +2532,16 @@
      ((name		  . "CYRILLIC SMALL LETTER E")
       (=ucs		  . #x044D)	; э
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER E")
-      (=ucs		  . #x044D)	; э
-      ))
     (=jis-x0208		. #x276F)	; &J90-276F; [07-79]
     (=gb2312		. #x276F)	; &I-G0-276F; [07-79]
     (=ks-x1001		. #x2C6F)	; &I-K0-2C6F; [12-79]
     (=big5-eten		. #xC873)	; &B-C873;
     (=ucs@gb/fw		. #x044D)	; &J90-276F;
     (=ucs@jis/fw	. #x044D)	; &J90-276F;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER E")
+      (=ucs		  . #x044D)	; э
+      ))
     (->uppercase
      ((=jis-x0208	  . #x273F)	; &J90-273F; [07-31]
       (=gb2312		  . #x273F)	; &I-G0-273F; [07-31]
@@ -2565,16 +2565,16 @@
      ((name		  . "CYRILLIC SMALL LETTER YU")
       (=ucs		  . #x044E)	; ю
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER YU")
-      (=ucs		  . #x044E)	; ю
-      ))
     (=jis-x0208		. #x2770)	; &J90-2770; [07-80]
     (=gb2312		. #x2770)	; &I-G0-2770; [07-80]
     (=ks-x1001		. #x2C70)	; &I-K0-2C70; [12-80]
     (=big5-eten		. #xC874)	; &B-C874;
     (=ucs@gb/fw		. #x044E)	; &J90-2770;
     (=ucs@jis/fw	. #x044E)	; &J90-2770;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER YU")
+      (=ucs		  . #x044E)	; ю
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2740)	; &J90-2740; [07-32]
       (=gb2312		  . #x2740)	; &I-G0-2740; [07-32]
@@ -2598,16 +2598,16 @@
      ((name		  . "CYRILLIC SMALL LETTER YA")
       (=ucs		  . #x044F)	; я
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER YA")
-      (=ucs		  . #x044F)	; я
-      ))
     (=jis-x0208		. #x2771)	; &J90-2771; [07-81]
     (=gb2312		. #x2771)	; &I-G0-2771; [07-81]
     (=ks-x1001		. #x2C71)	; &I-K0-2C71; [12-81]
     (=big5-eten		. #xC875)	; &B-C875;
     (=ucs@gb/fw		. #x044F)	; &J90-2771;
     (=ucs@jis/fw	. #x044F)	; &J90-2771;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER YA")
+      (=ucs		  . #x044F)	; я
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2741)	; &J90-2741; [07-33]
       (=gb2312		  . #x2741)	; &I-G0-2741; [07-33]
@@ -2656,10 +2656,6 @@
      ((name		  . "CYRILLIC SMALL LETTER IO")
       (=ucs		  . #x0451)	; ё
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER IO")
-      (=ucs		  . #x0451)	; ё
-      ))
     (=decomposition
      ((=jis-x0208	  . #x2756)	; &J90-2756; [07-54]
       (=gb2312		  . #x2756)	; &I-G0-2756; [07-54]
@@ -2674,6 +2670,10 @@
     (=big5-eten		. #xC85B)	; &B-C85B;
     (=ucs@gb/fw		. #x0451)	; &J90-2757;
     (=ucs@jis/fw	. #x0451)	; &J90-2757;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER IO")
+      (=ucs		  . #x0451)	; ё
+      ))
     (->uppercase
      ((=jis-x0208	  . #x2727)	; &J90-2727; [07-07]
       (=gb2312		  . #x2727)	; &I-G0-2727; [07-07]
@@ -2698,12 +2698,12 @@
      ((name		  . "CYRILLIC SMALL LETTER DJE")
       (=ucs		  . #x0452)	; ђ
       ))
+    (=jis-x0212		. #x2772)	; &JSP-2772; [07-82]
+    (=ucs@jis/fw	. #x0452)	; &JSP-2772;
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER DJE")
       (=ucs		  . #x0452)	; ђ
       ))
-    (=jis-x0212		. #x2772)	; &JSP-2772; [07-82]
-    (=ucs@jis/fw	. #x0452)	; &JSP-2772;
     (->uppercase
      ((=jis-x0212	  . #x2742)	; &JSP-2742; [07-34]
       ))
@@ -2732,10 +2732,6 @@
      ((name		  . "CYRILLIC SMALL LETTER GJE")
       (=ucs		  . #x0453)	; ѓ
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER GJE")
-      (=ucs		  . #x0453)	; ѓ
-      ))
     (=decomposition
      ((=jis-x0208	  . #x2754)	; &J90-2754; [07-52]
       (=gb2312		  . #x2754)	; &I-G0-2754; [07-52]
@@ -2746,6 +2742,10 @@
       ))
     (=jis-x0212		. #x2773)	; &JSP-2773; [07-83]
     (=ucs@jis/fw	. #x0453)	; &JSP-2773;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER GJE")
+      (=ucs		  . #x0453)	; ѓ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2743)	; &JSP-2743; [07-35]
       ))
@@ -2767,12 +2767,12 @@
      ((name		  . "CYRILLIC SMALL LETTER UKRAINIAN IE")
       (=ucs		  . #x0454)	; є
       ))
+    (=jis-x0212		. #x2774)	; &JSP-2774; [07-84]
+    (=ucs@jis/fw	. #x0454)	; &JSP-2774;
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER UKRAINIAN IE")
       (=ucs		  . #x0454)	; є
       ))
-    (=jis-x0212		. #x2774)	; &JSP-2774; [07-84]
-    (=ucs@jis/fw	. #x0454)	; &JSP-2774;
     (->uppercase
      ((=jis-x0212	  . #x2744)	; &JSP-2744; [07-36]
       ))
@@ -2794,12 +2794,12 @@
      ((name		  . "CYRILLIC SMALL LETTER DZE")
       (=ucs		  . #x0455)	; ѕ
       ))
+    (=jis-x0212		. #x2775)	; &JSP-2775; [07-85]
+    (=ucs@jis/fw	. #x0455)	; &JSP-2775;
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER DZE")
       (=ucs		  . #x0455)	; ѕ
       ))
-    (=jis-x0212		. #x2775)	; &JSP-2775; [07-85]
-    (=ucs@jis/fw	. #x0455)	; &JSP-2775;
     (->uppercase
      ((=jis-x0212	  . #x2745)	; &JSP-2745; [07-37]
       ))
@@ -2821,12 +2821,12 @@
      ((name . "CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I")
       (=ucs		  . #x0456)	; і
       ))
+    (=jis-x0212		. #x2776)	; &JSP-2776; [07-86]
+    (=ucs@jis/fw	. #x0456)	; &JSP-2776;
     (<-fullwidth
      ((name . "CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I")
       (=ucs		  . #x0456)	; і
       ))
-    (=jis-x0212		. #x2776)	; &JSP-2776; [07-86]
-    (=ucs@jis/fw	. #x0456)	; &JSP-2776;
     (->uppercase
      ((=jis-x0212	  . #x2746)	; &JSP-2746; [07-38]
       ))
@@ -2856,10 +2856,6 @@
      ((name		  . "CYRILLIC SMALL LETTER YI")
       (=ucs		  . #x0457)	; ї
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER YI")
-      (=ucs		  . #x0457)	; ї
-      ))
     (=decomposition
      ((=jis-x0212	  . #x2776)	; &JSP-2776; [07-86]
       )
@@ -2868,6 +2864,10 @@
       ))
     (=jis-x0212		. #x2777)	; &JSP-2777; [07-87]
     (=ucs@jis/fw	. #x0457)	; &JSP-2777;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER YI")
+      (=ucs		  . #x0457)	; ї
+      ))
     (->uppercase
      ((=jis-x0212	  . #x2747)	; &JSP-2747; [07-39]
       ))
@@ -2889,12 +2889,12 @@
      ((name		  . "CYRILLIC SMALL LETTER JE")
       (=ucs		  . #x0458)	; ј
       ))
+    (=jis-x0212		. #x2778)	; &JSP-2778; [07-88]
+    (=ucs@jis/fw	. #x0458)	; &JSP-2778;
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER JE")
       (=ucs		  . #x0458)	; ј
       ))
-    (=jis-x0212		. #x2778)	; &JSP-2778; [07-88]
-    (=ucs@jis/fw	. #x0458)	; &JSP-2778;
     (->uppercase
      ((=jis-x0212	  . #x2748)	; &JSP-2748; [07-40]
       ))
@@ -2916,12 +2916,12 @@
      ((name		  . "CYRILLIC SMALL LETTER LJE")
       (=ucs		  . #x0459)	; љ
       ))
+    (=jis-x0212		. #x2779)	; &JSP-2779; [07-89]
+    (=ucs@jis/fw	. #x0459)	; &JSP-2779;
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER LJE")
       (=ucs		  . #x0459)	; љ
       ))
-    (=jis-x0212		. #x2779)	; &JSP-2779; [07-89]
-    (=ucs@jis/fw	. #x0459)	; &JSP-2779;
     (->uppercase
      ((=jis-x0212	  . #x2749)	; &JSP-2749; [07-41]
       ))
@@ -2943,12 +2943,12 @@
      ((name		  . "CYRILLIC SMALL LETTER NJE")
       (=ucs		  . #x045A)	; њ
       ))
+    (=jis-x0212		. #x277A)	; &JSP-277A; [07-90]
+    (=ucs@jis/fw	. #x045A)	; &JSP-277A;
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER NJE")
       (=ucs		  . #x045A)	; њ
       ))
-    (=jis-x0212		. #x277A)	; &JSP-277A; [07-90]
-    (=ucs@jis/fw	. #x045A)	; &JSP-277A;
     (->uppercase
      ((=jis-x0212	  . #x274A)	; &JSP-274A; [07-42]
       ))
@@ -2971,12 +2971,12 @@
      ((name		  . "CYRILLIC SMALL LETTER TSHE")
       (=ucs		  . #x045B)	; ћ
       ))
+    (=jis-x0212		. #x277B)	; &JSP-277B; [07-91]
+    (=ucs@jis/fw	. #x045B)	; &JSP-277B;
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER TSHE")
       (=ucs		  . #x045B)	; ћ
       ))
-    (=jis-x0212		. #x277B)	; &JSP-277B; [07-91]
-    (=ucs@jis/fw	. #x045B)	; &JSP-277B;
     (->uppercase
      ((=jis-x0212	  . #x274B)	; &JSP-274B; [07-43]
       ))
@@ -3005,10 +3005,6 @@
      ((name		  . "CYRILLIC SMALL LETTER KJE")
       (=ucs		  . #x045C)	; ќ
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER KJE")
-      (=ucs		  . #x045C)	; ќ
-      ))
     (=decomposition
      ((=jis-x0208	  . #x275C)	; &J90-275C; [07-60]
       (=gb2312		  . #x275C)	; &I-G0-275C; [07-60]
@@ -3019,6 +3015,10 @@
       ))
     (=jis-x0212		. #x277C)	; &JSP-277C; [07-92]
     (=ucs@jis/fw	. #x045C)	; &JSP-277C;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER KJE")
+      (=ucs		  . #x045C)	; ќ
+      ))
     (->uppercase
      ((=jis-x0212	  . #x274C)	; &JSP-274C; [07-44]
       ))
@@ -3066,10 +3066,6 @@
      ((name		  . "CYRILLIC SMALL LETTER SHORT U")
       (=ucs		  . #x045E)	; ў
       ))
-    (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER SHORT U")
-      (=ucs		  . #x045E)	; ў
-      ))
     (=decomposition
      ((=jis-x0208	  . #x2765)	; &J90-2765; [07-69]
       (=gb2312		  . #x2765)	; &I-G0-2765; [07-69]
@@ -3080,6 +3076,10 @@
       ))
     (=jis-x0212		. #x277D)	; &JSP-277D; [07-93]
     (=ucs@jis/fw	. #x045E)	; &JSP-277D;
+    (<-fullwidth
+     ((name		  . "CYRILLIC SMALL LETTER SHORT U")
+      (=ucs		  . #x045E)	; ў
+      ))
     (->uppercase
      ((=jis-x0212	  . #x274D)	; &JSP-274D; [07-45]
       ))
@@ -3101,12 +3101,12 @@
      ((name		  . "CYRILLIC SMALL LETTER DZHE")
       (=ucs		  . #x045F)	; џ
       ))
+    (=jis-x0212		. #x277E)	; &JSP-277E; [07-94]
+    (=ucs@jis/fw	. #x045F)	; &JSP-277E;
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER DZHE")
       (=ucs		  . #x045F)	; џ
       ))
-    (=jis-x0212		. #x277E)	; &JSP-277E; [07-94]
-    (=ucs@jis/fw	. #x045F)	; &JSP-277E;
     (->uppercase
      ((=jis-x0212	  . #x274E)	; &JSP-274E; [07-46]
       ))
diff --git a/lisp/utf-2000/u00F00-Tibetan.el b/lisp/utf-2000/u00F00-Tibetan.el
index a8ebe11..c8334a6 100644
--- a/lisp/utf-2000/u00F00-Tibetan.el
+++ b/lisp/utf-2000/u00F00-Tibetan.el
@@ -100,11 +100,11 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "tsek tar")
+    (=ucs		. #x0F0C)	; ༌
     (<-noBreak
      ((name		  . "TIBETAN MARK INTERSYLLABIC TSHEG")
       (=ucs		  . #x0F0B)	; ་
       ))
-    (=ucs		. #x0F0C)	; ༌
     ))
 (define-char
   '((name		. "TIBETAN MARK SHAD")
diff --git a/lisp/utf-2000/u01E00-Latin-Extended-Additional.el b/lisp/utf-2000/u01E00-Latin-Extended-Additional.el
index 54ea42c..8c787af 100644
--- a/lisp/utf-2000/u01E00-Latin-Extended-Additional.el
+++ b/lisp/utf-2000/u01E00-Latin-Extended-Additional.el
@@ -886,10 +886,6 @@
      ((name		  . "LATIN CAPITAL LETTER K WITH ACUTE")
       (=ucs		  . #x1E30)	; Ḱ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER K WITH ACUTE")
-      (=ucs		  . #x1E30)	; Ḱ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER K")
       (=ucs		  . #xFF2B)	; Ｋ
@@ -898,6 +894,10 @@
       (=ucs		  . #x0301)	; ́
       ))
     (=jef-china3	. #x85DC)	; &JC3-85DC;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER K WITH ACUTE")
+      (=ucs		  . #x1E30)	; Ḱ
+      ))
     (->lowercase
      ((=jef-china3	  . #x85F2)	; &JC3-85F2;
       ))
@@ -925,10 +925,6 @@
      ((name		  . "LATIN SMALL LETTER K WITH ACUTE")
       (=ucs		  . #x1E31)	; ḱ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER K WITH ACUTE")
-      (=ucs		  . #x1E31)	; ḱ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER K")
       (=ucs		  . #xFF4B)	; ｋ
@@ -937,6 +933,10 @@
       (=ucs		  . #x0301)	; ́
       ))
     (=jef-china3	. #x85F2)	; &JC3-85F2;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER K WITH ACUTE")
+      (=ucs		  . #x1E31)	; ḱ
+      ))
     (->uppercase
      ((=jef-china3	  . #x85DC)	; &JC3-85DC;
       ))
@@ -1180,10 +1180,6 @@
      ((name		  . "LATIN CAPITAL LETTER M WITH ACUTE")
       (=ucs		  . #x1E3E)	; Ḿ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER M WITH ACUTE")
-      (=ucs		  . #x1E3E)	; Ḿ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER M")
       (=ucs		  . #xFF2D)	; ï¼­
@@ -1194,6 +1190,10 @@
     (=jis-x0213-1-2000	. #x2872)	; &JX1-2872; [08-82]
     (=jef-china3	. #x85DE)	; &I-JC3-85DE;
     (=ucs@jis/fw	. #x1E3E)	; &JX1-2872;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER M WITH ACUTE")
+      (=ucs		  . #x1E3E)	; Ḿ
+      ))
     (->lowercase
      ((=jis-x0213-1-2000  . #x2873)	; &JX1-2873; [08-83]
       ))
@@ -1221,10 +1221,6 @@
      ((name		  . "LATIN SMALL LETTER M WITH ACUTE")
       (=ucs		  . #x1E3F)	; ḿ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER M WITH ACUTE")
-      (=ucs		  . #x1E3F)	; ḿ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER M")
       (=ucs		  . #xFF4D)	; ｍ
@@ -1235,6 +1231,10 @@
     (=jis-x0213-1-2000	. #x2873)	; &JX1-2873; [08-83]
     (=jef-china3	. #x85F4)	; &I-JC3-85F4;
     (=ucs@jis/fw	. #x1E3F)	; &JX1-2873;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER M WITH ACUTE")
+      (=ucs		  . #x1E3F)	; ḿ
+      ))
     (->uppercase
      ((=jis-x0213-1-2000  . #x2872)	; &JX1-2872; [08-82]
       ))
@@ -1622,10 +1622,6 @@
      ((name		  . "LATIN CAPITAL LETTER P WITH ACUTE")
       (=ucs		  . #x1E54)	; Ṕ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER P WITH ACUTE")
-      (=ucs		  . #x1E54)	; Ṕ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER P")
       (=ucs		  . #xFF30)	; ï¼°
@@ -1634,6 +1630,10 @@
       (=ucs		  . #x0301)	; ́
       ))
     (=jef-china3	. #x85E1)	; &JC3-85E1;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER P WITH ACUTE")
+      (=ucs		  . #x1E54)	; Ṕ
+      ))
     (->lowercase
      ((=jef-china3	  . #x85F7)	; &JC3-85F7;
       ))
@@ -1661,10 +1661,6 @@
      ((name		  . "LATIN SMALL LETTER P WITH ACUTE")
       (=ucs		  . #x1E55)	; ṕ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER P WITH ACUTE")
-      (=ucs		  . #x1E55)	; ṕ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER P")
       (=ucs		  . #xFF50)	; ｐ
@@ -1673,6 +1669,10 @@
       (=ucs		  . #x0301)	; ́
       ))
     (=jef-china3	. #x85F7)	; &JC3-85F7;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER P WITH ACUTE")
+      (=ucs		  . #x1E55)	; ṕ
+      ))
     (->uppercase
      ((=jef-china3	  . #x85E1)	; &JC3-85E1;
       ))
@@ -1916,10 +1916,6 @@
      ((name		  . "LATIN CAPITAL LETTER S WITH DOT BELOW")
       (=ucs		  . #x1E62)	; á¹¢
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER S WITH DOT BELOW")
-      (=ucs		  . #x1E62)	; á¹¢
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER S")
       (=ucs		  . #xFF33)	; ï¼³
@@ -1928,6 +1924,10 @@
       (=ucs		  . #x0323)	; ̣
       ))
     (=jef-china3	. #x8AC2)	; &JC3-8AC2;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER S WITH DOT BELOW")
+      (=ucs		  . #x1E62)	; á¹¢
+      ))
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER S WITH DOT BELOW")
@@ -2510,10 +2510,6 @@
      ((name		  . "LATIN CAPITAL LETTER W WITH ACUTE")
       (=ucs		  . #x1E82)	; Ẃ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER W WITH ACUTE")
-      (=ucs		  . #x1E82)	; Ẃ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER W")
       (=ucs		  . #xFF37)	; ï¼·
@@ -2522,6 +2518,10 @@
       (=ucs		  . #x0301)	; ́
       ))
     (=jef-china3	. #x85E8)	; &JC3-85E8;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER W WITH ACUTE")
+      (=ucs		  . #x1E82)	; Ẃ
+      ))
     (->lowercase
      ((=jef-china3	  . #x85FE)	; &JC3-85FE;
       ))
@@ -2549,10 +2549,6 @@
      ((name		  . "LATIN SMALL LETTER W WITH ACUTE")
       (=ucs		  . #x1E83)	; ẃ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER W WITH ACUTE")
-      (=ucs		  . #x1E83)	; ẃ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER W")
       (=ucs		  . #xFF57)	; ｗ
@@ -2561,6 +2557,10 @@
       (=ucs		  . #x0301)	; ́
       ))
     (=jef-china3	. #x85FE)	; &JC3-85FE;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER W WITH ACUTE")
+      (=ucs		  . #x1E83)	; ẃ
+      ))
     (->uppercase
      ((=jef-china3	  . #x85E8)	; &JC3-85E8;
       ))
@@ -3085,10 +3085,6 @@
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EA4)	; Ấ
       ))
-    (<-fullwidth
-     ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE")
-      (=ucs		  . #x1EA4)	; Ấ
-      ))
     (=decomposition
      ((=jis-x0212	  . #x2A24)	; &JX1-2939; [10-04]
       (=jis-x0213-1-2000  . #x2939)	; &I-JX1-2939; [09-25]
@@ -3097,6 +3093,10 @@
       (=ucs		  . #x0301)	; ́
       ))
     (=jef-china3	. #x86A7)	; &JC3-86A7;
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EA4)	; Ấ
+      ))
     (->lowercase
      ((=jef-china3	  . #x86AA)	; &JC3-86AA;
       ))
@@ -3127,10 +3127,6 @@
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EA5)	; ấ
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE")
-      (=ucs		  . #x1EA5)	; ấ
-      ))
     (=decomposition
      ((=jis-x0212	  . #x2B24)	; &JX1-2958; [11-04]
       (=jis-x0213-1-2000  . #x2958)	; &I-JX1-2958; [09-56]
@@ -3139,6 +3135,10 @@
       (=ucs		  . #x0301)	; ́
       ))
     (=jef-china3	. #x86AA)	; &JC3-86AA;
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EA5)	; ấ
+      ))
     (->uppercase
      ((=jef-china3	  . #x86A7)	; &JC3-86A7;
       ))
@@ -3169,10 +3169,6 @@
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EA6)	; Ầ
       ))
-    (<-fullwidth
-     ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE")
-      (=ucs		  . #x1EA6)	; Ầ
-      ))
     (=decomposition
      ((=jis-x0212	  . #x2A24)	; &JX1-2939; [10-04]
       (=jis-x0213-1-2000  . #x2939)	; &I-JX1-2939; [09-25]
@@ -3181,6 +3177,10 @@
       (=ucs		  . #x0300)	; ̀
       ))
     (=jef-china3	. #x85B1)	; &JC3-85B1;
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EA6)	; Ầ
+      ))
     (->lowercase
      ((=jef-china3	  . #x85B4)	; &JC3-85B4;
       ))
@@ -3211,10 +3211,6 @@
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EA7)	; ầ
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE")
-      (=ucs		  . #x1EA7)	; ầ
-      ))
     (=decomposition
      ((=jis-x0212	  . #x2B24)	; &JX1-2958; [11-04]
       (=jis-x0213-1-2000  . #x2958)	; &I-JX1-2958; [09-56]
@@ -3223,6 +3219,10 @@
       (=ucs		  . #x0300)	; ̀
       ))
     (=jef-china3	. #x85B4)	; &JC3-85B4;
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EA7)	; ầ
+      ))
     (->uppercase
      ((=jef-china3	  . #x85B1)	; &JC3-85B1;
       ))
@@ -3710,10 +3710,6 @@
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EBE)	; Ế
       ))
-    (<-fullwidth
-     ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE")
-      (=ucs		  . #x1EBE)	; Ế
-      ))
     (=decomposition
      ((=jis-x0212	  . #x2A34)	; &JX1-2941; [10-20]
       (=jis-x0213-1-2000  . #x2941)	; &I-JX1-2941; [09-33]
@@ -3722,6 +3718,10 @@
       (=ucs		  . #x0301)	; ́
       ))
     (=jef-china3	. #x86A8)	; &JC3-86A8;
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EBE)	; Ế
+      ))
     (->lowercase
      ((=jef-china3	  . #x86AB)	; &JC3-86AB;
       ))
@@ -3752,10 +3752,6 @@
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EBF)	; ế
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE")
-      (=ucs		  . #x1EBF)	; ế
-      ))
     (=decomposition
      ((=gb2312		  . #x283A)	; &JX1-2960; [08-26]
       (=jis-x0212	  . #x2B34)	; &I-JSP-2B34; [11-20]
@@ -3765,6 +3761,10 @@
       (=ucs		  . #x0301)	; ́
       ))
     (=jef-china3	. #x86AB)	; &JC3-86AB;
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EBF)	; ế
+      ))
     (->uppercase
      ((=jef-china3	  . #x86A8)	; &JC3-86A8;
       ))
@@ -3795,10 +3795,6 @@
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EC0)	; Ề
       ))
-    (<-fullwidth
-     ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE")
-      (=ucs		  . #x1EC0)	; Ề
-      ))
     (=decomposition
      ((=jis-x0212	  . #x2A34)	; &JX1-2941; [10-20]
       (=jis-x0213-1-2000  . #x2941)	; &I-JX1-2941; [09-33]
@@ -3807,6 +3803,10 @@
       (=ucs		  . #x0300)	; ̀
       ))
     (=jef-china3	. #x85B2)	; &JC3-85B2;
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EC0)	; Ề
+      ))
     (->lowercase
      ((=jef-china3	  . #x85B5)	; &JC3-85B5;
       ))
@@ -3837,10 +3837,6 @@
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EC1)	; ề
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE")
-      (=ucs		  . #x1EC1)	; ề
-      ))
     (=decomposition
      ((=gb2312		  . #x283A)	; &JX1-2960; [08-26]
       (=jis-x0212	  . #x2B34)	; &I-JSP-2B34; [11-20]
@@ -3850,6 +3846,10 @@
       (=ucs		  . #x0300)	; ̀
       ))
     (=jef-china3	. #x85B5)	; &JC3-85B5;
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EC1)	; ề
+      ))
     (->uppercase
      ((=jef-china3	  . #x85B2)	; &JC3-85B2;
       ))
@@ -4169,10 +4169,6 @@
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1ED0)	; Ố
       ))
-    (<-fullwidth
-     ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE")
-      (=ucs		  . #x1ED0)	; Ố
-      ))
     (=decomposition
      ((=jis-x0212	  . #x2A54)	; &JX1-294B; [10-52]
       (=jis-x0213-1-2000  . #x294B)	; &I-JX1-294B; [09-43]
@@ -4181,6 +4177,10 @@
       (=ucs		  . #x0301)	; ́
       ))
     (=jef-china3	. #x86A9)	; &JC3-86A9;
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1ED0)	; Ố
+      ))
     (->lowercase
      ((=jef-china3	  . #x86AC)	; &JC3-86AC;
       ))
@@ -4211,10 +4211,6 @@
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1ED1)	; ố
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE")
-      (=ucs		  . #x1ED1)	; ố
-      ))
     (=decomposition
      ((=jis-x0212	  . #x2B54)	; &JX1-296A; [11-52]
       (=jis-x0213-1-2000  . #x296A)	; &I-JX1-296A; [09-74]
@@ -4223,6 +4219,10 @@
       (=ucs		  . #x0301)	; ́
       ))
     (=jef-china3	. #x86AC)	; &JC3-86AC;
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1ED1)	; ố
+      ))
     (->uppercase
      ((=jef-china3	  . #x86A9)	; &JC3-86A9;
       ))
@@ -4253,10 +4253,6 @@
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1ED2)	; Ồ
       ))
-    (<-fullwidth
-     ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE")
-      (=ucs		  . #x1ED2)	; Ồ
-      ))
     (=decomposition
      ((=jis-x0212	  . #x2A54)	; &JX1-294B; [10-52]
       (=jis-x0213-1-2000  . #x294B)	; &I-JX1-294B; [09-43]
@@ -4265,6 +4261,10 @@
       (=ucs		  . #x0300)	; ̀
       ))
     (=jef-china3	. #x85B3)	; &JC3-85B3;
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1ED2)	; Ồ
+      ))
     (->lowercase
      ((=jef-china3	  . #x85B6)	; &JC3-85B6;
       ))
@@ -4295,10 +4295,6 @@
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1ED3)	; ồ
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE")
-      (=ucs		  . #x1ED3)	; ồ
-      ))
     (=decomposition
      ((=jis-x0212	  . #x2B54)	; &JX1-296A; [11-52]
       (=jis-x0213-1-2000  . #x296A)	; &I-JX1-296A; [09-74]
@@ -4307,6 +4303,10 @@
       (=ucs		  . #x0300)	; ̀
       ))
     (=jef-china3	. #x85B6)	; &JC3-85B6;
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1ED3)	; ồ
+      ))
     (->uppercase
      ((=jef-china3	  . #x85B3)	; &JC3-85B3;
       ))
@@ -4953,10 +4953,6 @@
      ((name		  . "LATIN CAPITAL LETTER Y WITH GRAVE")
       (=ucs		  . #x1EF2)	; Ỳ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER Y WITH GRAVE")
-      (=ucs		  . #x1EF2)	; Ỳ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER Y")
       (=ucs		  . #xFF39)	; ï¼¹
@@ -4965,6 +4961,10 @@
       (=ucs		  . #x0300)	; ̀
       ))
     (=jef-china3	. #x85C0)	; &JC3-85C0;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER Y WITH GRAVE")
+      (=ucs		  . #x1EF2)	; Ỳ
+      ))
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER Y WITH GRAVE")
diff --git a/lisp/utf-2000/u02000-General-Punctuation.el b/lisp/utf-2000/u02000-General-Punctuation.el
index 522d80b..277f968 100644
--- a/lisp/utf-2000/u02000-General-Punctuation.el
+++ b/lisp/utf-2000/u02000-General-Punctuation.el
@@ -26,100 +26,100 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
+    (=ucs		. #x2002)	;  
     (<-compat
      ((name		  . "SPACE")
       (=ucs		  . #x0020)	;
       ))
-    (=ucs		. #x2002)	;  
     ))
 (define-char
   '((name		. "EM SPACE")
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
+    (=ucs		. #x2003)	;  
+    (=cns11643-1	. #x256D)	; &I-C1-256D; [05-77]
     (<-compat
      ((name		  . "SPACE")
       (=ucs		  . #x0020)	;
       ))
-    (=ucs		. #x2003)	;  
-    (=cns11643-1	. #x256D)	; &I-C1-256D; [05-77]
     ))
 (define-char
   '((name		. "THREE-PER-EM SPACE")
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
+    (=ucs		. #x2004)	;  
     (<-compat
      ((name		  . "SPACE")
       (=ucs		  . #x0020)	;
       ))
-    (=ucs		. #x2004)	;  
     ))
 (define-char
   '((name		. "FOUR-PER-EM SPACE")
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
+    (=ucs		. #x2005)	;  
     (<-compat
      ((name		  . "SPACE")
       (=ucs		  . #x0020)	;
       ))
-    (=ucs		. #x2005)	;  
     ))
 (define-char
   '((name		. "SIX-PER-EM SPACE")
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
+    (=ucs		. #x2006)	;  
     (<-compat
      ((name		  . "SPACE")
       (=ucs		  . #x0020)	;
       ))
-    (=ucs		. #x2006)	;  
     ))
 (define-char
   '((name		. "FIGURE SPACE")
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
+    (=ucs		. #x2007)	;  
     (<-noBreak
      ((name		  . "SPACE")
       (=ucs		  . #x0020)	;
       ))
-    (=ucs		. #x2007)	;  
     ))
 (define-char
   '((name		. "PUNCTUATION SPACE")
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
+    (=ucs		. #x2008)	;  
     (<-compat
      ((name		  . "SPACE")
       (=ucs		  . #x0020)	;
       ))
-    (=ucs		. #x2008)	;  
     ))
 (define-char
   '((name		. "THIN SPACE")
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
+    (=ucs		. #x2009)	;  
     (<-compat
      ((name		  . "SPACE")
       (=ucs		  . #x0020)	;
       ))
-    (=ucs		. #x2009)	;  
     ))
 (define-char
   '((name		. "HAIR SPACE")
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
+    (=ucs		. #x200A)	;  
     (<-compat
      ((name		  . "SPACE")
       (=ucs		  . #x0020)	;
       ))
-    (=ucs		. #x200A)	;  
     ))
 (define-char
   '((name		. "ZERO WIDTH SPACE")
@@ -168,23 +168,23 @@
      ((name		  . "HYPHEN")
       (=ucs		  . #x2010)	; ‐
       ))
+    (=jis-x0208		. #x213E)	; &J90-213E; [01-30]
+    (=ucs@jis		. #x2010)	; &J90-213E;
     (<-fullwidth
      ((name		  . "HYPHEN")
       (=ucs		  . #x2010)	; ‐
       ))
-    (=jis-x0208		. #x213E)	; &J90-213E; [01-30]
-    (=ucs@jis		. #x2010)	; &J90-213E;
     ))
 (define-char
   '((name		. "NON-BREAKING HYPHEN")
     (general-category	punctuation dash) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2011)	; ‑
     (<-noBreak
      ((name		  . "HYPHEN")
       (=ucs		  . #x2010)	; ‐
       ))
-    (=ucs		. #x2011)	; ‑
     ))
 (define-char
   '((name		. "FIGURE DASH")
@@ -205,16 +205,16 @@
      ((name		  . "EN DASH")
       (=ucs		  . #x2013)	; –
       ))
-    (<-fullwidth
-     ((name		  . "EN DASH")
-      (=ucs		  . #x2013)	; –
-      ))
     (=cns11643-1	. #x2139)	; &JX1-237C; [01-25]
     (=jis-x0213-1-2000	. #x237C)	; &I-JX1-237C; [03-92]
     (=big5		. #xA156)	; &I-B-A156;
     (=ucs@cns		. #x2013)	; &JX1-237C;
     (=ucs@jis		. #x2013)	; &JX1-237C;
     (=ucs@big5		. #x2013)	; &JX1-237C;
+    (<-fullwidth
+     ((name		  . "EN DASH")
+      (=ucs		  . #x2013)	; –
+      ))
     ))
 (define-char
   '((name		. "EM DASH")
@@ -228,16 +228,16 @@
      ((name		  . "EM DASH")
       (=ucs		  . #x2014)	; —
       ))
-    (<-fullwidth
-     ((name		  . "EM DASH")
-      (=ucs		  . #x2014)	; —
-      ))
     (=jis-x0208		. #x213D)	; &J90-213D; [01-29]
     (=cns11643-1	. #x2137)	; &I-C1-2137; [01-23]
     (=big5		. #xA158)	; &I-B-A158;
     (=ucs@cns		. #x2014)	; &J90-213D;
     (=ucs@jis		. #x2014)	; &J90-213D;
     (=ucs@big5		. #x2014)	; &J90-213D;
+    (<-fullwidth
+     ((name		  . "EM DASH")
+      (=ucs		  . #x2014)	; —
+      ))
     ))
 (define-char
   '((name		. "HORIZONTAL BAR")
@@ -252,14 +252,14 @@
      ((name		  . "HORIZONTAL BAR")
       (=ucs		  . #x2015)	; ―
       ))
-    (<-fullwidth
-     ((name		  . "HORIZONTAL BAR")
-      (=ucs		  . #x2015)	; ―
-      ))
     (=gb2312		. #x212A)	; &K0-212A; [01-10]
     (=ks-x1001		. #x212A)	; &I-K0-212A; [01-10]
     (=ucs@gb		. #x2015)	; &K0-212A;
     (=ucs@ks		. #x2015)	; &K0-212A;
+    (<-fullwidth
+     ((name		  . "HORIZONTAL BAR")
+      (=ucs		  . #x2015)	; ―
+      ))
     ))
 (define-char
   '((name		. "DOUBLE VERTICAL LINE")
@@ -273,16 +273,16 @@
      ((name		  . "DOUBLE VERTICAL LINE")
       (=ucs		  . #x2016)	; ‖
       ))
-    (<-fullwidth
-     ((name		  . "DOUBLE VERTICAL LINE")
-      (=ucs		  . #x2016)	; ‖
-      ))
     (=jis-x0208		. #x2142)	; &J90-2142; [01-34]
     (=gb2312		. #x212C)	; &I-G0-212C; [01-12]
     (=cns11643-1	. #x225D)	; &I-C1-225D; [02-61]
     (=ucs@gb		. #x2016)	; &J90-2142;
     (=ucs@cns		. #x2016)	; &J90-2142;
     (=ucs@jis		. #x2016)	; &J90-2142;
+    (<-fullwidth
+     ((name		  . "DOUBLE VERTICAL LINE")
+      (=ucs		  . #x2016)	; ‖
+      ))
     ))
 (define-char
   '((name		. "DOUBLE LOW LINE")
@@ -311,10 +311,6 @@
      ((name		  . "LEFT SINGLE QUOTATION MARK")
       (=ucs		  . #x2018)	; ‘
       ))
-    (<-fullwidth
-     ((name		  . "LEFT SINGLE QUOTATION MARK")
-      (=ucs		  . #x2018)	; ‘
-      ))
     (=jis-x0208		. #x2146)	; &J90-2146; [01-38]
     (=gb2312		. #x212E)	; &I-G0-212E; [01-14]
     (=ks-x1001		. #x212E)	; &I-K0-212E; [01-14]
@@ -325,6 +321,10 @@
     (=ucs@jis		. #x2018)	; &J90-2146;
     (=ucs@ks		. #x2018)	; &J90-2146;
     (=ucs@big5		. #x2018)	; &J90-2146;
+    (<-fullwidth
+     ((name		  . "LEFT SINGLE QUOTATION MARK")
+      (=ucs		  . #x2018)	; ‘
+      ))
     ))
 (define-char
   '((name		. "RIGHT SINGLE QUOTATION MARK")
@@ -338,10 +338,6 @@
      ((name		  . "RIGHT SINGLE QUOTATION MARK")
       (=ucs		  . #x2019)	; ’
       ))
-    (<-fullwidth
-     ((name		  . "RIGHT SINGLE QUOTATION MARK")
-      (=ucs		  . #x2019)	; ’
-      ))
     (=jis-x0208		. #x2147)	; &J90-2147; [01-39]
     (=gb2312		. #x212F)	; &I-G0-212F; [01-15]
     (=ks-x1001		. #x212F)	; &I-K0-212F; [01-15]
@@ -352,6 +348,10 @@
     (=ucs@jis		. #x2019)	; &J90-2147;
     (=ucs@ks		. #x2019)	; &J90-2147;
     (=ucs@big5		. #x2019)	; &J90-2147;
+    (<-fullwidth
+     ((name		  . "RIGHT SINGLE QUOTATION MARK")
+      (=ucs		  . #x2019)	; ’
+      ))
     ))
 (define-char
   '((name		. "SINGLE LOW-9 QUOTATION MARK")
@@ -379,10 +379,6 @@
      ((name		  . "LEFT DOUBLE QUOTATION MARK")
       (=ucs		  . #x201C)	; “
       ))
-    (<-fullwidth
-     ((name		  . "LEFT DOUBLE QUOTATION MARK")
-      (=ucs		  . #x201C)	; “
-      ))
     (=jis-x0208		. #x2148)	; &J90-2148; [01-40]
     (=gb2312		. #x2130)	; &I-G0-2130; [01-16]
     (=ks-x1001		. #x2130)	; &I-K0-2130; [01-16]
@@ -393,6 +389,10 @@
     (=ucs@jis		. #x201C)	; &J90-2148;
     (=ucs@ks		. #x201C)	; &J90-2148;
     (=ucs@big5		. #x201C)	; &J90-2148;
+    (<-fullwidth
+     ((name		  . "LEFT DOUBLE QUOTATION MARK")
+      (=ucs		  . #x201C)	; “
+      ))
     ))
 (define-char
   '((name		. "RIGHT DOUBLE QUOTATION MARK")
@@ -406,10 +406,6 @@
      ((name		  . "RIGHT DOUBLE QUOTATION MARK")
       (=ucs		  . #x201D)	; ”
       ))
-    (<-fullwidth
-     ((name		  . "RIGHT DOUBLE QUOTATION MARK")
-      (=ucs		  . #x201D)	; ”
-      ))
     (=jis-x0208		. #x2149)	; &J90-2149; [01-41]
     (=gb2312		. #x2131)	; &I-G0-2131; [01-17]
     (=ks-x1001		. #x2131)	; &I-K0-2131; [01-17]
@@ -420,6 +416,10 @@
     (=ucs@jis		. #x201D)	; &J90-2149;
     (=ucs@ks		. #x201D)	; &J90-2149;
     (=ucs@big5		. #x201D)	; &J90-2149;
+    (<-fullwidth
+     ((name		  . "RIGHT DOUBLE QUOTATION MARK")
+      (=ucs		  . #x201D)	; ”
+      ))
     ))
 (define-char
   '((name		. "DOUBLE LOW-9 QUOTATION MARK")
@@ -447,15 +447,15 @@
      ((name		  . "DAGGER")
       (=ucs		  . #x2020)	; †
       ))
-    (<-fullwidth
-     ((name		  . "DAGGER")
-      (=ucs		  . #x2020)	; †
-      ))
     (=jis-x0208@1983	. #x2277)	; &J90-2277; [02-87]
     (=ks-x1001		. #x2253)	; &I-K0-2253; [02-51]
     (=jis-x0208@1990	. #x2277)	; &I-J90-2277; [02-87]
     (=ucs@jis		. #x2020)	; &J90-2277;
     (=ucs@ks		. #x2020)	; &J90-2277;
+    (<-fullwidth
+     ((name		  . "DAGGER")
+      (=ucs		  . #x2020)	; †
+      ))
     ))
 (define-char
   '((name		. "DOUBLE DAGGER")
@@ -469,15 +469,15 @@
      ((name		  . "DOUBLE DAGGER")
       (=ucs		  . #x2021)	; ‡
       ))
-    (<-fullwidth
-     ((name		  . "DOUBLE DAGGER")
-      (=ucs		  . #x2021)	; ‡
-      ))
     (=jis-x0208@1983	. #x2278)	; &J90-2278; [02-88]
     (=ks-x1001		. #x2254)	; &I-K0-2254; [02-52]
     (=jis-x0208@1990	. #x2278)	; &I-J90-2278; [02-88]
     (=ucs@jis		. #x2021)	; &J90-2278;
     (=ucs@ks		. #x2021)	; &J90-2278;
+    (<-fullwidth
+     ((name		  . "DOUBLE DAGGER")
+      (=ucs		  . #x2021)	; ‡
+      ))
     ))
 (define-char
   '((name		. "BULLET")
@@ -491,12 +491,12 @@
      ((name		  . "BULLET")
       (=ucs		  . #x2022)	; •
       ))
+    (=jis-x0213-1-2000	. #x2340)	; &JX1-2340; [03-32]
+    (=ucs@jis/fw	. #x2022)	; &JX1-2340;
     (<-fullwidth
      ((name		  . "BULLET")
       (=ucs		  . #x2022)	; •
       ))
-    (=jis-x0213-1-2000	. #x2340)	; &JX1-2340; [03-32]
-    (=ucs@jis/fw	. #x2022)	; &JX1-2340;
     ))
 (define-char
   '((name		. "TRIANGULAR BULLET")
@@ -510,11 +510,11 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2024)	; ․
     (<-compat
      ((name		  . "FULL STOP")
       (=ucs		  . #x002E)	; .
       ))
-    (=ucs		. #x2024)	; ․
     ))
 (define-char
   '((name		. "TWO DOT LEADER")
@@ -535,10 +535,6 @@
      ((name		  . "TWO DOT LEADER")
       (=ucs		  . #x2025)	; ‥
       ))
-    (<-fullwidth
-     ((name		  . "TWO DOT LEADER")
-      (=ucs		  . #x2025)	; ‥
-      ))
     (=jis-x0208		. #x2145)	; &J90-2145; [01-37]
     (=ks-x1001		. #x2125)	; &I-K0-2125; [01-05]
     (=cns11643-1	. #x212D)	; &I-C1-212D; [01-13]
@@ -547,6 +543,10 @@
     (=ucs@jis		. #x2025)	; &J90-2145;
     (=ucs@ks		. #x2025)	; &J90-2145;
     (=ucs@big5		. #x2025)	; &J90-2145;
+    (<-fullwidth
+     ((name		  . "TWO DOT LEADER")
+      (=ucs		  . #x2025)	; ‥
+      ))
     ))
 (define-char
   '((name		. "HORIZONTAL ELLIPSIS")
@@ -570,10 +570,6 @@
      ((name		  . "HORIZONTAL ELLIPSIS")
       (=ucs		  . #x2026)	; …
       ))
-    (<-fullwidth
-     ((name		  . "HORIZONTAL ELLIPSIS")
-      (=ucs		  . #x2026)	; …
-      ))
     (=jis-x0208		. #x2144)	; &J90-2144; [01-36]
     (=gb2312		. #x212D)	; &I-G0-212D; [01-13]
     (=ks-x1001		. #x2126)	; &I-K0-2126; [01-06]
@@ -584,6 +580,10 @@
     (=ucs@jis		. #x2026)	; &J90-2144;
     (=ucs@ks		. #x2026)	; &J90-2144;
     (=ucs@big5		. #x2026)	; &J90-2144;
+    (<-fullwidth
+     ((name		  . "HORIZONTAL ELLIPSIS")
+      (=ucs		  . #x2026)	; …
+      ))
     ))
 (define-char
   '((name		. "HYPHENATION POINT")
@@ -597,14 +597,14 @@
      ((name		  . "HYPHENATION POINT")
       (=ucs		  . #x2027)	; ‧
       ))
-    (<-fullwidth
-     ((name		  . "HYPHENATION POINT")
-      (=ucs		  . #x2027)	; ‧
-      ))
     (=cns11643-1	. #x2126)	; &C1-2126; [01-06]
     (=big5		. #xA145)	; &I-B-A145;
     (=ucs@cns		. #x2027)	; &C1-2126;
     (=ucs@big5		. #x2027)	; &C1-2126;
+    (<-fullwidth
+     ((name		  . "HYPHENATION POINT")
+      (=ucs		  . #x2027)	; ‧
+      ))
     ))
 (define-char
   '((name		. "LINE SEPARATOR")
@@ -660,11 +660,11 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
+    (=ucs		. #x202F)	;  
     (<-noBreak
      ((name		  . "SPACE")
       (=ucs		  . #x0020)	;
       ))
-    (=ucs		. #x202F)	;  
     ))
 (define-char
   '((name		. "PER MILLE SIGN")
@@ -678,10 +678,6 @@
      ((name		  . "PER MILLE SIGN")
       (=ucs		  . #x2030)	; ‰
       ))
-    (<-fullwidth
-     ((name		  . "PER MILLE SIGN")
-      (=ucs		  . #x2030)	; ‰
-      ))
     (=gb2312		. #x216B)	; &J90-2273; [01-75]
     (=jis-x0208@1983	. #x2273)	; &I-J83-2273; [02-83]
     (=ks-x1001		. #x2236)	; &I-K0-2236; [02-22]
@@ -689,6 +685,10 @@
     (=ucs@gb		. #x2030)	; &J90-2273;
     (=ucs@jis		. #x2030)	; &J90-2273;
     (=ucs@ks		. #x2030)	; &J90-2273;
+    (<-fullwidth
+     ((name		  . "PER MILLE SIGN")
+      (=ucs		  . #x2030)	; ‰
+      ))
     ))
 (define-char
   '((name		. "PER TEN THOUSAND SIGN")
@@ -709,10 +709,6 @@
      ((name		  . "PRIME")
       (=ucs		  . #x2032)	; ′
       ))
-    (<-fullwidth
-     ((name		  . "PRIME")
-      (=ucs		  . #x2032)	; ′
-      ))
     (=jis-x0208		. #x216C)	; &J90-216C; [01-76]
     (=gb2312		. #x2164)	; &I-G0-2164; [01-68]
     (=ks-x1001		. #x2147)	; &I-K0-2147; [01-39]
@@ -723,6 +719,10 @@
     (=ucs@jis		. #x2032)	; &J90-216C;
     (=ucs@ks		. #x2032)	; &J90-216C;
     (=ucs@big5		. #x2032)	; &J90-216C;
+    (<-fullwidth
+     ((name		  . "PRIME")
+      (=ucs		  . #x2032)	; ′
+      ))
     ))
 (define-char
   '((name		. "DOUBLE PRIME")
@@ -743,16 +743,16 @@
      ((name		  . "DOUBLE PRIME")
       (=ucs		  . #x2033)	; ″
       ))
-    (<-fullwidth
-     ((name		  . "DOUBLE PRIME")
-      (=ucs		  . #x2033)	; ″
-      ))
     (=jis-x0208		. #x216D)	; &J90-216D; [01-77]
     (=gb2312		. #x2165)	; &I-G0-2165; [01-69]
     (=ks-x1001		. #x2148)	; &I-K0-2148; [01-40]
     (=ucs@gb		. #x2033)	; &J90-216D;
     (=ucs@jis		. #x2033)	; &J90-216D;
     (=ucs@ks		. #x2033)	; &J90-216D;
+    (<-fullwidth
+     ((name		  . "DOUBLE PRIME")
+      (=ucs		  . #x2033)	; ″
+      ))
     ))
 (define-char
   '((name		. "TRIPLE PRIME")
@@ -783,14 +783,14 @@
      ((name		  . "REVERSED PRIME")
       (=ucs		  . #x2035)	; ‵
       ))
-    (<-fullwidth
-     ((name		  . "REVERSED PRIME")
-      (=ucs		  . #x2035)	; ‵
-      ))
     (=cns11643-1	. #x216A)	; &C1-216A; [01-74]
     (=big5		. #xA1AB)	; &I-B-A1AB;
     (=ucs@cns		. #x2035)	; &C1-216A;
     (=ucs@big5		. #x2035)	; &C1-216A;
+    (<-fullwidth
+     ((name		  . "REVERSED PRIME")
+      (=ucs		  . #x2035)	; ‵
+      ))
     ))
 (define-char
   '((name		. "REVERSED DOUBLE PRIME")
@@ -856,10 +856,6 @@
      ((name		  . "REFERENCE MARK")
       (=ucs		  . #x203B)	; ※
       ))
-    (<-fullwidth
-     ((name		  . "REFERENCE MARK")
-      (=ucs		  . #x203B)	; ※
-      ))
     (=jis-x0208		. #x2228)	; &J90-2228; [02-08]
     (=gb2312		. #x2179)	; &I-G0-2179; [01-89]
     (=ks-x1001		. #x2158)	; &I-K0-2158; [01-56]
@@ -870,6 +866,10 @@
     (=ucs@jis		. #x203B)	; &J90-2228;
     (=ucs@ks		. #x203B)	; &J90-2228;
     (=ucs@big5		. #x203B)	; &J90-2228;
+    (<-fullwidth
+     ((name		  . "REFERENCE MARK")
+      (=ucs		  . #x203B)	; ※
+      ))
     ))
 (define-char
   '((name		. "DOUBLE EXCLAMATION MARK")
@@ -890,12 +890,12 @@
      ((name		  . "DOUBLE EXCLAMATION MARK")
       (=ucs		  . #x203C)	; ‼
       ))
+    (=jis-x0213-1-2000	. #x286B)	; &JX1-286B; [08-75]
+    (=ucs@jis		. #x203C)	; &JX1-286B;
     (<-fullwidth
      ((name		  . "DOUBLE EXCLAMATION MARK")
       (=ucs		  . #x203C)	; ‼
       ))
-    (=jis-x0213-1-2000	. #x286B)	; &JX1-286B; [08-75]
-    (=ucs@jis		. #x203C)	; &JX1-286B;
     ))
 (define-char
   '((name		. "INTERROBANG")
@@ -926,10 +926,6 @@
       (=ucs		  . #x203E)	; ‾
       ))
     (name		. "FULLWIDTH OVERLINE")
-    (<-fullwidth
-     ((name		  . "OVERLINE")
-      (=ucs		  . #x203E)	; ‾
-      ))
     (=jis-x0208		. #x2131)	; &J90-2131; [01-17]
     (=gb2312		. #x237E)	; &I-G0-237E; [03-94]
     (=ks-x1001		. #x237E)	; &I-K0-237E; [03-94]
@@ -937,6 +933,10 @@
     (=big5		. #xA1C2)	; &I-B-A1C2;
     (=ucs@gb		. #xFFE3)	; &J90-2131;
     (=ucs@jis		. #x203E)	; &J90-2131;
+    (<-fullwidth
+     ((name		  . "OVERLINE")
+      (=ucs		  . #x203E)	; ‾
+      ))
     ))
 (define-char
   '((name		. "UNDERTIE")
@@ -972,12 +972,12 @@
      ((name		  . "ASTERISM")
       (=ucs		  . #x2042)	; ⁂
       ))
+    (=jis-x0213-1-2000	. #x2C7E)	; &JX1-2C7E; [12-94]
+    (=ucs@jis		. #x2042)	; &JX1-2C7E;
     (<-fullwidth
      ((name		  . "ASTERISM")
       (=ucs		  . #x2042)	; ⁂
       ))
-    (=jis-x0213-1-2000	. #x2C7E)	; &JX1-2C7E; [12-94]
-    (=ucs@jis		. #x2042)	; &JX1-2C7E;
     ))
 (define-char
   '((name		. "HYPHEN BULLET")
@@ -1024,12 +1024,12 @@
      ((name		  . "DOUBLE QUESTION MARK")
       (=ucs		  . #x2047)	; ⁇
       ))
+    (=jis-x0213-1-2000	. #x286C)	; &JX1-286C; [08-76]
+    (=ucs@jis		. #x2047)	; &JX1-286C;
     (<-fullwidth
      ((name		  . "DOUBLE QUESTION MARK")
       (=ucs		  . #x2047)	; ⁇
       ))
-    (=jis-x0213-1-2000	. #x286C)	; &JX1-286C; [08-76]
-    (=ucs@jis		. #x2047)	; &JX1-286C;
     ))
 (define-char
   '((name		. "QUESTION EXCLAMATION MARK")
@@ -1050,12 +1050,12 @@
      ((name		  . "QUESTION EXCLAMATION MARK")
       (=ucs		  . #x2048)	; ⁈
       ))
+    (=jis-x0213-1-2000	. #x286D)	; &JX1-286D; [08-77]
+    (=ucs@jis		. #x2048)	; &JX1-286D;
     (<-fullwidth
      ((name		  . "QUESTION EXCLAMATION MARK")
       (=ucs		  . #x2048)	; ⁈
       ))
-    (=jis-x0213-1-2000	. #x286D)	; &JX1-286D; [08-77]
-    (=ucs@jis		. #x2048)	; &JX1-286D;
     ))
 (define-char
   '((name		. "EXCLAMATION QUESTION MARK")
@@ -1076,12 +1076,12 @@
      ((name		  . "EXCLAMATION QUESTION MARK")
       (=ucs		  . #x2049)	; ⁉
       ))
+    (=jis-x0213-1-2000	. #x286E)	; &JX1-286E; [08-78]
+    (=ucs@jis		. #x2049)	; &JX1-286E;
     (<-fullwidth
      ((name		  . "EXCLAMATION QUESTION MARK")
       (=ucs		  . #x2049)	; ⁉
       ))
-    (=jis-x0213-1-2000	. #x286E)	; &JX1-286E; [08-78]
-    (=ucs@jis		. #x2049)	; &JX1-286E;
     ))
 (define-char
   '((name		. "TIRONIAN SIGN ET")
diff --git a/lisp/utf-2000/u02070-Superscripts.el b/lisp/utf-2000/u02070-Superscripts.el
index 39c5362..c342d40 100644
--- a/lisp/utf-2000/u02070-Superscripts.el
+++ b/lisp/utf-2000/u02070-Superscripts.el
@@ -7,11 +7,11 @@
     (decimal-digit-value . 0)
     (digit-value	 . 0)
     (numeric-value	 . 0)
+    (=ucs		. #x2070)	; ⁰
     (<-superscript
      ((name		  . "DIGIT ZERO")
       (=ucs		  . #x0030)	; 0
       ))
-    (=ucs		. #x2070)	; ⁰
     ))
 (define-char
   '((name		. "SUPERSCRIPT FOUR")
@@ -21,22 +21,22 @@
     (decimal-digit-value . 4)
     (digit-value	 . 4)
     (numeric-value	 . 4)
+    (=ucs		. #x2074)	; ⁴
     (<-superscript
      ((name		  . "DIGIT FOUR")
       (=ucs		  . #x0034)	; 4
       ))
-    (=ucs		. #x2074)	; ⁴
     ))
 (define-char
   '((<-denotational
      ((name		  . "SUPERSCRIPT FOUR")
       (=ucs		  . #x2074)	; ⁴
       ))
+    (=ks-x1001		. #x2979)	; &K0-2979; [09-89]
     (<-fullwidth
      ((name		  . "SUPERSCRIPT FOUR")
       (=ucs		  . #x2074)	; ⁴
       ))
-    (=ks-x1001		. #x2979)	; &K0-2979; [09-89]
     ))
 (define-char
   '((name		. "SUPERSCRIPT FIVE")
@@ -46,11 +46,11 @@
     (decimal-digit-value . 5)
     (digit-value	 . 5)
     (numeric-value	 . 5)
+    (=ucs		. #x2075)	; ⁵
     (<-superscript
      ((name		  . "DIGIT FIVE")
       (=ucs		  . #x0035)	; 5
       ))
-    (=ucs		. #x2075)	; ⁵
     ))
 (define-char
   '((name		. "SUPERSCRIPT SIX")
@@ -60,11 +60,11 @@
     (decimal-digit-value . 6)
     (digit-value	 . 6)
     (numeric-value	 . 6)
+    (=ucs		. #x2076)	; ⁶
     (<-superscript
      ((name		  . "DIGIT SIX")
       (=ucs		  . #x0036)	; 6
       ))
-    (=ucs		. #x2076)	; ⁶
     ))
 (define-char
   '((name		. "SUPERSCRIPT SEVEN")
@@ -74,11 +74,11 @@
     (decimal-digit-value . 7)
     (digit-value	 . 7)
     (numeric-value	 . 7)
+    (=ucs		. #x2077)	; ⁷
     (<-superscript
      ((name		  . "DIGIT SEVEN")
       (=ucs		  . #x0037)	; 7
       ))
-    (=ucs		. #x2077)	; ⁷
     ))
 (define-char
   '((name		. "SUPERSCRIPT EIGHT")
@@ -88,11 +88,11 @@
     (decimal-digit-value . 8)
     (digit-value	 . 8)
     (numeric-value	 . 8)
+    (=ucs		. #x2078)	; ⁸
     (<-superscript
      ((name		  . "DIGIT EIGHT")
       (=ucs		  . #x0038)	; 8
       ))
-    (=ucs		. #x2078)	; ⁸
     ))
 (define-char
   '((name		. "SUPERSCRIPT NINE")
@@ -102,86 +102,86 @@
     (decimal-digit-value . 9)
     (digit-value	 . 9)
     (numeric-value	 . 9)
+    (=ucs		. #x2079)	; ⁹
     (<-superscript
      ((name		  . "DIGIT NINE")
       (=ucs		  . #x0039)	; 9
       ))
-    (=ucs		. #x2079)	; ⁹
     ))
 (define-char
   '((name		. "SUPERSCRIPT PLUS SIGN")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
+    (=ucs		. #x207A)	; ⁺
     (<-superscript
      ((name		  . "PLUS SIGN")
       (=ucs		  . #x002B)	; +
       ))
-    (=ucs		. #x207A)	; ⁺
     ))
 (define-char
   '((name		. "SUPERSCRIPT MINUS")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
+    (=ucs		. #x207B)	; ⁻
     (<-superscript
      ((name		  . "MINUS SIGN")
       (=ucs		  . #x2212)	; −
       ))
-    (=ucs		. #x207B)	; ⁻
     ))
 (define-char
   '((name		. "SUPERSCRIPT EQUALS SIGN")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x207C)	; ⁼
     (<-superscript
      ((name		  . "EQUALS SIGN")
       (=ucs		  . #x003D)	; =
       ))
-    (=ucs		. #x207C)	; ⁼
     ))
 (define-char
   '((name		. "SUPERSCRIPT LEFT PARENTHESIS")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
+    (=ucs		. #x207D)	; ⁽
     (<-superscript
      ((name		  . "LEFT PARENTHESIS")
       (=ucs		  . #x0028)	; (
       ))
-    (=ucs		. #x207D)	; ⁽
     ))
 (define-char
   '((name		. "SUPERSCRIPT RIGHT PARENTHESIS")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
+    (=ucs		. #x207E)	; ⁾
     (<-superscript
      ((name		  . "RIGHT PARENTHESIS")
       (=ucs		  . #x0029)	; )
       ))
-    (=ucs		. #x207E)	; ⁾
     ))
 (define-char
   '((name		. "SUPERSCRIPT LATIN SMALL LETTER N")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x207F)	; ⁿ
     (<-superscript
      ((name		  . "LATIN SMALL LETTER N")
       (=ucs		  . #x006E)	; n
       ))
-    (=ucs		. #x207F)	; ⁿ
     ))
 (define-char
   '((<-denotational
      ((name		  . "SUPERSCRIPT LATIN SMALL LETTER N")
       (=ucs		  . #x207F)	; ⁿ
       ))
+    (=ks-x1001		. #x297A)	; &K0-297A; [09-90]
     (<-fullwidth
      ((name		  . "SUPERSCRIPT LATIN SMALL LETTER N")
       (=ucs		  . #x207F)	; ⁿ
       ))
-    (=ks-x1001		. #x297A)	; &K0-297A; [09-90]
     ))
diff --git a/lisp/utf-2000/u02080-Subscripts.el b/lisp/utf-2000/u02080-Subscripts.el
index 9dd853d..e9f34a5 100644
--- a/lisp/utf-2000/u02080-Subscripts.el
+++ b/lisp/utf-2000/u02080-Subscripts.el
@@ -7,11 +7,11 @@
     (decimal-digit-value . 0)
     (digit-value	 . 0)
     (numeric-value	 . 0)
+    (=ucs		. #x2080)	; ₀
     (<-subscript
      ((name		  . "DIGIT ZERO")
       (=ucs		  . #x0030)	; 0
       ))
-    (=ucs		. #x2080)	; ₀
     ))
 (define-char
   '((name		. "SUBSCRIPT ONE")
@@ -21,22 +21,22 @@
     (decimal-digit-value . 1)
     (digit-value	 . 1)
     (numeric-value	 . 1)
+    (=ucs		. #x2081)	; ₁
     (<-subscript
      ((name		  . "DIGIT ONE")
       (=ucs		  . #x0031)	; 1
       ))
-    (=ucs		. #x2081)	; ₁
     ))
 (define-char
   '((<-denotational
      ((name		  . "SUBSCRIPT ONE")
       (=ucs		  . #x2081)	; ₁
       ))
+    (=ks-x1001		. #x297B)	; &K0-297B; [09-91]
     (<-fullwidth
      ((name		  . "SUBSCRIPT ONE")
       (=ucs		  . #x2081)	; ₁
       ))
-    (=ks-x1001		. #x297B)	; &K0-297B; [09-91]
     ))
 (define-char
   '((name		. "SUBSCRIPT TWO")
@@ -46,22 +46,22 @@
     (decimal-digit-value . 2)
     (digit-value	 . 2)
     (numeric-value	 . 2)
+    (=ucs		. #x2082)	; ₂
     (<-subscript
      ((name		  . "DIGIT TWO")
       (=ucs		  . #x0032)	; 2
       ))
-    (=ucs		. #x2082)	; ₂
     ))
 (define-char
   '((<-denotational
      ((name		  . "SUBSCRIPT TWO")
       (=ucs		  . #x2082)	; ₂
       ))
+    (=ks-x1001		. #x297C)	; &K0-297C; [09-92]
     (<-fullwidth
      ((name		  . "SUBSCRIPT TWO")
       (=ucs		  . #x2082)	; ₂
       ))
-    (=ks-x1001		. #x297C)	; &K0-297C; [09-92]
     ))
 (define-char
   '((name		. "SUBSCRIPT THREE")
@@ -71,22 +71,22 @@
     (decimal-digit-value . 3)
     (digit-value	 . 3)
     (numeric-value	 . 3)
+    (=ucs		. #x2083)	; ₃
     (<-subscript
      ((name		  . "DIGIT THREE")
       (=ucs		  . #x0033)	; 3
       ))
-    (=ucs		. #x2083)	; ₃
     ))
 (define-char
   '((<-denotational
      ((name		  . "SUBSCRIPT THREE")
       (=ucs		  . #x2083)	; ₃
       ))
+    (=ks-x1001		. #x297D)	; &K0-297D; [09-93]
     (<-fullwidth
      ((name		  . "SUBSCRIPT THREE")
       (=ucs		  . #x2083)	; ₃
       ))
-    (=ks-x1001		. #x297D)	; &K0-297D; [09-93]
     ))
 (define-char
   '((name		. "SUBSCRIPT FOUR")
@@ -96,22 +96,22 @@
     (decimal-digit-value . 4)
     (digit-value	 . 4)
     (numeric-value	 . 4)
+    (=ucs		. #x2084)	; ₄
     (<-subscript
      ((name		  . "DIGIT FOUR")
       (=ucs		  . #x0034)	; 4
       ))
-    (=ucs		. #x2084)	; ₄
     ))
 (define-char
   '((<-denotational
      ((name		  . "SUBSCRIPT FOUR")
       (=ucs		  . #x2084)	; ₄
       ))
+    (=ks-x1001		. #x297E)	; &K0-297E; [09-94]
     (<-fullwidth
      ((name		  . "SUBSCRIPT FOUR")
       (=ucs		  . #x2084)	; ₄
       ))
-    (=ks-x1001		. #x297E)	; &K0-297E; [09-94]
     ))
 (define-char
   '((name		. "SUBSCRIPT FIVE")
@@ -121,11 +121,11 @@
     (decimal-digit-value . 5)
     (digit-value	 . 5)
     (numeric-value	 . 5)
+    (=ucs		. #x2085)	; ₅
     (<-subscript
      ((name		  . "DIGIT FIVE")
       (=ucs		  . #x0035)	; 5
       ))
-    (=ucs		. #x2085)	; ₅
     ))
 (define-char
   '((name		. "SUBSCRIPT SIX")
@@ -135,11 +135,11 @@
     (decimal-digit-value . 6)
     (digit-value	 . 6)
     (numeric-value	 . 6)
+    (=ucs		. #x2086)	; ₆
     (<-subscript
      ((name		  . "DIGIT SIX")
       (=ucs		  . #x0036)	; 6
       ))
-    (=ucs		. #x2086)	; ₆
     ))
 (define-char
   '((name		. "SUBSCRIPT SEVEN")
@@ -149,11 +149,11 @@
     (decimal-digit-value . 7)
     (digit-value	 . 7)
     (numeric-value	 . 7)
+    (=ucs		. #x2087)	; ₇
     (<-subscript
      ((name		  . "DIGIT SEVEN")
       (=ucs		  . #x0037)	; 7
       ))
-    (=ucs		. #x2087)	; ₇
     ))
 (define-char
   '((name		. "SUBSCRIPT EIGHT")
@@ -163,11 +163,11 @@
     (decimal-digit-value . 8)
     (digit-value	 . 8)
     (numeric-value	 . 8)
+    (=ucs		. #x2088)	; ₈
     (<-subscript
      ((name		  . "DIGIT EIGHT")
       (=ucs		  . #x0038)	; 8
       ))
-    (=ucs		. #x2088)	; ₈
     ))
 (define-char
   '((name		. "SUBSCRIPT NINE")
@@ -177,64 +177,64 @@
     (decimal-digit-value . 9)
     (digit-value	 . 9)
     (numeric-value	 . 9)
+    (=ucs		. #x2089)	; ₉
     (<-subscript
      ((name		  . "DIGIT NINE")
       (=ucs		  . #x0039)	; 9
       ))
-    (=ucs		. #x2089)	; ₉
     ))
 (define-char
   '((name		. "SUBSCRIPT PLUS SIGN")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
+    (=ucs		. #x208A)	; ₊
     (<-subscript
      ((name		  . "PLUS SIGN")
       (=ucs		  . #x002B)	; +
       ))
-    (=ucs		. #x208A)	; ₊
     ))
 (define-char
   '((name		. "SUBSCRIPT MINUS")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
+    (=ucs		. #x208B)	; ₋
     (<-subscript
      ((name		  . "MINUS SIGN")
       (=ucs		  . #x2212)	; −
       ))
-    (=ucs		. #x208B)	; ₋
     ))
 (define-char
   '((name		. "SUBSCRIPT EQUALS SIGN")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x208C)	; ₌
     (<-subscript
      ((name		  . "EQUALS SIGN")
       (=ucs		  . #x003D)	; =
       ))
-    (=ucs		. #x208C)	; ₌
     ))
 (define-char
   '((name		. "SUBSCRIPT LEFT PARENTHESIS")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
+    (=ucs		. #x208D)	; ₍
     (<-subscript
      ((name		  . "LEFT PARENTHESIS")
       (=ucs		  . #x0028)	; (
       ))
-    (=ucs		. #x208D)	; ₍
     ))
 (define-char
   '((name		. "SUBSCRIPT RIGHT PARENTHESIS")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
+    (=ucs		. #x208E)	; ₎
     (<-subscript
      ((name		  . "RIGHT PARENTHESIS")
       (=ucs		  . #x0029)	; )
       ))
-    (=ucs		. #x208E)	; ₎
     ))
diff --git a/lisp/utf-2000/u02100-Letterlike-Symbols.el b/lisp/utf-2000/u02100-Letterlike-Symbols.el
index 059dc54..019008a 100644
--- a/lisp/utf-2000/u02100-Letterlike-Symbols.el
+++ b/lisp/utf-2000/u02100-Letterlike-Symbols.el
@@ -38,11 +38,11 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2102)	; ℂ
     (<-font/double-struck
      ((name		  . "LATIN CAPITAL LETTER C")
       (=ucs		  . #x0043)	; C
       ))
-    (=ucs		. #x2102)	; ℂ
     ))
 (define-char
   '((name		. "DEGREE CELSIUS")
@@ -63,10 +63,6 @@
      ((name		  . "DEGREE CELSIUS")
       (=ucs		  . #x2103)	; ℃
       ))
-    (<-fullwidth
-     ((name		  . "DEGREE CELSIUS")
-      (=ucs		  . #x2103)	; ℃
-      ))
     (=>decomposition@compat/unit
      ((name		  . "DEGREE SIGN")
       (=ucs		  . #x00B0)	; °
@@ -81,6 +77,10 @@
     (=big5		. #xA24A)	; &I-B-A24A;
     (=ucs@gb		. #x2103)	; &J90-216E;
     (=ucs@jis		. #x2103)	; &J90-216E;
+    (<-fullwidth
+     ((name		  . "DEGREE CELSIUS")
+      (=ucs		  . #x2103)	; ℃
+      ))
     ))
 (define-char
   '((name		. "CENTRE LINE SYMBOL")
@@ -111,14 +111,14 @@
      ((name		  . "CARE OF")
       (=ucs		  . #x2105)	; ℅
       ))
-    (<-fullwidth
-     ((name		  . "CARE OF")
-      (=ucs		  . #x2105)	; ℅
-      ))
     (=cns11643-1	. #x2222)	; &C1-2222; [02-02]
     (=big5		. #xA1C1)	; &I-B-A1C1;
     (=ucs@cns		. #x2105)	; &C1-2222;
     (=ucs@big5		. #x2105)	; &C1-2222;
+    (<-fullwidth
+     ((name		  . "CARE OF")
+      (=ucs		  . #x2105)	; ℅
+      ))
     ))
 (define-char
   '((name		. "CADA UNA")
@@ -142,11 +142,11 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2107)	; ℇ
     (<-compat/math
      ((name		  . "LATIN CAPITAL LETTER OPEN E")
       (=ucs		  . #x0190)	; Ɛ
       ))
-    (=ucs		. #x2107)	; ℇ
     ))
 (define-char
   '((name		. "SCRUPLE")
@@ -174,10 +174,6 @@
      ((name		  . "DEGREE FAHRENHEIT")
       (=ucs		  . #x2109)	; ℉
       ))
-    (<-fullwidth
-     ((name		  . "DEGREE FAHRENHEIT")
-      (=ucs		  . #x2109)	; ℉
-      ))
     (=>decomposition@compat/unit
      ((name		  . "DEGREE SIGN")
       (=ucs		  . #x00B0)	; °
@@ -188,134 +184,141 @@
     (=ks-x1001		. #x2235)	; &C1-226B; [02-21]
     (=cns11643-1	. #x226B)	; &I-C1-226B; [02-75]
     (=big5		. #xA24B)	; &I-B-A24B;
+    (<-fullwidth
+     ((name		  . "DEGREE FAHRENHEIT")
+      (=ucs		  . #x2109)	; ℉
+      ))
     ))
 (define-char
   '((name		. "SCRIPT SMALL G")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x210A)	; ℊ
     (<-font/script
      ((name		  . "LATIN SMALL LETTER G")
       (=ucs		  . #x0067)	; g
       ))
-    (=ucs		. #x210A)	; ℊ
     ))
 (define-char
   '((name		. "SCRIPT CAPITAL H")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x210B)	; ℋ
     (<-font/script
      ((name		  . "LATIN CAPITAL LETTER H")
       (=ucs		  . #x0048)	; H
       ))
-    (=ucs		. #x210B)	; ℋ
     ))
 (define-char
   '((name		. "BLACK-LETTER CAPITAL H")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x210C)	; ℌ
     (<-font/black-letter
      ((name		  . "LATIN CAPITAL LETTER H")
       (=ucs		  . #x0048)	; H
       ))
-    (=ucs		. #x210C)	; ℌ
     ))
 (define-char
   '((name		. "DOUBLE-STRUCK CAPITAL H")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x210D)	; ℍ
     (<-font/double-struck
      ((name		  . "LATIN CAPITAL LETTER H")
       (=ucs		  . #x0048)	; H
       ))
-    (=ucs		. #x210D)	; ℍ
     ))
 (define-char
   '((name		. "PLANCK CONSTANT")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x210E)	; ℎ
     (<-font/script/physical
      ((name		  . "LATIN SMALL LETTER H")
       (=ucs		  . #x0068)	; h
       ))
-    (=ucs		. #x210E)	; ℎ
     ))
 (define-char
   '((name		. "PLANCK CONSTANT OVER TWO PI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x210F)	; ℏ
     (<-font/script/physical
      ((name		  . "LATIN SMALL LETTER H WITH STROKE")
       (=ucs		  . #x0127)	; ħ
       ))
-    (=ucs		. #x210F)	; ℏ
     ))
 (define-char
   '((<-denotational
      ((name		  . "PLANCK CONSTANT OVER TWO PI")
       (=ucs		  . #x210F)	; ℏ
       ))
+    (=jis-x0213-1-2000	. #x235D)	; &JX1-235D; [03-61]
+    (=ucs@jis/fw	. #x210F)	; &JX1-235D;
     (<-fullwidth
      ((name		  . "PLANCK CONSTANT OVER TWO PI")
       (=ucs		  . #x210F)	; ℏ
       ))
-    (=jis-x0213-1-2000	. #x235D)	; &JX1-235D; [03-61]
-    (=ucs@jis/fw	. #x210F)	; &JX1-235D;
     ))
 (define-char
   '((name		. "SCRIPT CAPITAL I")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2110)	; ℐ
     (<-font/script
      ((name		  . "LATIN CAPITAL LETTER I")
       (=ucs		  . #x0049)	; I
       ))
-    (=ucs		. #x2110)	; ℐ
     ))
 (define-char
   '((name		. "BLACK-LETTER CAPITAL I")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2111)	; ℑ
     (<-font/black-letter
      ((name		  . "LATIN CAPITAL LETTER I")
       (=ucs		  . #x0049)	; I
       ))
-    (=ucs		. #x2111)	; ℑ
     ))
 (define-char
   '((name		. "SCRIPT CAPITAL L")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2112)	; ℒ
     (<-font/script
      ((name		  . "LATIN CAPITAL LETTER L")
       (=ucs		  . #x004C)	; L
       ))
-    (=ucs		. #x2112)	; ℒ
     ))
 (define-char
   '((name		. "SCRIPT SMALL L")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2113)	; ℓ
     (<-font/script
      ((name		  . "LATIN SMALL LETTER L")
       (=ucs		  . #x006C)	; l
       ))
-    (=ucs		. #x2113)	; ℓ
     ))
 (define-char
   '((<-denotational
      ((name		  . "SCRIPT SMALL L")
       (=ucs		  . #x2113)	; ℓ
       ))
+    (=ks-x1001		. #x2724)	; &JX1-235F; [07-04]
+    (=jis-x0213-1-2000	. #x235F)	; &I-JX1-235F; [03-63]
+    (=ucs@jis/fw	. #x2113)	; &JX1-235F;
     (<-font/script
      ((name		  . "FULLWIDTH LATIN SMALL LETTER L")
       (=ucs		  . #xFF4C)	; ｌ
@@ -324,9 +327,6 @@
      ((name		  . "SCRIPT SMALL L")
       (=ucs		  . #x2113)	; ℓ
       ))
-    (=ks-x1001		. #x2724)	; &JX1-235F; [07-04]
-    (=jis-x0213-1-2000	. #x235F)	; &I-JX1-235F; [03-63]
-    (=ucs@jis/fw	. #x2113)	; &JX1-235F;
     ))
 (define-char
   '((name		. "L B BAR SYMBOL")
@@ -340,11 +340,11 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2115)	; ℕ
     (<-font/double-struck
      ((name		  . "LATIN CAPITAL LETTER N")
       (=ucs		  . #x004E)	; N
       ))
-    (=ucs		. #x2115)	; ℕ
     ))
 (define-char
   '((name		. "NUMERO SIGN")
@@ -366,16 +366,16 @@
      ((name		  . "NUMERO SIGN")
       (=ucs		  . #x2116)	; №
       ))
-    (<-fullwidth
-     ((name		  . "NUMERO SIGN")
-      (=ucs		  . #x2116)	; №
-      ))
     (=gb2312		. #x216D)	; &JX1-2D62; [01-77]
     (=ks-x1001		. #x2260)	; &I-K0-2260; [02-64]
     (=jis-x0212		. #x2271)	; &I-JSP-2271; [02-81]
     (=jis-x0213-1-2000	. #x2D62)	; &I-JX1-2D62; [13-66]
     (=big5-eten		. #xC8D2)	; &B-C8D2;
     (=ucs@unicode	. #x2116)	; &JX1-2D62;
+    (<-fullwidth
+     ((name		  . "NUMERO SIGN")
+      (=ucs		  . #x2116)	; №
+      ))
     ))
 (define-char
   '((name		. "SOUND RECORDING COPYRIGHT")
@@ -396,55 +396,55 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2119)	; ℙ
     (<-font/double-struck
      ((name		  . "LATIN CAPITAL LETTER P")
       (=ucs		  . #x0050)	; P
       ))
-    (=ucs		. #x2119)	; ℙ
     ))
 (define-char
   '((name		. "DOUBLE-STRUCK CAPITAL Q")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x211A)	; ℚ
     (<-font/double-struck
      ((name		  . "LATIN CAPITAL LETTER Q")
       (=ucs		  . #x0051)	; Q
       ))
-    (=ucs		. #x211A)	; ℚ
     ))
 (define-char
   '((name		. "SCRIPT CAPITAL R")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x211B)	; ℛ
     (<-font/script
      ((name		  . "LATIN CAPITAL LETTER R")
       (=ucs		  . #x0052)	; R
       ))
-    (=ucs		. #x211B)	; ℛ
     ))
 (define-char
   '((name		. "BLACK-LETTER CAPITAL R")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x211C)	; ℜ
     (<-font/black-letter
      ((name		  . "LATIN CAPITAL LETTER R")
       (=ucs		  . #x0052)	; R
       ))
-    (=ucs		. #x211C)	; ℜ
     ))
 (define-char
   '((name		. "DOUBLE-STRUCK CAPITAL R")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x211D)	; ℝ
     (<-font/double-struck
      ((name		  . "LATIN CAPITAL LETTER R")
       (=ucs		  . #x0052)	; R
       ))
-    (=ucs		. #x211D)	; ℝ
     ))
 (define-char
   '((name		. "PRESCRIPTION TAKE")
@@ -496,14 +496,14 @@
      ((name		  . "TELEPHONE SIGN")
       (=ucs		  . #x2121)	; ℡
       ))
-    (<-fullwidth
-     ((name		  . "TELEPHONE SIGN")
-      (=ucs		  . #x2121)	; ℡
-      ))
     (=ks-x1001		. #x2265)	; &JX1-2D64; [02-69]
     (=jis-x0213-1-2000	. #x2D64)	; &I-JX1-2D64; [13-68]
     (=big5-eten		. #xC8D3)	; &B-C8D3;
     (=ucs@unicode	. #x2121)	; &JX1-2D64;
+    (<-fullwidth
+     ((name		  . "TELEPHONE SIGN")
+      (=ucs		  . #x2121)	; ℡
+      ))
     ))
 (define-char
   '((name		. "TRADE MARK SIGN")
@@ -524,13 +524,13 @@
      ((name		  . "TRADE MARK SIGN")
       (=ucs		  . #x2122)	; ™
       ))
+    (=ks-x1001		. #x2262)	; &JSP-226F; [02-66]
+    (=jis-x0212		. #x226F)	; &I-JSP-226F; [02-79]
+    (=ucs@jis		. #x2122)	; &JSP-226F;
     (<-fullwidth
      ((name		  . "TRADE MARK SIGN")
       (=ucs		  . #x2122)	; ™
       ))
-    (=ks-x1001		. #x2262)	; &JSP-226F; [02-66]
-    (=jis-x0212		. #x226F)	; &I-JSP-226F; [02-79]
-    (=ucs@jis		. #x2122)	; &JSP-226F;
     ))
 (define-char
   '((name		. "VERSICLE")
@@ -544,11 +544,11 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2124)	; ℤ
     (<-font/double-struck
      ((name		  . "LATIN CAPITAL LETTER Z")
       (=ucs		  . #x005A)	; Z
       ))
-    (=ucs		. #x2124)	; ℤ
     ))
 (define-char
   '((name		. "OUNCE SIGN")
@@ -573,11 +573,11 @@
      ((name		  . "OHM SIGN")
       (=ucs		  . #x2126)	; Ω
       ))
+    (=ks-x1001		. #x2759)	; &K0-2759; [07-57]
     (<-fullwidth
      ((name		  . "OHM SIGN")
       (=ucs		  . #x2126)	; Ω
       ))
-    (=ks-x1001		. #x2759)	; &K0-2759; [07-57]
     ))
 (define-char
   '((name		. "INVERTED OHM SIGN")
@@ -591,23 +591,23 @@
      ((name		  . "INVERTED OHM SIGN")
       (=ucs		  . #x2127)	; ℧
       ))
+    (=jis-x0213-1-2000	. #x2360)	; &JX1-2360; [03-64]
+    (=ucs@jis/fw	. #x2127)	; &JX1-2360;
     (<-fullwidth
      ((name		  . "INVERTED OHM SIGN")
       (=ucs		  . #x2127)	; ℧
       ))
-    (=jis-x0213-1-2000	. #x2360)	; &JX1-2360; [03-64]
-    (=ucs@jis/fw	. #x2127)	; &JX1-2360;
     ))
 (define-char
   '((name		. "BLACK-LETTER CAPITAL Z")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2128)	; ℨ
     (<-font/black-letter
      ((name		  . "LATIN CAPITAL LETTER Z")
       (=ucs		  . #x005A)	; Z
       ))
-    (=ucs		. #x2128)	; ℨ
     ))
 (define-char
   '((name		. "TURNED GREEK SMALL LETTER IOTA")
@@ -643,36 +643,36 @@
      ((name		  . "ANGSTROM SIGN")
       (=ucs		  . #x212B)	; Å
       ))
-    (<-fullwidth
-     ((name		  . "ANGSTROM SIGN")
-      (=ucs		  . #x212B)	; Å
-      ))
     (=jis-x0208@1983	. #x2272)	; &J90-2272; [02-82]
     (=ks-x1001		. #x214A)	; &I-K0-214A; [01-42]
     (=jis-x0208@1990	. #x2272)	; &I-J90-2272; [02-82]
     (=ucs@jis		. #x212B)	; &J90-2272;
+    (<-fullwidth
+     ((name		  . "ANGSTROM SIGN")
+      (=ucs		  . #x212B)	; Å
+      ))
     ))
 (define-char
   '((name		. "SCRIPT CAPITAL B")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x212C)	; ℬ
     (<-font/script
      ((name		  . "LATIN CAPITAL LETTER B")
       (=ucs		  . #x0042)	; B
       ))
-    (=ucs		. #x212C)	; ℬ
     ))
 (define-char
   '((name		. "BLACK-LETTER CAPITAL C")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x212D)	; ℭ
     (<-font/black-letter
      ((name		  . "LATIN CAPITAL LETTER C")
       (=ucs		  . #x0043)	; C
       ))
-    (=ucs		. #x212D)	; ℭ
     ))
 (define-char
   '((name		. "ESTIMATED SYMBOL")
@@ -686,33 +686,33 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x212F)	; ℯ
     (<-font/script
      ((name		  . "LATIN SMALL LETTER E")
       (=ucs		  . #x0065)	; e
       ))
-    (=ucs		. #x212F)	; ℯ
     ))
 (define-char
   '((name		. "SCRIPT CAPITAL E")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2130)	; ℰ
     (<-font/script
      ((name		  . "LATIN CAPITAL LETTER E")
       (=ucs		  . #x0045)	; E
       ))
-    (=ucs		. #x2130)	; ℰ
     ))
 (define-char
   '((name		. "SCRIPT CAPITAL F")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2131)	; ℱ
     (<-font/script
      ((name		  . "LATIN CAPITAL LETTER F")
       (=ucs		  . #x0046)	; F
       ))
-    (=ucs		. #x2131)	; ℱ
     ))
 (define-char
   '((name		. "TURNED CAPITAL F")
@@ -726,89 +726,89 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2133)	; ℳ
     (<-font/script
      ((name		  . "LATIN CAPITAL LETTER M")
       (=ucs		  . #x004D)	; M
       ))
-    (=ucs		. #x2133)	; ℳ
     ))
 (define-char
   '((name		. "SCRIPT SMALL O")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2134)	; ℴ
     (<-font/script
      ((name		  . "LATIN SMALL LETTER O")
       (=ucs		  . #x006F)	; o
       ))
-    (=ucs		. #x2134)	; ℴ
     ))
 (define-char
   '((name		. "ALEF SYMBOL")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2135)	; ℵ
     (<-compat/math
      ((name		  . "HEBREW LETTER ALEF")
       (=ucs		  . #x05D0)	; א
       ))
-    (=ucs		. #x2135)	; ℵ
     ))
 (define-char
   '((<-denotational
      ((name		  . "ALEF SYMBOL")
       (=ucs		  . #x2135)	; ℵ
       ))
+    (=jis-x0213-1-2000	. #x235C)	; &JX1-235C; [03-60]
+    (=ucs@jis		. #x2135)	; &JX1-235C;
     (<-fullwidth
      ((name		  . "ALEF SYMBOL")
       (=ucs		  . #x2135)	; ℵ
       ))
-    (=jis-x0213-1-2000	. #x235C)	; &JX1-235C; [03-60]
-    (=ucs@jis		. #x2135)	; &JX1-235C;
     ))
 (define-char
   '((name		. "BET SYMBOL")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2136)	; ℶ
     (<-compat/math
      ((name		  . "HEBREW LETTER BET")
       (=ucs		  . #x05D1)	; ב
       ))
-    (=ucs		. #x2136)	; ℶ
     ))
 (define-char
   '((name		. "GIMEL SYMBOL")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2137)	; ℷ
     (<-compat/math
      ((name		  . "HEBREW LETTER GIMEL")
       (=ucs		  . #x05D2)	; ג
       ))
-    (=ucs		. #x2137)	; ℷ
     ))
 (define-char
   '((name		. "DALET SYMBOL")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2138)	; ℸ
     (<-compat/math
      ((name		  . "HEBREW LETTER DALET")
       (=ucs		  . #x05D3)	; ד
       ))
-    (=ucs		. #x2138)	; ℸ
     ))
 (define-char
   '((name		. "INFORMATION SOURCE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x2139)	; ℹ
     (<-font
      ((name		  . "LATIN SMALL LETTER I")
       (=ucs		  . #x0069)	; i
       ))
-    (=ucs		. #x2139)	; ℹ
     ))
 (define-char
   '((name		. "ROTATED CAPITAL Q")
diff --git a/lisp/utf-2000/u02150-Number-Forms.el b/lisp/utf-2000/u02150-Number-Forms.el
index 26986d6..0a901b4 100644
--- a/lisp/utf-2000/u02150-Number-Forms.el
+++ b/lisp/utf-2000/u02150-Number-Forms.el
@@ -245,10 +245,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 1)
-    (<-compat/Roman-Numeral
-     ((name		  . "LATIN CAPITAL LETTER I")
-      (=ucs		  . #x0049)	; I
-      ))
     (=ucs		. #x2160)	; Ⅰ
     (=gb2312		. #x2271)	; &I-G0-2271; [02-81]
     (=ks-x1001		. #x2530)	; &I-K0-2530; [05-16]
@@ -256,6 +252,10 @@
     (=jis-x0213-1-2000	. #x2D35)	; &I-JX1-2D35; [13-21]
     (=big5		. #xA2B9)	; &I-B-A2B9;
     (=jef-china3	. #x77DE)	; &I-JC3-77DE;
+    (<-compat/Roman-Numeral
+     ((name		  . "LATIN CAPITAL LETTER I")
+      (=ucs		  . #x0049)	; I
+      ))
     (->lowercase
      ((name		  . "SMALL ROMAN NUMERAL ONE")
       (=ucs		  . #x2170)	; ⅰ
@@ -345,10 +345,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 5)
-    (<-compat/Roman-Numeral
-     ((name		  . "LATIN CAPITAL LETTER V")
-      (=ucs		  . #x0056)	; V
-      ))
     (=ucs		. #x2164)	; Ⅴ
     (=gb2312		. #x2275)	; &I-G0-2275; [02-85]
     (=ks-x1001		. #x2534)	; &I-K0-2534; [05-20]
@@ -356,6 +352,10 @@
     (=jis-x0213-1-2000	. #x2D39)	; &I-JX1-2D39; [13-25]
     (=big5		. #xA2BD)	; &I-B-A2BD;
     (=jef-china3	. #x77E2)	; &I-JC3-77E2;
+    (<-compat/Roman-Numeral
+     ((name		  . "LATIN CAPITAL LETTER V")
+      (=ucs		  . #x0056)	; V
+      ))
     (->lowercase
      ((name		  . "SMALL ROMAN NUMERAL FIVE")
       (=ucs		  . #x2174)	; ⅴ
@@ -476,10 +476,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 10)
-    (<-compat/Roman-Numeral
-     ((name		  . "LATIN CAPITAL LETTER X")
-      (=ucs		  . #x0058)	; X
-      ))
     (=ucs		. #x2169)	; Ⅹ
     (=gb2312		. #x227A)	; &I-G0-227A; [02-90]
     (=ks-x1001		. #x2539)	; &I-K0-2539; [05-25]
@@ -487,6 +483,10 @@
     (=jis-x0213-1-2000	. #x2D3E)	; &I-JX1-2D3E; [13-30]
     (=big5		. #xA2C2)	; &I-B-A2C2;
     (=jef-china3	. #x77E7)	; &I-JC3-77E7;
+    (<-compat/Roman-Numeral
+     ((name		  . "LATIN CAPITAL LETTER X")
+      (=ucs		  . #x0058)	; X
+      ))
     (->lowercase
      ((name		  . "SMALL ROMAN NUMERAL TEN")
       (=ucs		  . #x2179)	; ⅹ
@@ -543,11 +543,11 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 50)
+    (=ucs		. #x216C)	; Ⅼ
     (<-compat/Roman-Numeral
      ((name		  . "LATIN CAPITAL LETTER L")
       (=ucs		  . #x004C)	; L
       ))
-    (=ucs		. #x216C)	; Ⅼ
     (->lowercase
      ((name		  . "SMALL ROMAN NUMERAL FIFTY")
       (=ucs		  . #x217C)	; ⅼ
@@ -559,11 +559,11 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 100)
+    (=ucs		. #x216D)	; Ⅽ
     (<-compat/Roman-Numeral
      ((name		  . "LATIN CAPITAL LETTER C")
       (=ucs		  . #x0043)	; C
       ))
-    (=ucs		. #x216D)	; Ⅽ
     (->lowercase
      ((name		  . "SMALL ROMAN NUMERAL ONE HUNDRED")
       (=ucs		  . #x217D)	; ⅽ
@@ -575,11 +575,11 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 500)
+    (=ucs		. #x216E)	; Ⅾ
     (<-compat/Roman-Numeral
      ((name		  . "LATIN CAPITAL LETTER D")
       (=ucs		  . #x0044)	; D
       ))
-    (=ucs		. #x216E)	; Ⅾ
     (->lowercase
      ((name		  . "SMALL ROMAN NUMERAL FIVE HUNDRED")
       (=ucs		  . #x217E)	; ⅾ
@@ -591,11 +591,11 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 1000)
+    (=ucs		. #x216F)	; Ⅿ
     (<-compat/Roman-Numeral
      ((name		  . "LATIN CAPITAL LETTER M")
       (=ucs		  . #x004D)	; M
       ))
-    (=ucs		. #x216F)	; Ⅿ
     (->lowercase
      ((name		  . "SMALL ROMAN NUMERAL ONE THOUSAND")
       (=ucs		  . #x217F)	; ⅿ
@@ -607,16 +607,16 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 1)
-    (<-compat/Roman-Numeral
-     ((name		  . "LATIN SMALL LETTER I")
-      (=ucs		  . #x0069)	; i
-      ))
     (=ucs		. #x2170)	; ⅰ
     (=ks-x1001		. #x2521)	; &I-K0-2521; [05-01]
     (=cns11643-1	. #x2635)	; &I-C1-2635; [06-21]
     (=jis-x0213-1-2000	. #x2C35)	; &I-JX1-2C35; [12-21]
     (=big5-eten		. #xC6B5)	; &B-C6B5;
     (=jef-china3	. #x77EB)	; &I-JC3-77EB;
+    (<-compat/Roman-Numeral
+     ((name		  . "LATIN SMALL LETTER I")
+      (=ucs		  . #x0069)	; i
+      ))
     (->uppercase
      ((name		  . "ROMAN NUMERAL ONE")
       (=ucs		  . #x2160)	; Ⅰ
@@ -703,16 +703,16 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 5)
-    (<-compat/Roman-Numeral
-     ((name		  . "LATIN SMALL LETTER V")
-      (=ucs		  . #x0076)	; v
-      ))
     (=ucs		. #x2174)	; ⅴ
     (=ks-x1001		. #x2525)	; &I-K0-2525; [05-05]
     (=cns11643-1	. #x2639)	; &I-C1-2639; [06-25]
     (=jis-x0213-1-2000	. #x2C39)	; &I-JX1-2C39; [12-25]
     (=big5-eten		. #xC6B9)	; &B-C6B9;
     (=jef-china3	. #x77EF)	; &I-JC3-77EF;
+    (<-compat/Roman-Numeral
+     ((name		  . "LATIN SMALL LETTER V")
+      (=ucs		  . #x0076)	; v
+      ))
     (->uppercase
      ((name		  . "ROMAN NUMERAL FIVE")
       (=ucs		  . #x2164)	; Ⅴ
@@ -829,16 +829,16 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 10)
-    (<-compat/Roman-Numeral
-     ((name		  . "LATIN SMALL LETTER X")
-      (=ucs		  . #x0078)	; x
-      ))
     (=ucs		. #x2179)	; ⅹ
     (=ks-x1001		. #x252A)	; &I-K0-252A; [05-10]
     (=cns11643-1	. #x263E)	; &I-C1-263E; [06-30]
     (=jis-x0213-1-2000	. #x2C3E)	; &I-JX1-2C3E; [12-30]
     (=big5-eten		. #xC6BE)	; &B-C6BE;
     (=jef-china3	. #x77F4)	; &I-JC3-77F4;
+    (<-compat/Roman-Numeral
+     ((name		  . "LATIN SMALL LETTER X")
+      (=ucs		  . #x0078)	; x
+      ))
     (->uppercase
      ((name		  . "ROMAN NUMERAL TEN")
       (=ucs		  . #x2169)	; Ⅹ
@@ -893,11 +893,11 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 50)
+    (=ucs		. #x217C)	; ⅼ
     (<-compat/Roman-Numeral
      ((name		  . "LATIN SMALL LETTER L")
       (=ucs		  . #x006C)	; l
       ))
-    (=ucs		. #x217C)	; ⅼ
     (->uppercase
      ((name		  . "ROMAN NUMERAL FIFTY")
       (=ucs		  . #x216C)	; Ⅼ
@@ -909,11 +909,11 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 100)
+    (=ucs		. #x217D)	; ⅽ
     (<-compat/Roman-Numeral
      ((name		  . "LATIN SMALL LETTER C")
       (=ucs		  . #x0063)	; c
       ))
-    (=ucs		. #x217D)	; ⅽ
     (->uppercase
      ((name		  . "ROMAN NUMERAL ONE HUNDRED")
       (=ucs		  . #x216D)	; Ⅽ
@@ -925,11 +925,11 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 500)
+    (=ucs		. #x217E)	; ⅾ
     (<-compat/Roman-Numeral
      ((name		  . "LATIN SMALL LETTER D")
       (=ucs		  . #x0064)	; d
       ))
-    (=ucs		. #x217E)	; ⅾ
     (->uppercase
      ((name		  . "ROMAN NUMERAL FIVE HUNDRED")
       (=ucs		  . #x216E)	; Ⅾ
@@ -941,11 +941,11 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 1000)
+    (=ucs		. #x217F)	; ⅿ
     (<-compat/Roman-Numeral
      ((name		  . "LATIN SMALL LETTER M")
       (=ucs		  . #x006D)	; m
       ))
-    (=ucs		. #x217F)	; ⅿ
     (->uppercase
      ((name		  . "ROMAN NUMERAL ONE THOUSAND")
       (=ucs		  . #x216F)	; Ⅿ
diff --git a/lisp/utf-2000/u02190-Arrows.el b/lisp/utf-2000/u02190-Arrows.el
index 2400feb..ac5b8f1 100644
--- a/lisp/utf-2000/u02190-Arrows.el
+++ b/lisp/utf-2000/u02190-Arrows.el
@@ -11,10 +11,6 @@
      ((name		  . "LEFTWARDS ARROW")
       (=ucs		  . #x2190)	; ←
       ))
-    (<-fullwidth
-     ((name		  . "LEFTWARDS ARROW")
-      (=ucs		  . #x2190)	; ←
-      ))
     (=jis-x0208		. #x222B)	; &J90-222B; [02-11]
     (=gb2312		. #x217B)	; &I-G0-217B; [01-91]
     (=ks-x1001		. #x2167)	; &I-K0-2167; [01-71]
@@ -26,6 +22,10 @@
     (=ucs@jis		. #x2190)	; &J90-222B;
     (=ucs@ks		. #x2190)	; &J90-222B;
     (=ucs@big5		. #x2190)	; &J90-222B;
+    (<-fullwidth
+     ((name		  . "LEFTWARDS ARROW")
+      (=ucs		  . #x2190)	; ←
+      ))
     ))
 (define-char
   '((name		. "UPWARDS ARROW")
@@ -39,10 +39,6 @@
      ((name		  . "UPWARDS ARROW")
       (=ucs		  . #x2191)	; ↑
       ))
-    (<-fullwidth
-     ((name		  . "UPWARDS ARROW")
-      (=ucs		  . #x2191)	; ↑
-      ))
     (=jis-x0208		. #x222C)	; &J90-222C; [02-12]
     (=gb2312		. #x217C)	; &I-G0-217C; [01-92]
     (=ks-x1001		. #x2168)	; &I-K0-2168; [01-72]
@@ -54,6 +50,10 @@
     (=ucs@jis		. #x2191)	; &J90-222C;
     (=ucs@ks		. #x2191)	; &J90-222C;
     (=ucs@big5		. #x2191)	; &J90-222C;
+    (<-fullwidth
+     ((name		  . "UPWARDS ARROW")
+      (=ucs		  . #x2191)	; ↑
+      ))
     ))
 (define-char
   '((name		. "RIGHTWARDS ARROW")
@@ -67,10 +67,6 @@
      ((name		  . "RIGHTWARDS ARROW")
       (=ucs		  . #x2192)	; →
       ))
-    (<-fullwidth
-     ((name		  . "RIGHTWARDS ARROW")
-      (=ucs		  . #x2192)	; →
-      ))
     (=jis-x0208		. #x222A)	; &J90-222A; [02-10]
     (=gb2312		. #x217A)	; &I-G0-217A; [01-90]
     (=ks-x1001		. #x2166)	; &I-K0-2166; [01-70]
@@ -82,6 +78,10 @@
     (=ucs@jis		. #x2192)	; &J90-222A;
     (=ucs@ks		. #x2192)	; &J90-222A;
     (=ucs@big5		. #x2192)	; &J90-222A;
+    (<-fullwidth
+     ((name		  . "RIGHTWARDS ARROW")
+      (=ucs		  . #x2192)	; →
+      ))
     ))
 (define-char
   '((name		. "DOWNWARDS ARROW")
@@ -95,10 +95,6 @@
      ((name		  . "DOWNWARDS ARROW")
       (=ucs		  . #x2193)	; ↓
       ))
-    (<-fullwidth
-     ((name		  . "DOWNWARDS ARROW")
-      (=ucs		  . #x2193)	; ↓
-      ))
     (=jis-x0208		. #x222D)	; &J90-222D; [02-13]
     (=gb2312		. #x217D)	; &I-G0-217D; [01-93]
     (=ks-x1001		. #x2169)	; &I-K0-2169; [01-73]
@@ -110,6 +106,10 @@
     (=ucs@jis		. #x2193)	; &J90-222D;
     (=ucs@ks		. #x2193)	; &J90-222D;
     (=ucs@big5		. #x2193)	; &J90-222D;
+    (<-fullwidth
+     ((name		  . "DOWNWARDS ARROW")
+      (=ucs		  . #x2193)	; ↓
+      ))
     ))
 (define-char
   '((name		. "LEFT RIGHT ARROW")
@@ -123,14 +123,14 @@
      ((name		  . "LEFT RIGHT ARROW")
       (=ucs		  . #x2194)	; ↔
       ))
-    (<-fullwidth
-     ((name		  . "LEFT RIGHT ARROW")
-      (=ucs		  . #x2194)	; ↔
-      ))
     (=ks-x1001		. #x216A)	; &JX1-2271; [01-74]
     (=jis-x0213-1-2000	. #x2271)	; &I-JX1-2271; [02-81]
     (=ucs@jis		. #x2194)	; &JX1-2271;
     (=ucs@ks		. #x2194)	; &JX1-2271;
+    (<-fullwidth
+     ((name		  . "LEFT RIGHT ARROW")
+      (=ucs		  . #x2194)	; ↔
+      ))
     ))
 (define-char
   '((name		. "UP DOWN ARROW")
@@ -144,12 +144,12 @@
      ((name		  . "UP DOWN ARROW")
       (=ucs		  . #x2195)	; ↕
       ))
+    (=ks-x1001		. #x2255)	; &K0-2255; [02-53]
+    (=ucs@ks		. #x2195)	; &K0-2255;
     (<-fullwidth
      ((name		  . "UP DOWN ARROW")
       (=ucs		  . #x2195)	; ↕
       ))
-    (=ks-x1001		. #x2255)	; &K0-2255; [02-53]
-    (=ucs@ks		. #x2195)	; &K0-2255;
     ))
 (define-char
   '((name		. "NORTH WEST ARROW")
@@ -163,10 +163,6 @@
      ((name		  . "NORTH WEST ARROW")
       (=ucs		  . #x2196)	; ↖
       ))
-    (<-fullwidth
-     ((name		  . "NORTH WEST ARROW")
-      (=ucs		  . #x2196)	; ↖
-      ))
     (=ks-x1001		. #x2258)	; &JX1-2327; [02-56]
     (=cns11643-1	. #x2259)	; &I-C1-2259; [02-57]
     (=jis-x0213-1-2000	. #x2327)	; &I-JX1-2327; [03-07]
@@ -175,6 +171,10 @@
     (=ucs@jis		. #x2196)	; &JX1-2327;
     (=ucs@ks		. #x2196)	; &JX1-2327;
     (=ucs@big5		. #x2196)	; &JX1-2327;
+    (<-fullwidth
+     ((name		  . "NORTH WEST ARROW")
+      (=ucs		  . #x2196)	; ↖
+      ))
     ))
 (define-char
   '((name		. "NORTH EAST ARROW")
@@ -188,10 +188,6 @@
      ((name		  . "NORTH EAST ARROW")
       (=ucs		  . #x2197)	; ↗
       ))
-    (<-fullwidth
-     ((name		  . "NORTH EAST ARROW")
-      (=ucs		  . #x2197)	; ↗
-      ))
     (=ks-x1001		. #x2256)	; &JX1-2325; [02-54]
     (=cns11643-1	. #x225A)	; &I-C1-225A; [02-58]
     (=jis-x0213-1-2000	. #x2325)	; &I-JX1-2325; [03-05]
@@ -200,6 +196,10 @@
     (=ucs@jis		. #x2197)	; &JX1-2325;
     (=ucs@ks		. #x2197)	; &JX1-2325;
     (=ucs@big5		. #x2197)	; &JX1-2325;
+    (<-fullwidth
+     ((name		  . "NORTH EAST ARROW")
+      (=ucs		  . #x2197)	; ↗
+      ))
     ))
 (define-char
   '((name		. "SOUTH EAST ARROW")
@@ -213,10 +213,6 @@
      ((name		  . "SOUTH EAST ARROW")
       (=ucs		  . #x2198)	; ↘
       ))
-    (<-fullwidth
-     ((name		  . "SOUTH EAST ARROW")
-      (=ucs		  . #x2198)	; ↘
-      ))
     (=ks-x1001		. #x2259)	; &JX1-2326; [02-57]
     (=cns11643-1	. #x225C)	; &I-C1-225C; [02-60]
     (=jis-x0213-1-2000	. #x2326)	; &I-JX1-2326; [03-06]
@@ -225,6 +221,10 @@
     (=ucs@jis		. #x2198)	; &JX1-2326;
     (=ucs@ks		. #x2198)	; &JX1-2326;
     (=ucs@big5		. #x2198)	; &JX1-2326;
+    (<-fullwidth
+     ((name		  . "SOUTH EAST ARROW")
+      (=ucs		  . #x2198)	; ↘
+      ))
     ))
 (define-char
   '((name		. "SOUTH WEST ARROW")
@@ -238,10 +238,6 @@
      ((name		  . "SOUTH WEST ARROW")
       (=ucs		  . #x2199)	; ↙
       ))
-    (<-fullwidth
-     ((name		  . "SOUTH WEST ARROW")
-      (=ucs		  . #x2199)	; ↙
-      ))
     (=ks-x1001		. #x2257)	; &JX1-2328; [02-55]
     (=cns11643-1	. #x225B)	; &I-C1-225B; [02-59]
     (=jis-x0213-1-2000	. #x2328)	; &I-JX1-2328; [03-08]
@@ -250,6 +246,10 @@
     (=ucs@jis		. #x2199)	; &JX1-2328;
     (=ucs@ks		. #x2199)	; &JX1-2328;
     (=ucs@big5		. #x2199)	; &JX1-2328;
+    (<-fullwidth
+     ((name		  . "SOUTH WEST ARROW")
+      (=ucs		  . #x2199)	; ↙
+      ))
     ))
 (define-char
   '((name		. "LEFTWARDS ARROW WITH STROKE")
@@ -494,12 +494,12 @@
      ((name		  . "NORTH WEST ARROW TO LONG BAR")
       (=ucs		  . #x21B8)	; ↸
       ))
+    (=big5-eten		. #xC877)	; &B-C877;
+    (=ucs@big5		. #x21B8)	; &B-C877;
     (<-fullwidth
      ((name		  . "NORTH WEST ARROW TO LONG BAR")
       (=ucs		  . #x21B8)	; ↸
       ))
-    (=big5-eten		. #xC877)	; &B-C877;
-    (=ucs@big5		. #x21B8)	; &B-C877;
     ))
 (define-char
   '((name . "LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR")
@@ -513,12 +513,12 @@
      ((name . "LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR")
       (=ucs		  . #x21B9)	; ↹
       ))
+    (=big5-eten		. #xC878)	; &B-C878;
+    (=ucs@big5		. #x21B9)	; &B-C878;
     (<-fullwidth
      ((name . "LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR")
       (=ucs		  . #x21B9)	; ↹
       ))
-    (=big5-eten		. #xC878)	; &B-C878;
-    (=ucs@big5		. #x21B9)	; &B-C878;
     ))
 (define-char
   '((name		. "ANTICLOCKWISE OPEN CIRCLE ARROW")
@@ -602,12 +602,12 @@
      ((name		  . "RIGHTWARDS ARROW OVER LEFTWARDS ARROW")
       (=ucs		  . #x21C4)	; ⇄
       ))
+    (=jis-x0213-1-2000	. #x2329)	; &JX1-2329; [03-09]
+    (=ucs@jis		. #x21C4)	; &JX1-2329;
     (<-fullwidth
      ((name		  . "RIGHTWARDS ARROW OVER LEFTWARDS ARROW")
       (=ucs		  . #x21C4)	; ⇄
       ))
-    (=jis-x0213-1-2000	. #x2329)	; &JX1-2329; [03-09]
-    (=ucs@jis		. #x21C4)	; &JX1-2329;
     ))
 (define-char
   '((name		. "UPWARDS ARROW LEFTWARDS OF DOWNWARDS ARROW")
@@ -733,16 +733,16 @@
      ((name		  . "RIGHTWARDS DOUBLE ARROW")
       (=ucs		  . #x21D2)	; ⇒
       ))
-    (<-fullwidth
-     ((name		  . "RIGHTWARDS DOUBLE ARROW")
-      (=ucs		  . #x21D2)	; ⇒
-      ))
     (=jis-x0208@1983	. #x224D)	; &J90-224D; [02-45]
     (=ks-x1001		. #x2221)	; &I-K0-2221; [02-01]
     (=jis-x0208@1990	. #x224D)	; &I-J90-224D; [02-45]
     (=jef-china3	. #x7FDA)	; &I-JC3-7FDA;
     (=ucs@jis		. #x21D2)	; &J90-224D;
     (=ucs@ks		. #x21D2)	; &J90-224D;
+    (<-fullwidth
+     ((name		  . "RIGHTWARDS DOUBLE ARROW")
+      (=ucs		  . #x21D2)	; ⇒
+      ))
     ))
 (define-char
   '((name		. "DOWNWARDS DOUBLE ARROW")
@@ -763,16 +763,16 @@
      ((name		  . "LEFT RIGHT DOUBLE ARROW")
       (=ucs		  . #x21D4)	; ⇔
       ))
-    (<-fullwidth
-     ((name		  . "LEFT RIGHT DOUBLE ARROW")
-      (=ucs		  . #x21D4)	; ⇔
-      ))
     (=jis-x0208@1983	. #x224E)	; &J90-224E; [02-46]
     (=ks-x1001		. #x2222)	; &I-K0-2222; [02-02]
     (=jis-x0208@1990	. #x224E)	; &I-J90-224E; [02-46]
     (=jef-china3	. #x7FDB)	; &I-JC3-7FDB;
     (=ucs@jis		. #x21D4)	; &J90-224E;
     (=ucs@ks		. #x21D4)	; &J90-224E;
+    (<-fullwidth
+     ((name		  . "LEFT RIGHT DOUBLE ARROW")
+      (=ucs		  . #x21D4)	; ⇔
+      ))
     ))
 (define-char
   '((name		. "UP DOWN DOUBLE ARROW")
@@ -905,13 +905,13 @@
      ((name		  . "LEFTWARDS WHITE ARROW")
       (=ucs		  . #x21E6)	; ⇦
       ))
+    (=jis-x0213-1-2000	. #x232B)	; &JX1-232B; [03-11]
+    (=jef-china3	. #x76B2)	; &I-JC3-76B2;
+    (=ucs@jis		. #x21E6)	; &JX1-232B;
     (<-fullwidth
      ((name		  . "LEFTWARDS WHITE ARROW")
       (=ucs		  . #x21E6)	; ⇦
       ))
-    (=jis-x0213-1-2000	. #x232B)	; &JX1-232B; [03-11]
-    (=jef-china3	. #x76B2)	; &I-JC3-76B2;
-    (=ucs@jis		. #x21E6)	; &JX1-232B;
     ))
 (define-char
   '((name		. "UPWARDS WHITE ARROW")
@@ -925,15 +925,15 @@
      ((name		  . "UPWARDS WHITE ARROW")
       (=ucs		  . #x21E7)	; ⇧
       ))
-    (<-fullwidth
-     ((name		  . "UPWARDS WHITE ARROW")
-      (=ucs		  . #x21E7)	; ⇧
-      ))
     (=jis-x0213-1-2000	. #x232C)	; &JX1-232C; [03-12]
     (=big5-eten		. #xC876)	; &B-C876;
     (=jef-china3	. #x76B1)	; &I-JC3-76B1;
     (=ucs@jis		. #x21E7)	; &JX1-232C;
     (=ucs@big5		. #x21E7)	; &JX1-232C;
+    (<-fullwidth
+     ((name		  . "UPWARDS WHITE ARROW")
+      (=ucs		  . #x21E7)	; ⇧
+      ))
     ))
 (define-char
   '((name		. "RIGHTWARDS WHITE ARROW")
@@ -947,13 +947,13 @@
      ((name		  . "RIGHTWARDS WHITE ARROW")
       (=ucs		  . #x21E8)	; ⇨
       ))
+    (=jis-x0213-1-2000	. #x232A)	; &JX1-232A; [03-10]
+    (=jef-china3	. #x76B3)	; &I-JC3-76B3;
+    (=ucs@jis		. #x21E8)	; &JX1-232A;
     (<-fullwidth
      ((name		  . "RIGHTWARDS WHITE ARROW")
       (=ucs		  . #x21E8)	; ⇨
       ))
-    (=jis-x0213-1-2000	. #x232A)	; &JX1-232A; [03-10]
-    (=jef-china3	. #x76B3)	; &I-JC3-76B3;
-    (=ucs@jis		. #x21E8)	; &JX1-232A;
     ))
 (define-char
   '((name		. "DOWNWARDS WHITE ARROW")
@@ -967,13 +967,13 @@
      ((name		  . "DOWNWARDS WHITE ARROW")
       (=ucs		  . #x21E9)	; ⇩
       ))
+    (=jis-x0213-1-2000	. #x232D)	; &JX1-232D; [03-13]
+    (=jef-china3	. #x76B0)	; &I-JC3-76B0;
+    (=ucs@jis		. #x21E9)	; &JX1-232D;
     (<-fullwidth
      ((name		  . "DOWNWARDS WHITE ARROW")
       (=ucs		  . #x21E9)	; ⇩
       ))
-    (=jis-x0213-1-2000	. #x232D)	; &JX1-232D; [03-13]
-    (=jef-china3	. #x76B0)	; &I-JC3-76B0;
-    (=ucs@jis		. #x21E9)	; &JX1-232D;
     ))
 (define-char
   '((name		. "UPWARDS WHITE ARROW FROM BAR")
diff --git a/lisp/utf-2000/u02200-Mathematical-Operators.el b/lisp/utf-2000/u02200-Mathematical-Operators.el
index 570a049..ee661d6 100644
--- a/lisp/utf-2000/u02200-Mathematical-Operators.el
+++ b/lisp/utf-2000/u02200-Mathematical-Operators.el
@@ -11,16 +11,16 @@
      ((name		  . "FOR ALL")
       (=ucs		  . #x2200)	; ∀
       ))
-    (<-fullwidth
-     ((name		  . "FOR ALL")
-      (=ucs		  . #x2200)	; ∀
-      ))
     (=jis-x0208@1983	. #x224F)	; &J90-224F; [02-47]
     (=ks-x1001		. #x2223)	; &I-K0-2223; [02-03]
     (=jis-x0208@1990	. #x224F)	; &I-J90-224F; [02-47]
     (=jef-china3	. #x7FDC)	; &I-JC3-7FDC;
     (=ucs@jis		. #x2200)	; &J90-224F;
     (=ucs@ks		. #x2200)	; &J90-224F;
+    (<-fullwidth
+     ((name		  . "FOR ALL")
+      (=ucs		  . #x2200)	; ∀
+      ))
     ))
 (define-char
   '((name		. "COMPLEMENT")
@@ -41,16 +41,16 @@
      ((name		  . "PARTIAL DIFFERENTIAL")
       (=ucs		  . #x2202)	; ∂
       ))
-    (<-fullwidth
-     ((name		  . "PARTIAL DIFFERENTIAL")
-      (=ucs		  . #x2202)	; ∂
-      ))
     (=jis-x0208@1983	. #x225F)	; &J90-225F; [02-63]
     (=ks-x1001		. #x2153)	; &I-K0-2153; [01-51]
     (=jis-x0208@1990	. #x225F)	; &I-J90-225F; [02-63]
     (=jef-china3	. #x7FE1)	; &I-JC3-7FE1;
     (=ucs@jis		. #x2202)	; &J90-225F;
     (=ucs@ks		. #x2202)	; &J90-225F;
+    (<-fullwidth
+     ((name		  . "PARTIAL DIFFERENTIAL")
+      (=ucs		  . #x2202)	; ∂
+      ))
     ))
 (define-char
   '((name		. "THERE EXISTS")
@@ -64,16 +64,16 @@
      ((name		  . "THERE EXISTS")
       (=ucs		  . #x2203)	; ∃
       ))
-    (<-fullwidth
-     ((name		  . "THERE EXISTS")
-      (=ucs		  . #x2203)	; ∃
-      ))
     (=jis-x0208@1983	. #x2250)	; &J90-2250; [02-48]
     (=ks-x1001		. #x2224)	; &I-K0-2224; [02-04]
     (=jis-x0208@1990	. #x2250)	; &I-J90-2250; [02-48]
     (=jef-china3	. #x7FDD)	; &I-JC3-7FDD;
     (=ucs@jis		. #x2203)	; &J90-2250;
     (=ucs@ks		. #x2203)	; &J90-2250;
+    (<-fullwidth
+     ((name		  . "THERE EXISTS")
+      (=ucs		  . #x2203)	; ∃
+      ))
     ))
 (define-char
   '((name		. "THERE DOES NOT EXIST")
@@ -101,12 +101,12 @@
      ((name		  . "EMPTY SET")
       (=ucs		  . #x2205)	; ∅
       ))
+    (=jis-x0213-1-2000	. #x2247)	; &JX1-2247; [02-39]
+    (=ucs@jis		. #x2205)	; &JX1-2247;
     (<-fullwidth
      ((name		  . "EMPTY SET")
       (=ucs		  . #x2205)	; ∅
       ))
-    (=jis-x0213-1-2000	. #x2247)	; &JX1-2247; [02-39]
-    (=ucs@jis		. #x2205)	; &JX1-2247;
     ))
 (define-char
   '((name		. "INCREMENT")
@@ -127,16 +127,16 @@
      ((name		  . "NABLA")
       (=ucs		  . #x2207)	; ∇
       ))
-    (<-fullwidth
-     ((name		  . "NABLA")
-      (=ucs		  . #x2207)	; ∇
-      ))
     (=jis-x0208@1983	. #x2260)	; &J90-2260; [02-64]
     (=ks-x1001		. #x2154)	; &I-K0-2154; [01-52]
     (=jis-x0208@1990	. #x2260)	; &I-J90-2260; [02-64]
     (=jef-china3	. #x7FE2)	; &I-JC3-7FE2;
     (=ucs@jis		. #x2207)	; &J90-2260;
     (=ucs@ks		. #x2207)	; &J90-2260;
+    (<-fullwidth
+     ((name		  . "NABLA")
+      (=ucs		  . #x2207)	; ∇
+      ))
     ))
 (define-char
   '((name		. "ELEMENT OF")
@@ -150,10 +150,6 @@
      ((name		  . "ELEMENT OF")
       (=ucs		  . #x2208)	; ∈
       ))
-    (<-fullwidth
-     ((name		  . "ELEMENT OF")
-      (=ucs		  . #x2208)	; ∈
-      ))
     (=gb2312		. #x214A)	; &J90-223A; [01-42]
     (=jis-x0208@1983	. #x223A)	; &I-J83-223A; [02-26]
     (=ks-x1001		. #x2174)	; &I-K0-2174; [01-84]
@@ -162,6 +158,10 @@
     (=ucs@gb		. #x2208)	; &J90-223A;
     (=ucs@jis		. #x2208)	; &J90-223A;
     (=ucs@ks		. #x2208)	; &J90-223A;
+    (<-fullwidth
+     ((name		  . "ELEMENT OF")
+      (=ucs		  . #x2208)	; ∈
+      ))
     ))
 (define-char
   '((name		. "NOT AN ELEMENT OF")
@@ -182,12 +182,12 @@
      ((name		  . "NOT AN ELEMENT OF")
       (=ucs		  . #x2209)	; ∉
       ))
+    (=jis-x0213-1-2000	. #x2246)	; &JX1-2246; [02-38]
+    (=ucs@jis		. #x2209)	; &JX1-2246;
     (<-fullwidth
      ((name		  . "NOT AN ELEMENT OF")
       (=ucs		  . #x2209)	; ∉
       ))
-    (=jis-x0213-1-2000	. #x2246)	; &JX1-2246; [02-38]
-    (=ucs@jis		. #x2209)	; &JX1-2246;
     ))
 (define-char
   '((name		. "SMALL ELEMENT OF")
@@ -208,16 +208,16 @@
      ((name		  . "CONTAINS AS MEMBER")
       (=ucs		  . #x220B)	; ∋
       ))
-    (<-fullwidth
-     ((name		  . "CONTAINS AS MEMBER")
-      (=ucs		  . #x220B)	; ∋
-      ))
     (=jis-x0208@1983	. #x223B)	; &J90-223B; [02-27]
     (=ks-x1001		. #x2175)	; &I-K0-2175; [01-85]
     (=jis-x0208@1990	. #x223B)	; &I-J90-223B; [02-27]
     (=jef-china3	. #x7FD1)	; &I-JC3-7FD1;
     (=ucs@jis		. #x220B)	; &J90-223B;
     (=ucs@ks		. #x220B)	; &J90-223B;
+    (<-fullwidth
+     ((name		  . "CONTAINS AS MEMBER")
+      (=ucs		  . #x220B)	; ∋
+      ))
     ))
 (define-char
   '((name		. "DOES NOT CONTAIN AS MEMBER")
@@ -259,14 +259,14 @@
      ((name		  . "N-ARY PRODUCT")
       (=ucs		  . #x220F)	; ∏
       ))
-    (<-fullwidth
-     ((name		  . "N-ARY PRODUCT")
-      (=ucs		  . #x220F)	; ∏
-      ))
     (=gb2312		. #x2147)	; &K0-2233; [01-39]
     (=ks-x1001		. #x2233)	; &I-K0-2233; [02-19]
     (=ucs@gb		. #x220F)	; &K0-2233;
     (=ucs@ks		. #x220F)	; &K0-2233;
+    (<-fullwidth
+     ((name		  . "N-ARY PRODUCT")
+      (=ucs		  . #x220F)	; ∏
+      ))
     ))
 (define-char
   '((name		. "N-ARY COPRODUCT")
@@ -287,14 +287,14 @@
      ((name		  . "N-ARY SUMMATION")
       (=ucs		  . #x2211)	; ∑
       ))
-    (<-fullwidth
-     ((name		  . "N-ARY SUMMATION")
-      (=ucs		  . #x2211)	; ∑
-      ))
     (=gb2312		. #x2146)	; &K0-2232; [01-38]
     (=ks-x1001		. #x2232)	; &I-K0-2232; [02-18]
     (=ucs@gb		. #x2211)	; &K0-2232;
     (=ucs@ks		. #x2211)	; &K0-2232;
+    (<-fullwidth
+     ((name		  . "N-ARY SUMMATION")
+      (=ucs		  . #x2211)	; ∑
+      ))
     ))
 (define-char
   '((name		. "MINUS SIGN")
@@ -308,12 +308,12 @@
      ((name		  . "MINUS SIGN")
       (=ucs		  . #x2212)	; −
       ))
+    (=jis-x0208		. #x215D)	; &J90-215D; [01-61]
+    (=ucs@jis		. #x2212)	; &J90-215D;
     (<-fullwidth
      ((name		  . "MINUS SIGN")
       (=ucs		  . #x2212)	; −
       ))
-    (=jis-x0208		. #x215D)	; &J90-215D; [01-61]
-    (=ucs@jis		. #x2212)	; &J90-215D;
     ))
 (define-char
   '((name		. "MINUS-OR-PLUS SIGN")
@@ -327,12 +327,12 @@
      ((name		  . "MINUS-OR-PLUS SIGN")
       (=ucs		  . #x2213)	; ∓
       ))
+    (=jis-x0213-1-2000	. #x235B)	; &JX1-235B; [03-59]
+    (=ucs@jis		. #x2213)	; &JX1-235B;
     (<-fullwidth
      ((name		  . "MINUS-OR-PLUS SIGN")
       (=ucs		  . #x2213)	; ∓
       ))
-    (=jis-x0213-1-2000	. #x235B)	; &JX1-235B; [03-59]
-    (=ucs@jis		. #x2213)	; &JX1-235B;
     ))
 (define-char
   '((name		. "DOT PLUS")
@@ -353,14 +353,14 @@
      ((name		  . "DIVISION SLASH")
       (=ucs		  . #x2215)	; ∕
       ))
-    (<-fullwidth
-     ((name		  . "DIVISION SLASH")
-      (=ucs		  . #x2215)	; ∕
-      ))
     (=cns11643-1	. #x2261)	; &C1-2261; [02-65]
     (=big5		. #xA241)	; &I-B-A241;
     (=ucs@cns		. #x2215)	; &C1-2261;
     (=ucs@big5		. #x2215)	; &C1-2261;
+    (<-fullwidth
+     ((name		  . "DIVISION SLASH")
+      (=ucs		  . #x2215)	; ∕
+      ))
     ))
 (define-char
   '((name		. "SET MINUS")
@@ -402,10 +402,6 @@
      ((name		  . "SQUARE ROOT")
       (=ucs		  . #x221A)	; √
       ))
-    (<-fullwidth
-     ((name		  . "SQUARE ROOT")
-      (=ucs		  . #x221A)	; √
-      ))
     (=gb2312		. #x214C)	; &J90-2265; [01-44]
     (=jis-x0208@1983	. #x2265)	; &I-J83-2265; [02-69]
     (=ks-x1001		. #x216E)	; &I-K0-216E; [01-78]
@@ -417,6 +413,10 @@
     (=ucs@jis		. #x221A)	; &J90-2265;
     (=ucs@ks		. #x221A)	; &J90-2265;
     (=ucs@big5		. #x221A)	; &J90-2265;
+    (<-fullwidth
+     ((name		  . "SQUARE ROOT")
+      (=ucs		  . #x221A)	; √
+      ))
     ))
 (define-char
   '((name		. "CUBE ROOT")
@@ -444,10 +444,6 @@
      ((name		  . "PROPORTIONAL TO")
       (=ucs		  . #x221D)	; ∝
       ))
-    (<-fullwidth
-     ((name		  . "PROPORTIONAL TO")
-      (=ucs		  . #x221D)	; ∝
-      ))
     (=gb2312		. #x2158)	; &J90-2267; [01-56]
     (=jis-x0208@1983	. #x2267)	; &I-J83-2267; [02-71]
     (=ks-x1001		. #x2170)	; &I-K0-2170; [01-80]
@@ -456,6 +452,10 @@
     (=ucs@gb		. #x221D)	; &J90-2267;
     (=ucs@jis		. #x221D)	; &J90-2267;
     (=ucs@ks		. #x221D)	; &J90-2267;
+    (<-fullwidth
+     ((name		  . "PROPORTIONAL TO")
+      (=ucs		  . #x221D)	; ∝
+      ))
     ))
 (define-char
   '((name		. "INFINITY")
@@ -469,10 +469,6 @@
      ((name		  . "INFINITY")
       (=ucs		  . #x221E)	; ∞
       ))
-    (<-fullwidth
-     ((name		  . "INFINITY")
-      (=ucs		  . #x221E)	; ∞
-      ))
     (=jis-x0208		. #x2167)	; &J90-2167; [01-71]
     (=gb2312		. #x215E)	; &I-G0-215E; [01-62]
     (=ks-x1001		. #x2144)	; &I-K0-2144; [01-36]
@@ -483,6 +479,10 @@
     (=ucs@jis		. #x221E)	; &J90-2167;
     (=ucs@ks		. #x221E)	; &J90-2167;
     (=ucs@big5		. #x221E)	; &J90-2167;
+    (<-fullwidth
+     ((name		  . "INFINITY")
+      (=ucs		  . #x221E)	; ∞
+      ))
     ))
 (define-char
   '((name		. "RIGHT ANGLE")
@@ -496,16 +496,16 @@
      ((name		  . "RIGHT ANGLE")
       (=ucs		  . #x221F)	; ∟
       ))
-    (<-fullwidth
-     ((name		  . "RIGHT ANGLE")
-      (=ucs		  . #x221F)	; ∟
-      ))
     (=cns11643-1	. #x2249)	; &JX1-2D78; [02-41]
     (=jis-x0213-1-2000	. #x2D78)	; &I-JX1-2D78; [13-88]
     (=big5		. #xA1E8)	; &I-B-A1E8;
     (=ucs@cns		. #x221F)	; &JX1-2D78;
     (=ucs@jis		. #x221F)	; &JX1-2D78;
     (=ucs@big5		. #x221F)	; &JX1-2D78;
+    (<-fullwidth
+     ((name		  . "RIGHT ANGLE")
+      (=ucs		  . #x221F)	; ∟
+      ))
     ))
 (define-char
   '((name		. "ANGLE")
@@ -519,10 +519,6 @@
      ((name		  . "ANGLE")
       (=ucs		  . #x2220)	; ∠
       ))
-    (<-fullwidth
-     ((name		  . "ANGLE")
-      (=ucs		  . #x2220)	; ∠
-      ))
     (=gb2312		. #x214F)	; &J90-225C; [01-47]
     (=jis-x0208@1983	. #x225C)	; &I-J83-225C; [02-60]
     (=ks-x1001		. #x2150)	; &I-K0-2150; [01-48]
@@ -535,6 +531,10 @@
     (=ucs@jis		. #x2220)	; &J90-225C;
     (=ucs@ks		. #x2220)	; &J90-225C;
     (=ucs@big5		. #x2220)	; &J90-225C;
+    (<-fullwidth
+     ((name		  . "ANGLE")
+      (=ucs		  . #x2220)	; ∠
+      ))
     ))
 (define-char
   '((name		. "MEASURED ANGLE")
@@ -562,12 +562,12 @@
      ((name		  . "DIVIDES")
       (=ucs		  . #x2223)	; ∣
       ))
+    (=big5		. #xA1FD)	; &B-A1FD;
+    (=ucs@big5		. #x2223)	; &B-A1FD;
     (<-fullwidth
      ((name		  . "DIVIDES")
       (=ucs		  . #x2223)	; ∣
       ))
-    (=big5		. #xA1FD)	; &B-A1FD;
-    (=ucs@big5		. #x2223)	; &B-A1FD;
     ))
 (define-char
   '((name		. "DOES NOT DIVIDE")
@@ -595,10 +595,6 @@
      ((name		  . "PARALLEL TO")
       (=ucs		  . #x2225)	; ∥
       ))
-    (<-fullwidth
-     ((name		  . "PARALLEL TO")
-      (=ucs		  . #x2225)	; ∥
-      ))
     (=gb2312		. #x214E)	; &JX1-2254; [01-46]
     (=ks-x1001		. #x212B)	; &I-K0-212B; [01-11]
     (=jis-x0213-1-2000	. #x2254)	; &I-JX1-2254; [02-52]
@@ -607,6 +603,10 @@
     (=ucs@jis		. #x2225)	; &JX1-2254;
     (=ucs@ks		. #x2225)	; &JX1-2254;
     (=ucs@big5		. #x2225)	; &JX1-2254;
+    (<-fullwidth
+     ((name		  . "PARALLEL TO")
+      (=ucs		  . #x2225)	; ∥
+      ))
     ))
 (define-char
   '((name		. "NOT PARALLEL TO")
@@ -627,12 +627,12 @@
      ((name		  . "NOT PARALLEL TO")
       (=ucs		  . #x2226)	; ∦
       ))
+    (=jis-x0213-1-2000	. #x2255)	; &JX1-2255; [02-53]
+    (=ucs@jis		. #x2226)	; &JX1-2255;
     (<-fullwidth
      ((name		  . "NOT PARALLEL TO")
       (=ucs		  . #x2226)	; ∦
       ))
-    (=jis-x0213-1-2000	. #x2255)	; &JX1-2255; [02-53]
-    (=ucs@jis		. #x2226)	; &JX1-2255;
     ))
 (define-char
   '((name		. "LOGICAL AND")
@@ -646,10 +646,6 @@
      ((name		  . "LOGICAL AND")
       (=ucs		  . #x2227)	; ∧
       ))
-    (<-fullwidth
-     ((name		  . "LOGICAL AND")
-      (=ucs		  . #x2227)	; ∧
-      ))
     (=gb2312		. #x2144)	; &J90-224A; [01-36]
     (=jis-x0208@1983	. #x224A)	; &I-J83-224A; [02-42]
     (=ks-x1001		. #x217C)	; &I-K0-217C; [01-92]
@@ -658,6 +654,10 @@
     (=ucs@gb		. #x2227)	; &J90-224A;
     (=ucs@jis		. #x2227)	; &J90-224A;
     (=ucs@ks		. #x2227)	; &J90-224A;
+    (<-fullwidth
+     ((name		  . "LOGICAL AND")
+      (=ucs		  . #x2227)	; ∧
+      ))
     ))
 (define-char
   '((name		. "LOGICAL OR")
@@ -671,10 +671,6 @@
      ((name		  . "LOGICAL OR")
       (=ucs		  . #x2228)	; ∨
       ))
-    (<-fullwidth
-     ((name		  . "LOGICAL OR")
-      (=ucs		  . #x2228)	; ∨
-      ))
     (=gb2312		. #x2145)	; &J90-224B; [01-37]
     (=jis-x0208@1983	. #x224B)	; &I-J83-224B; [02-43]
     (=ks-x1001		. #x217D)	; &I-K0-217D; [01-93]
@@ -683,6 +679,10 @@
     (=ucs@gb		. #x2228)	; &J90-224B;
     (=ucs@jis		. #x2228)	; &J90-224B;
     (=ucs@ks		. #x2228)	; &J90-224B;
+    (<-fullwidth
+     ((name		  . "LOGICAL OR")
+      (=ucs		  . #x2228)	; ∨
+      ))
     ))
 (define-char
   '((name		. "INTERSECTION")
@@ -696,10 +696,6 @@
      ((name		  . "INTERSECTION")
       (=ucs		  . #x2229)	; ∩
       ))
-    (<-fullwidth
-     ((name		  . "INTERSECTION")
-      (=ucs		  . #x2229)	; ∩
-      ))
     (=gb2312		. #x2149)	; &J90-2241; [01-41]
     (=jis-x0208@1983	. #x2241)	; &I-J83-2241; [02-33]
     (=ks-x1001		. #x217B)	; &I-K0-217B; [01-91]
@@ -712,6 +708,10 @@
     (=ucs@jis		. #x2229)	; &J90-2241;
     (=ucs@ks		. #x2229)	; &J90-2241;
     (=ucs@big5		. #x2229)	; &J90-2241;
+    (<-fullwidth
+     ((name		  . "INTERSECTION")
+      (=ucs		  . #x2229)	; ∩
+      ))
     ))
 (define-char
   '((name		. "UNION")
@@ -725,10 +725,6 @@
      ((name		  . "UNION")
       (=ucs		  . #x222A)	; ∪
       ))
-    (<-fullwidth
-     ((name		  . "UNION")
-      (=ucs		  . #x222A)	; ∪
-      ))
     (=gb2312		. #x2148)	; &J90-2240; [01-40]
     (=jis-x0208@1983	. #x2240)	; &I-J83-2240; [02-32]
     (=ks-x1001		. #x217A)	; &I-K0-217A; [01-90]
@@ -741,6 +737,10 @@
     (=ucs@jis		. #x222A)	; &J90-2240;
     (=ucs@ks		. #x222A)	; &J90-2240;
     (=ucs@big5		. #x222A)	; &J90-2240;
+    (<-fullwidth
+     ((name		  . "UNION")
+      (=ucs		  . #x222A)	; ∪
+      ))
     ))
 (define-char
   '((name		. "INTEGRAL")
@@ -754,10 +754,6 @@
      ((name		  . "INTEGRAL")
       (=ucs		  . #x222B)	; ∫
       ))
-    (<-fullwidth
-     ((name		  . "INTEGRAL")
-      (=ucs		  . #x222B)	; ∫
-      ))
     (=gb2312		. #x2152)	; &J90-2269; [01-50]
     (=jis-x0208@1983	. #x2269)	; &I-J83-2269; [02-73]
     (=ks-x1001		. #x2172)	; &I-K0-2172; [01-82]
@@ -770,6 +766,10 @@
     (=ucs@jis		. #x222B)	; &J90-2269;
     (=ucs@ks		. #x222B)	; &J90-2269;
     (=ucs@big5		. #x222B)	; &J90-2269;
+    (<-fullwidth
+     ((name		  . "INTEGRAL")
+      (=ucs		  . #x222B)	; ∫
+      ))
     ))
 (define-char
   '((name		. "DOUBLE INTEGRAL")
@@ -790,16 +790,16 @@
      ((name		  . "DOUBLE INTEGRAL")
       (=ucs		  . #x222C)	; ∬
       ))
-    (<-fullwidth
-     ((name		  . "DOUBLE INTEGRAL")
-      (=ucs		  . #x222C)	; ∬
-      ))
     (=jis-x0208@1983	. #x226A)	; &J90-226A; [02-74]
     (=ks-x1001		. #x2173)	; &I-K0-2173; [01-83]
     (=jis-x0208@1990	. #x226A)	; &I-J90-226A; [02-74]
     (=jef-china3	. #x7FE9)	; &I-JC3-7FE9;
     (=ucs@jis		. #x222C)	; &J90-226A;
     (=ucs@ks		. #x222C)	; &J90-226A;
+    (<-fullwidth
+     ((name		  . "DOUBLE INTEGRAL")
+      (=ucs		  . #x222C)	; ∬
+      ))
     ))
 (define-char
   '((name		. "TRIPLE INTEGRAL")
@@ -830,10 +830,6 @@
      ((name		  . "CONTOUR INTEGRAL")
       (=ucs		  . #x222E)	; ∮
       ))
-    (<-fullwidth
-     ((name		  . "CONTOUR INTEGRAL")
-      (=ucs		  . #x222E)	; ∮
-      ))
     (=gb2312		. #x2153)	; &JX1-2D73; [01-51]
     (=ks-x1001		. #x2231)	; &I-K0-2231; [02-17]
     (=cns11643-1	. #x224E)	; &I-C1-224E; [02-46]
@@ -844,6 +840,10 @@
     (=ucs@jis		. #x222E)	; &JX1-2D73;
     (=ucs@ks		. #x222E)	; &JX1-2D73;
     (=ucs@big5		. #x222E)	; &JX1-2D73;
+    (<-fullwidth
+     ((name		  . "CONTOUR INTEGRAL")
+      (=ucs		  . #x222E)	; ∮
+      ))
     ))
 (define-char
   '((name		. "SURFACE INTEGRAL")
@@ -909,10 +909,6 @@
      ((name		  . "THEREFORE")
       (=ucs		  . #x2234)	; ∴
       ))
-    (<-fullwidth
-     ((name		  . "THEREFORE")
-      (=ucs		  . #x2234)	; ∴
-      ))
     (=jis-x0208		. #x2168)	; &J90-2168; [01-72]
     (=gb2312		. #x2160)	; &I-G0-2160; [01-64]
     (=ks-x1001		. #x2145)	; &I-K0-2145; [01-37]
@@ -923,6 +919,10 @@
     (=ucs@jis		. #x2234)	; &J90-2168;
     (=ucs@ks		. #x2234)	; &J90-2168;
     (=ucs@big5		. #x2234)	; &J90-2168;
+    (<-fullwidth
+     ((name		  . "THEREFORE")
+      (=ucs		  . #x2234)	; ∴
+      ))
     ))
 (define-char
   '((name		. "BECAUSE")
@@ -936,10 +936,6 @@
      ((name		  . "BECAUSE")
       (=ucs		  . #x2235)	; ∵
       ))
-    (<-fullwidth
-     ((name		  . "BECAUSE")
-      (=ucs		  . #x2235)	; ∵
-      ))
     (=gb2312		. #x215F)	; &J90-2268; [01-63]
     (=jis-x0208@1983	. #x2268)	; &I-J83-2268; [02-72]
     (=ks-x1001		. #x2171)	; &I-K0-2171; [01-81]
@@ -951,6 +947,10 @@
     (=ucs@jis		. #x2235)	; &J90-2268;
     (=ucs@ks		. #x2235)	; &J90-2268;
     (=ucs@big5		. #x2235)	; &J90-2268;
+    (<-fullwidth
+     ((name		  . "BECAUSE")
+      (=ucs		  . #x2235)	; ∵
+      ))
     ))
 (define-char
   '((name		. "RATIO")
@@ -964,12 +964,12 @@
      ((name		  . "RATIO")
       (=ucs		  . #x2236)	; ∶
       ))
+    (=gb2312		. #x2143)	; &G0-2143; [01-35]
+    (=ucs@gb		. #x2236)	; &G0-2143;
     (<-fullwidth
      ((name		  . "RATIO")
       (=ucs		  . #x2236)	; ∶
       ))
-    (=gb2312		. #x2143)	; &G0-2143; [01-35]
-    (=ucs@gb		. #x2236)	; &G0-2143;
     ))
 (define-char
   '((name		. "PROPORTION")
@@ -983,12 +983,12 @@
      ((name		  . "PROPORTION")
       (=ucs		  . #x2237)	; ∷
       ))
+    (=gb2312		. #x214B)	; &G0-214B; [01-43]
+    (=ucs@gb		. #x2237)	; &G0-214B;
     (<-fullwidth
      ((name		  . "PROPORTION")
       (=ucs		  . #x2237)	; ∷
       ))
-    (=gb2312		. #x214B)	; &G0-214B; [01-43]
-    (=ucs@gb		. #x2237)	; &G0-214B;
     ))
 (define-char
   '((name		. "DOT MINUS")
@@ -1030,16 +1030,16 @@
      ((name		  . "TILDE OPERATOR")
       (=ucs		  . #x223C)	; ∼
       ))
-    (<-fullwidth
-     ((name		  . "TILDE OPERATOR")
-      (=ucs		  . #x223C)	; ∼
-      ))
     (=ks-x1001		. #x212D)	; &C1-2244; [01-13]
     (=cns11643-1	. #x2244)	; &I-C1-2244; [02-36]
     (=big5		. #xA1E3)	; &I-B-A1E3;
     (=ucs@cns		. #xFF5E)	; &C1-2244;
     (=ucs@ks		. #x223C)	; &C1-2244;
     (=ucs@big5		. #xFF5E)	; &C1-2244;
+    (<-fullwidth
+     ((name		  . "TILDE OPERATOR")
+      (=ucs		  . #x223C)	; ∼
+      ))
     ))
 (define-char
   '((name		. "REVERSED TILDE")
@@ -1054,10 +1054,6 @@
      ((name		  . "REVERSED TILDE")
       (=ucs		  . #x223D)	; ∽
       ))
-    (<-fullwidth
-     ((name		  . "REVERSED TILDE")
-      (=ucs		  . #x223D)	; ∽
-      ))
     (=gb2312		. #x2157)	; &J90-2266; [01-55]
     (=jis-x0208@1983	. #x2266)	; &I-J83-2266; [02-70]
     (=ks-x1001		. #x216F)	; &I-K0-216F; [01-79]
@@ -1066,6 +1062,10 @@
     (=ucs@gb		. #x223D)	; &J90-2266;
     (=ucs@jis		. #x223D)	; &J90-2266;
     (=ucs@ks		. #x223D)	; &J90-2266;
+    (<-fullwidth
+     ((name		  . "REVERSED TILDE")
+      (=ucs		  . #x223D)	; ∽
+      ))
     ))
 (define-char
   '((name		. "INVERTED LAZY S")
@@ -1121,12 +1121,12 @@
      ((name		  . "ASYMPTOTICALLY EQUAL TO")
       (=ucs		  . #x2243)	; ≃
       ))
+    (=jis-x0213-1-2000	. #x226C)	; &JX1-226C; [02-76]
+    (=ucs@jis		. #x2243)	; &JX1-226C;
     (<-fullwidth
      ((name		  . "ASYMPTOTICALLY EQUAL TO")
       (=ucs		  . #x2243)	; ≃
       ))
-    (=jis-x0213-1-2000	. #x226C)	; &JX1-226C; [02-76]
-    (=ucs@jis		. #x2243)	; &JX1-226C;
     ))
 (define-char
   '((name		. "NOT ASYMPTOTICALLY EQUAL TO")
@@ -1154,12 +1154,12 @@
      ((name		  . "APPROXIMATELY EQUAL TO")
       (=ucs		  . #x2245)	; ≅
       ))
+    (=jis-x0213-1-2000	. #x226D)	; &JX1-226D; [02-77]
+    (=ucs@jis		. #x2245)	; &JX1-226D;
     (<-fullwidth
      ((name		  . "APPROXIMATELY EQUAL TO")
       (=ucs		  . #x2245)	; ≅
       ))
-    (=jis-x0213-1-2000	. #x226D)	; &JX1-226D; [02-77]
-    (=ucs@jis		. #x2245)	; &JX1-226D;
     ))
 (define-char
   '((name		. "APPROXIMATELY BUT NOT ACTUALLY EQUAL TO")
@@ -1194,14 +1194,14 @@
      ((name		  . "ALMOST EQUAL TO")
       (=ucs		  . #x2248)	; ≈
       ))
-    (<-fullwidth
-     ((name		  . "ALMOST EQUAL TO")
-      (=ucs		  . #x2248)	; ≈
-      ))
     (=gb2312		. #x2156)	; &JX1-226E; [01-54]
     (=jis-x0213-1-2000	. #x226E)	; &I-JX1-226E; [02-78]
     (=ucs@gb		. #x2248)	; &JX1-226E;
     (=ucs@jis		. #x2248)	; &JX1-226E;
+    (<-fullwidth
+     ((name		  . "ALMOST EQUAL TO")
+      (=ucs		  . #x2248)	; ≈
+      ))
     ))
 (define-char
   '((name		. "NOT ALMOST EQUAL TO")
@@ -1243,12 +1243,12 @@
      ((name		  . "ALL EQUAL TO")
       (=ucs		  . #x224C)	; ≌
       ))
+    (=gb2312		. #x2155)	; &G0-2155; [01-53]
+    (=ucs@gb		. #x224C)	; &G0-2155;
     (<-fullwidth
      ((name		  . "ALL EQUAL TO")
       (=ucs		  . #x224C)	; ≌
       ))
-    (=gb2312		. #x2155)	; &G0-2155; [01-53]
-    (=ucs@gb		. #x224C)	; &G0-2155;
     ))
 (define-char
   '((name		. "EQUIVALENT TO")
@@ -1297,10 +1297,6 @@
      ((name		  . "APPROXIMATELY EQUAL TO OR THE IMAGE OF")
       (=ucs		  . #x2252)	; ≒
       ))
-    (<-fullwidth
-     ((name		  . "APPROXIMATELY EQUAL TO OR THE IMAGE OF")
-      (=ucs		  . #x2252)	; ≒
-      ))
     (=jis-x0208@1983	. #x2262)	; &J90-2262; [02-66]
     (=ks-x1001		. #x2156)	; &I-K0-2156; [01-54]
     (=jis-x0208@1990	. #x2262)	; &I-J90-2262; [02-66]
@@ -1310,6 +1306,10 @@
     (=ucs@jis		. #x2252)	; &J90-2262;
     (=ucs@ks		. #x2252)	; &J90-2262;
     (=ucs@big5		. #x2252)	; &J90-2262;
+    (<-fullwidth
+     ((name		  . "APPROXIMATELY EQUAL TO OR THE IMAGE OF")
+      (=ucs		  . #x2252)	; ≒
+      ))
     ))
 (define-char
   '((name		. "IMAGE OF OR APPROXIMATELY EQUAL TO")
@@ -1421,10 +1421,6 @@
      ((name		  . "NOT EQUAL TO")
       (=ucs		  . #x2260)	; ≠
       ))
-    (<-fullwidth
-     ((name		  . "NOT EQUAL TO")
-      (=ucs		  . #x2260)	; ≠
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH EQUALS SIGN")
       (=ucs		  . #xFF1D)	; ＝
@@ -1442,6 +1438,10 @@
     (=ucs@jis		. #x2260)	; &J90-2162;
     (=ucs@ks		. #x2260)	; &J90-2162;
     (=ucs@big5		. #x2260)	; &J90-2162;
+    (<-fullwidth
+     ((name		  . "NOT EQUAL TO")
+      (=ucs		  . #x2260)	; ≠
+      ))
     ))
 (define-char
   '((name		. "IDENTICAL TO")
@@ -1455,10 +1455,6 @@
      ((name		  . "IDENTICAL TO")
       (=ucs		  . #x2261)	; ≡
       ))
-    (<-fullwidth
-     ((name		  . "IDENTICAL TO")
-      (=ucs		  . #x2261)	; ≡
-      ))
     (=gb2312		. #x2154)	; &J90-2261; [01-52]
     (=jis-x0208@1983	. #x2261)	; &I-J83-2261; [02-65]
     (=ks-x1001		. #x2155)	; &I-K0-2155; [01-53]
@@ -1470,6 +1466,10 @@
     (=ucs@jis		. #x2261)	; &J90-2261;
     (=ucs@ks		. #x2261)	; &J90-2261;
     (=ucs@big5		. #x2261)	; &J90-2261;
+    (<-fullwidth
+     ((name		  . "IDENTICAL TO")
+      (=ucs		  . #x2261)	; ≡
+      ))
     ))
 (define-char
   '((name		. "NOT IDENTICAL TO")
@@ -1490,10 +1490,6 @@
      ((name		  . "NOT IDENTICAL TO")
       (=ucs		  . #x2262)	; ≢
       ))
-    (<-fullwidth
-     ((name		  . "NOT IDENTICAL TO")
-      (=ucs		  . #x2262)	; ≢
-      ))
     (=decomposition
      ((=gb2312		  . #x2154)	; &J90-2261; [01-52]
       (=jis-x0208@1983	  . #x2261)	; &I-J83-2261; [02-65]
@@ -1505,6 +1501,10 @@
       ))
     (=jis-x0213-1-2000	. #x226B)	; &JX1-226B; [02-75]
     (=ucs@jis		. #x2262)	; &JX1-226B;
+    (<-fullwidth
+     ((name		  . "NOT IDENTICAL TO")
+      (=ucs		  . #x2262)	; ≢
+      ))
     ))
 (define-char
   '((name		. "STRICTLY EQUIVALENT TO")
@@ -1525,14 +1525,14 @@
      ((name		  . "LESS-THAN OR EQUAL TO")
       (=ucs		  . #x2264)	; ≤
       ))
-    (<-fullwidth
-     ((name		  . "LESS-THAN OR EQUAL TO")
-      (=ucs		  . #x2264)	; ≤
-      ))
     (=gb2312		. #x215C)	; &K0-2142; [01-60]
     (=ks-x1001		. #x2142)	; &I-K0-2142; [01-34]
     (=ucs@gb		. #x2264)	; &K0-2142;
     (=ucs@ks		. #x2264)	; &K0-2142;
+    (<-fullwidth
+     ((name		  . "LESS-THAN OR EQUAL TO")
+      (=ucs		  . #x2264)	; ≤
+      ))
     ))
 (define-char
   '((name		. "GREATER-THAN OR EQUAL TO")
@@ -1546,14 +1546,14 @@
      ((name		  . "GREATER-THAN OR EQUAL TO")
       (=ucs		  . #x2265)	; ≥
       ))
-    (<-fullwidth
-     ((name		  . "GREATER-THAN OR EQUAL TO")
-      (=ucs		  . #x2265)	; ≥
-      ))
     (=gb2312		. #x215D)	; &K0-2143; [01-61]
     (=ks-x1001		. #x2143)	; &I-K0-2143; [01-35]
     (=ucs@gb		. #x2265)	; &K0-2143;
     (=ucs@ks		. #x2265)	; &K0-2143;
+    (<-fullwidth
+     ((name		  . "GREATER-THAN OR EQUAL TO")
+      (=ucs		  . #x2265)	; ≥
+      ))
     ))
 (define-char
   '((name		. "LESS-THAN OVER EQUAL TO")
@@ -1567,16 +1567,16 @@
      ((name		  . "LESS-THAN OVER EQUAL TO")
       (=ucs		  . #x2266)	; ≦
       ))
-    (<-fullwidth
-     ((name		  . "LESS-THAN OVER EQUAL TO")
-      (=ucs		  . #x2266)	; ≦
-      ))
     (=jis-x0208		. #x2165)	; &J90-2165; [01-69]
     (=cns11643-1	. #x2239)	; &I-C1-2239; [02-25]
     (=big5		. #xA1D8)	; &I-B-A1D8;
     (=ucs@cns		. #x2266)	; &J90-2165;
     (=ucs@jis		. #x2266)	; &J90-2165;
     (=ucs@big5		. #x2266)	; &J90-2165;
+    (<-fullwidth
+     ((name		  . "LESS-THAN OVER EQUAL TO")
+      (=ucs		  . #x2266)	; ≦
+      ))
     ))
 (define-char
   '((name		. "GREATER-THAN OVER EQUAL TO")
@@ -1590,16 +1590,16 @@
      ((name		  . "GREATER-THAN OVER EQUAL TO")
       (=ucs		  . #x2267)	; ≧
       ))
-    (<-fullwidth
-     ((name		  . "GREATER-THAN OVER EQUAL TO")
-      (=ucs		  . #x2267)	; ≧
-      ))
     (=jis-x0208		. #x2166)	; &J90-2166; [01-70]
     (=cns11643-1	. #x223A)	; &I-C1-223A; [02-26]
     (=big5		. #xA1D9)	; &I-B-A1D9;
     (=ucs@cns		. #x2267)	; &J90-2166;
     (=ucs@jis		. #x2267)	; &J90-2166;
     (=ucs@big5		. #x2267)	; &J90-2166;
+    (<-fullwidth
+     ((name		  . "GREATER-THAN OVER EQUAL TO")
+      (=ucs		  . #x2267)	; ≧
+      ))
     ))
 (define-char
   '((name		. "LESS-THAN BUT NOT EQUAL TO")
@@ -1627,16 +1627,16 @@
      ((name		  . "MUCH LESS-THAN")
       (=ucs		  . #x226A)	; ≪
       ))
-    (<-fullwidth
-     ((name		  . "MUCH LESS-THAN")
-      (=ucs		  . #x226A)	; ≪
-      ))
     (=jis-x0208@1983	. #x2263)	; &J90-2263; [02-67]
     (=ks-x1001		. #x216C)	; &I-K0-216C; [01-76]
     (=jis-x0208@1990	. #x2263)	; &I-J90-2263; [02-67]
     (=jef-china3	. #x7FE3)	; &I-JC3-7FE3;
     (=ucs@jis		. #x226A)	; &J90-2263;
     (=ucs@ks		. #x226A)	; &J90-2263;
+    (<-fullwidth
+     ((name		  . "MUCH LESS-THAN")
+      (=ucs		  . #x226A)	; ≪
+      ))
     ))
 (define-char
   '((name		. "MUCH GREATER-THAN")
@@ -1650,16 +1650,16 @@
      ((name		  . "MUCH GREATER-THAN")
       (=ucs		  . #x226B)	; ≫
       ))
-    (<-fullwidth
-     ((name		  . "MUCH GREATER-THAN")
-      (=ucs		  . #x226B)	; ≫
-      ))
     (=jis-x0208@1983	. #x2264)	; &J90-2264; [02-68]
     (=ks-x1001		. #x216D)	; &I-K0-216D; [01-77]
     (=jis-x0208@1990	. #x2264)	; &I-J90-2264; [02-68]
     (=jef-china3	. #x7FE4)	; &I-JC3-7FE4;
     (=ucs@jis		. #x226B)	; &J90-2264;
     (=ucs@ks		. #x226B)	; &J90-2264;
+    (<-fullwidth
+     ((name		  . "MUCH GREATER-THAN")
+      (=ucs		  . #x226B)	; ≫
+      ))
     ))
 (define-char
   '((name		. "BETWEEN")
@@ -1701,10 +1701,6 @@
      ((name		  . "NOT LESS-THAN")
       (=ucs		  . #x226E)	; ≮
       ))
-    (<-fullwidth
-     ((name		  . "NOT LESS-THAN")
-      (=ucs		  . #x226E)	; ≮
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LESS-THAN SIGN")
       (=ucs		  . #xFF1C)	; ＜
@@ -1714,6 +1710,10 @@
       ))
     (=gb2312		. #x215A)	; &G0-215A; [01-58]
     (=ucs@gb		. #x226E)	; &G0-215A;
+    (<-fullwidth
+     ((name		  . "NOT LESS-THAN")
+      (=ucs		  . #x226E)	; ≮
+      ))
     ))
 (define-char
   '((name		. "NOT GREATER-THAN")
@@ -1734,10 +1734,6 @@
      ((name		  . "NOT GREATER-THAN")
       (=ucs		  . #x226F)	; ≯
       ))
-    (<-fullwidth
-     ((name		  . "NOT GREATER-THAN")
-      (=ucs		  . #x226F)	; ≯
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH GREATER-THAN SIGN")
       (=ucs		  . #xFF1E)	; ＞
@@ -1747,6 +1743,10 @@
       ))
     (=gb2312		. #x215B)	; &G0-215B; [01-59]
     (=ucs@gb		. #x226F)	; &G0-215B;
+    (<-fullwidth
+     ((name		  . "NOT GREATER-THAN")
+      (=ucs		  . #x226F)	; ≯
+      ))
     ))
 (define-char
   '((name		. "NEITHER LESS-THAN NOR EQUAL TO")
@@ -1830,12 +1830,12 @@
      ((name		  . "LESS-THAN OR GREATER-THAN")
       (=ucs		  . #x2276)	; ≶
       ))
+    (=jis-x0213-1-2000	. #x226F)	; &JX1-226F; [02-79]
+    (=ucs@jis		. #x2276)	; &JX1-226F;
     (<-fullwidth
      ((name		  . "LESS-THAN OR GREATER-THAN")
       (=ucs		  . #x2276)	; ≶
       ))
-    (=jis-x0213-1-2000	. #x226F)	; &JX1-226F; [02-79]
-    (=ucs@jis		. #x2276)	; &JX1-226F;
     ))
 (define-char
   '((name		. "GREATER-THAN OR LESS-THAN")
@@ -1849,12 +1849,12 @@
      ((name		  . "GREATER-THAN OR LESS-THAN")
       (=ucs		  . #x2277)	; ≷
       ))
+    (=jis-x0213-1-2000	. #x2270)	; &JX1-2270; [02-80]
+    (=ucs@jis		. #x2277)	; &JX1-2270;
     (<-fullwidth
      ((name		  . "GREATER-THAN OR LESS-THAN")
       (=ucs		  . #x2277)	; ≷
       ))
-    (=jis-x0213-1-2000	. #x2270)	; &JX1-2270; [02-80]
-    (=ucs@jis		. #x2277)	; &JX1-2270;
     ))
 (define-char
   '((name		. "NEITHER LESS-THAN NOR GREATER-THAN")
@@ -1966,16 +1966,16 @@
      ((name		  . "SUBSET OF")
       (=ucs		  . #x2282)	; ⊂
       ))
-    (<-fullwidth
-     ((name		  . "SUBSET OF")
-      (=ucs		  . #x2282)	; ⊂
-      ))
     (=jis-x0208@1983	. #x223E)	; &J90-223E; [02-30]
     (=ks-x1001		. #x2178)	; &I-K0-2178; [01-88]
     (=jis-x0208@1990	. #x223E)	; &I-J90-223E; [02-30]
     (=jef-china3	. #x7FD4)	; &I-JC3-7FD4;
     (=ucs@jis		. #x2282)	; &J90-223E;
     (=ucs@ks		. #x2282)	; &J90-223E;
+    (<-fullwidth
+     ((name		  . "SUBSET OF")
+      (=ucs		  . #x2282)	; ⊂
+      ))
     ))
 (define-char
   '((name		. "SUPERSET OF")
@@ -1989,16 +1989,16 @@
      ((name		  . "SUPERSET OF")
       (=ucs		  . #x2283)	; ⊃
       ))
-    (<-fullwidth
-     ((name		  . "SUPERSET OF")
-      (=ucs		  . #x2283)	; ⊃
-      ))
     (=jis-x0208@1983	. #x223F)	; &J90-223F; [02-31]
     (=ks-x1001		. #x2179)	; &I-K0-2179; [01-89]
     (=jis-x0208@1990	. #x223F)	; &I-J90-223F; [02-31]
     (=jef-china3	. #x7FD5)	; &I-JC3-7FD5;
     (=ucs@jis		. #x2283)	; &J90-223F;
     (=ucs@ks		. #x2283)	; &J90-223F;
+    (<-fullwidth
+     ((name		  . "SUPERSET OF")
+      (=ucs		  . #x2283)	; ⊃
+      ))
     ))
 (define-char
   '((name		. "NOT A SUBSET OF")
@@ -2019,12 +2019,12 @@
      ((name		  . "NOT A SUBSET OF")
       (=ucs		  . #x2284)	; ⊄
       ))
+    (=jis-x0213-1-2000	. #x2242)	; &JX1-2242; [02-34]
+    (=ucs@jis		. #x2284)	; &JX1-2242;
     (<-fullwidth
      ((name		  . "NOT A SUBSET OF")
       (=ucs		  . #x2284)	; ⊄
       ))
-    (=jis-x0213-1-2000	. #x2242)	; &JX1-2242; [02-34]
-    (=ucs@jis		. #x2284)	; &JX1-2242;
     ))
 (define-char
   '((name		. "NOT A SUPERSET OF")
@@ -2045,12 +2045,12 @@
      ((name		  . "NOT A SUPERSET OF")
       (=ucs		  . #x2285)	; ⊅
       ))
+    (=jis-x0213-1-2000	. #x2243)	; &JX1-2243; [02-35]
+    (=ucs@jis		. #x2285)	; &JX1-2243;
     (<-fullwidth
      ((name		  . "NOT A SUPERSET OF")
       (=ucs		  . #x2285)	; ⊅
       ))
-    (=jis-x0213-1-2000	. #x2243)	; &JX1-2243; [02-35]
-    (=ucs@jis		. #x2285)	; &JX1-2243;
     ))
 (define-char
   '((name		. "SUBSET OF OR EQUAL TO")
@@ -2064,16 +2064,16 @@
      ((name		  . "SUBSET OF OR EQUAL TO")
       (=ucs		  . #x2286)	; ⊆
       ))
-    (<-fullwidth
-     ((name		  . "SUBSET OF OR EQUAL TO")
-      (=ucs		  . #x2286)	; ⊆
-      ))
     (=jis-x0208@1983	. #x223C)	; &J90-223C; [02-28]
     (=ks-x1001		. #x2176)	; &I-K0-2176; [01-86]
     (=jis-x0208@1990	. #x223C)	; &I-J90-223C; [02-28]
     (=jef-china3	. #x7FD2)	; &I-JC3-7FD2;
     (=ucs@jis		. #x2286)	; &J90-223C;
     (=ucs@ks		. #x2286)	; &J90-223C;
+    (<-fullwidth
+     ((name		  . "SUBSET OF OR EQUAL TO")
+      (=ucs		  . #x2286)	; ⊆
+      ))
     ))
 (define-char
   '((name		. "SUPERSET OF OR EQUAL TO")
@@ -2087,16 +2087,16 @@
      ((name		  . "SUPERSET OF OR EQUAL TO")
       (=ucs		  . #x2287)	; ⊇
       ))
-    (<-fullwidth
-     ((name		  . "SUPERSET OF OR EQUAL TO")
-      (=ucs		  . #x2287)	; ⊇
-      ))
     (=jis-x0208@1983	. #x223D)	; &J90-223D; [02-29]
     (=ks-x1001		. #x2177)	; &I-K0-2177; [01-87]
     (=jis-x0208@1990	. #x223D)	; &I-J90-223D; [02-29]
     (=jef-china3	. #x7FD3)	; &I-JC3-7FD3;
     (=ucs@jis		. #x2287)	; &J90-223D;
     (=ucs@ks		. #x2287)	; &J90-223D;
+    (<-fullwidth
+     ((name		  . "SUPERSET OF OR EQUAL TO")
+      (=ucs		  . #x2287)	; ⊇
+      ))
     ))
 (define-char
   '((name		. "NEITHER A SUBSET OF NOR EQUAL TO")
@@ -2138,12 +2138,12 @@
      ((name		  . "SUBSET OF WITH NOT EQUAL TO")
       (=ucs		  . #x228A)	; ⊊
       ))
+    (=jis-x0213-1-2000	. #x2244)	; &JX1-2244; [02-36]
+    (=ucs@jis		. #x228A)	; &JX1-2244;
     (<-fullwidth
      ((name		  . "SUBSET OF WITH NOT EQUAL TO")
       (=ucs		  . #x228A)	; ⊊
       ))
-    (=jis-x0213-1-2000	. #x2244)	; &JX1-2244; [02-36]
-    (=ucs@jis		. #x228A)	; &JX1-2244;
     ))
 (define-char
   '((name		. "SUPERSET OF WITH NOT EQUAL TO")
@@ -2157,12 +2157,12 @@
      ((name		  . "SUPERSET OF WITH NOT EQUAL TO")
       (=ucs		  . #x228B)	; ⊋
       ))
+    (=jis-x0213-1-2000	. #x2245)	; &JX1-2245; [02-37]
+    (=ucs@jis		. #x228B)	; &JX1-2245;
     (<-fullwidth
      ((name		  . "SUPERSET OF WITH NOT EQUAL TO")
       (=ucs		  . #x228B)	; ⊋
       ))
-    (=jis-x0213-1-2000	. #x2245)	; &JX1-2245; [02-37]
-    (=ucs@jis		. #x228B)	; &JX1-2245;
     ))
 (define-char
   '((name		. "MULTISET")
@@ -2239,16 +2239,16 @@
      ((name		  . "CIRCLED PLUS")
       (=ucs		  . #x2295)	; ⊕
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED PLUS")
-      (=ucs		  . #x2295)	; ⊕
-      ))
     (=cns11643-1	. #x2253)	; &JX1-2251; [02-51]
     (=jis-x0213-1-2000	. #x2251)	; &I-JX1-2251; [02-49]
     (=big5		. #xA1F2)	; &I-B-A1F2;
     (=ucs@cns		. #x2295)	; &JX1-2251;
     (=ucs@jis		. #x2295)	; &JX1-2251;
     (=ucs@big5		. #x2295)	; &JX1-2251;
+    (<-fullwidth
+     ((name		  . "CIRCLED PLUS")
+      (=ucs		  . #x2295)	; ⊕
+      ))
     ))
 (define-char
   '((name		. "CIRCLED MINUS")
@@ -2262,12 +2262,12 @@
      ((name		  . "CIRCLED MINUS")
       (=ucs		  . #x2296)	; ⊖
       ))
+    (=jis-x0213-1-2000	. #x2252)	; &JX1-2252; [02-50]
+    (=ucs@jis		. #x2296)	; &JX1-2252;
     (<-fullwidth
      ((name		  . "CIRCLED MINUS")
       (=ucs		  . #x2296)	; ⊖
       ))
-    (=jis-x0213-1-2000	. #x2252)	; &JX1-2252; [02-50]
-    (=ucs@jis		. #x2296)	; &JX1-2252;
     ))
 (define-char
   '((name		. "CIRCLED TIMES")
@@ -2281,12 +2281,12 @@
      ((name		  . "CIRCLED TIMES")
       (=ucs		  . #x2297)	; ⊗
       ))
+    (=jis-x0213-1-2000	. #x2253)	; &JX1-2253; [02-51]
+    (=ucs@jis		. #x2297)	; &JX1-2253;
     (<-fullwidth
      ((name		  . "CIRCLED TIMES")
       (=ucs		  . #x2297)	; ⊗
       ))
-    (=jis-x0213-1-2000	. #x2253)	; &JX1-2253; [02-51]
-    (=ucs@jis		. #x2297)	; &JX1-2253;
     ))
 (define-char
   '((name		. "CIRCLED DIVISION SLASH")
@@ -2307,10 +2307,6 @@
      ((name		  . "CIRCLED DOT OPERATOR")
       (=ucs		  . #x2299)	; ⊙
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED DOT OPERATOR")
-      (=ucs		  . #x2299)	; ⊙
-      ))
     (=gb2312		. #x2151)	; &C1-2254; [01-49]
     (=ks-x1001		. #x2241)	; &I-K0-2241; [02-33]
     (=cns11643-1	. #x2254)	; &I-C1-2254; [02-52]
@@ -2319,6 +2315,10 @@
     (=ucs@cns		. #x2299)	; &C1-2254;
     (=ucs@ks		. #x2299)	; &C1-2254;
     (=ucs@big5		. #x2299)	; &C1-2254;
+    (<-fullwidth
+     ((name		  . "CIRCLED DOT OPERATOR")
+      (=ucs		  . #x2299)	; ⊙
+      ))
     ))
 (define-char
   '((name		. "CIRCLED RING OPERATOR")
@@ -2409,10 +2409,6 @@
      ((name		  . "UP TACK")
       (=ucs		  . #x22A5)	; ⊥
       ))
-    (<-fullwidth
-     ((name		  . "UP TACK")
-      (=ucs		  . #x22A5)	; ⊥
-      ))
     (=gb2312		. #x214D)	; &J90-225D; [01-45]
     (=jis-x0208@1983	. #x225D)	; &I-J83-225D; [02-61]
     (=ks-x1001		. #x2151)	; &I-K0-2151; [01-49]
@@ -2424,6 +2420,10 @@
     (=ucs@jis		. #x22A5)	; &J90-225D;
     (=ucs@ks		. #x22A5)	; &J90-225D;
     (=ucs@big5		. #x22A5)	; &J90-225D;
+    (<-fullwidth
+     ((name		  . "UP TACK")
+      (=ucs		  . #x22A5)	; ⊥
+      ))
     ))
 (define-char
   '((name		. "ASSERTION")
@@ -2640,16 +2640,16 @@
      ((name		  . "RIGHT TRIANGLE")
       (=ucs		  . #x22BF)	; ⊿
       ))
-    (<-fullwidth
-     ((name		  . "RIGHT TRIANGLE")
-      (=ucs		  . #x22BF)	; ⊿
-      ))
     (=cns11643-1	. #x224A)	; &JX1-2D79; [02-42]
     (=jis-x0213-1-2000	. #x2D79)	; &I-JX1-2D79; [13-89]
     (=big5		. #xA1E9)	; &I-B-A1E9;
     (=ucs@cns		. #x22BF)	; &JX1-2D79;
     (=ucs@jis		. #x22BF)	; &JX1-2D79;
     (=ucs@big5		. #x22BF)	; &JX1-2D79;
+    (<-fullwidth
+     ((name		  . "RIGHT TRIANGLE")
+      (=ucs		  . #x22BF)	; ⊿
+      ))
     ))
 (define-char
   '((name		. "N-ARY LOGICAL AND")
@@ -2845,12 +2845,12 @@
      ((name		  . "LESS-THAN EQUAL TO OR GREATER-THAN")
       (=ucs		  . #x22DA)	; ⋚
       ))
+    (=jis-x0213-1-2000	. #x2776)	; &JX1-2776; [07-86]
+    (=ucs@jis		. #x22DA)	; &JX1-2776;
     (<-fullwidth
      ((name		  . "LESS-THAN EQUAL TO OR GREATER-THAN")
       (=ucs		  . #x22DA)	; ⋚
       ))
-    (=jis-x0213-1-2000	. #x2776)	; &JX1-2776; [07-86]
-    (=ucs@jis		. #x22DA)	; &JX1-2776;
     ))
 (define-char
   '((name		. "GREATER-THAN EQUAL TO OR LESS-THAN")
@@ -2864,12 +2864,12 @@
      ((name		  . "GREATER-THAN EQUAL TO OR LESS-THAN")
       (=ucs		  . #x22DB)	; ⋛
       ))
+    (=jis-x0213-1-2000	. #x2777)	; &JX1-2777; [07-87]
+    (=ucs@jis		. #x22DB)	; &JX1-2777;
     (<-fullwidth
      ((name		  . "GREATER-THAN EQUAL TO OR LESS-THAN")
       (=ucs		  . #x22DB)	; ⋛
       ))
-    (=jis-x0213-1-2000	. #x2777)	; &JX1-2777; [07-87]
-    (=ucs@jis		. #x22DB)	; &JX1-2777;
     ))
 (define-char
   '((name		. "EQUAL TO OR LESS-THAN")
diff --git a/lisp/utf-2000/u02300-Miscellaneous-Technical.el b/lisp/utf-2000/u02300-Miscellaneous-Technical.el
index 53467bf..283bcf7 100644
--- a/lisp/utf-2000/u02300-Miscellaneous-Technical.el
+++ b/lisp/utf-2000/u02300-Miscellaneous-Technical.el
@@ -46,12 +46,12 @@
      ((name		  . "PROJECTIVE")
       (=ucs		  . #x2305)	; ⌅
       ))
+    (=jis-x0213-1-2000	. #x2248)	; &JX1-2248; [02-40]
+    (=ucs@jis		. #x2305)	; &JX1-2248;
     (<-fullwidth
      ((name		  . "PROJECTIVE")
       (=ucs		  . #x2305)	; ⌅
       ))
-    (=jis-x0213-1-2000	. #x2248)	; &JX1-2248; [02-40]
-    (=ucs@jis		. #x2305)	; &JX1-2248;
     ))
 (define-char
   '((name		. "PERSPECTIVE")
@@ -65,12 +65,12 @@
      ((name		  . "PERSPECTIVE")
       (=ucs		  . #x2306)	; ⌆
       ))
+    (=jis-x0213-1-2000	. #x2249)	; &JX1-2249; [02-41]
+    (=ucs@jis		. #x2306)	; &JX1-2249;
     (<-fullwidth
      ((name		  . "PERSPECTIVE")
       (=ucs		  . #x2306)	; ⌆
       ))
-    (=jis-x0213-1-2000	. #x2249)	; &JX1-2249; [02-41]
-    (=ucs@jis		. #x2306)	; &JX1-2249;
     ))
 (define-char
   '((name		. "WAVY LINE")
@@ -161,10 +161,6 @@
      ((name		  . "ARC")
       (=ucs		  . #x2312)	; ⌒
       ))
-    (<-fullwidth
-     ((name		  . "ARC")
-      (=ucs		  . #x2312)	; ⌒
-      ))
     (=gb2312		. #x2150)	; &J90-225E; [01-48]
     (=jis-x0208@1983	. #x225E)	; &I-J83-225E; [02-62]
     (=ks-x1001		. #x2152)	; &I-K0-2152; [01-50]
@@ -172,6 +168,10 @@
     (=ucs@gb		. #x2312)	; &J90-225E;
     (=ucs@jis		. #x2312)	; &J90-225E;
     (=ucs@ks		. #x2312)	; &J90-225E;
+    (<-fullwidth
+     ((name		  . "ARC")
+      (=ucs		  . #x2312)	; ⌒
+      ))
     ))
 (define-char
   '((name		. "SEGMENT")
@@ -220,12 +220,12 @@
      ((name		  . "PLACE OF INTEREST SIGN")
       (=ucs		  . #x2318)	; ⌘
       ))
+    (=jis-x0213-1-2000	. #x277C)	; &JX1-277C; [07-92]
+    (=ucs@jis		. #x2318)	; &JX1-277C;
     (<-fullwidth
      ((name		  . "PLACE OF INTEREST SIGN")
       (=ucs		  . #x2318)	; ⌘
       ))
-    (=jis-x0213-1-2000	. #x277C)	; &JX1-277C; [07-92]
-    (=ucs@jis		. #x2318)	; &JX1-277C;
     ))
 (define-char
   '((name		. "TURNED NOT SIGN")
@@ -1156,12 +1156,12 @@
      ((name . "DENTISTRY SYMBOL LIGHT VERTICAL AND TOP RIGHT")
       (=ucs		  . #x23BE)	; ⎾
       ))
+    (=jis-x0213-1-2000	. #x2742)	; &JX1-2742; [07-34]
+    (=ucs@jis		. #x23BE)	; &JX1-2742;
     (<-fullwidth
      ((name . "DENTISTRY SYMBOL LIGHT VERTICAL AND TOP RIGHT")
       (=ucs		  . #x23BE)	; ⎾
       ))
-    (=jis-x0213-1-2000	. #x2742)	; &JX1-2742; [07-34]
-    (=ucs@jis		. #x23BE)	; &JX1-2742;
     ))
 (define-char
   '((name . "DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM RIGHT")
@@ -1173,12 +1173,12 @@
      ((name . "DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM RIGHT")
       (=ucs		  . #x23BF)	; ⎿
       ))
+    (=jis-x0213-1-2000	. #x2743)	; &JX1-2743; [07-35]
+    (=ucs@jis		. #x23BF)	; &JX1-2743;
     (<-fullwidth
      ((name . "DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM RIGHT")
       (=ucs		  . #x23BF)	; ⎿
       ))
-    (=jis-x0213-1-2000	. #x2743)	; &JX1-2743; [07-35]
-    (=ucs@jis		. #x23BF)	; &JX1-2743;
     ))
 (define-char
   '((name		. "DENTISTRY SYMBOL LIGHT VERTICAL WITH CIRCLE")
@@ -1190,12 +1190,12 @@
      ((name . "DENTISTRY SYMBOL LIGHT VERTICAL WITH CIRCLE")
       (=ucs		  . #x23C0)	; ⏀
       ))
+    (=jis-x0213-1-2000	. #x2744)	; &JX1-2744; [07-36]
+    (=ucs@jis		. #x23C0)	; &JX1-2744;
     (<-fullwidth
      ((name . "DENTISTRY SYMBOL LIGHT VERTICAL WITH CIRCLE")
       (=ucs		  . #x23C0)	; ⏀
       ))
-    (=jis-x0213-1-2000	. #x2744)	; &JX1-2744; [07-36]
-    (=ucs@jis		. #x23C0)	; &JX1-2744;
     ))
 (define-char
   '((name . "DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH CIRCLE")
@@ -1207,12 +1207,12 @@
      ((name . "DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH CIRCLE")
       (=ucs		  . #x23C1)	; ⏁
       ))
+    (=jis-x0213-1-2000	. #x2745)	; &JX1-2745; [07-37]
+    (=ucs@jis		. #x23C1)	; &JX1-2745;
     (<-fullwidth
      ((name . "DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH CIRCLE")
       (=ucs		  . #x23C1)	; ⏁
       ))
-    (=jis-x0213-1-2000	. #x2745)	; &JX1-2745; [07-37]
-    (=ucs@jis		. #x23C1)	; &JX1-2745;
     ))
 (define-char
   '((name . "DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH CIRCLE")
@@ -1224,12 +1224,12 @@
      ((name . "DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH CIRCLE")
       (=ucs		  . #x23C2)	; ⏂
       ))
+    (=jis-x0213-1-2000	. #x2746)	; &JX1-2746; [07-38]
+    (=ucs@jis		. #x23C2)	; &JX1-2746;
     (<-fullwidth
      ((name . "DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH CIRCLE")
       (=ucs		  . #x23C2)	; ⏂
       ))
-    (=jis-x0213-1-2000	. #x2746)	; &JX1-2746; [07-38]
-    (=ucs@jis		. #x23C2)	; &JX1-2746;
     ))
 (define-char
   '((name . "DENTISTRY SYMBOL LIGHT VERTICAL WITH TRIANGLE")
@@ -1241,12 +1241,12 @@
      ((name . "DENTISTRY SYMBOL LIGHT VERTICAL WITH TRIANGLE")
       (=ucs		  . #x23C3)	; ⏃
       ))
+    (=jis-x0213-1-2000	. #x2747)	; &JX1-2747; [07-39]
+    (=ucs@jis		. #x23C3)	; &JX1-2747;
     (<-fullwidth
      ((name . "DENTISTRY SYMBOL LIGHT VERTICAL WITH TRIANGLE")
       (=ucs		  . #x23C3)	; ⏃
       ))
-    (=jis-x0213-1-2000	. #x2747)	; &JX1-2747; [07-39]
-    (=ucs@jis		. #x23C3)	; &JX1-2747;
     ))
 (define-char
   '((name . "DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH TRIANGLE")
@@ -1258,12 +1258,12 @@
      ((name . "DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH TRIANGLE")
       (=ucs		  . #x23C4)	; ⏄
       ))
+    (=jis-x0213-1-2000	. #x2748)	; &JX1-2748; [07-40]
+    (=ucs@jis		. #x23C4)	; &JX1-2748;
     (<-fullwidth
      ((name . "DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH TRIANGLE")
       (=ucs		  . #x23C4)	; ⏄
       ))
-    (=jis-x0213-1-2000	. #x2748)	; &JX1-2748; [07-40]
-    (=ucs@jis		. #x23C4)	; &JX1-2748;
     ))
 (define-char
   '((name . "DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH TRIANGLE")
@@ -1275,12 +1275,12 @@
      ((name . "DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH TRIANGLE")
       (=ucs		  . #x23C5)	; ⏅
       ))
+    (=jis-x0213-1-2000	. #x2749)	; &JX1-2749; [07-41]
+    (=ucs@jis		. #x23C5)	; &JX1-2749;
     (<-fullwidth
      ((name . "DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH TRIANGLE")
       (=ucs		  . #x23C5)	; ⏅
       ))
-    (=jis-x0213-1-2000	. #x2749)	; &JX1-2749; [07-41]
-    (=ucs@jis		. #x23C5)	; &JX1-2749;
     ))
 (define-char
   '((name		. "DENTISTRY SYMBOL LIGHT VERTICAL AND WAVE")
@@ -1292,12 +1292,12 @@
      ((name		  . "DENTISTRY SYMBOL LIGHT VERTICAL AND WAVE")
       (=ucs		  . #x23C6)	; ⏆
       ))
+    (=jis-x0213-1-2000	. #x274A)	; &JX1-274A; [07-42]
+    (=ucs@jis		. #x23C6)	; &JX1-274A;
     (<-fullwidth
      ((name		  . "DENTISTRY SYMBOL LIGHT VERTICAL AND WAVE")
       (=ucs		  . #x23C6)	; ⏆
       ))
-    (=jis-x0213-1-2000	. #x274A)	; &JX1-274A; [07-42]
-    (=ucs@jis		. #x23C6)	; &JX1-274A;
     ))
 (define-char
   '((name . "DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH WAVE")
@@ -1309,12 +1309,12 @@
      ((name . "DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH WAVE")
       (=ucs		  . #x23C7)	; ⏇
       ))
+    (=jis-x0213-1-2000	. #x274B)	; &JX1-274B; [07-43]
+    (=ucs@jis		. #x23C7)	; &JX1-274B;
     (<-fullwidth
      ((name . "DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH WAVE")
       (=ucs		  . #x23C7)	; ⏇
       ))
-    (=jis-x0213-1-2000	. #x274B)	; &JX1-274B; [07-43]
-    (=ucs@jis		. #x23C7)	; &JX1-274B;
     ))
 (define-char
   '((name . "DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH WAVE")
@@ -1326,12 +1326,12 @@
      ((name . "DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH WAVE")
       (=ucs		  . #x23C8)	; ⏈
       ))
+    (=jis-x0213-1-2000	. #x274C)	; &JX1-274C; [07-44]
+    (=ucs@jis		. #x23C8)	; &JX1-274C;
     (<-fullwidth
      ((name . "DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH WAVE")
       (=ucs		  . #x23C8)	; ⏈
       ))
-    (=jis-x0213-1-2000	. #x274C)	; &JX1-274C; [07-44]
-    (=ucs@jis		. #x23C8)	; &JX1-274C;
     ))
 (define-char
   '((name		. "DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL")
@@ -1343,12 +1343,12 @@
      ((name		  . "DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL")
       (=ucs		  . #x23C9)	; ⏉
       ))
+    (=jis-x0213-1-2000	. #x274D)	; &JX1-274D; [07-45]
+    (=ucs@jis		. #x23C9)	; &JX1-274D;
     (<-fullwidth
      ((name		  . "DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL")
       (=ucs		  . #x23C9)	; ⏉
       ))
-    (=jis-x0213-1-2000	. #x274D)	; &JX1-274D; [07-45]
-    (=ucs@jis		. #x23C9)	; &JX1-274D;
     ))
 (define-char
   '((name		. "DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL")
@@ -1360,12 +1360,12 @@
      ((name		  . "DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL")
       (=ucs		  . #x23CA)	; ⏊
       ))
+    (=jis-x0213-1-2000	. #x274E)	; &JX1-274E; [07-46]
+    (=ucs@jis		. #x23CA)	; &JX1-274E;
     (<-fullwidth
      ((name		  . "DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL")
       (=ucs		  . #x23CA)	; ⏊
       ))
-    (=jis-x0213-1-2000	. #x274E)	; &JX1-274E; [07-46]
-    (=ucs@jis		. #x23CA)	; &JX1-274E;
     ))
 (define-char
   '((name		. "DENTISTRY SYMBOL LIGHT VERTICAL AND TOP LEFT")
@@ -1377,12 +1377,12 @@
      ((name . "DENTISTRY SYMBOL LIGHT VERTICAL AND TOP LEFT")
       (=ucs		  . #x23CB)	; ⏋
       ))
+    (=jis-x0213-1-2000	. #x274F)	; &JX1-274F; [07-47]
+    (=ucs@jis		. #x23CB)	; &JX1-274F;
     (<-fullwidth
      ((name . "DENTISTRY SYMBOL LIGHT VERTICAL AND TOP LEFT")
       (=ucs		  . #x23CB)	; ⏋
       ))
-    (=jis-x0213-1-2000	. #x274F)	; &JX1-274F; [07-47]
-    (=ucs@jis		. #x23CB)	; &JX1-274F;
     ))
 (define-char
   '((name . "DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM LEFT")
@@ -1394,12 +1394,12 @@
      ((name . "DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM LEFT")
       (=ucs		  . #x23CC)	; ⏌
       ))
+    (=jis-x0213-1-2000	. #x2750)	; &JX1-2750; [07-48]
+    (=ucs@jis		. #x23CC)	; &JX1-2750;
     (<-fullwidth
      ((name . "DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM LEFT")
       (=ucs		  . #x23CC)	; ⏌
       ))
-    (=jis-x0213-1-2000	. #x2750)	; &JX1-2750; [07-48]
-    (=ucs@jis		. #x23CC)	; &JX1-2750;
     ))
 (define-char
   '((name		. "SQUARE FOOT")
@@ -1416,12 +1416,12 @@
      ((name		  . "RETURN SYMBOL")
       (=ucs		  . #x23CE)	; ⏎
       ))
+    (=jis-x0213-1-2000	. #x277E)	; &JX1-277E; [07-94]
+    (=ucs@jis		. #x23CE)	; &JX1-277E;
     (<-fullwidth
      ((name		  . "RETURN SYMBOL")
       (=ucs		  . #x23CE)	; ⏎
       ))
-    (=jis-x0213-1-2000	. #x277E)	; &JX1-277E; [07-94]
-    (=ucs@jis		. #x23CE)	; &JX1-277E;
     ))
 (define-char
   '((name		. "EJECT SYMBOL")
diff --git a/lisp/utf-2000/u02400-Control-Pictures.el b/lisp/utf-2000/u02400-Control-Pictures.el
index 9647808..2361622 100644
--- a/lisp/utf-2000/u02400-Control-Pictures.el
+++ b/lisp/utf-2000/u02400-Control-Pictures.el
@@ -11,12 +11,12 @@
      ((name		  . "SYMBOL FOR NULL")
       (=ucs		  . #x2400)	; ␀
       ))
+    (=cns11643-1	. #x4221)	; &C1-4221; [34-01]
+    (=ucs@cns		. #x2400)	; &C1-4221;
     (<-fullwidth
      ((name		  . "SYMBOL FOR NULL")
       (=ucs		  . #x2400)	; ␀
       ))
-    (=cns11643-1	. #x4221)	; &C1-4221; [34-01]
-    (=ucs@cns		. #x2400)	; &C1-4221;
     ))
 (define-char
   '((name		. "SYMBOL FOR START OF HEADING")
@@ -30,12 +30,12 @@
      ((name		  . "SYMBOL FOR START OF HEADING")
       (=ucs		  . #x2401)	; ␁
       ))
+    (=cns11643-1	. #x4222)	; &C1-4222; [34-02]
+    (=ucs@cns		. #x2401)	; &C1-4222;
     (<-fullwidth
      ((name		  . "SYMBOL FOR START OF HEADING")
       (=ucs		  . #x2401)	; ␁
       ))
-    (=cns11643-1	. #x4222)	; &C1-4222; [34-02]
-    (=ucs@cns		. #x2401)	; &C1-4222;
     ))
 (define-char
   '((name		. "SYMBOL FOR START OF TEXT")
@@ -49,12 +49,12 @@
      ((name		  . "SYMBOL FOR START OF TEXT")
       (=ucs		  . #x2402)	; ␂
       ))
+    (=cns11643-1	. #x4223)	; &C1-4223; [34-03]
+    (=ucs@cns		. #x2402)	; &C1-4223;
     (<-fullwidth
      ((name		  . "SYMBOL FOR START OF TEXT")
       (=ucs		  . #x2402)	; ␂
       ))
-    (=cns11643-1	. #x4223)	; &C1-4223; [34-03]
-    (=ucs@cns		. #x2402)	; &C1-4223;
     ))
 (define-char
   '((name		. "SYMBOL FOR END OF TEXT")
@@ -68,12 +68,12 @@
      ((name		  . "SYMBOL FOR END OF TEXT")
       (=ucs		  . #x2403)	; ␃
       ))
+    (=cns11643-1	. #x4224)	; &C1-4224; [34-04]
+    (=ucs@cns		. #x2403)	; &C1-4224;
     (<-fullwidth
      ((name		  . "SYMBOL FOR END OF TEXT")
       (=ucs		  . #x2403)	; ␃
       ))
-    (=cns11643-1	. #x4224)	; &C1-4224; [34-04]
-    (=ucs@cns		. #x2403)	; &C1-4224;
     ))
 (define-char
   '((name		. "SYMBOL FOR END OF TRANSMISSION")
@@ -87,12 +87,12 @@
      ((name		  . "SYMBOL FOR END OF TRANSMISSION")
       (=ucs		  . #x2404)	; ␄
       ))
+    (=cns11643-1	. #x4225)	; &C1-4225; [34-05]
+    (=ucs@cns		. #x2404)	; &C1-4225;
     (<-fullwidth
      ((name		  . "SYMBOL FOR END OF TRANSMISSION")
       (=ucs		  . #x2404)	; ␄
       ))
-    (=cns11643-1	. #x4225)	; &C1-4225; [34-05]
-    (=ucs@cns		. #x2404)	; &C1-4225;
     ))
 (define-char
   '((name		. "SYMBOL FOR ENQUIRY")
@@ -106,12 +106,12 @@
      ((name		  . "SYMBOL FOR ENQUIRY")
       (=ucs		  . #x2405)	; ␅
       ))
+    (=cns11643-1	. #x4226)	; &C1-4226; [34-06]
+    (=ucs@cns		. #x2405)	; &C1-4226;
     (<-fullwidth
      ((name		  . "SYMBOL FOR ENQUIRY")
       (=ucs		  . #x2405)	; ␅
       ))
-    (=cns11643-1	. #x4226)	; &C1-4226; [34-06]
-    (=ucs@cns		. #x2405)	; &C1-4226;
     ))
 (define-char
   '((name		. "SYMBOL FOR ACKNOWLEDGE")
@@ -125,12 +125,12 @@
      ((name		  . "SYMBOL FOR ACKNOWLEDGE")
       (=ucs		  . #x2406)	; ␆
       ))
+    (=cns11643-1	. #x4227)	; &C1-4227; [34-07]
+    (=ucs@cns		. #x2406)	; &C1-4227;
     (<-fullwidth
      ((name		  . "SYMBOL FOR ACKNOWLEDGE")
       (=ucs		  . #x2406)	; ␆
       ))
-    (=cns11643-1	. #x4227)	; &C1-4227; [34-07]
-    (=ucs@cns		. #x2406)	; &C1-4227;
     ))
 (define-char
   '((name		. "SYMBOL FOR BELL")
@@ -144,12 +144,12 @@
      ((name		  . "SYMBOL FOR BELL")
       (=ucs		  . #x2407)	; ␇
       ))
+    (=cns11643-1	. #x4228)	; &C1-4228; [34-08]
+    (=ucs@cns		. #x2407)	; &C1-4228;
     (<-fullwidth
      ((name		  . "SYMBOL FOR BELL")
       (=ucs		  . #x2407)	; ␇
       ))
-    (=cns11643-1	. #x4228)	; &C1-4228; [34-08]
-    (=ucs@cns		. #x2407)	; &C1-4228;
     ))
 (define-char
   '((name		. "SYMBOL FOR BACKSPACE")
@@ -163,12 +163,12 @@
      ((name		  . "SYMBOL FOR BACKSPACE")
       (=ucs		  . #x2408)	; ␈
       ))
+    (=cns11643-1	. #x4229)	; &C1-4229; [34-09]
+    (=ucs@cns		. #x2408)	; &C1-4229;
     (<-fullwidth
      ((name		  . "SYMBOL FOR BACKSPACE")
       (=ucs		  . #x2408)	; ␈
       ))
-    (=cns11643-1	. #x4229)	; &C1-4229; [34-09]
-    (=ucs@cns		. #x2408)	; &C1-4229;
     ))
 (define-char
   '((name		. "SYMBOL FOR HORIZONTAL TABULATION")
@@ -182,12 +182,12 @@
      ((name		  . "SYMBOL FOR HORIZONTAL TABULATION")
       (=ucs		  . #x2409)	; ␉
       ))
+    (=cns11643-1	. #x422A)	; &C1-422A; [34-10]
+    (=ucs@cns		. #x2409)	; &C1-422A;
     (<-fullwidth
      ((name		  . "SYMBOL FOR HORIZONTAL TABULATION")
       (=ucs		  . #x2409)	; ␉
       ))
-    (=cns11643-1	. #x422A)	; &C1-422A; [34-10]
-    (=ucs@cns		. #x2409)	; &C1-422A;
     ))
 (define-char
   '((name		. "SYMBOL FOR LINE FEED")
@@ -201,12 +201,12 @@
      ((name		  . "SYMBOL FOR LINE FEED")
       (=ucs		  . #x240A)	; ␊
       ))
+    (=cns11643-1	. #x422B)	; &C1-422B; [34-11]
+    (=ucs@cns		. #x240A)	; &C1-422B;
     (<-fullwidth
      ((name		  . "SYMBOL FOR LINE FEED")
       (=ucs		  . #x240A)	; ␊
       ))
-    (=cns11643-1	. #x422B)	; &C1-422B; [34-11]
-    (=ucs@cns		. #x240A)	; &C1-422B;
     ))
 (define-char
   '((name		. "SYMBOL FOR VERTICAL TABULATION")
@@ -220,12 +220,12 @@
      ((name		  . "SYMBOL FOR VERTICAL TABULATION")
       (=ucs		  . #x240B)	; ␋
       ))
+    (=cns11643-1	. #x422C)	; &C1-422C; [34-12]
+    (=ucs@cns		. #x240B)	; &C1-422C;
     (<-fullwidth
      ((name		  . "SYMBOL FOR VERTICAL TABULATION")
       (=ucs		  . #x240B)	; ␋
       ))
-    (=cns11643-1	. #x422C)	; &C1-422C; [34-12]
-    (=ucs@cns		. #x240B)	; &C1-422C;
     ))
 (define-char
   '((name		. "SYMBOL FOR FORM FEED")
@@ -239,12 +239,12 @@
      ((name		  . "SYMBOL FOR FORM FEED")
       (=ucs		  . #x240C)	; ␌
       ))
+    (=cns11643-1	. #x422D)	; &C1-422D; [34-13]
+    (=ucs@cns		. #x240C)	; &C1-422D;
     (<-fullwidth
      ((name		  . "SYMBOL FOR FORM FEED")
       (=ucs		  . #x240C)	; ␌
       ))
-    (=cns11643-1	. #x422D)	; &C1-422D; [34-13]
-    (=ucs@cns		. #x240C)	; &C1-422D;
     ))
 (define-char
   '((name		. "SYMBOL FOR CARRIAGE RETURN")
@@ -258,12 +258,12 @@
      ((name		  . "SYMBOL FOR CARRIAGE RETURN")
       (=ucs		  . #x240D)	; ␍
       ))
+    (=cns11643-1	. #x422E)	; &C1-422E; [34-14]
+    (=ucs@cns		. #x240D)	; &C1-422E;
     (<-fullwidth
      ((name		  . "SYMBOL FOR CARRIAGE RETURN")
       (=ucs		  . #x240D)	; ␍
       ))
-    (=cns11643-1	. #x422E)	; &C1-422E; [34-14]
-    (=ucs@cns		. #x240D)	; &C1-422E;
     ))
 (define-char
   '((name		. "SYMBOL FOR SHIFT OUT")
@@ -277,12 +277,12 @@
      ((name		  . "SYMBOL FOR SHIFT OUT")
       (=ucs		  . #x240E)	; ␎
       ))
+    (=cns11643-1	. #x422F)	; &C1-422F; [34-15]
+    (=ucs@cns		. #x240E)	; &C1-422F;
     (<-fullwidth
      ((name		  . "SYMBOL FOR SHIFT OUT")
       (=ucs		  . #x240E)	; ␎
       ))
-    (=cns11643-1	. #x422F)	; &C1-422F; [34-15]
-    (=ucs@cns		. #x240E)	; &C1-422F;
     ))
 (define-char
   '((name		. "SYMBOL FOR SHIFT IN")
@@ -296,12 +296,12 @@
      ((name		  . "SYMBOL FOR SHIFT IN")
       (=ucs		  . #x240F)	; ␏
       ))
+    (=cns11643-1	. #x4230)	; &C1-4230; [34-16]
+    (=ucs@cns		. #x240F)	; &C1-4230;
     (<-fullwidth
      ((name		  . "SYMBOL FOR SHIFT IN")
       (=ucs		  . #x240F)	; ␏
       ))
-    (=cns11643-1	. #x4230)	; &C1-4230; [34-16]
-    (=ucs@cns		. #x240F)	; &C1-4230;
     ))
 (define-char
   '((name		. "SYMBOL FOR DATA LINK ESCAPE")
@@ -315,12 +315,12 @@
      ((name		  . "SYMBOL FOR DATA LINK ESCAPE")
       (=ucs		  . #x2410)	; ␐
       ))
+    (=cns11643-1	. #x4231)	; &C1-4231; [34-17]
+    (=ucs@cns		. #x2410)	; &C1-4231;
     (<-fullwidth
      ((name		  . "SYMBOL FOR DATA LINK ESCAPE")
       (=ucs		  . #x2410)	; ␐
       ))
-    (=cns11643-1	. #x4231)	; &C1-4231; [34-17]
-    (=ucs@cns		. #x2410)	; &C1-4231;
     ))
 (define-char
   '((name		. "SYMBOL FOR DEVICE CONTROL ONE")
@@ -334,12 +334,12 @@
      ((name		  . "SYMBOL FOR DEVICE CONTROL ONE")
       (=ucs		  . #x2411)	; ␑
       ))
+    (=cns11643-1	. #x4232)	; &C1-4232; [34-18]
+    (=ucs@cns		. #x2411)	; &C1-4232;
     (<-fullwidth
      ((name		  . "SYMBOL FOR DEVICE CONTROL ONE")
       (=ucs		  . #x2411)	; ␑
       ))
-    (=cns11643-1	. #x4232)	; &C1-4232; [34-18]
-    (=ucs@cns		. #x2411)	; &C1-4232;
     ))
 (define-char
   '((name		. "SYMBOL FOR DEVICE CONTROL TWO")
@@ -353,12 +353,12 @@
      ((name		  . "SYMBOL FOR DEVICE CONTROL TWO")
       (=ucs		  . #x2412)	; ␒
       ))
+    (=cns11643-1	. #x4233)	; &C1-4233; [34-19]
+    (=ucs@cns		. #x2412)	; &C1-4233;
     (<-fullwidth
      ((name		  . "SYMBOL FOR DEVICE CONTROL TWO")
       (=ucs		  . #x2412)	; ␒
       ))
-    (=cns11643-1	. #x4233)	; &C1-4233; [34-19]
-    (=ucs@cns		. #x2412)	; &C1-4233;
     ))
 (define-char
   '((name		. "SYMBOL FOR DEVICE CONTROL THREE")
@@ -372,12 +372,12 @@
      ((name		  . "SYMBOL FOR DEVICE CONTROL THREE")
       (=ucs		  . #x2413)	; ␓
       ))
+    (=cns11643-1	. #x4234)	; &C1-4234; [34-20]
+    (=ucs@cns		. #x2413)	; &C1-4234;
     (<-fullwidth
      ((name		  . "SYMBOL FOR DEVICE CONTROL THREE")
       (=ucs		  . #x2413)	; ␓
       ))
-    (=cns11643-1	. #x4234)	; &C1-4234; [34-20]
-    (=ucs@cns		. #x2413)	; &C1-4234;
     ))
 (define-char
   '((name		. "SYMBOL FOR DEVICE CONTROL FOUR")
@@ -391,12 +391,12 @@
      ((name		  . "SYMBOL FOR DEVICE CONTROL FOUR")
       (=ucs		  . #x2414)	; ␔
       ))
+    (=cns11643-1	. #x4235)	; &C1-4235; [34-21]
+    (=ucs@cns		. #x2414)	; &C1-4235;
     (<-fullwidth
      ((name		  . "SYMBOL FOR DEVICE CONTROL FOUR")
       (=ucs		  . #x2414)	; ␔
       ))
-    (=cns11643-1	. #x4235)	; &C1-4235; [34-21]
-    (=ucs@cns		. #x2414)	; &C1-4235;
     ))
 (define-char
   '((name		. "SYMBOL FOR NEGATIVE ACKNOWLEDGE")
@@ -410,12 +410,12 @@
      ((name		  . "SYMBOL FOR NEGATIVE ACKNOWLEDGE")
       (=ucs		  . #x2415)	; ␕
       ))
+    (=cns11643-1	. #x4236)	; &C1-4236; [34-22]
+    (=ucs@cns		. #x2415)	; &C1-4236;
     (<-fullwidth
      ((name		  . "SYMBOL FOR NEGATIVE ACKNOWLEDGE")
       (=ucs		  . #x2415)	; ␕
       ))
-    (=cns11643-1	. #x4236)	; &C1-4236; [34-22]
-    (=ucs@cns		. #x2415)	; &C1-4236;
     ))
 (define-char
   '((name		. "SYMBOL FOR SYNCHRONOUS IDLE")
@@ -429,12 +429,12 @@
      ((name		  . "SYMBOL FOR SYNCHRONOUS IDLE")
       (=ucs		  . #x2416)	; ␖
       ))
+    (=cns11643-1	. #x4237)	; &C1-4237; [34-23]
+    (=ucs@cns		. #x2416)	; &C1-4237;
     (<-fullwidth
      ((name		  . "SYMBOL FOR SYNCHRONOUS IDLE")
       (=ucs		  . #x2416)	; ␖
       ))
-    (=cns11643-1	. #x4237)	; &C1-4237; [34-23]
-    (=ucs@cns		. #x2416)	; &C1-4237;
     ))
 (define-char
   '((name		. "SYMBOL FOR END OF TRANSMISSION BLOCK")
@@ -448,12 +448,12 @@
      ((name		  . "SYMBOL FOR END OF TRANSMISSION BLOCK")
       (=ucs		  . #x2417)	; ␗
       ))
+    (=cns11643-1	. #x4238)	; &C1-4238; [34-24]
+    (=ucs@cns		. #x2417)	; &C1-4238;
     (<-fullwidth
      ((name		  . "SYMBOL FOR END OF TRANSMISSION BLOCK")
       (=ucs		  . #x2417)	; ␗
       ))
-    (=cns11643-1	. #x4238)	; &C1-4238; [34-24]
-    (=ucs@cns		. #x2417)	; &C1-4238;
     ))
 (define-char
   '((name		. "SYMBOL FOR CANCEL")
@@ -467,12 +467,12 @@
      ((name		  . "SYMBOL FOR CANCEL")
       (=ucs		  . #x2418)	; ␘
       ))
+    (=cns11643-1	. #x4239)	; &C1-4239; [34-25]
+    (=ucs@cns		. #x2418)	; &C1-4239;
     (<-fullwidth
      ((name		  . "SYMBOL FOR CANCEL")
       (=ucs		  . #x2418)	; ␘
       ))
-    (=cns11643-1	. #x4239)	; &C1-4239; [34-25]
-    (=ucs@cns		. #x2418)	; &C1-4239;
     ))
 (define-char
   '((name		. "SYMBOL FOR END OF MEDIUM")
@@ -486,12 +486,12 @@
      ((name		  . "SYMBOL FOR END OF MEDIUM")
       (=ucs		  . #x2419)	; ␙
       ))
+    (=cns11643-1	. #x423A)	; &C1-423A; [34-26]
+    (=ucs@cns		. #x2419)	; &C1-423A;
     (<-fullwidth
      ((name		  . "SYMBOL FOR END OF MEDIUM")
       (=ucs		  . #x2419)	; ␙
       ))
-    (=cns11643-1	. #x423A)	; &C1-423A; [34-26]
-    (=ucs@cns		. #x2419)	; &C1-423A;
     ))
 (define-char
   '((name		. "SYMBOL FOR SUBSTITUTE")
@@ -505,12 +505,12 @@
      ((name		  . "SYMBOL FOR SUBSTITUTE")
       (=ucs		  . #x241A)	; ␚
       ))
+    (=cns11643-1	. #x423B)	; &C1-423B; [34-27]
+    (=ucs@cns		. #x241A)	; &C1-423B;
     (<-fullwidth
      ((name		  . "SYMBOL FOR SUBSTITUTE")
       (=ucs		  . #x241A)	; ␚
       ))
-    (=cns11643-1	. #x423B)	; &C1-423B; [34-27]
-    (=ucs@cns		. #x241A)	; &C1-423B;
     ))
 (define-char
   '((name		. "SYMBOL FOR ESCAPE")
@@ -524,12 +524,12 @@
      ((name		  . "SYMBOL FOR ESCAPE")
       (=ucs		  . #x241B)	; ␛
       ))
+    (=cns11643-1	. #x423C)	; &C1-423C; [34-28]
+    (=ucs@cns		. #x241B)	; &C1-423C;
     (<-fullwidth
      ((name		  . "SYMBOL FOR ESCAPE")
       (=ucs		  . #x241B)	; ␛
       ))
-    (=cns11643-1	. #x423C)	; &C1-423C; [34-28]
-    (=ucs@cns		. #x241B)	; &C1-423C;
     ))
 (define-char
   '((name		. "SYMBOL FOR FILE SEPARATOR")
@@ -543,12 +543,12 @@
      ((name		  . "SYMBOL FOR FILE SEPARATOR")
       (=ucs		  . #x241C)	; ␜
       ))
+    (=cns11643-1	. #x423D)	; &C1-423D; [34-29]
+    (=ucs@cns		. #x241C)	; &C1-423D;
     (<-fullwidth
      ((name		  . "SYMBOL FOR FILE SEPARATOR")
       (=ucs		  . #x241C)	; ␜
       ))
-    (=cns11643-1	. #x423D)	; &C1-423D; [34-29]
-    (=ucs@cns		. #x241C)	; &C1-423D;
     ))
 (define-char
   '((name		. "SYMBOL FOR GROUP SEPARATOR")
@@ -562,12 +562,12 @@
      ((name		  . "SYMBOL FOR GROUP SEPARATOR")
       (=ucs		  . #x241D)	; ␝
       ))
+    (=cns11643-1	. #x423E)	; &C1-423E; [34-30]
+    (=ucs@cns		. #x241D)	; &C1-423E;
     (<-fullwidth
      ((name		  . "SYMBOL FOR GROUP SEPARATOR")
       (=ucs		  . #x241D)	; ␝
       ))
-    (=cns11643-1	. #x423E)	; &C1-423E; [34-30]
-    (=ucs@cns		. #x241D)	; &C1-423E;
     ))
 (define-char
   '((name		. "SYMBOL FOR RECORD SEPARATOR")
@@ -581,12 +581,12 @@
      ((name		  . "SYMBOL FOR RECORD SEPARATOR")
       (=ucs		  . #x241E)	; ␞
       ))
+    (=cns11643-1	. #x423F)	; &C1-423F; [34-31]
+    (=ucs@cns		. #x241E)	; &C1-423F;
     (<-fullwidth
      ((name		  . "SYMBOL FOR RECORD SEPARATOR")
       (=ucs		  . #x241E)	; ␞
       ))
-    (=cns11643-1	. #x423F)	; &C1-423F; [34-31]
-    (=ucs@cns		. #x241E)	; &C1-423F;
     ))
 (define-char
   '((name		. "SYMBOL FOR UNIT SEPARATOR")
@@ -600,12 +600,12 @@
      ((name		  . "SYMBOL FOR UNIT SEPARATOR")
       (=ucs		  . #x241F)	; ␟
       ))
+    (=cns11643-1	. #x4240)	; &C1-4240; [34-32]
+    (=ucs@cns		. #x241F)	; &C1-4240;
     (<-fullwidth
      ((name		  . "SYMBOL FOR UNIT SEPARATOR")
       (=ucs		  . #x241F)	; ␟
       ))
-    (=cns11643-1	. #x4240)	; &C1-4240; [34-32]
-    (=ucs@cns		. #x241F)	; &C1-4240;
     ))
 (define-char
   '((name		. "SYMBOL FOR SPACE")
@@ -626,12 +626,12 @@
      ((name		  . "SYMBOL FOR DELETE")
       (=ucs		  . #x2421)	; ␡
       ))
+    (=cns11643-1	. #x4241)	; &C1-4241; [34-33]
+    (=ucs@cns		. #x2421)	; &C1-4241;
     (<-fullwidth
      ((name		  . "SYMBOL FOR DELETE")
       (=ucs		  . #x2421)	; ␡
       ))
-    (=cns11643-1	. #x4241)	; &C1-4241; [34-33]
-    (=ucs@cns		. #x2421)	; &C1-4241;
     ))
 (define-char
   '((name		. "BLANK SYMBOL")
@@ -652,12 +652,12 @@
      ((name		  . "OPEN BOX")
       (=ucs		  . #x2423)	; ␣
       ))
+    (=jis-x0213-1-2000	. #x277D)	; &JX1-277D; [07-93]
+    (=ucs@jis		. #x2423)	; &JX1-277D;
     (<-fullwidth
      ((name		  . "OPEN BOX")
       (=ucs		  . #x2423)	; ␣
       ))
-    (=jis-x0213-1-2000	. #x277D)	; &JX1-277D; [07-93]
-    (=ucs@jis		. #x2423)	; &JX1-277D;
     ))
 (define-char
   '((name		. "SYMBOL FOR NEWLINE")
diff --git a/lisp/utf-2000/u02460-Enclosed-Alphanumerics.el b/lisp/utf-2000/u02460-Enclosed-Alphanumerics.el
index 1cd27bd..ae6f9ac 100644
--- a/lisp/utf-2000/u02460-Enclosed-Alphanumerics.el
+++ b/lisp/utf-2000/u02460-Enclosed-Alphanumerics.el
@@ -6,10 +6,6 @@
     (mirrored		. nil)
     (digit-value	. 1)
     (numeric-value	. 1)
-    (<-circled
-     ((name		  . "DIGIT ONE")
-      (=ucs		  . #x0031)	; 1
-      ))
     (=ucs		. #x2460)	; ①
     (=gb2312		. #x2259)	; &I-G0-2259; [02-57]
     (=ks-x1001		. #x2867)	; &I-K0-2867; [08-71]
@@ -17,6 +13,10 @@
     (=jis-x0213-1-2000	. #x2D21)	; &I-JX1-2D21; [13-01]
     (=big5-eten		. #xC6A1)	; &B-C6A1;
     (=jef-china3	. #x77C9)	; &I-JC3-77C9;
+    (<-circled
+     ((name		  . "DIGIT ONE")
+      (=ucs		  . #x0031)	; 1
+      ))
     ))
 (define-char
   '((name		. "CIRCLED DIGIT TWO")
@@ -25,10 +25,6 @@
     (mirrored		. nil)
     (digit-value	. 2)
     (numeric-value	. 2)
-    (<-circled
-     ((name		  . "DIGIT TWO")
-      (=ucs		  . #x0032)	; 2
-      ))
     (=ucs		. #x2461)	; ②
     (=gb2312		. #x225A)	; &I-G0-225A; [02-58]
     (=ks-x1001		. #x2868)	; &I-K0-2868; [08-72]
@@ -36,6 +32,10 @@
     (=jis-x0213-1-2000	. #x2D22)	; &I-JX1-2D22; [13-02]
     (=big5-eten		. #xC6A2)	; &B-C6A2;
     (=jef-china3	. #x77CA)	; &I-JC3-77CA;
+    (<-circled
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      ))
     ))
 (define-char
   '((name		. "CIRCLED DIGIT THREE")
@@ -44,10 +44,6 @@
     (mirrored		. nil)
     (digit-value	. 3)
     (numeric-value	. 3)
-    (<-circled
-     ((name		  . "DIGIT THREE")
-      (=ucs		  . #x0033)	; 3
-      ))
     (=ucs		. #x2462)	; ③
     (=gb2312		. #x225B)	; &I-G0-225B; [02-59]
     (=ks-x1001		. #x2869)	; &I-K0-2869; [08-73]
@@ -55,6 +51,10 @@
     (=jis-x0213-1-2000	. #x2D23)	; &I-JX1-2D23; [13-03]
     (=big5-eten		. #xC6A3)	; &B-C6A3;
     (=jef-china3	. #x77CB)	; &I-JC3-77CB;
+    (<-circled
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      ))
     ))
 (define-char
   '((name		. "CIRCLED DIGIT FOUR")
@@ -63,10 +63,6 @@
     (mirrored		. nil)
     (digit-value	. 4)
     (numeric-value	. 4)
-    (<-circled
-     ((name		  . "DIGIT FOUR")
-      (=ucs		  . #x0034)	; 4
-      ))
     (=ucs		. #x2463)	; ④
     (=gb2312		. #x225C)	; &I-G0-225C; [02-60]
     (=ks-x1001		. #x286A)	; &I-K0-286A; [08-74]
@@ -74,6 +70,10 @@
     (=jis-x0213-1-2000	. #x2D24)	; &I-JX1-2D24; [13-04]
     (=big5-eten		. #xC6A4)	; &B-C6A4;
     (=jef-china3	. #x77CC)	; &I-JC3-77CC;
+    (<-circled
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      ))
     ))
 (define-char
   '((name		. "CIRCLED DIGIT FIVE")
@@ -82,10 +82,6 @@
     (mirrored		. nil)
     (digit-value	. 5)
     (numeric-value	. 5)
-    (<-circled
-     ((name		  . "DIGIT FIVE")
-      (=ucs		  . #x0035)	; 5
-      ))
     (=ucs		. #x2464)	; ⑤
     (=gb2312		. #x225D)	; &I-G0-225D; [02-61]
     (=ks-x1001		. #x286B)	; &I-K0-286B; [08-75]
@@ -93,6 +89,10 @@
     (=jis-x0213-1-2000	. #x2D25)	; &I-JX1-2D25; [13-05]
     (=big5-eten		. #xC6A5)	; &B-C6A5;
     (=jef-china3	. #x77CD)	; &I-JC3-77CD;
+    (<-circled
+     ((name		  . "DIGIT FIVE")
+      (=ucs		  . #x0035)	; 5
+      ))
     ))
 (define-char
   '((name		. "CIRCLED DIGIT SIX")
@@ -101,10 +101,6 @@
     (mirrored		. nil)
     (digit-value	. 6)
     (numeric-value	. 6)
-    (<-circled
-     ((name		  . "DIGIT SIX")
-      (=ucs		  . #x0036)	; 6
-      ))
     (=ucs		. #x2465)	; ⑥
     (=gb2312		. #x225E)	; &I-G0-225E; [02-62]
     (=ks-x1001		. #x286C)	; &I-K0-286C; [08-76]
@@ -112,6 +108,10 @@
     (=jis-x0213-1-2000	. #x2D26)	; &I-JX1-2D26; [13-06]
     (=big5-eten		. #xC6A6)	; &B-C6A6;
     (=jef-china3	. #x77CE)	; &I-JC3-77CE;
+    (<-circled
+     ((name		  . "DIGIT SIX")
+      (=ucs		  . #x0036)	; 6
+      ))
     ))
 (define-char
   '((name		. "CIRCLED DIGIT SEVEN")
@@ -120,10 +120,6 @@
     (mirrored		. nil)
     (digit-value	. 7)
     (numeric-value	. 7)
-    (<-circled
-     ((name		  . "DIGIT SEVEN")
-      (=ucs		  . #x0037)	; 7
-      ))
     (=ucs		. #x2466)	; ⑦
     (=gb2312		. #x225F)	; &I-G0-225F; [02-63]
     (=ks-x1001		. #x286D)	; &I-K0-286D; [08-77]
@@ -131,6 +127,10 @@
     (=jis-x0213-1-2000	. #x2D27)	; &I-JX1-2D27; [13-07]
     (=big5-eten		. #xC6A7)	; &B-C6A7;
     (=jef-china3	. #x77CF)	; &I-JC3-77CF;
+    (<-circled
+     ((name		  . "DIGIT SEVEN")
+      (=ucs		  . #x0037)	; 7
+      ))
     ))
 (define-char
   '((name		. "CIRCLED DIGIT EIGHT")
@@ -139,10 +139,6 @@
     (mirrored		. nil)
     (digit-value	. 8)
     (numeric-value	. 8)
-    (<-circled
-     ((name		  . "DIGIT EIGHT")
-      (=ucs		  . #x0038)	; 8
-      ))
     (=ucs		. #x2467)	; ⑧
     (=gb2312		. #x2260)	; &I-G0-2260; [02-64]
     (=ks-x1001		. #x286E)	; &I-K0-286E; [08-78]
@@ -150,6 +146,10 @@
     (=jis-x0213-1-2000	. #x2D28)	; &I-JX1-2D28; [13-08]
     (=big5-eten		. #xC6A8)	; &B-C6A8;
     (=jef-china3	. #x77D0)	; &I-JC3-77D0;
+    (<-circled
+     ((name		  . "DIGIT EIGHT")
+      (=ucs		  . #x0038)	; 8
+      ))
     ))
 (define-char
   '((name		. "CIRCLED DIGIT NINE")
@@ -158,10 +158,6 @@
     (mirrored		. nil)
     (digit-value	. 9)
     (numeric-value	. 9)
-    (<-circled
-     ((name		  . "DIGIT NINE")
-      (=ucs		  . #x0039)	; 9
-      ))
     (=ucs		. #x2468)	; ⑨
     (=gb2312		. #x2261)	; &I-G0-2261; [02-65]
     (=ks-x1001		. #x286F)	; &I-K0-286F; [08-79]
@@ -169,6 +165,10 @@
     (=jis-x0213-1-2000	. #x2D29)	; &I-JX1-2D29; [13-09]
     (=big5-eten		. #xC6A9)	; &B-C6A9;
     (=jef-china3	. #x77D1)	; &I-JC3-77D1;
+    (<-circled
+     ((name		  . "DIGIT NINE")
+      (=ucs		  . #x0039)	; 9
+      ))
     ))
 (define-char
   '((name		. "CIRCLED NUMBER TEN")
@@ -1207,13 +1207,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER A")
       (=ucs		  . #x249C)	; ⒜
       ))
+    (=ks-x1001		. #x294D)	; &K0-294D; [09-45]
+    (=jef-china3	. #x78A1)	; &I-JC3-78A1;
+    (=ucs@ks		. #x249C)	; &K0-294D;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER A")
       (=ucs		  . #x249C)	; ⒜
       ))
-    (=ks-x1001		. #x294D)	; &K0-294D; [09-45]
-    (=jef-china3	. #x78A1)	; &I-JC3-78A1;
-    (=ucs@ks		. #x249C)	; &K0-294D;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER B")
@@ -1237,13 +1237,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER B")
       (=ucs		  . #x249D)	; ⒝
       ))
+    (=ks-x1001		. #x294E)	; &K0-294E; [09-46]
+    (=jef-china3	. #x78A2)	; &I-JC3-78A2;
+    (=ucs@ks		. #x249D)	; &K0-294E;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER B")
       (=ucs		  . #x249D)	; ⒝
       ))
-    (=ks-x1001		. #x294E)	; &K0-294E; [09-46]
-    (=jef-china3	. #x78A2)	; &I-JC3-78A2;
-    (=ucs@ks		. #x249D)	; &K0-294E;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER C")
@@ -1267,13 +1267,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER C")
       (=ucs		  . #x249E)	; ⒞
       ))
+    (=ks-x1001		. #x294F)	; &K0-294F; [09-47]
+    (=jef-china3	. #x78A3)	; &I-JC3-78A3;
+    (=ucs@ks		. #x249E)	; &K0-294F;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER C")
       (=ucs		  . #x249E)	; ⒞
       ))
-    (=ks-x1001		. #x294F)	; &K0-294F; [09-47]
-    (=jef-china3	. #x78A3)	; &I-JC3-78A3;
-    (=ucs@ks		. #x249E)	; &K0-294F;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER D")
@@ -1297,13 +1297,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER D")
       (=ucs		  . #x249F)	; ⒟
       ))
+    (=ks-x1001		. #x2950)	; &K0-2950; [09-48]
+    (=jef-china3	. #x78A4)	; &I-JC3-78A4;
+    (=ucs@ks		. #x249F)	; &K0-2950;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER D")
       (=ucs		  . #x249F)	; ⒟
       ))
-    (=ks-x1001		. #x2950)	; &K0-2950; [09-48]
-    (=jef-china3	. #x78A4)	; &I-JC3-78A4;
-    (=ucs@ks		. #x249F)	; &K0-2950;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER E")
@@ -1327,13 +1327,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER E")
       (=ucs		  . #x24A0)	; ⒠
       ))
+    (=ks-x1001		. #x2951)	; &K0-2951; [09-49]
+    (=jef-china3	. #x78A5)	; &I-JC3-78A5;
+    (=ucs@ks		. #x24A0)	; &K0-2951;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER E")
       (=ucs		  . #x24A0)	; ⒠
       ))
-    (=ks-x1001		. #x2951)	; &K0-2951; [09-49]
-    (=jef-china3	. #x78A5)	; &I-JC3-78A5;
-    (=ucs@ks		. #x24A0)	; &K0-2951;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER F")
@@ -1357,13 +1357,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER F")
       (=ucs		  . #x24A1)	; ⒡
       ))
+    (=ks-x1001		. #x2952)	; &K0-2952; [09-50]
+    (=jef-china3	. #x78A6)	; &I-JC3-78A6;
+    (=ucs@ks		. #x24A1)	; &K0-2952;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER F")
       (=ucs		  . #x24A1)	; ⒡
       ))
-    (=ks-x1001		. #x2952)	; &K0-2952; [09-50]
-    (=jef-china3	. #x78A6)	; &I-JC3-78A6;
-    (=ucs@ks		. #x24A1)	; &K0-2952;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER G")
@@ -1387,13 +1387,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER G")
       (=ucs		  . #x24A2)	; ⒢
       ))
+    (=ks-x1001		. #x2953)	; &K0-2953; [09-51]
+    (=jef-china3	. #x78A7)	; &I-JC3-78A7;
+    (=ucs@ks		. #x24A2)	; &K0-2953;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER G")
       (=ucs		  . #x24A2)	; ⒢
       ))
-    (=ks-x1001		. #x2953)	; &K0-2953; [09-51]
-    (=jef-china3	. #x78A7)	; &I-JC3-78A7;
-    (=ucs@ks		. #x24A2)	; &K0-2953;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER H")
@@ -1417,13 +1417,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER H")
       (=ucs		  . #x24A3)	; ⒣
       ))
+    (=ks-x1001		. #x2954)	; &K0-2954; [09-52]
+    (=jef-china3	. #x78A8)	; &I-JC3-78A8;
+    (=ucs@ks		. #x24A3)	; &K0-2954;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER H")
       (=ucs		  . #x24A3)	; ⒣
       ))
-    (=ks-x1001		. #x2954)	; &K0-2954; [09-52]
-    (=jef-china3	. #x78A8)	; &I-JC3-78A8;
-    (=ucs@ks		. #x24A3)	; &K0-2954;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER I")
@@ -1447,13 +1447,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER I")
       (=ucs		  . #x24A4)	; ⒤
       ))
+    (=ks-x1001		. #x2955)	; &K0-2955; [09-53]
+    (=jef-china3	. #x78A9)	; &I-JC3-78A9;
+    (=ucs@ks		. #x24A4)	; &K0-2955;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER I")
       (=ucs		  . #x24A4)	; ⒤
       ))
-    (=ks-x1001		. #x2955)	; &K0-2955; [09-53]
-    (=jef-china3	. #x78A9)	; &I-JC3-78A9;
-    (=ucs@ks		. #x24A4)	; &K0-2955;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER J")
@@ -1477,13 +1477,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER J")
       (=ucs		  . #x24A5)	; ⒥
       ))
+    (=ks-x1001		. #x2956)	; &K0-2956; [09-54]
+    (=jef-china3	. #x78AA)	; &I-JC3-78AA;
+    (=ucs@ks		. #x24A5)	; &K0-2956;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER J")
       (=ucs		  . #x24A5)	; ⒥
       ))
-    (=ks-x1001		. #x2956)	; &K0-2956; [09-54]
-    (=jef-china3	. #x78AA)	; &I-JC3-78AA;
-    (=ucs@ks		. #x24A5)	; &K0-2956;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER K")
@@ -1507,13 +1507,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER K")
       (=ucs		  . #x24A6)	; ⒦
       ))
+    (=ks-x1001		. #x2957)	; &K0-2957; [09-55]
+    (=jef-china3	. #x78AB)	; &I-JC3-78AB;
+    (=ucs@ks		. #x24A6)	; &K0-2957;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER K")
       (=ucs		  . #x24A6)	; ⒦
       ))
-    (=ks-x1001		. #x2957)	; &K0-2957; [09-55]
-    (=jef-china3	. #x78AB)	; &I-JC3-78AB;
-    (=ucs@ks		. #x24A6)	; &K0-2957;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER L")
@@ -1537,13 +1537,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER L")
       (=ucs		  . #x24A7)	; ⒧
       ))
+    (=ks-x1001		. #x2958)	; &K0-2958; [09-56]
+    (=jef-china3	. #x78AC)	; &I-JC3-78AC;
+    (=ucs@ks		. #x24A7)	; &K0-2958;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER L")
       (=ucs		  . #x24A7)	; ⒧
       ))
-    (=ks-x1001		. #x2958)	; &K0-2958; [09-56]
-    (=jef-china3	. #x78AC)	; &I-JC3-78AC;
-    (=ucs@ks		. #x24A7)	; &K0-2958;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER M")
@@ -1567,13 +1567,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER M")
       (=ucs		  . #x24A8)	; ⒨
       ))
+    (=ks-x1001		. #x2959)	; &K0-2959; [09-57]
+    (=jef-china3	. #x78AD)	; &I-JC3-78AD;
+    (=ucs@ks		. #x24A8)	; &K0-2959;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER M")
       (=ucs		  . #x24A8)	; ⒨
       ))
-    (=ks-x1001		. #x2959)	; &K0-2959; [09-57]
-    (=jef-china3	. #x78AD)	; &I-JC3-78AD;
-    (=ucs@ks		. #x24A8)	; &K0-2959;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER N")
@@ -1597,13 +1597,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER N")
       (=ucs		  . #x24A9)	; ⒩
       ))
+    (=ks-x1001		. #x295A)	; &K0-295A; [09-58]
+    (=jef-china3	. #x78AE)	; &I-JC3-78AE;
+    (=ucs@ks		. #x24A9)	; &K0-295A;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER N")
       (=ucs		  . #x24A9)	; ⒩
       ))
-    (=ks-x1001		. #x295A)	; &K0-295A; [09-58]
-    (=jef-china3	. #x78AE)	; &I-JC3-78AE;
-    (=ucs@ks		. #x24A9)	; &K0-295A;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER O")
@@ -1627,13 +1627,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER O")
       (=ucs		  . #x24AA)	; ⒪
       ))
+    (=ks-x1001		. #x295B)	; &K0-295B; [09-59]
+    (=jef-china3	. #x78AF)	; &I-JC3-78AF;
+    (=ucs@ks		. #x24AA)	; &K0-295B;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER O")
       (=ucs		  . #x24AA)	; ⒪
       ))
-    (=ks-x1001		. #x295B)	; &K0-295B; [09-59]
-    (=jef-china3	. #x78AF)	; &I-JC3-78AF;
-    (=ucs@ks		. #x24AA)	; &K0-295B;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER P")
@@ -1657,13 +1657,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER P")
       (=ucs		  . #x24AB)	; ⒫
       ))
+    (=ks-x1001		. #x295C)	; &K0-295C; [09-60]
+    (=jef-china3	. #x78B0)	; &I-JC3-78B0;
+    (=ucs@ks		. #x24AB)	; &K0-295C;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER P")
       (=ucs		  . #x24AB)	; ⒫
       ))
-    (=ks-x1001		. #x295C)	; &K0-295C; [09-60]
-    (=jef-china3	. #x78B0)	; &I-JC3-78B0;
-    (=ucs@ks		. #x24AB)	; &K0-295C;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER Q")
@@ -1687,13 +1687,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER Q")
       (=ucs		  . #x24AC)	; ⒬
       ))
+    (=ks-x1001		. #x295D)	; &K0-295D; [09-61]
+    (=jef-china3	. #x78B1)	; &I-JC3-78B1;
+    (=ucs@ks		. #x24AC)	; &K0-295D;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER Q")
       (=ucs		  . #x24AC)	; ⒬
       ))
-    (=ks-x1001		. #x295D)	; &K0-295D; [09-61]
-    (=jef-china3	. #x78B1)	; &I-JC3-78B1;
-    (=ucs@ks		. #x24AC)	; &K0-295D;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER R")
@@ -1717,13 +1717,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER R")
       (=ucs		  . #x24AD)	; ⒭
       ))
+    (=ks-x1001		. #x295E)	; &K0-295E; [09-62]
+    (=jef-china3	. #x78B2)	; &I-JC3-78B2;
+    (=ucs@ks		. #x24AD)	; &K0-295E;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER R")
       (=ucs		  . #x24AD)	; ⒭
       ))
-    (=ks-x1001		. #x295E)	; &K0-295E; [09-62]
-    (=jef-china3	. #x78B2)	; &I-JC3-78B2;
-    (=ucs@ks		. #x24AD)	; &K0-295E;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER S")
@@ -1747,13 +1747,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER S")
       (=ucs		  . #x24AE)	; ⒮
       ))
+    (=ks-x1001		. #x295F)	; &K0-295F; [09-63]
+    (=jef-china3	. #x78B3)	; &I-JC3-78B3;
+    (=ucs@ks		. #x24AE)	; &K0-295F;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER S")
       (=ucs		  . #x24AE)	; ⒮
       ))
-    (=ks-x1001		. #x295F)	; &K0-295F; [09-63]
-    (=jef-china3	. #x78B3)	; &I-JC3-78B3;
-    (=ucs@ks		. #x24AE)	; &K0-295F;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER T")
@@ -1777,13 +1777,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER T")
       (=ucs		  . #x24AF)	; ⒯
       ))
+    (=ks-x1001		. #x2960)	; &K0-2960; [09-64]
+    (=jef-china3	. #x78B4)	; &I-JC3-78B4;
+    (=ucs@ks		. #x24AF)	; &K0-2960;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER T")
       (=ucs		  . #x24AF)	; ⒯
       ))
-    (=ks-x1001		. #x2960)	; &K0-2960; [09-64]
-    (=jef-china3	. #x78B4)	; &I-JC3-78B4;
-    (=ucs@ks		. #x24AF)	; &K0-2960;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER U")
@@ -1807,13 +1807,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER U")
       (=ucs		  . #x24B0)	; ⒰
       ))
+    (=ks-x1001		. #x2961)	; &K0-2961; [09-65]
+    (=jef-china3	. #x78B5)	; &I-JC3-78B5;
+    (=ucs@ks		. #x24B0)	; &K0-2961;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER U")
       (=ucs		  . #x24B0)	; ⒰
       ))
-    (=ks-x1001		. #x2961)	; &K0-2961; [09-65]
-    (=jef-china3	. #x78B5)	; &I-JC3-78B5;
-    (=ucs@ks		. #x24B0)	; &K0-2961;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER V")
@@ -1837,13 +1837,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER V")
       (=ucs		  . #x24B1)	; ⒱
       ))
+    (=ks-x1001		. #x2962)	; &K0-2962; [09-66]
+    (=jef-china3	. #x78B6)	; &I-JC3-78B6;
+    (=ucs@ks		. #x24B1)	; &K0-2962;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER V")
       (=ucs		  . #x24B1)	; ⒱
       ))
-    (=ks-x1001		. #x2962)	; &K0-2962; [09-66]
-    (=jef-china3	. #x78B6)	; &I-JC3-78B6;
-    (=ucs@ks		. #x24B1)	; &K0-2962;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER W")
@@ -1867,13 +1867,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER W")
       (=ucs		  . #x24B2)	; ⒲
       ))
+    (=ks-x1001		. #x2963)	; &K0-2963; [09-67]
+    (=jef-china3	. #x78B7)	; &I-JC3-78B7;
+    (=ucs@ks		. #x24B2)	; &K0-2963;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER W")
       (=ucs		  . #x24B2)	; ⒲
       ))
-    (=ks-x1001		. #x2963)	; &K0-2963; [09-67]
-    (=jef-china3	. #x78B7)	; &I-JC3-78B7;
-    (=ucs@ks		. #x24B2)	; &K0-2963;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER X")
@@ -1897,13 +1897,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER X")
       (=ucs		  . #x24B3)	; ⒳
       ))
+    (=ks-x1001		. #x2964)	; &K0-2964; [09-68]
+    (=jef-china3	. #x78B8)	; &I-JC3-78B8;
+    (=ucs@ks		. #x24B3)	; &K0-2964;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER X")
       (=ucs		  . #x24B3)	; ⒳
       ))
-    (=ks-x1001		. #x2964)	; &K0-2964; [09-68]
-    (=jef-china3	. #x78B8)	; &I-JC3-78B8;
-    (=ucs@ks		. #x24B3)	; &K0-2964;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER Y")
@@ -1927,13 +1927,13 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER Y")
       (=ucs		  . #x24B4)	; ⒴
       ))
+    (=ks-x1001		. #x2965)	; &K0-2965; [09-69]
+    (=jef-china3	. #x78B9)	; &I-JC3-78B9;
+    (=ucs@ks		. #x24B4)	; &K0-2965;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER Y")
       (=ucs		  . #x24B4)	; ⒴
       ))
-    (=ks-x1001		. #x2965)	; &K0-2965; [09-69]
-    (=jef-china3	. #x78B9)	; &I-JC3-78B9;
-    (=ucs@ks		. #x24B4)	; &K0-2965;
     ))
 (define-char
   '((name		. "PARENTHESIZED LATIN SMALL LETTER Z")
@@ -1957,24 +1957,24 @@
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER Z")
       (=ucs		  . #x24B5)	; ⒵
       ))
+    (=ks-x1001		. #x2966)	; &K0-2966; [09-70]
+    (=jef-china3	. #x78BA)	; &I-JC3-78BA;
+    (=ucs@ks		. #x24B5)	; &K0-2966;
     (<-fullwidth
      ((name		  . "PARENTHESIZED LATIN SMALL LETTER Z")
       (=ucs		  . #x24B5)	; ⒵
       ))
-    (=ks-x1001		. #x2966)	; &K0-2966; [09-70]
-    (=jef-china3	. #x78BA)	; &I-JC3-78BA;
-    (=ucs@ks		. #x24B5)	; &K0-2966;
     ))
 (define-char
   '((name		. "CIRCLED LATIN CAPITAL LETTER A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24B6)	; Ⓐ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER A")
       (=ucs		  . #x0041)	; A
       ))
-    (=ucs		. #x24B6)	; Ⓐ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER A")
       (=ucs		  . #x24D0)	; ⓐ
@@ -1985,11 +1985,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24B7)	; Ⓑ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER B")
       (=ucs		  . #x0042)	; B
       ))
-    (=ucs		. #x24B7)	; Ⓑ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER B")
       (=ucs		  . #x24D1)	; ⓑ
@@ -2000,11 +2000,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24B8)	; Ⓒ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER C")
       (=ucs		  . #x0043)	; C
       ))
-    (=ucs		. #x24B8)	; Ⓒ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER C")
       (=ucs		  . #x24D2)	; ⓒ
@@ -2015,11 +2015,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24B9)	; Ⓓ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER D")
       (=ucs		  . #x0044)	; D
       ))
-    (=ucs		. #x24B9)	; Ⓓ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER D")
       (=ucs		  . #x24D3)	; ⓓ
@@ -2030,11 +2030,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24BA)	; Ⓔ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER E")
       (=ucs		  . #x0045)	; E
       ))
-    (=ucs		. #x24BA)	; Ⓔ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER E")
       (=ucs		  . #x24D4)	; ⓔ
@@ -2045,11 +2045,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24BB)	; Ⓕ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER F")
       (=ucs		  . #x0046)	; F
       ))
-    (=ucs		. #x24BB)	; Ⓕ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER F")
       (=ucs		  . #x24D5)	; ⓕ
@@ -2060,11 +2060,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24BC)	; Ⓖ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER G")
       (=ucs		  . #x0047)	; G
       ))
-    (=ucs		. #x24BC)	; Ⓖ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER G")
       (=ucs		  . #x24D6)	; ⓖ
@@ -2075,11 +2075,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24BD)	; Ⓗ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER H")
       (=ucs		  . #x0048)	; H
       ))
-    (=ucs		. #x24BD)	; Ⓗ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER H")
       (=ucs		  . #x24D7)	; ⓗ
@@ -2090,11 +2090,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24BE)	; Ⓘ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER I")
       (=ucs		  . #x0049)	; I
       ))
-    (=ucs		. #x24BE)	; Ⓘ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER I")
       (=ucs		  . #x24D8)	; ⓘ
@@ -2105,11 +2105,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24BF)	; Ⓙ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER J")
       (=ucs		  . #x004A)	; J
       ))
-    (=ucs		. #x24BF)	; Ⓙ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER J")
       (=ucs		  . #x24D9)	; ⓙ
@@ -2120,11 +2120,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24C0)	; Ⓚ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER K")
       (=ucs		  . #x004B)	; K
       ))
-    (=ucs		. #x24C0)	; Ⓚ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER K")
       (=ucs		  . #x24DA)	; ⓚ
@@ -2135,11 +2135,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24C1)	; Ⓛ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER L")
       (=ucs		  . #x004C)	; L
       ))
-    (=ucs		. #x24C1)	; Ⓛ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER L")
       (=ucs		  . #x24DB)	; ⓛ
@@ -2150,11 +2150,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24C2)	; Ⓜ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER M")
       (=ucs		  . #x004D)	; M
       ))
-    (=ucs		. #x24C2)	; Ⓜ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER M")
       (=ucs		  . #x24DC)	; ⓜ
@@ -2165,11 +2165,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24C3)	; Ⓝ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER N")
       (=ucs		  . #x004E)	; N
       ))
-    (=ucs		. #x24C3)	; Ⓝ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER N")
       (=ucs		  . #x24DD)	; ⓝ
@@ -2180,11 +2180,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24C4)	; Ⓞ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER O")
       (=ucs		  . #x004F)	; O
       ))
-    (=ucs		. #x24C4)	; Ⓞ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER O")
       (=ucs		  . #x24DE)	; ⓞ
@@ -2195,11 +2195,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24C5)	; Ⓟ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER P")
       (=ucs		  . #x0050)	; P
       ))
-    (=ucs		. #x24C5)	; Ⓟ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER P")
       (=ucs		  . #x24DF)	; ⓟ
@@ -2210,11 +2210,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24C6)	; Ⓠ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER Q")
       (=ucs		  . #x0051)	; Q
       ))
-    (=ucs		. #x24C6)	; Ⓠ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER Q")
       (=ucs		  . #x24E0)	; ⓠ
@@ -2225,11 +2225,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24C7)	; Ⓡ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER R")
       (=ucs		  . #x0052)	; R
       ))
-    (=ucs		. #x24C7)	; Ⓡ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER R")
       (=ucs		  . #x24E1)	; ⓡ
@@ -2240,11 +2240,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24C8)	; Ⓢ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER S")
       (=ucs		  . #x0053)	; S
       ))
-    (=ucs		. #x24C8)	; Ⓢ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER S")
       (=ucs		  . #x24E2)	; ⓢ
@@ -2255,11 +2255,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24C9)	; Ⓣ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER T")
       (=ucs		  . #x0054)	; T
       ))
-    (=ucs		. #x24C9)	; Ⓣ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER T")
       (=ucs		  . #x24E3)	; ⓣ
@@ -2270,11 +2270,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24CA)	; Ⓤ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER U")
       (=ucs		  . #x0055)	; U
       ))
-    (=ucs		. #x24CA)	; Ⓤ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER U")
       (=ucs		  . #x24E4)	; ⓤ
@@ -2285,11 +2285,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24CB)	; Ⓥ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER V")
       (=ucs		  . #x0056)	; V
       ))
-    (=ucs		. #x24CB)	; Ⓥ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER V")
       (=ucs		  . #x24E5)	; ⓥ
@@ -2300,11 +2300,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24CC)	; Ⓦ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER W")
       (=ucs		  . #x0057)	; W
       ))
-    (=ucs		. #x24CC)	; Ⓦ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER W")
       (=ucs		  . #x24E6)	; ⓦ
@@ -2315,11 +2315,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24CD)	; Ⓧ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER X")
       (=ucs		  . #x0058)	; X
       ))
-    (=ucs		. #x24CD)	; Ⓧ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER X")
       (=ucs		  . #x24E7)	; ⓧ
@@ -2330,11 +2330,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24CE)	; Ⓨ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER Y")
       (=ucs		  . #x0059)	; Y
       ))
-    (=ucs		. #x24CE)	; Ⓨ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER Y")
       (=ucs		  . #x24E8)	; ⓨ
@@ -2345,11 +2345,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24CF)	; Ⓩ
     (<-circled
      ((name		  . "LATIN CAPITAL LETTER Z")
       (=ucs		  . #x005A)	; Z
       ))
-    (=ucs		. #x24CF)	; Ⓩ
     (->lowercase
      ((name		  . "CIRCLED LATIN SMALL LETTER Z")
       (=ucs		  . #x24E9)	; ⓩ
@@ -2360,11 +2360,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24D0)	; ⓐ
     (<-circled
      ((name		  . "LATIN SMALL LETTER A")
       (=ucs		  . #x0061)	; a
       ))
-    (=ucs		. #x24D0)	; ⓐ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER A")
       (=ucs		  . #x24B6)	; Ⓐ
@@ -2375,25 +2375,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER A")
       (=ucs		  . #x24D0)	; ⓐ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER A")
-      (=ucs		  . #x24D0)	; ⓐ
-      ))
     (=ks-x1001		. #x284D)	; &JX1-2C41; [08-45]
     (=jis-x0213-1-2000	. #x2C41)	; &I-JX1-2C41; [12-33]
     (=ucs@jis		. #x24D0)	; &JX1-2C41;
     (=ucs@ks		. #x24D0)	; &JX1-2C41;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER A")
+      (=ucs		  . #x24D0)	; ⓐ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER B")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24D1)	; ⓑ
     (<-circled
      ((name		  . "LATIN SMALL LETTER B")
       (=ucs		  . #x0062)	; b
       ))
-    (=ucs		. #x24D1)	; ⓑ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER B")
       (=ucs		  . #x24B7)	; Ⓑ
@@ -2404,25 +2404,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER B")
       (=ucs		  . #x24D1)	; ⓑ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER B")
-      (=ucs		  . #x24D1)	; ⓑ
-      ))
     (=ks-x1001		. #x284E)	; &JX1-2C42; [08-46]
     (=jis-x0213-1-2000	. #x2C42)	; &I-JX1-2C42; [12-34]
     (=ucs@jis		. #x24D1)	; &JX1-2C42;
     (=ucs@ks		. #x24D1)	; &JX1-2C42;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER B")
+      (=ucs		  . #x24D1)	; ⓑ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER C")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24D2)	; ⓒ
     (<-circled
      ((name		  . "LATIN SMALL LETTER C")
       (=ucs		  . #x0063)	; c
       ))
-    (=ucs		. #x24D2)	; ⓒ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER C")
       (=ucs		  . #x24B8)	; Ⓒ
@@ -2433,25 +2433,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER C")
       (=ucs		  . #x24D2)	; ⓒ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER C")
-      (=ucs		  . #x24D2)	; ⓒ
-      ))
     (=ks-x1001		. #x284F)	; &JX1-2C43; [08-47]
     (=jis-x0213-1-2000	. #x2C43)	; &I-JX1-2C43; [12-35]
     (=ucs@jis		. #x24D2)	; &JX1-2C43;
     (=ucs@ks		. #x24D2)	; &JX1-2C43;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER C")
+      (=ucs		  . #x24D2)	; ⓒ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER D")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24D3)	; ⓓ
     (<-circled
      ((name		  . "LATIN SMALL LETTER D")
       (=ucs		  . #x0064)	; d
       ))
-    (=ucs		. #x24D3)	; ⓓ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER D")
       (=ucs		  . #x24B9)	; Ⓓ
@@ -2462,25 +2462,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER D")
       (=ucs		  . #x24D3)	; ⓓ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER D")
-      (=ucs		  . #x24D3)	; ⓓ
-      ))
     (=ks-x1001		. #x2850)	; &JX1-2C44; [08-48]
     (=jis-x0213-1-2000	. #x2C44)	; &I-JX1-2C44; [12-36]
     (=ucs@jis		. #x24D3)	; &JX1-2C44;
     (=ucs@ks		. #x24D3)	; &JX1-2C44;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER D")
+      (=ucs		  . #x24D3)	; ⓓ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER E")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24D4)	; ⓔ
     (<-circled
      ((name		  . "LATIN SMALL LETTER E")
       (=ucs		  . #x0065)	; e
       ))
-    (=ucs		. #x24D4)	; ⓔ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER E")
       (=ucs		  . #x24BA)	; Ⓔ
@@ -2491,25 +2491,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER E")
       (=ucs		  . #x24D4)	; ⓔ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER E")
-      (=ucs		  . #x24D4)	; ⓔ
-      ))
     (=ks-x1001		. #x2851)	; &JX1-2C45; [08-49]
     (=jis-x0213-1-2000	. #x2C45)	; &I-JX1-2C45; [12-37]
     (=ucs@jis		. #x24D4)	; &JX1-2C45;
     (=ucs@ks		. #x24D4)	; &JX1-2C45;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER E")
+      (=ucs		  . #x24D4)	; ⓔ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER F")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24D5)	; ⓕ
     (<-circled
      ((name		  . "LATIN SMALL LETTER F")
       (=ucs		  . #x0066)	; f
       ))
-    (=ucs		. #x24D5)	; ⓕ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER F")
       (=ucs		  . #x24BB)	; Ⓕ
@@ -2520,25 +2520,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER F")
       (=ucs		  . #x24D5)	; ⓕ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER F")
-      (=ucs		  . #x24D5)	; ⓕ
-      ))
     (=ks-x1001		. #x2852)	; &JX1-2C46; [08-50]
     (=jis-x0213-1-2000	. #x2C46)	; &I-JX1-2C46; [12-38]
     (=ucs@jis		. #x24D5)	; &JX1-2C46;
     (=ucs@ks		. #x24D5)	; &JX1-2C46;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER F")
+      (=ucs		  . #x24D5)	; ⓕ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER G")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24D6)	; ⓖ
     (<-circled
      ((name		  . "LATIN SMALL LETTER G")
       (=ucs		  . #x0067)	; g
       ))
-    (=ucs		. #x24D6)	; ⓖ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER G")
       (=ucs		  . #x24BC)	; Ⓖ
@@ -2549,25 +2549,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER G")
       (=ucs		  . #x24D6)	; ⓖ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER G")
-      (=ucs		  . #x24D6)	; ⓖ
-      ))
     (=ks-x1001		. #x2853)	; &JX1-2C47; [08-51]
     (=jis-x0213-1-2000	. #x2C47)	; &I-JX1-2C47; [12-39]
     (=ucs@jis		. #x24D6)	; &JX1-2C47;
     (=ucs@ks		. #x24D6)	; &JX1-2C47;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER G")
+      (=ucs		  . #x24D6)	; ⓖ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER H")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24D7)	; ⓗ
     (<-circled
      ((name		  . "LATIN SMALL LETTER H")
       (=ucs		  . #x0068)	; h
       ))
-    (=ucs		. #x24D7)	; ⓗ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER H")
       (=ucs		  . #x24BD)	; Ⓗ
@@ -2578,25 +2578,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER H")
       (=ucs		  . #x24D7)	; ⓗ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER H")
-      (=ucs		  . #x24D7)	; ⓗ
-      ))
     (=ks-x1001		. #x2854)	; &JX1-2C48; [08-52]
     (=jis-x0213-1-2000	. #x2C48)	; &I-JX1-2C48; [12-40]
     (=ucs@jis		. #x24D7)	; &JX1-2C48;
     (=ucs@ks		. #x24D7)	; &JX1-2C48;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER H")
+      (=ucs		  . #x24D7)	; ⓗ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER I")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24D8)	; ⓘ
     (<-circled
      ((name		  . "LATIN SMALL LETTER I")
       (=ucs		  . #x0069)	; i
       ))
-    (=ucs		. #x24D8)	; ⓘ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER I")
       (=ucs		  . #x24BE)	; Ⓘ
@@ -2607,25 +2607,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER I")
       (=ucs		  . #x24D8)	; ⓘ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER I")
-      (=ucs		  . #x24D8)	; ⓘ
-      ))
     (=ks-x1001		. #x2855)	; &JX1-2C49; [08-53]
     (=jis-x0213-1-2000	. #x2C49)	; &I-JX1-2C49; [12-41]
     (=ucs@jis		. #x24D8)	; &JX1-2C49;
     (=ucs@ks		. #x24D8)	; &JX1-2C49;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER I")
+      (=ucs		  . #x24D8)	; ⓘ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER J")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24D9)	; ⓙ
     (<-circled
      ((name		  . "LATIN SMALL LETTER J")
       (=ucs		  . #x006A)	; j
       ))
-    (=ucs		. #x24D9)	; ⓙ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER J")
       (=ucs		  . #x24BF)	; Ⓙ
@@ -2636,25 +2636,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER J")
       (=ucs		  . #x24D9)	; ⓙ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER J")
-      (=ucs		  . #x24D9)	; ⓙ
-      ))
     (=ks-x1001		. #x2856)	; &JX1-2C4A; [08-54]
     (=jis-x0213-1-2000	. #x2C4A)	; &I-JX1-2C4A; [12-42]
     (=ucs@jis		. #x24D9)	; &JX1-2C4A;
     (=ucs@ks		. #x24D9)	; &JX1-2C4A;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER J")
+      (=ucs		  . #x24D9)	; ⓙ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER K")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24DA)	; ⓚ
     (<-circled
      ((name		  . "LATIN SMALL LETTER K")
       (=ucs		  . #x006B)	; k
       ))
-    (=ucs		. #x24DA)	; ⓚ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER K")
       (=ucs		  . #x24C0)	; Ⓚ
@@ -2665,25 +2665,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER K")
       (=ucs		  . #x24DA)	; ⓚ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER K")
-      (=ucs		  . #x24DA)	; ⓚ
-      ))
     (=ks-x1001		. #x2857)	; &JX1-2C4B; [08-55]
     (=jis-x0213-1-2000	. #x2C4B)	; &I-JX1-2C4B; [12-43]
     (=ucs@jis		. #x24DA)	; &JX1-2C4B;
     (=ucs@ks		. #x24DA)	; &JX1-2C4B;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER K")
+      (=ucs		  . #x24DA)	; ⓚ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER L")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24DB)	; ⓛ
     (<-circled
      ((name		  . "LATIN SMALL LETTER L")
       (=ucs		  . #x006C)	; l
       ))
-    (=ucs		. #x24DB)	; ⓛ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER L")
       (=ucs		  . #x24C1)	; Ⓛ
@@ -2694,25 +2694,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER L")
       (=ucs		  . #x24DB)	; ⓛ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER L")
-      (=ucs		  . #x24DB)	; ⓛ
-      ))
     (=ks-x1001		. #x2858)	; &JX1-2C4C; [08-56]
     (=jis-x0213-1-2000	. #x2C4C)	; &I-JX1-2C4C; [12-44]
     (=ucs@jis		. #x24DB)	; &JX1-2C4C;
     (=ucs@ks		. #x24DB)	; &JX1-2C4C;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER L")
+      (=ucs		  . #x24DB)	; ⓛ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER M")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24DC)	; ⓜ
     (<-circled
      ((name		  . "LATIN SMALL LETTER M")
       (=ucs		  . #x006D)	; m
       ))
-    (=ucs		. #x24DC)	; ⓜ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER M")
       (=ucs		  . #x24C2)	; Ⓜ
@@ -2723,25 +2723,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER M")
       (=ucs		  . #x24DC)	; ⓜ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER M")
-      (=ucs		  . #x24DC)	; ⓜ
-      ))
     (=ks-x1001		. #x2859)	; &JX1-2C4D; [08-57]
     (=jis-x0213-1-2000	. #x2C4D)	; &I-JX1-2C4D; [12-45]
     (=ucs@jis		. #x24DC)	; &JX1-2C4D;
     (=ucs@ks		. #x24DC)	; &JX1-2C4D;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER M")
+      (=ucs		  . #x24DC)	; ⓜ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER N")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24DD)	; ⓝ
     (<-circled
      ((name		  . "LATIN SMALL LETTER N")
       (=ucs		  . #x006E)	; n
       ))
-    (=ucs		. #x24DD)	; ⓝ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER N")
       (=ucs		  . #x24C3)	; Ⓝ
@@ -2752,25 +2752,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER N")
       (=ucs		  . #x24DD)	; ⓝ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER N")
-      (=ucs		  . #x24DD)	; ⓝ
-      ))
     (=ks-x1001		. #x285A)	; &JX1-2C4E; [08-58]
     (=jis-x0213-1-2000	. #x2C4E)	; &I-JX1-2C4E; [12-46]
     (=ucs@jis		. #x24DD)	; &JX1-2C4E;
     (=ucs@ks		. #x24DD)	; &JX1-2C4E;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER N")
+      (=ucs		  . #x24DD)	; ⓝ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER O")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24DE)	; ⓞ
     (<-circled
      ((name		  . "LATIN SMALL LETTER O")
       (=ucs		  . #x006F)	; o
       ))
-    (=ucs		. #x24DE)	; ⓞ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER O")
       (=ucs		  . #x24C4)	; Ⓞ
@@ -2781,25 +2781,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER O")
       (=ucs		  . #x24DE)	; ⓞ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER O")
-      (=ucs		  . #x24DE)	; ⓞ
-      ))
     (=ks-x1001		. #x285B)	; &JX1-2C4F; [08-59]
     (=jis-x0213-1-2000	. #x2C4F)	; &I-JX1-2C4F; [12-47]
     (=ucs@jis		. #x24DE)	; &JX1-2C4F;
     (=ucs@ks		. #x24DE)	; &JX1-2C4F;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER O")
+      (=ucs		  . #x24DE)	; ⓞ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER P")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24DF)	; ⓟ
     (<-circled
      ((name		  . "LATIN SMALL LETTER P")
       (=ucs		  . #x0070)	; p
       ))
-    (=ucs		. #x24DF)	; ⓟ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER P")
       (=ucs		  . #x24C5)	; Ⓟ
@@ -2810,25 +2810,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER P")
       (=ucs		  . #x24DF)	; ⓟ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER P")
-      (=ucs		  . #x24DF)	; ⓟ
-      ))
     (=ks-x1001		. #x285C)	; &JX1-2C50; [08-60]
     (=jis-x0213-1-2000	. #x2C50)	; &I-JX1-2C50; [12-48]
     (=ucs@jis		. #x24DF)	; &JX1-2C50;
     (=ucs@ks		. #x24DF)	; &JX1-2C50;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER P")
+      (=ucs		  . #x24DF)	; ⓟ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER Q")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24E0)	; ⓠ
     (<-circled
      ((name		  . "LATIN SMALL LETTER Q")
       (=ucs		  . #x0071)	; q
       ))
-    (=ucs		. #x24E0)	; ⓠ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER Q")
       (=ucs		  . #x24C6)	; Ⓠ
@@ -2839,25 +2839,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER Q")
       (=ucs		  . #x24E0)	; ⓠ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER Q")
-      (=ucs		  . #x24E0)	; ⓠ
-      ))
     (=ks-x1001		. #x285D)	; &JX1-2C51; [08-61]
     (=jis-x0213-1-2000	. #x2C51)	; &I-JX1-2C51; [12-49]
     (=ucs@jis		. #x24E0)	; &JX1-2C51;
     (=ucs@ks		. #x24E0)	; &JX1-2C51;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER Q")
+      (=ucs		  . #x24E0)	; ⓠ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER R")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24E1)	; ⓡ
     (<-circled
      ((name		  . "LATIN SMALL LETTER R")
       (=ucs		  . #x0072)	; r
       ))
-    (=ucs		. #x24E1)	; ⓡ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER R")
       (=ucs		  . #x24C7)	; Ⓡ
@@ -2868,25 +2868,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER R")
       (=ucs		  . #x24E1)	; ⓡ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER R")
-      (=ucs		  . #x24E1)	; ⓡ
-      ))
     (=ks-x1001		. #x285E)	; &JX1-2C52; [08-62]
     (=jis-x0213-1-2000	. #x2C52)	; &I-JX1-2C52; [12-50]
     (=ucs@jis		. #x24E1)	; &JX1-2C52;
     (=ucs@ks		. #x24E1)	; &JX1-2C52;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER R")
+      (=ucs		  . #x24E1)	; ⓡ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER S")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24E2)	; ⓢ
     (<-circled
      ((name		  . "LATIN SMALL LETTER S")
       (=ucs		  . #x0073)	; s
       ))
-    (=ucs		. #x24E2)	; ⓢ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER S")
       (=ucs		  . #x24C8)	; Ⓢ
@@ -2897,25 +2897,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER S")
       (=ucs		  . #x24E2)	; ⓢ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER S")
-      (=ucs		  . #x24E2)	; ⓢ
-      ))
     (=ks-x1001		. #x285F)	; &JX1-2C53; [08-63]
     (=jis-x0213-1-2000	. #x2C53)	; &I-JX1-2C53; [12-51]
     (=ucs@jis		. #x24E2)	; &JX1-2C53;
     (=ucs@ks		. #x24E2)	; &JX1-2C53;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER S")
+      (=ucs		  . #x24E2)	; ⓢ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER T")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24E3)	; ⓣ
     (<-circled
      ((name		  . "LATIN SMALL LETTER T")
       (=ucs		  . #x0074)	; t
       ))
-    (=ucs		. #x24E3)	; ⓣ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER T")
       (=ucs		  . #x24C9)	; Ⓣ
@@ -2926,25 +2926,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER T")
       (=ucs		  . #x24E3)	; ⓣ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER T")
-      (=ucs		  . #x24E3)	; ⓣ
-      ))
     (=ks-x1001		. #x2860)	; &JX1-2C54; [08-64]
     (=jis-x0213-1-2000	. #x2C54)	; &I-JX1-2C54; [12-52]
     (=ucs@jis		. #x24E3)	; &JX1-2C54;
     (=ucs@ks		. #x24E3)	; &JX1-2C54;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER T")
+      (=ucs		  . #x24E3)	; ⓣ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER U")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24E4)	; ⓤ
     (<-circled
      ((name		  . "LATIN SMALL LETTER U")
       (=ucs		  . #x0075)	; u
       ))
-    (=ucs		. #x24E4)	; ⓤ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER U")
       (=ucs		  . #x24CA)	; Ⓤ
@@ -2955,25 +2955,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER U")
       (=ucs		  . #x24E4)	; ⓤ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER U")
-      (=ucs		  . #x24E4)	; ⓤ
-      ))
     (=ks-x1001		. #x2861)	; &JX1-2C55; [08-65]
     (=jis-x0213-1-2000	. #x2C55)	; &I-JX1-2C55; [12-53]
     (=ucs@jis		. #x24E4)	; &JX1-2C55;
     (=ucs@ks		. #x24E4)	; &JX1-2C55;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER U")
+      (=ucs		  . #x24E4)	; ⓤ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER V")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24E5)	; ⓥ
     (<-circled
      ((name		  . "LATIN SMALL LETTER V")
       (=ucs		  . #x0076)	; v
       ))
-    (=ucs		. #x24E5)	; ⓥ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER V")
       (=ucs		  . #x24CB)	; Ⓥ
@@ -2984,25 +2984,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER V")
       (=ucs		  . #x24E5)	; ⓥ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER V")
-      (=ucs		  . #x24E5)	; ⓥ
-      ))
     (=ks-x1001		. #x2862)	; &JX1-2C56; [08-66]
     (=jis-x0213-1-2000	. #x2C56)	; &I-JX1-2C56; [12-54]
     (=ucs@jis		. #x24E5)	; &JX1-2C56;
     (=ucs@ks		. #x24E5)	; &JX1-2C56;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER V")
+      (=ucs		  . #x24E5)	; ⓥ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER W")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24E6)	; ⓦ
     (<-circled
      ((name		  . "LATIN SMALL LETTER W")
       (=ucs		  . #x0077)	; w
       ))
-    (=ucs		. #x24E6)	; ⓦ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER W")
       (=ucs		  . #x24CC)	; Ⓦ
@@ -3013,25 +3013,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER W")
       (=ucs		  . #x24E6)	; ⓦ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER W")
-      (=ucs		  . #x24E6)	; ⓦ
-      ))
     (=ks-x1001		. #x2863)	; &JX1-2C57; [08-67]
     (=jis-x0213-1-2000	. #x2C57)	; &I-JX1-2C57; [12-55]
     (=ucs@jis		. #x24E6)	; &JX1-2C57;
     (=ucs@ks		. #x24E6)	; &JX1-2C57;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER W")
+      (=ucs		  . #x24E6)	; ⓦ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER X")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24E7)	; ⓧ
     (<-circled
      ((name		  . "LATIN SMALL LETTER X")
       (=ucs		  . #x0078)	; x
       ))
-    (=ucs		. #x24E7)	; ⓧ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER X")
       (=ucs		  . #x24CD)	; Ⓧ
@@ -3042,25 +3042,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER X")
       (=ucs		  . #x24E7)	; ⓧ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER X")
-      (=ucs		  . #x24E7)	; ⓧ
-      ))
     (=ks-x1001		. #x2864)	; &JX1-2C58; [08-68]
     (=jis-x0213-1-2000	. #x2C58)	; &I-JX1-2C58; [12-56]
     (=ucs@jis		. #x24E7)	; &JX1-2C58;
     (=ucs@ks		. #x24E7)	; &JX1-2C58;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER X")
+      (=ucs		  . #x24E7)	; ⓧ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER Y")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24E8)	; ⓨ
     (<-circled
      ((name		  . "LATIN SMALL LETTER Y")
       (=ucs		  . #x0079)	; y
       ))
-    (=ucs		. #x24E8)	; ⓨ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER Y")
       (=ucs		  . #x24CE)	; Ⓨ
@@ -3071,25 +3071,25 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER Y")
       (=ucs		  . #x24E8)	; ⓨ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER Y")
-      (=ucs		  . #x24E8)	; ⓨ
-      ))
     (=ks-x1001		. #x2865)	; &JX1-2C59; [08-69]
     (=jis-x0213-1-2000	. #x2C59)	; &I-JX1-2C59; [12-57]
     (=ucs@jis		. #x24E8)	; &JX1-2C59;
     (=ucs@ks		. #x24E8)	; &JX1-2C59;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER Y")
+      (=ucs		  . #x24E8)	; ⓨ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED LATIN SMALL LETTER Z")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x24E9)	; ⓩ
     (<-circled
      ((name		  . "LATIN SMALL LETTER Z")
       (=ucs		  . #x007A)	; z
       ))
-    (=ucs		. #x24E9)	; ⓩ
     (->uppercase
      ((name		  . "CIRCLED LATIN CAPITAL LETTER Z")
       (=ucs		  . #x24CF)	; Ⓩ
@@ -3100,14 +3100,14 @@
      ((name		  . "CIRCLED LATIN SMALL LETTER Z")
       (=ucs		  . #x24E9)	; ⓩ
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLED LATIN SMALL LETTER Z")
-      (=ucs		  . #x24E9)	; ⓩ
-      ))
     (=ks-x1001		. #x2866)	; &JX1-2C5A; [08-70]
     (=jis-x0213-1-2000	. #x2C5A)	; &I-JX1-2C5A; [12-58]
     (=ucs@jis		. #x24E9)	; &JX1-2C5A;
     (=ucs@ks		. #x24E9)	; &JX1-2C5A;
+    (<-fullwidth
+     ((name		  . "CIRCLED LATIN SMALL LETTER Z")
+      (=ucs		  . #x24E9)	; ⓩ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED DIGIT ZERO")
@@ -3116,11 +3116,11 @@
     (mirrored		. nil)
     (digit-value	. 0)
     (numeric-value	. 0)
+    (=ucs		. #x24EA)	; ⓪
     (<-circled
      ((name		  . "DIGIT ZERO")
       (=ucs		  . #x0030)	; 0
       ))
-    (=ucs		. #x24EA)	; ⓪
     ))
 (define-char
   '((name		. "NEGATIVE CIRCLED NUMBER ELEVEN")
diff --git a/lisp/utf-2000/u02500-Box-Drawing.el b/lisp/utf-2000/u02500-Box-Drawing.el
index 79f487c..c0ecc8d 100644
--- a/lisp/utf-2000/u02500-Box-Drawing.el
+++ b/lisp/utf-2000/u02500-Box-Drawing.el
@@ -11,10 +11,6 @@
      ((name		  . "BOX DRAWINGS LIGHT HORIZONTAL")
       (=ucs		  . #x2500)	; ─
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT HORIZONTAL")
-      (=ucs		  . #x2500)	; ─
-      ))
     (=gb2312		. #x2924)	; &J90-2821; [09-04]
     (=jis-x0208@1983	. #x2821)	; &I-J83-2821; [08-01]
     (=ks-x1001		. #x2621)	; &I-K0-2621; [06-01]
@@ -26,6 +22,10 @@
     (=ucs@jis		. #x2500)	; &J90-2821;
     (=ucs@ks		. #x2500)	; &J90-2821;
     (=ucs@big5		. #x2500)	; &J90-2821;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT HORIZONTAL")
+      (=ucs		  . #x2500)	; ─
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY HORIZONTAL")
@@ -39,10 +39,6 @@
      ((name		  . "BOX DRAWINGS HEAVY HORIZONTAL")
       (=ucs		  . #x2501)	; ━
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS HEAVY HORIZONTAL")
-      (=ucs		  . #x2501)	; ━
-      ))
     (=gb2312		. #x2925)	; &J90-282C; [09-05]
     (=jis-x0208@1983	. #x282C)	; &I-J83-282C; [08-12]
     (=ks-x1001		. #x262C)	; &I-K0-262C; [06-12]
@@ -50,6 +46,10 @@
     (=ucs@gb		. #x2501)	; &J90-282C;
     (=ucs@jis		. #x2501)	; &J90-282C;
     (=ucs@ks		. #x2501)	; &J90-282C;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS HEAVY HORIZONTAL")
+      (=ucs		  . #x2501)	; ━
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT VERTICAL")
@@ -63,10 +63,6 @@
      ((name		  . "BOX DRAWINGS LIGHT VERTICAL")
       (=ucs		  . #x2502)	; │
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT VERTICAL")
-      (=ucs		  . #x2502)	; │
-      ))
     (=gb2312		. #x2926)	; &J90-2822; [09-06]
     (=jis-x0208@1983	. #x2822)	; &I-J83-2822; [08-02]
     (=ks-x1001		. #x2622)	; &I-K0-2622; [06-02]
@@ -78,6 +74,10 @@
     (=ucs@jis		. #x2502)	; &J90-2822;
     (=ucs@ks		. #x2502)	; &J90-2822;
     (=ucs@big5		. #x2502)	; &J90-2822;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT VERTICAL")
+      (=ucs		  . #x2502)	; │
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY VERTICAL")
@@ -91,10 +91,6 @@
      ((name		  . "BOX DRAWINGS HEAVY VERTICAL")
       (=ucs		  . #x2503)	; ┃
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS HEAVY VERTICAL")
-      (=ucs		  . #x2503)	; ┃
-      ))
     (=gb2312		. #x2927)	; &J90-282D; [09-07]
     (=jis-x0208@1983	. #x282D)	; &I-J83-282D; [08-13]
     (=ks-x1001		. #x262D)	; &I-K0-262D; [06-13]
@@ -102,6 +98,10 @@
     (=ucs@gb		. #x2503)	; &J90-282D;
     (=ucs@jis		. #x2503)	; &J90-282D;
     (=ucs@ks		. #x2503)	; &J90-282D;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS HEAVY VERTICAL")
+      (=ucs		  . #x2503)	; ┃
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL")
@@ -115,12 +115,12 @@
      ((name		  . "BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL")
       (=ucs		  . #x2504)	; ┄
       ))
+    (=gb2312		. #x2928)	; &G0-2928; [09-08]
+    (=ucs@gb		. #x2504)	; &G0-2928;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL")
       (=ucs		  . #x2504)	; ┄
       ))
-    (=gb2312		. #x2928)	; &G0-2928; [09-08]
-    (=ucs@gb		. #x2504)	; &G0-2928;
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL")
@@ -134,12 +134,12 @@
      ((name		  . "BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL")
       (=ucs		  . #x2505)	; ┅
       ))
+    (=gb2312		. #x2929)	; &G0-2929; [09-09]
+    (=ucs@gb		. #x2505)	; &G0-2929;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL")
       (=ucs		  . #x2505)	; ┅
       ))
-    (=gb2312		. #x2929)	; &G0-2929; [09-09]
-    (=ucs@gb		. #x2505)	; &G0-2929;
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL")
@@ -153,12 +153,12 @@
      ((name		  . "BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL")
       (=ucs		  . #x2506)	; ┆
       ))
+    (=gb2312		. #x292A)	; &G0-292A; [09-10]
+    (=ucs@gb		. #x2506)	; &G0-292A;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL")
       (=ucs		  . #x2506)	; ┆
       ))
-    (=gb2312		. #x292A)	; &G0-292A; [09-10]
-    (=ucs@gb		. #x2506)	; &G0-292A;
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL")
@@ -172,12 +172,12 @@
      ((name		  . "BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL")
       (=ucs		  . #x2507)	; ┇
       ))
+    (=gb2312		. #x292B)	; &G0-292B; [09-11]
+    (=ucs@gb		. #x2507)	; &G0-292B;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL")
       (=ucs		  . #x2507)	; ┇
       ))
-    (=gb2312		. #x292B)	; &G0-292B; [09-11]
-    (=ucs@gb		. #x2507)	; &G0-292B;
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL")
@@ -191,12 +191,12 @@
      ((name . "BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL")
       (=ucs		  . #x2508)	; ┈
       ))
+    (=gb2312		. #x292C)	; &G0-292C; [09-12]
+    (=ucs@gb		. #x2508)	; &G0-292C;
     (<-fullwidth
      ((name . "BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL")
       (=ucs		  . #x2508)	; ┈
       ))
-    (=gb2312		. #x292C)	; &G0-292C; [09-12]
-    (=ucs@gb		. #x2508)	; &G0-292C;
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL")
@@ -210,12 +210,12 @@
      ((name . "BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL")
       (=ucs		  . #x2509)	; ┉
       ))
+    (=gb2312		. #x292D)	; &G0-292D; [09-13]
+    (=ucs@gb		. #x2509)	; &G0-292D;
     (<-fullwidth
      ((name . "BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL")
       (=ucs		  . #x2509)	; ┉
       ))
-    (=gb2312		. #x292D)	; &G0-292D; [09-13]
-    (=ucs@gb		. #x2509)	; &G0-292D;
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL")
@@ -229,12 +229,12 @@
      ((name		  . "BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL")
       (=ucs		  . #x250A)	; ┊
       ))
+    (=gb2312		. #x292E)	; &G0-292E; [09-14]
+    (=ucs@gb		. #x250A)	; &G0-292E;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL")
       (=ucs		  . #x250A)	; ┊
       ))
-    (=gb2312		. #x292E)	; &G0-292E; [09-14]
-    (=ucs@gb		. #x250A)	; &G0-292E;
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL")
@@ -248,12 +248,12 @@
      ((name		  . "BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL")
       (=ucs		  . #x250B)	; ┋
       ))
+    (=gb2312		. #x292F)	; &G0-292F; [09-15]
+    (=ucs@gb		. #x250B)	; &G0-292F;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL")
       (=ucs		  . #x250B)	; ┋
       ))
-    (=gb2312		. #x292F)	; &G0-292F; [09-15]
-    (=ucs@gb		. #x250B)	; &G0-292F;
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT DOWN AND RIGHT")
@@ -267,10 +267,6 @@
      ((name		  . "BOX DRAWINGS LIGHT DOWN AND RIGHT")
       (=ucs		  . #x250C)	; ┌
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT DOWN AND RIGHT")
-      (=ucs		  . #x250C)	; ┌
-      ))
     (=gb2312		. #x2930)	; &J90-2823; [09-16]
     (=jis-x0208@1983	. #x2823)	; &I-J83-2823; [08-03]
     (=ks-x1001		. #x2623)	; &I-K0-2623; [06-03]
@@ -282,6 +278,10 @@
     (=ucs@jis		. #x250C)	; &J90-2823;
     (=ucs@ks		. #x250C)	; &J90-2823;
     (=ucs@big5		. #x250C)	; &J90-2823;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT DOWN AND RIGHT")
+      (=ucs		  . #x250C)	; ┌
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY")
@@ -295,14 +295,14 @@
      ((name		  . "BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY")
       (=ucs		  . #x250D)	; ┍
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY")
-      (=ucs		  . #x250D)	; ┍
-      ))
     (=gb2312		. #x2931)	; &K0-2648; [09-17]
     (=ks-x1001		. #x2648)	; &I-K0-2648; [06-40]
     (=ucs@gb		. #x250D)	; &K0-2648;
     (=ucs@ks		. #x250D)	; &K0-2648;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY")
+      (=ucs		  . #x250D)	; ┍
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT")
@@ -316,14 +316,14 @@
      ((name		  . "BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT")
       (=ucs		  . #x250E)	; ┎
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT")
-      (=ucs		  . #x250E)	; ┎
-      ))
     (=gb2312		. #x2932)	; &K0-2647; [09-18]
     (=ks-x1001		. #x2647)	; &I-K0-2647; [06-39]
     (=ucs@gb		. #x250E)	; &K0-2647;
     (=ucs@ks		. #x250E)	; &K0-2647;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT")
+      (=ucs		  . #x250E)	; ┎
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY DOWN AND RIGHT")
@@ -337,10 +337,6 @@
      ((name		  . "BOX DRAWINGS HEAVY DOWN AND RIGHT")
       (=ucs		  . #x250F)	; ┏
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS HEAVY DOWN AND RIGHT")
-      (=ucs		  . #x250F)	; ┏
-      ))
     (=gb2312		. #x2933)	; &J90-282E; [09-19]
     (=jis-x0208@1983	. #x282E)	; &I-J83-282E; [08-14]
     (=ks-x1001		. #x262E)	; &I-K0-262E; [06-14]
@@ -348,6 +344,10 @@
     (=ucs@gb		. #x250F)	; &J90-282E;
     (=ucs@jis		. #x250F)	; &J90-282E;
     (=ucs@ks		. #x250F)	; &J90-282E;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS HEAVY DOWN AND RIGHT")
+      (=ucs		  . #x250F)	; ┏
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT DOWN AND LEFT")
@@ -361,10 +361,6 @@
      ((name		  . "BOX DRAWINGS LIGHT DOWN AND LEFT")
       (=ucs		  . #x2510)	; ┐
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT DOWN AND LEFT")
-      (=ucs		  . #x2510)	; ┐
-      ))
     (=gb2312		. #x2934)	; &J90-2824; [09-20]
     (=jis-x0208@1983	. #x2824)	; &I-J83-2824; [08-04]
     (=ks-x1001		. #x2624)	; &I-K0-2624; [06-04]
@@ -376,6 +372,10 @@
     (=ucs@jis		. #x2510)	; &J90-2824;
     (=ucs@ks		. #x2510)	; &J90-2824;
     (=ucs@big5		. #x2510)	; &J90-2824;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT DOWN AND LEFT")
+      (=ucs		  . #x2510)	; ┐
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY")
@@ -389,14 +389,14 @@
      ((name		  . "BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY")
       (=ucs		  . #x2511)	; ┑
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY")
-      (=ucs		  . #x2511)	; ┑
-      ))
     (=gb2312		. #x2935)	; &K0-2642; [09-21]
     (=ks-x1001		. #x2642)	; &I-K0-2642; [06-34]
     (=ucs@gb		. #x2511)	; &K0-2642;
     (=ucs@ks		. #x2511)	; &K0-2642;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY")
+      (=ucs		  . #x2511)	; ┑
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT")
@@ -410,14 +410,14 @@
      ((name		  . "BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT")
       (=ucs		  . #x2512)	; ┒
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT")
-      (=ucs		  . #x2512)	; ┒
-      ))
     (=gb2312		. #x2936)	; &K0-2641; [09-22]
     (=ks-x1001		. #x2641)	; &I-K0-2641; [06-33]
     (=ucs@gb		. #x2512)	; &K0-2641;
     (=ucs@ks		. #x2512)	; &K0-2641;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT")
+      (=ucs		  . #x2512)	; ┒
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY DOWN AND LEFT")
@@ -431,10 +431,6 @@
      ((name		  . "BOX DRAWINGS HEAVY DOWN AND LEFT")
       (=ucs		  . #x2513)	; ┓
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS HEAVY DOWN AND LEFT")
-      (=ucs		  . #x2513)	; ┓
-      ))
     (=gb2312		. #x2937)	; &J90-282F; [09-23]
     (=jis-x0208@1983	. #x282F)	; &I-J83-282F; [08-15]
     (=ks-x1001		. #x262F)	; &I-K0-262F; [06-15]
@@ -442,6 +438,10 @@
     (=ucs@gb		. #x2513)	; &J90-282F;
     (=ucs@jis		. #x2513)	; &J90-282F;
     (=ucs@ks		. #x2513)	; &J90-282F;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS HEAVY DOWN AND LEFT")
+      (=ucs		  . #x2513)	; ┓
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT UP AND RIGHT")
@@ -455,10 +455,6 @@
      ((name		  . "BOX DRAWINGS LIGHT UP AND RIGHT")
       (=ucs		  . #x2514)	; └
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT UP AND RIGHT")
-      (=ucs		  . #x2514)	; └
-      ))
     (=gb2312		. #x2938)	; &J90-2826; [09-24]
     (=jis-x0208@1983	. #x2826)	; &I-J83-2826; [08-06]
     (=ks-x1001		. #x2626)	; &I-K0-2626; [06-06]
@@ -470,6 +466,10 @@
     (=ucs@jis		. #x2514)	; &J90-2826;
     (=ucs@ks		. #x2514)	; &J90-2826;
     (=ucs@big5		. #x2514)	; &J90-2826;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT UP AND RIGHT")
+      (=ucs		  . #x2514)	; └
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP LIGHT AND RIGHT HEAVY")
@@ -483,14 +483,14 @@
      ((name		  . "BOX DRAWINGS UP LIGHT AND RIGHT HEAVY")
       (=ucs		  . #x2515)	; ┕
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS UP LIGHT AND RIGHT HEAVY")
-      (=ucs		  . #x2515)	; ┕
-      ))
     (=gb2312		. #x2939)	; &K0-2646; [09-25]
     (=ks-x1001		. #x2646)	; &I-K0-2646; [06-38]
     (=ucs@gb		. #x2515)	; &K0-2646;
     (=ucs@ks		. #x2515)	; &K0-2646;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS UP LIGHT AND RIGHT HEAVY")
+      (=ucs		  . #x2515)	; ┕
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP HEAVY AND RIGHT LIGHT")
@@ -504,14 +504,14 @@
      ((name		  . "BOX DRAWINGS UP HEAVY AND RIGHT LIGHT")
       (=ucs		  . #x2516)	; ┖
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS UP HEAVY AND RIGHT LIGHT")
-      (=ucs		  . #x2516)	; ┖
-      ))
     (=gb2312		. #x293A)	; &K0-2645; [09-26]
     (=ks-x1001		. #x2645)	; &I-K0-2645; [06-37]
     (=ucs@gb		. #x2516)	; &K0-2645;
     (=ucs@ks		. #x2516)	; &K0-2645;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS UP HEAVY AND RIGHT LIGHT")
+      (=ucs		  . #x2516)	; ┖
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY UP AND RIGHT")
@@ -525,10 +525,6 @@
      ((name		  . "BOX DRAWINGS HEAVY UP AND RIGHT")
       (=ucs		  . #x2517)	; ┗
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS HEAVY UP AND RIGHT")
-      (=ucs		  . #x2517)	; ┗
-      ))
     (=gb2312		. #x293B)	; &J90-2831; [09-27]
     (=jis-x0208@1983	. #x2831)	; &I-J83-2831; [08-17]
     (=ks-x1001		. #x2631)	; &I-K0-2631; [06-17]
@@ -536,6 +532,10 @@
     (=ucs@gb		. #x2517)	; &J90-2831;
     (=ucs@jis		. #x2517)	; &J90-2831;
     (=ucs@ks		. #x2517)	; &J90-2831;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS HEAVY UP AND RIGHT")
+      (=ucs		  . #x2517)	; ┗
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT UP AND LEFT")
@@ -549,10 +549,6 @@
      ((name		  . "BOX DRAWINGS LIGHT UP AND LEFT")
       (=ucs		  . #x2518)	; ┘
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT UP AND LEFT")
-      (=ucs		  . #x2518)	; ┘
-      ))
     (=gb2312		. #x293C)	; &J90-2825; [09-28]
     (=jis-x0208@1983	. #x2825)	; &I-J83-2825; [08-05]
     (=ks-x1001		. #x2625)	; &I-K0-2625; [06-05]
@@ -564,6 +560,10 @@
     (=ucs@jis		. #x2518)	; &J90-2825;
     (=ucs@ks		. #x2518)	; &J90-2825;
     (=ucs@big5		. #x2518)	; &J90-2825;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT UP AND LEFT")
+      (=ucs		  . #x2518)	; ┘
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP LIGHT AND LEFT HEAVY")
@@ -577,14 +577,14 @@
      ((name		  . "BOX DRAWINGS UP LIGHT AND LEFT HEAVY")
       (=ucs		  . #x2519)	; ┙
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS UP LIGHT AND LEFT HEAVY")
-      (=ucs		  . #x2519)	; ┙
-      ))
     (=gb2312		. #x293D)	; &K0-2644; [09-29]
     (=ks-x1001		. #x2644)	; &I-K0-2644; [06-36]
     (=ucs@gb		. #x2519)	; &K0-2644;
     (=ucs@ks		. #x2519)	; &K0-2644;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS UP LIGHT AND LEFT HEAVY")
+      (=ucs		  . #x2519)	; ┙
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP HEAVY AND LEFT LIGHT")
@@ -598,14 +598,14 @@
      ((name		  . "BOX DRAWINGS UP HEAVY AND LEFT LIGHT")
       (=ucs		  . #x251A)	; ┚
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS UP HEAVY AND LEFT LIGHT")
-      (=ucs		  . #x251A)	; ┚
-      ))
     (=gb2312		. #x293E)	; &K0-2643; [09-30]
     (=ks-x1001		. #x2643)	; &I-K0-2643; [06-35]
     (=ucs@gb		. #x251A)	; &K0-2643;
     (=ucs@ks		. #x251A)	; &K0-2643;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS UP HEAVY AND LEFT LIGHT")
+      (=ucs		  . #x251A)	; ┚
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY UP AND LEFT")
@@ -619,10 +619,6 @@
      ((name		  . "BOX DRAWINGS HEAVY UP AND LEFT")
       (=ucs		  . #x251B)	; ┛
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS HEAVY UP AND LEFT")
-      (=ucs		  . #x251B)	; ┛
-      ))
     (=gb2312		. #x293F)	; &J90-2830; [09-31]
     (=jis-x0208@1983	. #x2830)	; &I-J83-2830; [08-16]
     (=ks-x1001		. #x2630)	; &I-K0-2630; [06-16]
@@ -630,6 +626,10 @@
     (=ucs@gb		. #x251B)	; &J90-2830;
     (=ucs@jis		. #x251B)	; &J90-2830;
     (=ucs@ks		. #x251B)	; &J90-2830;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS HEAVY UP AND LEFT")
+      (=ucs		  . #x251B)	; ┛
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT VERTICAL AND RIGHT")
@@ -643,10 +643,6 @@
      ((name		  . "BOX DRAWINGS LIGHT VERTICAL AND RIGHT")
       (=ucs		  . #x251C)	; ├
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT VERTICAL AND RIGHT")
-      (=ucs		  . #x251C)	; ├
-      ))
     (=gb2312		. #x2940)	; &J90-2827; [09-32]
     (=jis-x0208@1983	. #x2827)	; &I-J83-2827; [08-07]
     (=ks-x1001		. #x2627)	; &I-K0-2627; [06-07]
@@ -658,6 +654,10 @@
     (=ucs@jis		. #x251C)	; &J90-2827;
     (=ucs@ks		. #x251C)	; &J90-2827;
     (=ucs@big5		. #x251C)	; &J90-2827;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT VERTICAL AND RIGHT")
+      (=ucs		  . #x251C)	; ├
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY")
@@ -671,10 +671,6 @@
      ((name . "BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY")
       (=ucs		  . #x251D)	; ┝
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY")
-      (=ucs		  . #x251D)	; ┝
-      ))
     (=gb2312		. #x2941)	; &J90-283C; [09-33]
     (=jis-x0208@1983	. #x283C)	; &I-J83-283C; [08-28]
     (=ks-x1001		. #x263C)	; &I-K0-263C; [06-28]
@@ -682,6 +678,10 @@
     (=ucs@gb		. #x251D)	; &J90-283C;
     (=ucs@jis		. #x251D)	; &J90-283C;
     (=ucs@ks		. #x251D)	; &J90-283C;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY")
+      (=ucs		  . #x251D)	; ┝
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT")
@@ -695,14 +695,14 @@
      ((name		  . "BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT")
       (=ucs		  . #x251E)	; ┞
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT")
-      (=ucs		  . #x251E)	; ┞
-      ))
     (=gb2312		. #x2942)	; &K0-2649; [09-34]
     (=ks-x1001		. #x2649)	; &I-K0-2649; [06-41]
     (=ucs@gb		. #x251E)	; &K0-2649;
     (=ucs@ks		. #x251E)	; &K0-2649;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT")
+      (=ucs		  . #x251E)	; ┞
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT")
@@ -716,14 +716,14 @@
      ((name		  . "BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT")
       (=ucs		  . #x251F)	; ┟
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT")
-      (=ucs		  . #x251F)	; ┟
-      ))
     (=gb2312		. #x2943)	; &K0-264A; [09-35]
     (=ks-x1001		. #x264A)	; &I-K0-264A; [06-42]
     (=ucs@gb		. #x251F)	; &K0-264A;
     (=ucs@ks		. #x251F)	; &K0-264A;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT")
+      (=ucs		  . #x251F)	; ┟
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT")
@@ -737,10 +737,6 @@
      ((name . "BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT")
       (=ucs		  . #x2520)	; ┠
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT")
-      (=ucs		  . #x2520)	; ┠
-      ))
     (=gb2312		. #x2944)	; &J90-2837; [09-36]
     (=jis-x0208@1983	. #x2837)	; &I-J83-2837; [08-23]
     (=ks-x1001		. #x2637)	; &I-K0-2637; [06-23]
@@ -748,6 +744,10 @@
     (=ucs@gb		. #x2520)	; &J90-2837;
     (=ucs@jis		. #x2520)	; &J90-2837;
     (=ucs@ks		. #x2520)	; &J90-2837;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT")
+      (=ucs		  . #x2520)	; ┠
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY")
@@ -761,14 +761,14 @@
      ((name		  . "BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY")
       (=ucs		  . #x2521)	; ┡
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY")
-      (=ucs		  . #x2521)	; ┡
-      ))
     (=gb2312		. #x2945)	; &K0-264B; [09-37]
     (=ks-x1001		. #x264B)	; &I-K0-264B; [06-43]
     (=ucs@gb		. #x2521)	; &K0-264B;
     (=ucs@ks		. #x2521)	; &K0-264B;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY")
+      (=ucs		  . #x2521)	; ┡
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY")
@@ -782,14 +782,14 @@
      ((name		  . "BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY")
       (=ucs		  . #x2522)	; ┢
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY")
-      (=ucs		  . #x2522)	; ┢
-      ))
     (=gb2312		. #x2946)	; &K0-264C; [09-38]
     (=ks-x1001		. #x264C)	; &I-K0-264C; [06-44]
     (=ucs@gb		. #x2522)	; &K0-264C;
     (=ucs@ks		. #x2522)	; &K0-264C;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY")
+      (=ucs		  . #x2522)	; ┢
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY VERTICAL AND RIGHT")
@@ -803,10 +803,6 @@
      ((name		  . "BOX DRAWINGS HEAVY VERTICAL AND RIGHT")
       (=ucs		  . #x2523)	; ┣
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS HEAVY VERTICAL AND RIGHT")
-      (=ucs		  . #x2523)	; ┣
-      ))
     (=gb2312		. #x2947)	; &J90-2832; [09-39]
     (=jis-x0208@1983	. #x2832)	; &I-J83-2832; [08-18]
     (=ks-x1001		. #x2632)	; &I-K0-2632; [06-18]
@@ -814,6 +810,10 @@
     (=ucs@gb		. #x2523)	; &J90-2832;
     (=ucs@jis		. #x2523)	; &J90-2832;
     (=ucs@ks		. #x2523)	; &J90-2832;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS HEAVY VERTICAL AND RIGHT")
+      (=ucs		  . #x2523)	; ┣
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT VERTICAL AND LEFT")
@@ -827,10 +827,6 @@
      ((name		  . "BOX DRAWINGS LIGHT VERTICAL AND LEFT")
       (=ucs		  . #x2524)	; ┤
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT VERTICAL AND LEFT")
-      (=ucs		  . #x2524)	; ┤
-      ))
     (=gb2312		. #x2948)	; &J90-2829; [09-40]
     (=jis-x0208@1983	. #x2829)	; &I-J83-2829; [08-09]
     (=ks-x1001		. #x2629)	; &I-K0-2629; [06-09]
@@ -842,6 +838,10 @@
     (=ucs@jis		. #x2524)	; &J90-2829;
     (=ucs@ks		. #x2524)	; &J90-2829;
     (=ucs@big5		. #x2524)	; &J90-2829;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT VERTICAL AND LEFT")
+      (=ucs		  . #x2524)	; ┤
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY")
@@ -855,10 +855,6 @@
      ((name		  . "BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY")
       (=ucs		  . #x2525)	; ┥
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY")
-      (=ucs		  . #x2525)	; ┥
-      ))
     (=gb2312		. #x2949)	; &J90-283E; [09-41]
     (=jis-x0208@1983	. #x283E)	; &I-J83-283E; [08-30]
     (=ks-x1001		. #x263E)	; &I-K0-263E; [06-30]
@@ -866,6 +862,10 @@
     (=ucs@gb		. #x2525)	; &J90-283E;
     (=ucs@jis		. #x2525)	; &J90-283E;
     (=ucs@ks		. #x2525)	; &J90-283E;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY")
+      (=ucs		  . #x2525)	; ┥
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT")
@@ -879,14 +879,14 @@
      ((name		  . "BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT")
       (=ucs		  . #x2526)	; ┦
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT")
-      (=ucs		  . #x2526)	; ┦
-      ))
     (=gb2312		. #x294A)	; &K0-264D; [09-42]
     (=ks-x1001		. #x264D)	; &I-K0-264D; [06-45]
     (=ucs@gb		. #x2526)	; &K0-264D;
     (=ucs@ks		. #x2526)	; &K0-264D;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT")
+      (=ucs		  . #x2526)	; ┦
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT")
@@ -900,14 +900,14 @@
      ((name		  . "BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT")
       (=ucs		  . #x2527)	; ┧
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT")
-      (=ucs		  . #x2527)	; ┧
-      ))
     (=gb2312		. #x294B)	; &K0-264E; [09-43]
     (=ks-x1001		. #x264E)	; &I-K0-264E; [06-46]
     (=ucs@gb		. #x2527)	; &K0-264E;
     (=ucs@ks		. #x2527)	; &K0-264E;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT")
+      (=ucs		  . #x2527)	; ┧
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT")
@@ -921,10 +921,6 @@
      ((name		  . "BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT")
       (=ucs		  . #x2528)	; ┨
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT")
-      (=ucs		  . #x2528)	; ┨
-      ))
     (=gb2312		. #x294C)	; &J90-2839; [09-44]
     (=jis-x0208@1983	. #x2839)	; &I-J83-2839; [08-25]
     (=ks-x1001		. #x2639)	; &I-K0-2639; [06-25]
@@ -932,6 +928,10 @@
     (=ucs@gb		. #x2528)	; &J90-2839;
     (=ucs@jis		. #x2528)	; &J90-2839;
     (=ucs@ks		. #x2528)	; &J90-2839;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT")
+      (=ucs		  . #x2528)	; ┨
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY")
@@ -945,14 +945,14 @@
      ((name		  . "BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY")
       (=ucs		  . #x2529)	; ┩
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY")
-      (=ucs		  . #x2529)	; ┩
-      ))
     (=gb2312		. #x294D)	; &K0-264F; [09-45]
     (=ks-x1001		. #x264F)	; &I-K0-264F; [06-47]
     (=ucs@gb		. #x2529)	; &K0-264F;
     (=ucs@ks		. #x2529)	; &K0-264F;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY")
+      (=ucs		  . #x2529)	; ┩
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY")
@@ -966,14 +966,14 @@
      ((name		  . "BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY")
       (=ucs		  . #x252A)	; ┪
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY")
-      (=ucs		  . #x252A)	; ┪
-      ))
     (=gb2312		. #x294E)	; &K0-2650; [09-46]
     (=ks-x1001		. #x2650)	; &I-K0-2650; [06-48]
     (=ucs@gb		. #x252A)	; &K0-2650;
     (=ucs@ks		. #x252A)	; &K0-2650;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY")
+      (=ucs		  . #x252A)	; ┪
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY VERTICAL AND LEFT")
@@ -987,10 +987,6 @@
      ((name		  . "BOX DRAWINGS HEAVY VERTICAL AND LEFT")
       (=ucs		  . #x252B)	; ┫
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS HEAVY VERTICAL AND LEFT")
-      (=ucs		  . #x252B)	; ┫
-      ))
     (=gb2312		. #x294F)	; &J90-2834; [09-47]
     (=jis-x0208@1983	. #x2834)	; &I-J83-2834; [08-20]
     (=ks-x1001		. #x2634)	; &I-K0-2634; [06-20]
@@ -998,6 +994,10 @@
     (=ucs@gb		. #x252B)	; &J90-2834;
     (=ucs@jis		. #x252B)	; &J90-2834;
     (=ucs@ks		. #x252B)	; &J90-2834;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS HEAVY VERTICAL AND LEFT")
+      (=ucs		  . #x252B)	; ┫
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT DOWN AND HORIZONTAL")
@@ -1011,10 +1011,6 @@
      ((name		  . "BOX DRAWINGS LIGHT DOWN AND HORIZONTAL")
       (=ucs		  . #x252C)	; ┬
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT DOWN AND HORIZONTAL")
-      (=ucs		  . #x252C)	; ┬
-      ))
     (=gb2312		. #x2950)	; &J90-2828; [09-48]
     (=jis-x0208@1983	. #x2828)	; &I-J83-2828; [08-08]
     (=ks-x1001		. #x2628)	; &I-K0-2628; [06-08]
@@ -1026,6 +1022,10 @@
     (=ucs@jis		. #x252C)	; &J90-2828;
     (=ucs@ks		. #x252C)	; &J90-2828;
     (=ucs@big5		. #x252C)	; &J90-2828;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT DOWN AND HORIZONTAL")
+      (=ucs		  . #x252C)	; ┬
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT")
@@ -1039,14 +1039,14 @@
      ((name . "BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT")
       (=ucs		  . #x252D)	; ┭
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT")
-      (=ucs		  . #x252D)	; ┭
-      ))
     (=gb2312		. #x2951)	; &K0-2651; [09-49]
     (=ks-x1001		. #x2651)	; &I-K0-2651; [06-49]
     (=ucs@gb		. #x252D)	; &K0-2651;
     (=ucs@ks		. #x252D)	; &K0-2651;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT")
+      (=ucs		  . #x252D)	; ┭
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT")
@@ -1060,14 +1060,14 @@
      ((name . "BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT")
       (=ucs		  . #x252E)	; ┮
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT")
-      (=ucs		  . #x252E)	; ┮
-      ))
     (=gb2312		. #x2952)	; &K0-2652; [09-50]
     (=ks-x1001		. #x2652)	; &I-K0-2652; [06-50]
     (=ucs@gb		. #x252E)	; &K0-2652;
     (=ucs@ks		. #x252E)	; &K0-2652;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT")
+      (=ucs		  . #x252E)	; ┮
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY")
@@ -1081,10 +1081,6 @@
      ((name . "BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY")
       (=ucs		  . #x252F)	; ┯
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY")
-      (=ucs		  . #x252F)	; ┯
-      ))
     (=gb2312		. #x2953)	; &J90-2838; [09-51]
     (=jis-x0208@1983	. #x2838)	; &I-J83-2838; [08-24]
     (=ks-x1001		. #x2638)	; &I-K0-2638; [06-24]
@@ -1092,6 +1088,10 @@
     (=ucs@gb		. #x252F)	; &J90-2838;
     (=ucs@jis		. #x252F)	; &J90-2838;
     (=ucs@ks		. #x252F)	; &J90-2838;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY")
+      (=ucs		  . #x252F)	; ┯
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT")
@@ -1105,10 +1105,6 @@
      ((name . "BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT")
       (=ucs		  . #x2530)	; ┰
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT")
-      (=ucs		  . #x2530)	; ┰
-      ))
     (=gb2312		. #x2954)	; &J90-283D; [09-52]
     (=jis-x0208@1983	. #x283D)	; &I-J83-283D; [08-29]
     (=ks-x1001		. #x263D)	; &I-K0-263D; [06-29]
@@ -1116,6 +1112,10 @@
     (=ucs@gb		. #x2530)	; &J90-283D;
     (=ucs@jis		. #x2530)	; &J90-283D;
     (=ucs@ks		. #x2530)	; &J90-283D;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT")
+      (=ucs		  . #x2530)	; ┰
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY")
@@ -1129,14 +1129,14 @@
      ((name . "BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY")
       (=ucs		  . #x2531)	; ┱
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY")
-      (=ucs		  . #x2531)	; ┱
-      ))
     (=gb2312		. #x2955)	; &K0-2653; [09-53]
     (=ks-x1001		. #x2653)	; &I-K0-2653; [06-51]
     (=ucs@gb		. #x2531)	; &K0-2653;
     (=ucs@ks		. #x2531)	; &K0-2653;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY")
+      (=ucs		  . #x2531)	; ┱
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY")
@@ -1150,14 +1150,14 @@
      ((name . "BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY")
       (=ucs		  . #x2532)	; ┲
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY")
-      (=ucs		  . #x2532)	; ┲
-      ))
     (=gb2312		. #x2956)	; &K0-2654; [09-54]
     (=ks-x1001		. #x2654)	; &I-K0-2654; [06-52]
     (=ucs@gb		. #x2532)	; &K0-2654;
     (=ucs@ks		. #x2532)	; &K0-2654;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY")
+      (=ucs		  . #x2532)	; ┲
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY DOWN AND HORIZONTAL")
@@ -1171,10 +1171,6 @@
      ((name		  . "BOX DRAWINGS HEAVY DOWN AND HORIZONTAL")
       (=ucs		  . #x2533)	; ┳
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS HEAVY DOWN AND HORIZONTAL")
-      (=ucs		  . #x2533)	; ┳
-      ))
     (=gb2312		. #x2957)	; &J90-2833; [09-55]
     (=jis-x0208@1983	. #x2833)	; &I-J83-2833; [08-19]
     (=ks-x1001		. #x2633)	; &I-K0-2633; [06-19]
@@ -1182,6 +1178,10 @@
     (=ucs@gb		. #x2533)	; &J90-2833;
     (=ucs@jis		. #x2533)	; &J90-2833;
     (=ucs@ks		. #x2533)	; &J90-2833;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS HEAVY DOWN AND HORIZONTAL")
+      (=ucs		  . #x2533)	; ┳
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT UP AND HORIZONTAL")
@@ -1195,10 +1195,6 @@
      ((name		  . "BOX DRAWINGS LIGHT UP AND HORIZONTAL")
       (=ucs		  . #x2534)	; ┴
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT UP AND HORIZONTAL")
-      (=ucs		  . #x2534)	; ┴
-      ))
     (=gb2312		. #x2958)	; &J90-282A; [09-56]
     (=jis-x0208@1983	. #x282A)	; &I-J83-282A; [08-10]
     (=ks-x1001		. #x262A)	; &I-K0-262A; [06-10]
@@ -1210,6 +1206,10 @@
     (=ucs@jis		. #x2534)	; &J90-282A;
     (=ucs@ks		. #x2534)	; &J90-282A;
     (=ucs@big5		. #x2534)	; &J90-282A;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT UP AND HORIZONTAL")
+      (=ucs		  . #x2534)	; ┴
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT")
@@ -1223,14 +1223,14 @@
      ((name		  . "BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT")
       (=ucs		  . #x2535)	; ┵
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT")
-      (=ucs		  . #x2535)	; ┵
-      ))
     (=gb2312		. #x2959)	; &K0-2655; [09-57]
     (=ks-x1001		. #x2655)	; &I-K0-2655; [06-53]
     (=ucs@gb		. #x2535)	; &K0-2655;
     (=ucs@ks		. #x2535)	; &K0-2655;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT")
+      (=ucs		  . #x2535)	; ┵
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT")
@@ -1244,14 +1244,14 @@
      ((name		  . "BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT")
       (=ucs		  . #x2536)	; ┶
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT")
-      (=ucs		  . #x2536)	; ┶
-      ))
     (=gb2312		. #x295A)	; &K0-2656; [09-58]
     (=ks-x1001		. #x2656)	; &I-K0-2656; [06-54]
     (=ucs@gb		. #x2536)	; &K0-2656;
     (=ucs@ks		. #x2536)	; &K0-2656;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT")
+      (=ucs		  . #x2536)	; ┶
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY")
@@ -1265,10 +1265,6 @@
      ((name		  . "BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY")
       (=ucs		  . #x2537)	; ┷
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY")
-      (=ucs		  . #x2537)	; ┷
-      ))
     (=gb2312		. #x295B)	; &J90-283A; [09-59]
     (=jis-x0208@1983	. #x283A)	; &I-J83-283A; [08-26]
     (=ks-x1001		. #x263A)	; &I-K0-263A; [06-26]
@@ -1276,6 +1272,10 @@
     (=ucs@gb		. #x2537)	; &J90-283A;
     (=ucs@jis		. #x2537)	; &J90-283A;
     (=ucs@ks		. #x2537)	; &J90-283A;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY")
+      (=ucs		  . #x2537)	; ┷
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT")
@@ -1289,10 +1289,6 @@
      ((name		  . "BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT")
       (=ucs		  . #x2538)	; ┸
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT")
-      (=ucs		  . #x2538)	; ┸
-      ))
     (=gb2312		. #x295C)	; &J90-283F; [09-60]
     (=jis-x0208@1983	. #x283F)	; &I-J83-283F; [08-31]
     (=ks-x1001		. #x263F)	; &I-K0-263F; [06-31]
@@ -1300,6 +1296,10 @@
     (=ucs@gb		. #x2538)	; &J90-283F;
     (=ucs@jis		. #x2538)	; &J90-283F;
     (=ucs@ks		. #x2538)	; &J90-283F;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT")
+      (=ucs		  . #x2538)	; ┸
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY")
@@ -1313,14 +1313,14 @@
      ((name		  . "BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY")
       (=ucs		  . #x2539)	; ┹
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY")
-      (=ucs		  . #x2539)	; ┹
-      ))
     (=gb2312		. #x295D)	; &K0-2657; [09-61]
     (=ks-x1001		. #x2657)	; &I-K0-2657; [06-55]
     (=ucs@gb		. #x2539)	; &K0-2657;
     (=ucs@ks		. #x2539)	; &K0-2657;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY")
+      (=ucs		  . #x2539)	; ┹
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY")
@@ -1334,14 +1334,14 @@
      ((name		  . "BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY")
       (=ucs		  . #x253A)	; ┺
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY")
-      (=ucs		  . #x253A)	; ┺
-      ))
     (=gb2312		. #x295E)	; &K0-2658; [09-62]
     (=ks-x1001		. #x2658)	; &I-K0-2658; [06-56]
     (=ucs@gb		. #x253A)	; &K0-2658;
     (=ucs@ks		. #x253A)	; &K0-2658;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY")
+      (=ucs		  . #x253A)	; ┺
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY UP AND HORIZONTAL")
@@ -1355,10 +1355,6 @@
      ((name		  . "BOX DRAWINGS HEAVY UP AND HORIZONTAL")
       (=ucs		  . #x253B)	; ┻
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS HEAVY UP AND HORIZONTAL")
-      (=ucs		  . #x253B)	; ┻
-      ))
     (=gb2312		. #x295F)	; &J90-2835; [09-63]
     (=jis-x0208@1983	. #x2835)	; &I-J83-2835; [08-21]
     (=ks-x1001		. #x2635)	; &I-K0-2635; [06-21]
@@ -1366,6 +1362,10 @@
     (=ucs@gb		. #x253B)	; &J90-2835;
     (=ucs@jis		. #x253B)	; &J90-2835;
     (=ucs@ks		. #x253B)	; &J90-2835;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS HEAVY UP AND HORIZONTAL")
+      (=ucs		  . #x253B)	; ┻
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL")
@@ -1379,10 +1379,6 @@
      ((name		  . "BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL")
       (=ucs		  . #x253C)	; ┼
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL")
-      (=ucs		  . #x253C)	; ┼
-      ))
     (=gb2312		. #x2960)	; &J90-282B; [09-64]
     (=jis-x0208@1983	. #x282B)	; &I-J83-282B; [08-11]
     (=ks-x1001		. #x262B)	; &I-K0-262B; [06-11]
@@ -1394,6 +1390,10 @@
     (=ucs@jis		. #x253C)	; &J90-282B;
     (=ucs@ks		. #x253C)	; &J90-282B;
     (=ucs@big5		. #x253C)	; &J90-282B;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL")
+      (=ucs		  . #x253C)	; ┼
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT")
@@ -1407,14 +1407,14 @@
      ((name . "BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT")
       (=ucs		  . #x253D)	; ┽
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT")
-      (=ucs		  . #x253D)	; ┽
-      ))
     (=gb2312		. #x2961)	; &K0-2659; [09-65]
     (=ks-x1001		. #x2659)	; &I-K0-2659; [06-57]
     (=ucs@gb		. #x253D)	; &K0-2659;
     (=ucs@ks		. #x253D)	; &K0-2659;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT")
+      (=ucs		  . #x253D)	; ┽
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT")
@@ -1428,14 +1428,14 @@
      ((name . "BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT")
       (=ucs		  . #x253E)	; ┾
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT")
-      (=ucs		  . #x253E)	; ┾
-      ))
     (=gb2312		. #x2962)	; &K0-265A; [09-66]
     (=ks-x1001		. #x265A)	; &I-K0-265A; [06-58]
     (=ucs@gb		. #x253E)	; &K0-265A;
     (=ucs@ks		. #x253E)	; &K0-265A;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT")
+      (=ucs		  . #x253E)	; ┾
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY")
@@ -1449,10 +1449,6 @@
      ((name . "BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY")
       (=ucs		  . #x253F)	; ┿
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY")
-      (=ucs		  . #x253F)	; ┿
-      ))
     (=gb2312		. #x2963)	; &J90-283B; [09-67]
     (=jis-x0208@1983	. #x283B)	; &I-J83-283B; [08-27]
     (=ks-x1001		. #x263B)	; &I-K0-263B; [06-27]
@@ -1460,6 +1456,10 @@
     (=ucs@gb		. #x253F)	; &J90-283B;
     (=ucs@jis		. #x253F)	; &J90-283B;
     (=ucs@ks		. #x253F)	; &J90-283B;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY")
+      (=ucs		  . #x253F)	; ┿
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT")
@@ -1473,14 +1473,14 @@
      ((name . "BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT")
       (=ucs		  . #x2540)	; ╀
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT")
-      (=ucs		  . #x2540)	; ╀
-      ))
     (=gb2312		. #x2964)	; &K0-265B; [09-68]
     (=ks-x1001		. #x265B)	; &I-K0-265B; [06-59]
     (=ucs@gb		. #x2540)	; &K0-265B;
     (=ucs@ks		. #x2540)	; &K0-265B;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT")
+      (=ucs		  . #x2540)	; ╀
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT")
@@ -1494,14 +1494,14 @@
      ((name . "BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT")
       (=ucs		  . #x2541)	; ╁
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT")
-      (=ucs		  . #x2541)	; ╁
-      ))
     (=gb2312		. #x2965)	; &K0-265C; [09-69]
     (=ks-x1001		. #x265C)	; &I-K0-265C; [06-60]
     (=ucs@gb		. #x2541)	; &K0-265C;
     (=ucs@ks		. #x2541)	; &K0-265C;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT")
+      (=ucs		  . #x2541)	; ╁
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT")
@@ -1515,10 +1515,6 @@
      ((name . "BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT")
       (=ucs		  . #x2542)	; ╂
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT")
-      (=ucs		  . #x2542)	; ╂
-      ))
     (=gb2312		. #x2966)	; &J90-2840; [09-70]
     (=jis-x0208@1983	. #x2840)	; &I-J83-2840; [08-32]
     (=ks-x1001		. #x2640)	; &I-K0-2640; [06-32]
@@ -1526,6 +1522,10 @@
     (=ucs@gb		. #x2542)	; &J90-2840;
     (=ucs@jis		. #x2542)	; &J90-2840;
     (=ucs@ks		. #x2542)	; &J90-2840;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT")
+      (=ucs		  . #x2542)	; ╂
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT")
@@ -1539,14 +1539,14 @@
      ((name . "BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT")
       (=ucs		  . #x2543)	; ╃
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT")
-      (=ucs		  . #x2543)	; ╃
-      ))
     (=gb2312		. #x2967)	; &K0-265D; [09-71]
     (=ks-x1001		. #x265D)	; &I-K0-265D; [06-61]
     (=ucs@gb		. #x2543)	; &K0-265D;
     (=ucs@ks		. #x2543)	; &K0-265D;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT")
+      (=ucs		  . #x2543)	; ╃
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT")
@@ -1560,14 +1560,14 @@
      ((name . "BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT")
       (=ucs		  . #x2544)	; ╄
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT")
-      (=ucs		  . #x2544)	; ╄
-      ))
     (=gb2312		. #x2968)	; &K0-265E; [09-72]
     (=ks-x1001		. #x265E)	; &I-K0-265E; [06-62]
     (=ucs@gb		. #x2544)	; &K0-265E;
     (=ucs@ks		. #x2544)	; &K0-265E;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT")
+      (=ucs		  . #x2544)	; ╄
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT")
@@ -1581,14 +1581,14 @@
      ((name . "BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT")
       (=ucs		  . #x2545)	; ╅
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT")
-      (=ucs		  . #x2545)	; ╅
-      ))
     (=gb2312		. #x2969)	; &K0-265F; [09-73]
     (=ks-x1001		. #x265F)	; &I-K0-265F; [06-63]
     (=ucs@gb		. #x2545)	; &K0-265F;
     (=ucs@ks		. #x2545)	; &K0-265F;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT")
+      (=ucs		  . #x2545)	; ╅
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT")
@@ -1602,14 +1602,14 @@
      ((name . "BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT")
       (=ucs		  . #x2546)	; ╆
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT")
-      (=ucs		  . #x2546)	; ╆
-      ))
     (=gb2312		. #x296A)	; &K0-2660; [09-74]
     (=ks-x1001		. #x2660)	; &I-K0-2660; [06-64]
     (=ucs@gb		. #x2546)	; &K0-2660;
     (=ucs@ks		. #x2546)	; &K0-2660;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT")
+      (=ucs		  . #x2546)	; ╆
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY")
@@ -1623,14 +1623,14 @@
      ((name . "BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY")
       (=ucs		  . #x2547)	; ╇
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY")
-      (=ucs		  . #x2547)	; ╇
-      ))
     (=gb2312		. #x296B)	; &K0-2661; [09-75]
     (=ks-x1001		. #x2661)	; &I-K0-2661; [06-65]
     (=ucs@gb		. #x2547)	; &K0-2661;
     (=ucs@ks		. #x2547)	; &K0-2661;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY")
+      (=ucs		  . #x2547)	; ╇
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY")
@@ -1644,14 +1644,14 @@
      ((name . "BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY")
       (=ucs		  . #x2548)	; ╈
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY")
-      (=ucs		  . #x2548)	; ╈
-      ))
     (=gb2312		. #x296C)	; &K0-2662; [09-76]
     (=ks-x1001		. #x2662)	; &I-K0-2662; [06-66]
     (=ucs@gb		. #x2548)	; &K0-2662;
     (=ucs@ks		. #x2548)	; &K0-2662;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY")
+      (=ucs		  . #x2548)	; ╈
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY")
@@ -1665,14 +1665,14 @@
      ((name . "BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY")
       (=ucs		  . #x2549)	; ╉
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY")
-      (=ucs		  . #x2549)	; ╉
-      ))
     (=gb2312		. #x296D)	; &K0-2663; [09-77]
     (=ks-x1001		. #x2663)	; &I-K0-2663; [06-67]
     (=ucs@gb		. #x2549)	; &K0-2663;
     (=ucs@ks		. #x2549)	; &K0-2663;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY")
+      (=ucs		  . #x2549)	; ╉
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY")
@@ -1686,14 +1686,14 @@
      ((name . "BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY")
       (=ucs		  . #x254A)	; ╊
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY")
-      (=ucs		  . #x254A)	; ╊
-      ))
     (=gb2312		. #x296E)	; &K0-2664; [09-78]
     (=ks-x1001		. #x2664)	; &I-K0-2664; [06-68]
     (=ucs@gb		. #x254A)	; &K0-2664;
     (=ucs@ks		. #x254A)	; &K0-2664;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY")
+      (=ucs		  . #x254A)	; ╊
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL")
@@ -1707,10 +1707,6 @@
      ((name		  . "BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL")
       (=ucs		  . #x254B)	; ╋
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL")
-      (=ucs		  . #x254B)	; ╋
-      ))
     (=gb2312		. #x296F)	; &J90-2836; [09-79]
     (=jis-x0208@1983	. #x2836)	; &I-J83-2836; [08-22]
     (=ks-x1001		. #x2636)	; &I-K0-2636; [06-22]
@@ -1718,6 +1714,10 @@
     (=ucs@gb		. #x254B)	; &J90-2836;
     (=ucs@jis		. #x254B)	; &J90-2836;
     (=ucs@ks		. #x254B)	; &J90-2836;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL")
+      (=ucs		  . #x254B)	; ╋
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT DOUBLE DASH HORIZONTAL")
@@ -1759,27 +1759,27 @@
      ((name		  . "BOX DRAWINGS DOUBLE HORIZONTAL")
       (=ucs		  . #x2550)	; ═
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS DOUBLE HORIZONTAL")
-      (=ucs		  . #x2550)	; ═
-      ))
     (=cns11643-1	. #x2344)	; &C1-2344; [03-36]
     (=big5		. #xA2A4)	; &I-B-A2A4;
     (=ucs@cns		. #x2550)	; &C1-2344;
     (=ucs@big5		. #x2550)	; &C1-2344;
     (=ucs@big5/cns11643 . #x2501)	; &C1-2344;
     (=ucs@cns11643	. #x2501)	; &C1-2344;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS DOUBLE HORIZONTAL")
+      (=ucs		  . #x2550)	; ═
+      ))
     ))
 (define-char
   '((<-denotational
      ((name		  . "BOX DRAWINGS DOUBLE HORIZONTAL")
       (=ucs		  . #x2550)	; ═
       ))
+    (=big5-eten		. #xF9F9)	; &B-F9F9;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS DOUBLE HORIZONTAL")
       (=ucs		  . #x2550)	; ═
       ))
-    (=big5-eten		. #xF9F9)	; &B-F9F9;
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOUBLE VERTICAL")
@@ -1793,12 +1793,12 @@
      ((name		  . "BOX DRAWINGS DOUBLE VERTICAL")
       (=ucs		  . #x2551)	; ║
       ))
+    (=big5-eten		. #xF9F8)	; &B-F9F8;
+    (=ucs@big5		. #x2551)	; &B-F9F8;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS DOUBLE VERTICAL")
       (=ucs		  . #x2551)	; ║
       ))
-    (=big5-eten		. #xF9F8)	; &B-F9F8;
-    (=ucs@big5		. #x2551)	; &B-F9F8;
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE")
@@ -1812,12 +1812,12 @@
      ((name		  . "BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE")
       (=ucs		  . #x2552)	; ╒
       ))
+    (=big5-eten		. #xF9E6)	; &B-F9E6;
+    (=ucs@big5		. #x2552)	; &B-F9E6;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE")
       (=ucs		  . #x2552)	; ╒
       ))
-    (=big5-eten		. #xF9E6)	; &B-F9E6;
-    (=ucs@big5		. #x2552)	; &B-F9E6;
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE")
@@ -1831,12 +1831,12 @@
      ((name		  . "BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE")
       (=ucs		  . #x2553)	; ╓
       ))
+    (=big5-eten		. #xF9EF)	; &B-F9EF;
+    (=ucs@big5		. #x2553)	; &B-F9EF;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE")
       (=ucs		  . #x2553)	; ╓
       ))
-    (=big5-eten		. #xF9EF)	; &B-F9EF;
-    (=ucs@big5		. #x2553)	; &B-F9EF;
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOUBLE DOWN AND RIGHT")
@@ -1850,12 +1850,12 @@
      ((name		  . "BOX DRAWINGS DOUBLE DOWN AND RIGHT")
       (=ucs		  . #x2554)	; ╔
       ))
+    (=big5-eten		. #xF9DD)	; &B-F9DD;
+    (=ucs@big5		. #x2554)	; &B-F9DD;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS DOUBLE DOWN AND RIGHT")
       (=ucs		  . #x2554)	; ╔
       ))
-    (=big5-eten		. #xF9DD)	; &B-F9DD;
-    (=ucs@big5		. #x2554)	; &B-F9DD;
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE")
@@ -1869,12 +1869,12 @@
      ((name		  . "BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE")
       (=ucs		  . #x2555)	; ╕
       ))
+    (=big5-eten		. #xF9E8)	; &B-F9E8;
+    (=ucs@big5		. #x2555)	; &B-F9E8;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE")
       (=ucs		  . #x2555)	; ╕
       ))
-    (=big5-eten		. #xF9E8)	; &B-F9E8;
-    (=ucs@big5		. #x2555)	; &B-F9E8;
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE")
@@ -1888,12 +1888,12 @@
      ((name		  . "BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE")
       (=ucs		  . #x2556)	; ╖
       ))
+    (=big5-eten		. #xF9F1)	; &B-F9F1;
+    (=ucs@big5		. #x2556)	; &B-F9F1;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE")
       (=ucs		  . #x2556)	; ╖
       ))
-    (=big5-eten		. #xF9F1)	; &B-F9F1;
-    (=ucs@big5		. #x2556)	; &B-F9F1;
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOUBLE DOWN AND LEFT")
@@ -1907,12 +1907,12 @@
      ((name		  . "BOX DRAWINGS DOUBLE DOWN AND LEFT")
       (=ucs		  . #x2557)	; ╗
       ))
+    (=big5-eten		. #xF9DF)	; &B-F9DF;
+    (=ucs@big5		. #x2557)	; &B-F9DF;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS DOUBLE DOWN AND LEFT")
       (=ucs		  . #x2557)	; ╗
       ))
-    (=big5-eten		. #xF9DF)	; &B-F9DF;
-    (=ucs@big5		. #x2557)	; &B-F9DF;
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE")
@@ -1926,12 +1926,12 @@
      ((name		  . "BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE")
       (=ucs		  . #x2558)	; ╘
       ))
+    (=big5-eten		. #xF9EC)	; &B-F9EC;
+    (=ucs@big5		. #x2558)	; &B-F9EC;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE")
       (=ucs		  . #x2558)	; ╘
       ))
-    (=big5-eten		. #xF9EC)	; &B-F9EC;
-    (=ucs@big5		. #x2558)	; &B-F9EC;
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE")
@@ -1945,12 +1945,12 @@
      ((name		  . "BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE")
       (=ucs		  . #x2559)	; ╙
       ))
+    (=big5-eten		. #xF9F5)	; &B-F9F5;
+    (=ucs@big5		. #x2559)	; &B-F9F5;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE")
       (=ucs		  . #x2559)	; ╙
       ))
-    (=big5-eten		. #xF9F5)	; &B-F9F5;
-    (=ucs@big5		. #x2559)	; &B-F9F5;
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOUBLE UP AND RIGHT")
@@ -1964,12 +1964,12 @@
      ((name		  . "BOX DRAWINGS DOUBLE UP AND RIGHT")
       (=ucs		  . #x255A)	; ╚
       ))
+    (=big5-eten		. #xF9E3)	; &B-F9E3;
+    (=ucs@big5		. #x255A)	; &B-F9E3;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS DOUBLE UP AND RIGHT")
       (=ucs		  . #x255A)	; ╚
       ))
-    (=big5-eten		. #xF9E3)	; &B-F9E3;
-    (=ucs@big5		. #x255A)	; &B-F9E3;
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP SINGLE AND LEFT DOUBLE")
@@ -1983,12 +1983,12 @@
      ((name		  . "BOX DRAWINGS UP SINGLE AND LEFT DOUBLE")
       (=ucs		  . #x255B)	; ╛
       ))
+    (=big5-eten		. #xF9EE)	; &B-F9EE;
+    (=ucs@big5		. #x255B)	; &B-F9EE;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS UP SINGLE AND LEFT DOUBLE")
       (=ucs		  . #x255B)	; ╛
       ))
-    (=big5-eten		. #xF9EE)	; &B-F9EE;
-    (=ucs@big5		. #x255B)	; &B-F9EE;
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP DOUBLE AND LEFT SINGLE")
@@ -2002,12 +2002,12 @@
      ((name		  . "BOX DRAWINGS UP DOUBLE AND LEFT SINGLE")
       (=ucs		  . #x255C)	; ╜
       ))
+    (=big5-eten		. #xF9F7)	; &B-F9F7;
+    (=ucs@big5		. #x255C)	; &B-F9F7;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS UP DOUBLE AND LEFT SINGLE")
       (=ucs		  . #x255C)	; ╜
       ))
-    (=big5-eten		. #xF9F7)	; &B-F9F7;
-    (=ucs@big5		. #x255C)	; &B-F9F7;
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOUBLE UP AND LEFT")
@@ -2021,12 +2021,12 @@
      ((name		  . "BOX DRAWINGS DOUBLE UP AND LEFT")
       (=ucs		  . #x255D)	; ╝
       ))
+    (=big5-eten		. #xF9E5)	; &B-F9E5;
+    (=ucs@big5		. #x255D)	; &B-F9E5;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS DOUBLE UP AND LEFT")
       (=ucs		  . #x255D)	; ╝
       ))
-    (=big5-eten		. #xF9E5)	; &B-F9E5;
-    (=ucs@big5		. #x255D)	; &B-F9E5;
     ))
 (define-char
   '((name . "BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE")
@@ -2040,14 +2040,14 @@
      ((name . "BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE")
       (=ucs		  . #x255E)	; ╞
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE")
-      (=ucs		  . #x255E)	; ╞
-      ))
     (=cns11643-1	. #x2345)	; &C1-2345; [03-37]
     (=big5		. #xA2A5)	; &I-B-A2A5;
     (=ucs@cns		. #x255E)	; &C1-2345;
     (=ucs@big5		. #x255E)	; &C1-2345;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE")
+      (=ucs		  . #x255E)	; ╞
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE")
@@ -2061,12 +2061,12 @@
      ((name . "BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE")
       (=ucs		  . #x255F)	; ╟
       ))
+    (=big5-eten		. #xF9F2)	; &B-F9F2;
+    (=ucs@big5		. #x255F)	; &B-F9F2;
     (<-fullwidth
      ((name . "BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE")
       (=ucs		  . #x255F)	; ╟
       ))
-    (=big5-eten		. #xF9F2)	; &B-F9F2;
-    (=ucs@big5		. #x255F)	; &B-F9F2;
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOUBLE VERTICAL AND RIGHT")
@@ -2080,12 +2080,12 @@
      ((name		  . "BOX DRAWINGS DOUBLE VERTICAL AND RIGHT")
       (=ucs		  . #x2560)	; ╠
       ))
+    (=big5-eten		. #xF9E0)	; &B-F9E0;
+    (=ucs@big5		. #x2560)	; &B-F9E0;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS DOUBLE VERTICAL AND RIGHT")
       (=ucs		  . #x2560)	; ╠
       ))
-    (=big5-eten		. #xF9E0)	; &B-F9E0;
-    (=ucs@big5		. #x2560)	; &B-F9E0;
     ))
 (define-char
   '((name		. "BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE")
@@ -2099,14 +2099,14 @@
      ((name . "BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE")
       (=ucs		  . #x2561)	; ╡
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE")
-      (=ucs		  . #x2561)	; ╡
-      ))
     (=cns11643-1	. #x2347)	; &C1-2347; [03-39]
     (=big5		. #xA2A7)	; &I-B-A2A7;
     (=ucs@cns		. #x2561)	; &C1-2347;
     (=ucs@big5		. #x2561)	; &C1-2347;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE")
+      (=ucs		  . #x2561)	; ╡
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE")
@@ -2120,12 +2120,12 @@
      ((name . "BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE")
       (=ucs		  . #x2562)	; ╢
       ))
+    (=big5-eten		. #xF9F4)	; &B-F9F4;
+    (=ucs@big5		. #x2562)	; &B-F9F4;
     (<-fullwidth
      ((name . "BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE")
       (=ucs		  . #x2562)	; ╢
       ))
-    (=big5-eten		. #xF9F4)	; &B-F9F4;
-    (=ucs@big5		. #x2562)	; &B-F9F4;
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOUBLE VERTICAL AND LEFT")
@@ -2139,12 +2139,12 @@
      ((name		  . "BOX DRAWINGS DOUBLE VERTICAL AND LEFT")
       (=ucs		  . #x2563)	; ╣
       ))
+    (=big5-eten		. #xF9E2)	; &B-F9E2;
+    (=ucs@big5		. #x2563)	; &B-F9E2;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS DOUBLE VERTICAL AND LEFT")
       (=ucs		  . #x2563)	; ╣
       ))
-    (=big5-eten		. #xF9E2)	; &B-F9E2;
-    (=ucs@big5		. #x2563)	; &B-F9E2;
     ))
 (define-char
   '((name . "BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE")
@@ -2158,12 +2158,12 @@
      ((name . "BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE")
       (=ucs		  . #x2564)	; ╤
       ))
+    (=big5-eten		. #xF9E7)	; &B-F9E7;
+    (=ucs@big5		. #x2564)	; &B-F9E7;
     (<-fullwidth
      ((name . "BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE")
       (=ucs		  . #x2564)	; ╤
       ))
-    (=big5-eten		. #xF9E7)	; &B-F9E7;
-    (=ucs@big5		. #x2564)	; &B-F9E7;
     ))
 (define-char
   '((name . "BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE")
@@ -2177,12 +2177,12 @@
      ((name . "BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE")
       (=ucs		  . #x2565)	; ╥
       ))
+    (=big5-eten		. #xF9F0)	; &B-F9F0;
+    (=ucs@big5		. #x2565)	; &B-F9F0;
     (<-fullwidth
      ((name . "BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE")
       (=ucs		  . #x2565)	; ╥
       ))
-    (=big5-eten		. #xF9F0)	; &B-F9F0;
-    (=ucs@big5		. #x2565)	; &B-F9F0;
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL")
@@ -2196,12 +2196,12 @@
      ((name		  . "BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL")
       (=ucs		  . #x2566)	; ╦
       ))
+    (=big5-eten		. #xF9DE)	; &B-F9DE;
+    (=ucs@big5		. #x2566)	; &B-F9DE;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL")
       (=ucs		  . #x2566)	; ╦
       ))
-    (=big5-eten		. #xF9DE)	; &B-F9DE;
-    (=ucs@big5		. #x2566)	; &B-F9DE;
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE")
@@ -2215,12 +2215,12 @@
      ((name . "BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE")
       (=ucs		  . #x2567)	; ╧
       ))
+    (=big5-eten		. #xF9ED)	; &B-F9ED;
+    (=ucs@big5		. #x2567)	; &B-F9ED;
     (<-fullwidth
      ((name . "BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE")
       (=ucs		  . #x2567)	; ╧
       ))
-    (=big5-eten		. #xF9ED)	; &B-F9ED;
-    (=ucs@big5		. #x2567)	; &B-F9ED;
     ))
 (define-char
   '((name		. "BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE")
@@ -2234,12 +2234,12 @@
      ((name . "BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE")
       (=ucs		  . #x2568)	; ╨
       ))
+    (=big5-eten		. #xF9F6)	; &B-F9F6;
+    (=ucs@big5		. #x2568)	; &B-F9F6;
     (<-fullwidth
      ((name . "BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE")
       (=ucs		  . #x2568)	; ╨
       ))
-    (=big5-eten		. #xF9F6)	; &B-F9F6;
-    (=ucs@big5		. #x2568)	; &B-F9F6;
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOUBLE UP AND HORIZONTAL")
@@ -2253,12 +2253,12 @@
      ((name		  . "BOX DRAWINGS DOUBLE UP AND HORIZONTAL")
       (=ucs		  . #x2569)	; ╩
       ))
+    (=big5-eten		. #xF9E4)	; &B-F9E4;
+    (=ucs@big5		. #x2569)	; &B-F9E4;
     (<-fullwidth
      ((name		  . "BOX DRAWINGS DOUBLE UP AND HORIZONTAL")
       (=ucs		  . #x2569)	; ╩
       ))
-    (=big5-eten		. #xF9E4)	; &B-F9E4;
-    (=ucs@big5		. #x2569)	; &B-F9E4;
     ))
 (define-char
   '((name . "BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE")
@@ -2272,14 +2272,14 @@
      ((name . "BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE")
       (=ucs		  . #x256A)	; ╪
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE")
-      (=ucs		  . #x256A)	; ╪
-      ))
     (=cns11643-1	. #x2346)	; &C1-2346; [03-38]
     (=big5		. #xA2A6)	; &I-B-A2A6;
     (=ucs@cns		. #x256A)	; &C1-2346;
     (=ucs@big5		. #x256A)	; &C1-2346;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE")
+      (=ucs		  . #x256A)	; ╪
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE")
@@ -2293,12 +2293,12 @@
      ((name . "BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE")
       (=ucs		  . #x256B)	; ╫
       ))
+    (=big5-eten		. #xF9F3)	; &B-F9F3;
+    (=ucs@big5		. #x256B)	; &B-F9F3;
     (<-fullwidth
      ((name . "BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE")
       (=ucs		  . #x256B)	; ╫
       ))
-    (=big5-eten		. #xF9F3)	; &B-F9F3;
-    (=ucs@big5		. #x256B)	; &B-F9F3;
     ))
 (define-char
   '((name		. "BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL")
@@ -2312,12 +2312,12 @@
      ((name . "BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL")
       (=ucs		  . #x256C)	; ╬
       ))
+    (=big5-eten		. #xF9E1)	; &B-F9E1;
+    (=ucs@big5		. #x256C)	; &B-F9E1;
     (<-fullwidth
      ((name . "BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL")
       (=ucs		  . #x256C)	; ╬
       ))
-    (=big5-eten		. #xF9E1)	; &B-F9E1;
-    (=ucs@big5		. #x256C)	; &B-F9E1;
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT ARC DOWN AND RIGHT")
@@ -2331,14 +2331,14 @@
      ((name		  . "BOX DRAWINGS LIGHT ARC DOWN AND RIGHT")
       (=ucs		  . #x256D)	; ╭
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT ARC DOWN AND RIGHT")
-      (=ucs		  . #x256D)	; ╭
-      ))
     (=cns11643-1	. #x2340)	; &C1-2340; [03-32]
     (=big5		. #xA27E)	; &I-B-A27E;
     (=ucs@cns		. #x256D)	; &C1-2340;
     (=ucs@big5		. #x256D)	; &C1-2340;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT ARC DOWN AND RIGHT")
+      (=ucs		  . #x256D)	; ╭
+      ))
     ))
 (define-char
   '((name*		. "box drawings double light arc down and right")
@@ -2358,14 +2358,14 @@
      ((name		  . "BOX DRAWINGS LIGHT ARC DOWN AND LEFT")
       (=ucs		  . #x256E)	; ╮
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT ARC DOWN AND LEFT")
-      (=ucs		  . #x256E)	; ╮
-      ))
     (=cns11643-1	. #x2341)	; &C1-2341; [03-33]
     (=big5		. #xA2A1)	; &I-B-A2A1;
     (=ucs@cns		. #x256E)	; &C1-2341;
     (=ucs@big5		. #x256E)	; &C1-2341;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT ARC DOWN AND LEFT")
+      (=ucs		  . #x256E)	; ╮
+      ))
     ))
 (define-char
   '((name*		. "box drawings double light arc down and left")
@@ -2385,14 +2385,14 @@
      ((name		  . "BOX DRAWINGS LIGHT ARC UP AND LEFT")
       (=ucs		  . #x256F)	; ╯
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT ARC UP AND LEFT")
-      (=ucs		  . #x256F)	; ╯
-      ))
     (=cns11643-1	. #x2343)	; &C1-2343; [03-35]
     (=big5		. #xA2A3)	; &I-B-A2A3;
     (=ucs@cns		. #x256F)	; &C1-2343;
     (=ucs@big5		. #x256F)	; &C1-2343;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT ARC UP AND LEFT")
+      (=ucs		  . #x256F)	; ╯
+      ))
     ))
 (define-char
   '((name*		. "box drawings double light arc up and left")
@@ -2412,14 +2412,14 @@
      ((name		  . "BOX DRAWINGS LIGHT ARC UP AND RIGHT")
       (=ucs		  . #x2570)	; ╰
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT ARC UP AND RIGHT")
-      (=ucs		  . #x2570)	; ╰
-      ))
     (=cns11643-1	. #x2342)	; &C1-2342; [03-34]
     (=big5		. #xA2A2)	; &I-B-A2A2;
     (=ucs@cns		. #x2570)	; &C1-2342;
     (=ucs@big5		. #x2570)	; &C1-2342;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT ARC UP AND RIGHT")
+      (=ucs		  . #x2570)	; ╰
+      ))
     ))
 (define-char
   '((name*		. "box drawings double light arc up and right")
@@ -2439,14 +2439,14 @@
      ((name . "BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT")
       (=ucs		  . #x2571)	; ╱
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT")
-      (=ucs		  . #x2571)	; ╱
-      ))
     (=cns11643-1	. #x234C)	; &C1-234C; [03-44]
     (=big5		. #xA2AC)	; &I-B-A2AC;
     (=ucs@cns		. #x2571)	; &C1-234C;
     (=ucs@big5		. #x2571)	; &C1-234C;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT")
+      (=ucs		  . #x2571)	; ╱
+      ))
     ))
 (define-char
   '((name . "BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT")
@@ -2460,14 +2460,14 @@
      ((name . "BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT")
       (=ucs		  . #x2572)	; ╲
       ))
-    (<-fullwidth
-     ((name . "BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT")
-      (=ucs		  . #x2572)	; ╲
-      ))
     (=cns11643-1	. #x234D)	; &C1-234D; [03-45]
     (=big5		. #xA2AD)	; &I-B-A2AD;
     (=ucs@cns		. #x2572)	; &C1-234D;
     (=ucs@big5		. #x2572)	; &C1-234D;
+    (<-fullwidth
+     ((name . "BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT")
+      (=ucs		  . #x2572)	; ╲
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT DIAGONAL CROSS")
@@ -2481,14 +2481,14 @@
      ((name		  . "BOX DRAWINGS LIGHT DIAGONAL CROSS")
       (=ucs		  . #x2573)	; ╳
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT DIAGONAL CROSS")
-      (=ucs		  . #x2573)	; ╳
-      ))
     (=cns11643-1	. #x234E)	; &C1-234E; [03-46]
     (=big5		. #xA2AE)	; &I-B-A2AE;
     (=ucs@cns		. #x2573)	; &C1-234E;
     (=ucs@big5		. #x2573)	; &C1-234E;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT DIAGONAL CROSS")
+      (=ucs		  . #x2573)	; ╳
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT LEFT")
@@ -2502,14 +2502,14 @@
      ((name		  . "BOX DRAWINGS LIGHT LEFT")
       (=ucs		  . #x2574)	; ╴
       ))
-    (<-fullwidth
-     ((name		  . "BOX DRAWINGS LIGHT LEFT")
-      (=ucs		  . #x2574)	; ╴
-      ))
     (=cns11643-1	. #x213B)	; &C1-213B; [01-27]
     (=big5		. #xA15A)	; &I-B-A15A;
     (=ucs@cns		. #x2574)	; &C1-213B;
     (=ucs@big5		. #x2574)	; &C1-213B;
+    (<-fullwidth
+     ((name		  . "BOX DRAWINGS LIGHT LEFT")
+      (=ucs		  . #x2574)	; ╴
+      ))
     ))
 (define-char
   '((name		. "BOX DRAWINGS LIGHT UP")
diff --git a/lisp/utf-2000/u02580-Block-Elements.el b/lisp/utf-2000/u02580-Block-Elements.el
index 5f31a5d..2e49479 100644
--- a/lisp/utf-2000/u02580-Block-Elements.el
+++ b/lisp/utf-2000/u02580-Block-Elements.el
@@ -18,14 +18,14 @@
      ((name		  . "LOWER ONE EIGHTH BLOCK")
       (=ucs		  . #x2581)	; ▁
       ))
-    (<-fullwidth
-     ((name		  . "LOWER ONE EIGHTH BLOCK")
-      (=ucs		  . #x2581)	; ▁
-      ))
     (=cns11643-1	. #x2324)	; &C1-2324; [03-04]
     (=big5		. #xA262)	; &I-B-A262;
     (=ucs@cns		. #x2581)	; &C1-2324;
     (=ucs@big5		. #x2581)	; &C1-2324;
+    (<-fullwidth
+     ((name		  . "LOWER ONE EIGHTH BLOCK")
+      (=ucs		  . #x2581)	; ▁
+      ))
     ))
 (define-char
   '((name		. "LOWER ONE QUARTER BLOCK")
@@ -39,14 +39,14 @@
      ((name		  . "LOWER ONE QUARTER BLOCK")
       (=ucs		  . #x2582)	; ▂
       ))
-    (<-fullwidth
-     ((name		  . "LOWER ONE QUARTER BLOCK")
-      (=ucs		  . #x2582)	; ▂
-      ))
     (=cns11643-1	. #x2325)	; &C1-2325; [03-05]
     (=big5		. #xA263)	; &I-B-A263;
     (=ucs@cns		. #x2582)	; &C1-2325;
     (=ucs@big5		. #x2582)	; &C1-2325;
+    (<-fullwidth
+     ((name		  . "LOWER ONE QUARTER BLOCK")
+      (=ucs		  . #x2582)	; ▂
+      ))
     ))
 (define-char
   '((name		. "LOWER THREE EIGHTHS BLOCK")
@@ -60,14 +60,14 @@
      ((name		  . "LOWER THREE EIGHTHS BLOCK")
       (=ucs		  . #x2583)	; ▃
       ))
-    (<-fullwidth
-     ((name		  . "LOWER THREE EIGHTHS BLOCK")
-      (=ucs		  . #x2583)	; ▃
-      ))
     (=cns11643-1	. #x2326)	; &C1-2326; [03-06]
     (=big5		. #xA264)	; &I-B-A264;
     (=ucs@cns		. #x2583)	; &C1-2326;
     (=ucs@big5		. #x2583)	; &C1-2326;
+    (<-fullwidth
+     ((name		  . "LOWER THREE EIGHTHS BLOCK")
+      (=ucs		  . #x2583)	; ▃
+      ))
     ))
 (define-char
   '((name		. "LOWER HALF BLOCK")
@@ -81,14 +81,14 @@
      ((name		  . "LOWER HALF BLOCK")
       (=ucs		  . #x2584)	; ▄
       ))
-    (<-fullwidth
-     ((name		  . "LOWER HALF BLOCK")
-      (=ucs		  . #x2584)	; ▄
-      ))
     (=cns11643-1	. #x2327)	; &C1-2327; [03-07]
     (=big5		. #xA265)	; &I-B-A265;
     (=ucs@cns		. #x2584)	; &C1-2327;
     (=ucs@big5		. #x2584)	; &C1-2327;
+    (<-fullwidth
+     ((name		  . "LOWER HALF BLOCK")
+      (=ucs		  . #x2584)	; ▄
+      ))
     ))
 (define-char
   '((name		. "LOWER FIVE EIGHTHS BLOCK")
@@ -102,14 +102,14 @@
      ((name		  . "LOWER FIVE EIGHTHS BLOCK")
       (=ucs		  . #x2585)	; ▅
       ))
-    (<-fullwidth
-     ((name		  . "LOWER FIVE EIGHTHS BLOCK")
-      (=ucs		  . #x2585)	; ▅
-      ))
     (=cns11643-1	. #x2328)	; &C1-2328; [03-08]
     (=big5		. #xA266)	; &I-B-A266;
     (=ucs@cns		. #x2585)	; &C1-2328;
     (=ucs@big5		. #x2585)	; &C1-2328;
+    (<-fullwidth
+     ((name		  . "LOWER FIVE EIGHTHS BLOCK")
+      (=ucs		  . #x2585)	; ▅
+      ))
     ))
 (define-char
   '((name		. "LOWER THREE QUARTERS BLOCK")
@@ -123,14 +123,14 @@
      ((name		  . "LOWER THREE QUARTERS BLOCK")
       (=ucs		  . #x2586)	; ▆
       ))
-    (<-fullwidth
-     ((name		  . "LOWER THREE QUARTERS BLOCK")
-      (=ucs		  . #x2586)	; ▆
-      ))
     (=cns11643-1	. #x2329)	; &C1-2329; [03-09]
     (=big5		. #xA267)	; &I-B-A267;
     (=ucs@cns		. #x2586)	; &C1-2329;
     (=ucs@big5		. #x2586)	; &C1-2329;
+    (<-fullwidth
+     ((name		  . "LOWER THREE QUARTERS BLOCK")
+      (=ucs		  . #x2586)	; ▆
+      ))
     ))
 (define-char
   '((name		. "LOWER SEVEN EIGHTHS BLOCK")
@@ -144,14 +144,14 @@
      ((name		  . "LOWER SEVEN EIGHTHS BLOCK")
       (=ucs		  . #x2587)	; ▇
       ))
-    (<-fullwidth
-     ((name		  . "LOWER SEVEN EIGHTHS BLOCK")
-      (=ucs		  . #x2587)	; ▇
-      ))
     (=cns11643-1	. #x232A)	; &C1-232A; [03-10]
     (=big5		. #xA268)	; &I-B-A268;
     (=ucs@cns		. #x2587)	; &C1-232A;
     (=ucs@big5		. #x2587)	; &C1-232A;
+    (<-fullwidth
+     ((name		  . "LOWER SEVEN EIGHTHS BLOCK")
+      (=ucs		  . #x2587)	; ▇
+      ))
     ))
 (define-char
   '((name		. "FULL BLOCK")
@@ -165,14 +165,14 @@
      ((name		  . "FULL BLOCK")
       (=ucs		  . #x2588)	; █
       ))
-    (<-fullwidth
-     ((name		  . "FULL BLOCK")
-      (=ucs		  . #x2588)	; █
-      ))
     (=cns11643-1	. #x232B)	; &C1-232B; [03-11]
     (=big5		. #xA269)	; &I-B-A269;
     (=ucs@cns		. #x2588)	; &C1-232B;
     (=ucs@big5		. #x2588)	; &C1-232B;
+    (<-fullwidth
+     ((name		  . "FULL BLOCK")
+      (=ucs		  . #x2588)	; █
+      ))
     ))
 (define-char
   '((name		. "LEFT SEVEN EIGHTHS BLOCK")
@@ -186,14 +186,14 @@
      ((name		  . "LEFT SEVEN EIGHTHS BLOCK")
       (=ucs		  . #x2589)	; ▉
       ))
-    (<-fullwidth
-     ((name		  . "LEFT SEVEN EIGHTHS BLOCK")
-      (=ucs		  . #x2589)	; ▉
-      ))
     (=cns11643-1	. #x2332)	; &C1-2332; [03-18]
     (=big5		. #xA270)	; &I-B-A270;
     (=ucs@cns		. #x2589)	; &C1-2332;
     (=ucs@big5		. #x2589)	; &C1-2332;
+    (<-fullwidth
+     ((name		  . "LEFT SEVEN EIGHTHS BLOCK")
+      (=ucs		  . #x2589)	; ▉
+      ))
     ))
 (define-char
   '((name		. "LEFT THREE QUARTERS BLOCK")
@@ -207,14 +207,14 @@
      ((name		  . "LEFT THREE QUARTERS BLOCK")
       (=ucs		  . #x258A)	; ▊
       ))
-    (<-fullwidth
-     ((name		  . "LEFT THREE QUARTERS BLOCK")
-      (=ucs		  . #x258A)	; ▊
-      ))
     (=cns11643-1	. #x2331)	; &C1-2331; [03-17]
     (=big5		. #xA26F)	; &I-B-A26F;
     (=ucs@cns		. #x258A)	; &C1-2331;
     (=ucs@big5		. #x258A)	; &C1-2331;
+    (<-fullwidth
+     ((name		  . "LEFT THREE QUARTERS BLOCK")
+      (=ucs		  . #x258A)	; ▊
+      ))
     ))
 (define-char
   '((name		. "LEFT FIVE EIGHTHS BLOCK")
@@ -228,14 +228,14 @@
      ((name		  . "LEFT FIVE EIGHTHS BLOCK")
       (=ucs		  . #x258B)	; ▋
       ))
-    (<-fullwidth
-     ((name		  . "LEFT FIVE EIGHTHS BLOCK")
-      (=ucs		  . #x258B)	; ▋
-      ))
     (=cns11643-1	. #x2330)	; &C1-2330; [03-16]
     (=big5		. #xA26E)	; &I-B-A26E;
     (=ucs@cns		. #x258B)	; &C1-2330;
     (=ucs@big5		. #x258B)	; &C1-2330;
+    (<-fullwidth
+     ((name		  . "LEFT FIVE EIGHTHS BLOCK")
+      (=ucs		  . #x258B)	; ▋
+      ))
     ))
 (define-char
   '((name		. "LEFT HALF BLOCK")
@@ -249,14 +249,14 @@
      ((name		  . "LEFT HALF BLOCK")
       (=ucs		  . #x258C)	; ▌
       ))
-    (<-fullwidth
-     ((name		  . "LEFT HALF BLOCK")
-      (=ucs		  . #x258C)	; ▌
-      ))
     (=cns11643-1	. #x232F)	; &C1-232F; [03-15]
     (=big5		. #xA26D)	; &I-B-A26D;
     (=ucs@cns		. #x258C)	; &C1-232F;
     (=ucs@big5		. #x258C)	; &C1-232F;
+    (<-fullwidth
+     ((name		  . "LEFT HALF BLOCK")
+      (=ucs		  . #x258C)	; ▌
+      ))
     ))
 (define-char
   '((name		. "LEFT THREE EIGHTHS BLOCK")
@@ -270,14 +270,14 @@
      ((name		  . "LEFT THREE EIGHTHS BLOCK")
       (=ucs		  . #x258D)	; ▍
       ))
-    (<-fullwidth
-     ((name		  . "LEFT THREE EIGHTHS BLOCK")
-      (=ucs		  . #x258D)	; ▍
-      ))
     (=cns11643-1	. #x232E)	; &C1-232E; [03-14]
     (=big5		. #xA26C)	; &I-B-A26C;
     (=ucs@cns		. #x258D)	; &C1-232E;
     (=ucs@big5		. #x258D)	; &C1-232E;
+    (<-fullwidth
+     ((name		  . "LEFT THREE EIGHTHS BLOCK")
+      (=ucs		  . #x258D)	; ▍
+      ))
     ))
 (define-char
   '((name		. "LEFT ONE QUARTER BLOCK")
@@ -291,14 +291,14 @@
      ((name		  . "LEFT ONE QUARTER BLOCK")
       (=ucs		  . #x258E)	; ▎
       ))
-    (<-fullwidth
-     ((name		  . "LEFT ONE QUARTER BLOCK")
-      (=ucs		  . #x258E)	; ▎
-      ))
     (=cns11643-1	. #x232D)	; &C1-232D; [03-13]
     (=big5		. #xA26B)	; &I-B-A26B;
     (=ucs@cns		. #x258E)	; &C1-232D;
     (=ucs@big5		. #x258E)	; &C1-232D;
+    (<-fullwidth
+     ((name		  . "LEFT ONE QUARTER BLOCK")
+      (=ucs		  . #x258E)	; ▎
+      ))
     ))
 (define-char
   '((name		. "LEFT ONE EIGHTH BLOCK")
@@ -312,14 +312,14 @@
      ((name		  . "LEFT ONE EIGHTH BLOCK")
       (=ucs		  . #x258F)	; ▏
       ))
-    (<-fullwidth
-     ((name		  . "LEFT ONE EIGHTH BLOCK")
-      (=ucs		  . #x258F)	; ▏
-      ))
     (=cns11643-1	. #x232C)	; &C1-232C; [03-12]
     (=big5		. #xA26A)	; &I-B-A26A;
     (=ucs@cns		. #x258F)	; &C1-232C;
     (=ucs@big5		. #x258F)	; &C1-232C;
+    (<-fullwidth
+     ((name		  . "LEFT ONE EIGHTH BLOCK")
+      (=ucs		  . #x258F)	; ▏
+      ))
     ))
 (define-char
   '((name		. "RIGHT HALF BLOCK")
@@ -347,12 +347,12 @@
      ((name		  . "MEDIUM SHADE")
       (=ucs		  . #x2592)	; ▒
       ))
+    (=ks-x1001		. #x2246)	; &K0-2246; [02-38]
+    (=ucs@ks		. #x2592)	; &K0-2246;
     (<-fullwidth
      ((name		  . "MEDIUM SHADE")
       (=ucs		  . #x2592)	; ▒
       ))
-    (=ks-x1001		. #x2246)	; &K0-2246; [02-38]
-    (=ucs@ks		. #x2592)	; &K0-2246;
     ))
 (define-char
   '((name		. "DARK SHADE")
@@ -366,12 +366,12 @@
      ((name		  . "DARK SHADE")
       (=ucs		  . #x2593)	; ▓
       ))
+    (=big5-eten		. #xF9FE)	; &B-F9FE;
+    (=ucs@big5		. #x2593)	; &B-F9FE;
     (<-fullwidth
      ((name		  . "DARK SHADE")
       (=ucs		  . #x2593)	; ▓
       ))
-    (=big5-eten		. #xF9FE)	; &B-F9FE;
-    (=ucs@big5		. #x2593)	; &B-F9FE;
     ))
 (define-char
   '((name		. "UPPER ONE EIGHTH BLOCK")
@@ -385,14 +385,14 @@
      ((name		  . "UPPER ONE EIGHTH BLOCK")
       (=ucs		  . #x2594)	; ▔
       ))
-    (<-fullwidth
-     ((name		  . "UPPER ONE EIGHTH BLOCK")
-      (=ucs		  . #x2594)	; ▔
-      ))
     (=cns11643-1	. #x2338)	; &C1-2338; [03-24]
     (=big5		. #xA276)	; &I-B-A276;
     (=ucs@cns		. #x2594)	; &C1-2338;
     (=ucs@big5		. #x2594)	; &C1-2338;
+    (<-fullwidth
+     ((name		  . "UPPER ONE EIGHTH BLOCK")
+      (=ucs		  . #x2594)	; ▔
+      ))
     ))
 (define-char
   '((name		. "RIGHT ONE EIGHTH BLOCK")
@@ -406,12 +406,12 @@
      ((name		  . "RIGHT ONE EIGHTH BLOCK")
       (=ucs		  . #x2595)	; ▕
       ))
-    (<-fullwidth
-     ((name		  . "RIGHT ONE EIGHTH BLOCK")
-      (=ucs		  . #x2595)	; ▕
-      ))
     (=cns11643-1	. #x233B)	; &C1-233B; [03-27]
     (=big5		. #xA279)	; &I-B-A279;
     (=ucs@cns		. #x2595)	; &C1-233B;
     (=ucs@big5		. #x2595)	; &C1-233B;
+    (<-fullwidth
+     ((name		  . "RIGHT ONE EIGHTH BLOCK")
+      (=ucs		  . #x2595)	; ▕
+      ))
     ))
diff --git a/lisp/utf-2000/u025A0-Geometric-Shapes.el b/lisp/utf-2000/u025A0-Geometric-Shapes.el
index eb7ed25..1cfd999 100644
--- a/lisp/utf-2000/u025A0-Geometric-Shapes.el
+++ b/lisp/utf-2000/u025A0-Geometric-Shapes.el
@@ -11,10 +11,6 @@
      ((name		  . "BLACK SQUARE")
       (=ucs		  . #x25A0)	; ■
       ))
-    (<-fullwidth
-     ((name		  . "BLACK SQUARE")
-      (=ucs		  . #x25A0)	; ■
-      ))
     (=jis-x0208		. #x2223)	; &J90-2223; [02-03]
     (=gb2312		. #x2176)	; &I-G0-2176; [01-86]
     (=ks-x1001		. #x2161)	; &I-K0-2161; [01-65]
@@ -25,6 +21,10 @@
     (=ucs@jis		. #x25A0)	; &J90-2223;
     (=ucs@ks		. #x25A0)	; &J90-2223;
     (=ucs@big5		. #x25A0)	; &J90-2223;
+    (<-fullwidth
+     ((name		  . "BLACK SQUARE")
+      (=ucs		  . #x25A0)	; ■
+      ))
     ))
 (define-char
   '((name		. "WHITE SQUARE")
@@ -38,10 +38,6 @@
      ((name		  . "WHITE SQUARE")
       (=ucs		  . #x25A1)	; □
       ))
-    (<-fullwidth
-     ((name		  . "WHITE SQUARE")
-      (=ucs		  . #x25A1)	; □
-      ))
     (=jis-x0208		. #x2222)	; &J90-2222; [02-02]
     (=gb2312		. #x2175)	; &I-G0-2175; [01-85]
     (=ks-x1001		. #x2160)	; &I-K0-2160; [01-64]
@@ -52,6 +48,10 @@
     (=ucs@jis		. #x25A1)	; &J90-2222;
     (=ucs@ks		. #x25A1)	; &J90-2222;
     (=ucs@big5		. #x25A1)	; &J90-2222;
+    (<-fullwidth
+     ((name		  . "WHITE SQUARE")
+      (=ucs		  . #x25A1)	; □
+      ))
     ))
 (define-char
   '((name		. "WHITE SQUARE WITH ROUNDED CORNERS")
@@ -72,12 +72,12 @@
      ((name		  . "WHITE SQUARE CONTAINING BLACK SMALL SQUARE")
       (=ucs		  . #x25A3)	; ▣
       ))
+    (=ks-x1001		. #x2243)	; &K0-2243; [02-35]
+    (=ucs@ks		. #x25A3)	; &K0-2243;
     (<-fullwidth
      ((name		  . "WHITE SQUARE CONTAINING BLACK SMALL SQUARE")
       (=ucs		  . #x25A3)	; ▣
       ))
-    (=ks-x1001		. #x2243)	; &K0-2243; [02-35]
-    (=ucs@ks		. #x25A3)	; &K0-2243;
     ))
 (define-char
   '((name		. "SQUARE WITH HORIZONTAL FILL")
@@ -91,12 +91,12 @@
      ((name		  . "SQUARE WITH HORIZONTAL FILL")
       (=ucs		  . #x25A4)	; ▤
       ))
+    (=ks-x1001		. #x2247)	; &K0-2247; [02-39]
+    (=ucs@ks		. #x25A4)	; &K0-2247;
     (<-fullwidth
      ((name		  . "SQUARE WITH HORIZONTAL FILL")
       (=ucs		  . #x25A4)	; ▤
       ))
-    (=ks-x1001		. #x2247)	; &K0-2247; [02-39]
-    (=ucs@ks		. #x25A4)	; &K0-2247;
     ))
 (define-char
   '((name		. "SQUARE WITH VERTICAL FILL")
@@ -110,12 +110,12 @@
      ((name		  . "SQUARE WITH VERTICAL FILL")
       (=ucs		  . #x25A5)	; ▥
       ))
+    (=ks-x1001		. #x2248)	; &K0-2248; [02-40]
+    (=ucs@ks		. #x25A5)	; &K0-2248;
     (<-fullwidth
      ((name		  . "SQUARE WITH VERTICAL FILL")
       (=ucs		  . #x25A5)	; ▥
       ))
-    (=ks-x1001		. #x2248)	; &K0-2248; [02-40]
-    (=ucs@ks		. #x25A5)	; &K0-2248;
     ))
 (define-char
   '((name		. "SQUARE WITH ORTHOGONAL CROSSHATCH FILL")
@@ -129,12 +129,12 @@
      ((name		  . "SQUARE WITH ORTHOGONAL CROSSHATCH FILL")
       (=ucs		  . #x25A6)	; ▦
       ))
+    (=ks-x1001		. #x224B)	; &K0-224B; [02-43]
+    (=ucs@ks		. #x25A6)	; &K0-224B;
     (<-fullwidth
      ((name		  . "SQUARE WITH ORTHOGONAL CROSSHATCH FILL")
       (=ucs		  . #x25A6)	; ▦
       ))
-    (=ks-x1001		. #x224B)	; &K0-224B; [02-43]
-    (=ucs@ks		. #x25A6)	; &K0-224B;
     ))
 (define-char
   '((name		. "SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL")
@@ -148,12 +148,12 @@
      ((name		  . "SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL")
       (=ucs		  . #x25A7)	; ▧
       ))
+    (=ks-x1001		. #x224A)	; &K0-224A; [02-42]
+    (=ucs@ks		. #x25A7)	; &K0-224A;
     (<-fullwidth
      ((name		  . "SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL")
       (=ucs		  . #x25A7)	; ▧
       ))
-    (=ks-x1001		. #x224A)	; &K0-224A; [02-42]
-    (=ucs@ks		. #x25A7)	; &K0-224A;
     ))
 (define-char
   '((name		. "SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL")
@@ -167,12 +167,12 @@
      ((name		  . "SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL")
       (=ucs		  . #x25A8)	; ▨
       ))
+    (=ks-x1001		. #x2249)	; &K0-2249; [02-41]
+    (=ucs@ks		. #x25A8)	; &K0-2249;
     (<-fullwidth
      ((name		  . "SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL")
       (=ucs		  . #x25A8)	; ▨
       ))
-    (=ks-x1001		. #x2249)	; &K0-2249; [02-41]
-    (=ucs@ks		. #x25A8)	; &K0-2249;
     ))
 (define-char
   '((name		. "SQUARE WITH DIAGONAL CROSSHATCH FILL")
@@ -186,12 +186,12 @@
      ((name		  . "SQUARE WITH DIAGONAL CROSSHATCH FILL")
       (=ucs		  . #x25A9)	; ▩
       ))
+    (=ks-x1001		. #x224C)	; &K0-224C; [02-44]
+    (=ucs@ks		. #x25A9)	; &K0-224C;
     (<-fullwidth
      ((name		  . "SQUARE WITH DIAGONAL CROSSHATCH FILL")
       (=ucs		  . #x25A9)	; ▩
       ))
-    (=ks-x1001		. #x224C)	; &K0-224C; [02-44]
-    (=ucs@ks		. #x25A9)	; &K0-224C;
     ))
 (define-char
   '((name		. "BLACK SMALL SQUARE")
@@ -254,12 +254,12 @@
      ((name		  . "WHITE PARALLELOGRAM")
       (=ucs		  . #x25B1)	; ▱
       ))
+    (=jis-x0213-1-2000	. #x266D)	; &JX1-266D; [06-77]
+    (=ucs@jis		. #x25B1)	; &JX1-266D;
     (<-fullwidth
      ((name		  . "WHITE PARALLELOGRAM")
       (=ucs		  . #x25B1)	; ▱
       ))
-    (=jis-x0213-1-2000	. #x266D)	; &JX1-266D; [06-77]
-    (=ucs@jis		. #x25B1)	; &JX1-266D;
     ))
 (define-char
   '((name		. "BLACK UP-POINTING TRIANGLE")
@@ -273,10 +273,6 @@
      ((name		  . "BLACK UP-POINTING TRIANGLE")
       (=ucs		  . #x25B2)	; ▲
       ))
-    (<-fullwidth
-     ((name		  . "BLACK UP-POINTING TRIANGLE")
-      (=ucs		  . #x25B2)	; ▲
-      ))
     (=jis-x0208		. #x2225)	; &J90-2225; [02-05]
     (=gb2312		. #x2178)	; &I-G0-2178; [01-88]
     (=ks-x1001		. #x2163)	; &I-K0-2163; [01-67]
@@ -287,6 +283,10 @@
     (=ucs@jis		. #x25B2)	; &J90-2225;
     (=ucs@ks		. #x25B2)	; &J90-2225;
     (=ucs@big5		. #x25B2)	; &J90-2225;
+    (<-fullwidth
+     ((name		  . "BLACK UP-POINTING TRIANGLE")
+      (=ucs		  . #x25B2)	; ▲
+      ))
     ))
 (define-char
   '((name		. "WHITE UP-POINTING TRIANGLE")
@@ -300,10 +300,6 @@
      ((name		  . "WHITE UP-POINTING TRIANGLE")
       (=ucs		  . #x25B3)	; △
       ))
-    (<-fullwidth
-     ((name		  . "WHITE UP-POINTING TRIANGLE")
-      (=ucs		  . #x25B3)	; △
-      ))
     (=jis-x0208		. #x2224)	; &J90-2224; [02-04]
     (=gb2312		. #x2177)	; &I-G0-2177; [01-87]
     (=ks-x1001		. #x2162)	; &I-K0-2162; [01-66]
@@ -314,6 +310,10 @@
     (=ucs@jis		. #x25B3)	; &J90-2224;
     (=ucs@ks		. #x25B3)	; &J90-2224;
     (=ucs@big5		. #x25B3)	; &J90-2224;
+    (<-fullwidth
+     ((name		  . "WHITE UP-POINTING TRIANGLE")
+      (=ucs		  . #x25B3)	; △
+      ))
     ))
 (define-char
   '((name		. "BLACK UP-POINTING SMALL TRIANGLE")
@@ -341,14 +341,14 @@
      ((name		  . "BLACK RIGHT-POINTING TRIANGLE")
       (=ucs		  . #x25B6)	; ▶
       ))
-    (<-fullwidth
-     ((name		  . "BLACK RIGHT-POINTING TRIANGLE")
-      (=ucs		  . #x25B6)	; ▶
-      ))
     (=ks-x1001		. #x223A)	; &JX1-2322; [02-26]
     (=jis-x0213-1-2000	. #x2322)	; &I-JX1-2322; [03-02]
     (=ucs@jis		. #x25B6)	; &JX1-2322;
     (=ucs@ks		. #x25B6)	; &JX1-2322;
+    (<-fullwidth
+     ((name		  . "BLACK RIGHT-POINTING TRIANGLE")
+      (=ucs		  . #x25B6)	; ▶
+      ))
     ))
 (define-char
   '((name		. "WHITE RIGHT-POINTING TRIANGLE")
@@ -362,14 +362,14 @@
      ((name		  . "WHITE RIGHT-POINTING TRIANGLE")
       (=ucs		  . #x25B7)	; ▷
       ))
-    (<-fullwidth
-     ((name		  . "WHITE RIGHT-POINTING TRIANGLE")
-      (=ucs		  . #x25B7)	; ▷
-      ))
     (=ks-x1001		. #x2239)	; &JX1-2321; [02-25]
     (=jis-x0213-1-2000	. #x2321)	; &I-JX1-2321; [03-01]
     (=ucs@jis		. #x25B7)	; &JX1-2321;
     (=ucs@ks		. #x25B7)	; &JX1-2321;
+    (<-fullwidth
+     ((name		  . "WHITE RIGHT-POINTING TRIANGLE")
+      (=ucs		  . #x25B7)	; ▷
+      ))
     ))
 (define-char
   '((name		. "BLACK RIGHT-POINTING SMALL TRIANGLE")
@@ -411,10 +411,6 @@
      ((name		  . "BLACK DOWN-POINTING TRIANGLE")
       (=ucs		  . #x25BC)	; ▼
       ))
-    (<-fullwidth
-     ((name		  . "BLACK DOWN-POINTING TRIANGLE")
-      (=ucs		  . #x25BC)	; ▼
-      ))
     (=jis-x0208		. #x2227)	; &J90-2227; [02-07]
     (=ks-x1001		. #x2165)	; &I-K0-2165; [01-69]
     (=cns11643-1	. #x217E)	; &I-C1-217E; [01-94]
@@ -423,6 +419,10 @@
     (=ucs@jis		. #x25BC)	; &J90-2227;
     (=ucs@ks		. #x25BC)	; &J90-2227;
     (=ucs@big5		. #x25BC)	; &J90-2227;
+    (<-fullwidth
+     ((name		  . "BLACK DOWN-POINTING TRIANGLE")
+      (=ucs		  . #x25BC)	; ▼
+      ))
     ))
 (define-char
   '((name		. "WHITE DOWN-POINTING TRIANGLE")
@@ -436,10 +436,6 @@
      ((name		  . "WHITE DOWN-POINTING TRIANGLE")
       (=ucs		  . #x25BD)	; ▽
       ))
-    (<-fullwidth
-     ((name		  . "WHITE DOWN-POINTING TRIANGLE")
-      (=ucs		  . #x25BD)	; ▽
-      ))
     (=jis-x0208		. #x2226)	; &J90-2226; [02-06]
     (=ks-x1001		. #x2164)	; &I-K0-2164; [01-68]
     (=cns11643-1	. #x217D)	; &I-C1-217D; [01-93]
@@ -448,6 +444,10 @@
     (=ucs@jis		. #x25BD)	; &J90-2226;
     (=ucs@ks		. #x25BD)	; &J90-2226;
     (=ucs@big5		. #x25BD)	; &J90-2226;
+    (<-fullwidth
+     ((name		  . "WHITE DOWN-POINTING TRIANGLE")
+      (=ucs		  . #x25BD)	; ▽
+      ))
     ))
 (define-char
   '((name		. "BLACK DOWN-POINTING SMALL TRIANGLE")
@@ -475,14 +475,14 @@
      ((name		  . "BLACK LEFT-POINTING TRIANGLE")
       (=ucs		  . #x25C0)	; ◀
       ))
-    (<-fullwidth
-     ((name		  . "BLACK LEFT-POINTING TRIANGLE")
-      (=ucs		  . #x25C0)	; ◀
-      ))
     (=ks-x1001		. #x2238)	; &JX1-2324; [02-24]
     (=jis-x0213-1-2000	. #x2324)	; &I-JX1-2324; [03-04]
     (=ucs@jis		. #x25C0)	; &JX1-2324;
     (=ucs@ks		. #x25C0)	; &JX1-2324;
+    (<-fullwidth
+     ((name		  . "BLACK LEFT-POINTING TRIANGLE")
+      (=ucs		  . #x25C0)	; ◀
+      ))
     ))
 (define-char
   '((name		. "WHITE LEFT-POINTING TRIANGLE")
@@ -496,14 +496,14 @@
      ((name		  . "WHITE LEFT-POINTING TRIANGLE")
       (=ucs		  . #x25C1)	; ◁
       ))
-    (<-fullwidth
-     ((name		  . "WHITE LEFT-POINTING TRIANGLE")
-      (=ucs		  . #x25C1)	; ◁
-      ))
     (=ks-x1001		. #x2237)	; &JX1-2323; [02-23]
     (=jis-x0213-1-2000	. #x2323)	; &I-JX1-2323; [03-03]
     (=ucs@jis		. #x25C1)	; &JX1-2323;
     (=ucs@ks		. #x25C1)	; &JX1-2323;
+    (<-fullwidth
+     ((name		  . "WHITE LEFT-POINTING TRIANGLE")
+      (=ucs		  . #x25C1)	; ◁
+      ))
     ))
 (define-char
   '((name		. "BLACK LEFT-POINTING SMALL TRIANGLE")
@@ -545,10 +545,6 @@
      ((name		  . "BLACK DIAMOND")
       (=ucs		  . #x25C6)	; ◆
       ))
-    (<-fullwidth
-     ((name		  . "BLACK DIAMOND")
-      (=ucs		  . #x25C6)	; ◆
-      ))
     (=jis-x0208		. #x2221)	; &J90-2221; [02-01]
     (=gb2312		. #x2174)	; &I-G0-2174; [01-84]
     (=ks-x1001		. #x215F)	; &I-K0-215F; [01-63]
@@ -559,6 +555,10 @@
     (=ucs@jis		. #x25C6)	; &J90-2221;
     (=ucs@ks		. #x25C6)	; &J90-2221;
     (=ucs@big5		. #x25C6)	; &J90-2221;
+    (<-fullwidth
+     ((name		  . "BLACK DIAMOND")
+      (=ucs		  . #x25C6)	; ◆
+      ))
     ))
 (define-char
   '((name		. "WHITE DIAMOND")
@@ -572,10 +572,6 @@
      ((name		  . "WHITE DIAMOND")
       (=ucs		  . #x25C7)	; ◇
       ))
-    (<-fullwidth
-     ((name		  . "WHITE DIAMOND")
-      (=ucs		  . #x25C7)	; ◇
-      ))
     (=jis-x0208		. #x217E)	; &J90-217E; [01-94]
     (=gb2312		. #x2173)	; &I-G0-2173; [01-83]
     (=ks-x1001		. #x215E)	; &I-K0-215E; [01-62]
@@ -586,6 +582,10 @@
     (=ucs@jis		. #x25C7)	; &J90-217E;
     (=ucs@ks		. #x25C7)	; &J90-217E;
     (=ucs@big5		. #x25C7)	; &J90-217E;
+    (<-fullwidth
+     ((name		  . "WHITE DIAMOND")
+      (=ucs		  . #x25C7)	; ◇
+      ))
     ))
 (define-char
   '((name		. "WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND")
@@ -599,12 +599,12 @@
      ((name . "WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND")
       (=ucs		  . #x25C8)	; ◈
       ))
+    (=ks-x1001		. #x2242)	; &K0-2242; [02-34]
+    (=ucs@ks		. #x25C8)	; &K0-2242;
     (<-fullwidth
      ((name . "WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND")
       (=ucs		  . #x25C8)	; ◈
       ))
-    (=ks-x1001		. #x2242)	; &K0-2242; [02-34]
-    (=ucs@ks		. #x25C8)	; &K0-2242;
     ))
 (define-char
   '((name		. "FISHEYE")
@@ -618,12 +618,12 @@
      ((name		  . "FISHEYE")
       (=ucs		  . #x25C9)	; ◉
       ))
+    (=jis-x0213-1-2000	. #x233B)	; &JX1-233B; [03-27]
+    (=ucs@jis		. #x25C9)	; &JX1-233B;
     (<-fullwidth
      ((name		  . "FISHEYE")
       (=ucs		  . #x25C9)	; ◉
       ))
-    (=jis-x0213-1-2000	. #x233B)	; &JX1-233B; [03-27]
-    (=ucs@jis		. #x25C9)	; &JX1-233B;
     ))
 (define-char
   '((name		. "LOZENGE")
@@ -644,10 +644,6 @@
      ((name		  . "WHITE CIRCLE")
       (=ucs		  . #x25CB)	; ○
       ))
-    (<-fullwidth
-     ((name		  . "WHITE CIRCLE")
-      (=ucs		  . #x25CB)	; ○
-      ))
     (=jis-x0208		. #x217B)	; &J90-217B; [01-91]
     (=gb2312		. #x2170)	; &I-G0-2170; [01-80]
     (=ks-x1001		. #x215B)	; &I-K0-215B; [01-59]
@@ -658,6 +654,10 @@
     (=ucs@jis		. #x25CB)	; &J90-217B;
     (=ucs@ks		. #x25CB)	; &J90-217B;
     (=ucs@big5		. #x25CB)	; &J90-217B;
+    (<-fullwidth
+     ((name		  . "WHITE CIRCLE")
+      (=ucs		  . #x25CB)	; ○
+      ))
     ))
 (define-char
   '((name		. "DOTTED CIRCLE")
@@ -685,10 +685,6 @@
      ((name		  . "BULLSEYE")
       (=ucs		  . #x25CE)	; ◎
       ))
-    (<-fullwidth
-     ((name		  . "BULLSEYE")
-      (=ucs		  . #x25CE)	; ◎
-      ))
     (=jis-x0208		. #x217D)	; &J90-217D; [01-93]
     (=gb2312		. #x2172)	; &I-G0-2172; [01-82]
     (=ks-x1001		. #x215D)	; &I-K0-215D; [01-61]
@@ -699,6 +695,10 @@
     (=ucs@jis		. #x25CE)	; &J90-217D;
     (=ucs@ks		. #x25CE)	; &J90-217D;
     (=ucs@big5		. #x25CE)	; &J90-217D;
+    (<-fullwidth
+     ((name		  . "BULLSEYE")
+      (=ucs		  . #x25CE)	; ◎
+      ))
     ))
 (define-char
   '((name		. "BLACK CIRCLE")
@@ -712,10 +712,6 @@
      ((name		  . "BLACK CIRCLE")
       (=ucs		  . #x25CF)	; ●
       ))
-    (<-fullwidth
-     ((name		  . "BLACK CIRCLE")
-      (=ucs		  . #x25CF)	; ●
-      ))
     (=jis-x0208		. #x217C)	; &J90-217C; [01-92]
     (=gb2312		. #x2171)	; &I-G0-2171; [01-81]
     (=ks-x1001		. #x215C)	; &I-K0-215C; [01-60]
@@ -726,6 +722,10 @@
     (=ucs@jis		. #x25CF)	; &J90-217C;
     (=ucs@ks		. #x25CF)	; &J90-217C;
     (=ucs@big5		. #x25CF)	; &J90-217C;
+    (<-fullwidth
+     ((name		  . "BLACK CIRCLE")
+      (=ucs		  . #x25CF)	; ●
+      ))
     ))
 (define-char
   '((name		. "CIRCLE WITH LEFT HALF BLACK")
@@ -739,14 +739,14 @@
      ((name		  . "CIRCLE WITH LEFT HALF BLACK")
       (=ucs		  . #x25D0)	; ◐
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLE WITH LEFT HALF BLACK")
-      (=ucs		  . #x25D0)	; ◐
-      ))
     (=ks-x1001		. #x2244)	; &JX1-2867; [02-36]
     (=jis-x0213-1-2000	. #x2867)	; &I-JX1-2867; [08-71]
     (=ucs@jis		. #x25D0)	; &JX1-2867;
     (=ucs@ks		. #x25D0)	; &JX1-2867;
+    (<-fullwidth
+     ((name		  . "CIRCLE WITH LEFT HALF BLACK")
+      (=ucs		  . #x25D0)	; ◐
+      ))
     ))
 (define-char
   '((name		. "CIRCLE WITH RIGHT HALF BLACK")
@@ -760,14 +760,14 @@
      ((name		  . "CIRCLE WITH RIGHT HALF BLACK")
       (=ucs		  . #x25D1)	; ◑
       ))
-    (<-fullwidth
-     ((name		  . "CIRCLE WITH RIGHT HALF BLACK")
-      (=ucs		  . #x25D1)	; ◑
-      ))
     (=ks-x1001		. #x2245)	; &JX1-2868; [02-37]
     (=jis-x0213-1-2000	. #x2868)	; &I-JX1-2868; [08-72]
     (=ucs@jis		. #x25D1)	; &JX1-2868;
     (=ucs@ks		. #x25D1)	; &JX1-2868;
+    (<-fullwidth
+     ((name		  . "CIRCLE WITH RIGHT HALF BLACK")
+      (=ucs		  . #x25D1)	; ◑
+      ))
     ))
 (define-char
   '((name		. "CIRCLE WITH LOWER HALF BLACK")
@@ -781,12 +781,12 @@
      ((name		  . "CIRCLE WITH LOWER HALF BLACK")
       (=ucs		  . #x25D2)	; ◒
       ))
+    (=jis-x0213-1-2000	. #x2869)	; &JX1-2869; [08-73]
+    (=ucs@jis		. #x25D2)	; &JX1-2869;
     (<-fullwidth
      ((name		  . "CIRCLE WITH LOWER HALF BLACK")
       (=ucs		  . #x25D2)	; ◒
       ))
-    (=jis-x0213-1-2000	. #x2869)	; &JX1-2869; [08-73]
-    (=ucs@jis		. #x25D2)	; &JX1-2869;
     ))
 (define-char
   '((name		. "CIRCLE WITH UPPER HALF BLACK")
@@ -800,12 +800,12 @@
      ((name		  . "CIRCLE WITH UPPER HALF BLACK")
       (=ucs		  . #x25D3)	; ◓
       ))
+    (=jis-x0213-1-2000	. #x286A)	; &JX1-286A; [08-74]
+    (=ucs@jis		. #x25D3)	; &JX1-286A;
     (<-fullwidth
      ((name		  . "CIRCLE WITH UPPER HALF BLACK")
       (=ucs		  . #x25D3)	; ◓
       ))
-    (=jis-x0213-1-2000	. #x286A)	; &JX1-286A; [08-74]
-    (=ucs@jis		. #x25D3)	; &JX1-286A;
     ))
 (define-char
   '((name		. "CIRCLE WITH UPPER RIGHT QUADRANT BLACK")
@@ -917,14 +917,14 @@
      ((name		  . "BLACK LOWER RIGHT TRIANGLE")
       (=ucs		  . #x25E2)	; ◢
       ))
-    (<-fullwidth
-     ((name		  . "BLACK LOWER RIGHT TRIANGLE")
-      (=ucs		  . #x25E2)	; ◢
-      ))
     (=cns11643-1	. #x2348)	; &C1-2348; [03-40]
     (=big5		. #xA2A8)	; &I-B-A2A8;
     (=ucs@cns		. #x25E2)	; &C1-2348;
     (=ucs@big5		. #x25E2)	; &C1-2348;
+    (<-fullwidth
+     ((name		  . "BLACK LOWER RIGHT TRIANGLE")
+      (=ucs		  . #x25E2)	; ◢
+      ))
     ))
 (define-char
   '((name		. "BLACK LOWER LEFT TRIANGLE")
@@ -938,14 +938,14 @@
      ((name		  . "BLACK LOWER LEFT TRIANGLE")
       (=ucs		  . #x25E3)	; ◣
       ))
-    (<-fullwidth
-     ((name		  . "BLACK LOWER LEFT TRIANGLE")
-      (=ucs		  . #x25E3)	; ◣
-      ))
     (=cns11643-1	. #x2349)	; &C1-2349; [03-41]
     (=big5		. #xA2A9)	; &I-B-A2A9;
     (=ucs@cns		. #x25E3)	; &C1-2349;
     (=ucs@big5		. #x25E3)	; &C1-2349;
+    (<-fullwidth
+     ((name		  . "BLACK LOWER LEFT TRIANGLE")
+      (=ucs		  . #x25E3)	; ◣
+      ))
     ))
 (define-char
   '((name		. "BLACK UPPER LEFT TRIANGLE")
@@ -959,14 +959,14 @@
      ((name		  . "BLACK UPPER LEFT TRIANGLE")
       (=ucs		  . #x25E4)	; ◤
       ))
-    (<-fullwidth
-     ((name		  . "BLACK UPPER LEFT TRIANGLE")
-      (=ucs		  . #x25E4)	; ◤
-      ))
     (=cns11643-1	. #x234B)	; &C1-234B; [03-43]
     (=big5		. #xA2AB)	; &I-B-A2AB;
     (=ucs@cns		. #x25E4)	; &C1-234B;
     (=ucs@big5		. #x25E4)	; &C1-234B;
+    (<-fullwidth
+     ((name		  . "BLACK UPPER LEFT TRIANGLE")
+      (=ucs		  . #x25E4)	; ◤
+      ))
     ))
 (define-char
   '((name		. "BLACK UPPER RIGHT TRIANGLE")
@@ -980,14 +980,14 @@
      ((name		  . "BLACK UPPER RIGHT TRIANGLE")
       (=ucs		  . #x25E5)	; ◥
       ))
-    (<-fullwidth
-     ((name		  . "BLACK UPPER RIGHT TRIANGLE")
-      (=ucs		  . #x25E5)	; ◥
-      ))
     (=cns11643-1	. #x234A)	; &C1-234A; [03-42]
     (=big5		. #xA2AA)	; &I-B-A2AA;
     (=ucs@cns		. #x25E5)	; &C1-234A;
     (=ucs@big5		. #x25E5)	; &C1-234A;
+    (<-fullwidth
+     ((name		  . "BLACK UPPER RIGHT TRIANGLE")
+      (=ucs		  . #x25E5)	; ◥
+      ))
     ))
 (define-char
   '((name		. "WHITE BULLET")
@@ -1001,12 +1001,12 @@
      ((name		  . "WHITE BULLET")
       (=ucs		  . #x25E6)	; ◦
       ))
+    (=jis-x0213-1-2000	. #x233F)	; &JX1-233F; [03-31]
+    (=ucs@jis		. #x25E6)	; &JX1-233F;
     (<-fullwidth
      ((name		  . "WHITE BULLET")
       (=ucs		  . #x25E6)	; ◦
       ))
-    (=jis-x0213-1-2000	. #x233F)	; &JX1-233F; [03-31]
-    (=ucs@jis		. #x25E6)	; &JX1-233F;
     ))
 (define-char
   '((name		. "SQUARE WITH LEFT HALF BLACK")
@@ -1076,13 +1076,13 @@
      ((name		  . "LARGE CIRCLE")
       (=ucs		  . #x25EF)	; ◯
       ))
+    (=jis-x0208@1983	. #x227E)	; &J90-227E; [02-94]
+    (=jis-x0208@1990	. #x227E)	; &I-J90-227E; [02-94]
+    (=ucs@jis		. #x25EF)	; &J90-227E;
     (<-fullwidth
      ((name		  . "LARGE CIRCLE")
       (=ucs		  . #x25EF)	; ◯
       ))
-    (=jis-x0208@1983	. #x227E)	; &J90-227E; [02-94]
-    (=jis-x0208@1990	. #x227E)	; &I-J90-227E; [02-94]
-    (=ucs@jis		. #x25EF)	; &J90-227E;
     ))
 (define-char
   '((name		. "WHITE SQUARE WITH UPPER LEFT QUADRANT")
diff --git a/lisp/utf-2000/u02600-Miscellaneous-Symbols.el b/lisp/utf-2000/u02600-Miscellaneous-Symbols.el
index e5b9ac9..3dca115 100644
--- a/lisp/utf-2000/u02600-Miscellaneous-Symbols.el
+++ b/lisp/utf-2000/u02600-Miscellaneous-Symbols.el
@@ -11,12 +11,12 @@
      ((name		  . "BLACK SUN WITH RAYS")
       (=ucs		  . #x2600)	; ☀
       ))
+    (=jis-x0213-1-2000	. #x2668)	; &JX1-2668; [06-72]
+    (=ucs@jis		. #x2600)	; &JX1-2668;
     (<-fullwidth
      ((name		  . "BLACK SUN WITH RAYS")
       (=ucs		  . #x2600)	; ☀
       ))
-    (=jis-x0213-1-2000	. #x2668)	; &JX1-2668; [06-72]
-    (=ucs@jis		. #x2600)	; &JX1-2668;
     ))
 (define-char
   '((name		. "CLOUD")
@@ -30,12 +30,12 @@
      ((name		  . "CLOUD")
       (=ucs		  . #x2601)	; ☁
       ))
+    (=jis-x0213-1-2000	. #x2669)	; &JX1-2669; [06-73]
+    (=ucs@jis		. #x2601)	; &JX1-2669;
     (<-fullwidth
      ((name		  . "CLOUD")
       (=ucs		  . #x2601)	; ☁
       ))
-    (=jis-x0213-1-2000	. #x2669)	; &JX1-2669; [06-73]
-    (=ucs@jis		. #x2601)	; &JX1-2669;
     ))
 (define-char
   '((name		. "UMBRELLA")
@@ -49,12 +49,12 @@
      ((name		  . "UMBRELLA")
       (=ucs		  . #x2602)	; ☂
       ))
+    (=jis-x0213-1-2000	. #x266A)	; &JX1-266A; [06-74]
+    (=ucs@jis		. #x2602)	; &JX1-266A;
     (<-fullwidth
      ((name		  . "UMBRELLA")
       (=ucs		  . #x2602)	; ☂
       ))
-    (=jis-x0213-1-2000	. #x266A)	; &JX1-266A; [06-74]
-    (=ucs@jis		. #x2602)	; &JX1-266A;
     ))
 (define-char
   '((name		. "SNOWMAN")
@@ -68,12 +68,12 @@
      ((name		  . "SNOWMAN")
       (=ucs		  . #x2603)	; ☃
       ))
+    (=jis-x0213-1-2000	. #x266B)	; &JX1-266B; [06-75]
+    (=ucs@jis		. #x2603)	; &JX1-266B;
     (<-fullwidth
      ((name		  . "SNOWMAN")
       (=ucs		  . #x2603)	; ☃
       ))
-    (=jis-x0213-1-2000	. #x266B)	; &JX1-266B; [06-75]
-    (=ucs@jis		. #x2603)	; &JX1-266B;
     ))
 (define-char
   '((name		. "COMET")
@@ -94,10 +94,6 @@
      ((name		  . "BLACK STAR")
       (=ucs		  . #x2605)	; ★
       ))
-    (<-fullwidth
-     ((name		  . "BLACK STAR")
-      (=ucs		  . #x2605)	; ★
-      ))
     (=jis-x0208		. #x217A)	; &J90-217A; [01-90]
     (=gb2312		. #x216F)	; &I-G0-216F; [01-79]
     (=ks-x1001		. #x215A)	; &I-K0-215A; [01-58]
@@ -108,6 +104,10 @@
     (=ucs@jis		. #x2605)	; &J90-217A;
     (=ucs@ks		. #x2605)	; &J90-217A;
     (=ucs@big5		. #x2605)	; &J90-217A;
+    (<-fullwidth
+     ((name		  . "BLACK STAR")
+      (=ucs		  . #x2605)	; ★
+      ))
     ))
 (define-char
   '((name		. "WHITE STAR")
@@ -121,10 +121,6 @@
      ((name		  . "WHITE STAR")
       (=ucs		  . #x2606)	; ☆
       ))
-    (<-fullwidth
-     ((name		  . "WHITE STAR")
-      (=ucs		  . #x2606)	; ☆
-      ))
     (=jis-x0208		. #x2179)	; &J90-2179; [01-89]
     (=gb2312		. #x216E)	; &I-G0-216E; [01-78]
     (=ks-x1001		. #x2159)	; &I-K0-2159; [01-57]
@@ -135,6 +131,10 @@
     (=ucs@jis		. #x2606)	; &J90-2179;
     (=ucs@ks		. #x2606)	; &J90-2179;
     (=ucs@big5		. #x2606)	; &J90-2179;
+    (<-fullwidth
+     ((name		  . "WHITE STAR")
+      (=ucs		  . #x2606)	; ☆
+      ))
     ))
 (define-char
   '((name		. "LIGHTNING")
@@ -197,14 +197,14 @@
      ((name		  . "BLACK TELEPHONE")
       (=ucs		  . #x260E)	; ☎
       ))
-    (<-fullwidth
-     ((name		  . "BLACK TELEPHONE")
-      (=ucs		  . #x260E)	; ☎
-      ))
     (=ks-x1001		. #x224F)	; &JX1-2667; [02-47]
     (=jis-x0213-1-2000	. #x2667)	; &I-JX1-2667; [06-71]
     (=ucs@jis		. #x260E)	; &JX1-2667;
     (=ucs@ks		. #x260E)	; &JX1-2667;
+    (<-fullwidth
+     ((name		  . "BLACK TELEPHONE")
+      (=ucs		  . #x260E)	; ☎
+      ))
     ))
 (define-char
   '((name		. "WHITE TELEPHONE")
@@ -218,12 +218,12 @@
      ((name		  . "WHITE TELEPHONE")
       (=ucs		  . #x260F)	; ☏
       ))
+    (=ks-x1001		. #x224E)	; &K0-224E; [02-46]
+    (=ucs@ks		. #x260F)	; &K0-224E;
     (<-fullwidth
      ((name		  . "WHITE TELEPHONE")
       (=ucs		  . #x260F)	; ☏
       ))
-    (=ks-x1001		. #x224E)	; &K0-224E; [02-46]
-    (=ucs@ks		. #x260F)	; &K0-224E;
     ))
 (define-char
   '((name		. "BALLOT BOX")
@@ -237,11 +237,11 @@
      ((name		  . "BALLOT BOX")
       (=ucs		  . #x2610)	; ☐
       ))
+    (=jef-china3	. #x76B4)	; &JC3-76B4;
     (<-fullwidth
      ((name		  . "BALLOT BOX")
       (=ucs		  . #x2610)	; ☐
       ))
-    (=jef-china3	. #x76B4)	; &JC3-76B4;
     ))
 (define-char
   '((name		. "BALLOT BOX WITH CHECK")
@@ -307,12 +307,12 @@
      ((name		  . "WHITE LEFT POINTING INDEX")
       (=ucs		  . #x261C)	; ☜
       ))
+    (=ks-x1001		. #x2250)	; &K0-2250; [02-48]
+    (=ucs@ks		. #x261C)	; &K0-2250;
     (<-fullwidth
      ((name		  . "WHITE LEFT POINTING INDEX")
       (=ucs		  . #x261C)	; ☜
       ))
-    (=ks-x1001		. #x2250)	; &K0-2250; [02-48]
-    (=ucs@ks		. #x261C)	; &K0-2250;
     ))
 (define-char
   '((name		. "WHITE UP POINTING INDEX")
@@ -333,14 +333,14 @@
      ((name		  . "WHITE RIGHT POINTING INDEX")
       (=ucs		  . #x261E)	; ☞
       ))
-    (<-fullwidth
-     ((name		  . "WHITE RIGHT POINTING INDEX")
-      (=ucs		  . #x261E)	; ☞
-      ))
     (=ks-x1001		. #x2251)	; &JX1-2D7E; [02-49]
     (=jis-x0213-1-2000	. #x2D7E)	; &I-JX1-2D7E; [13-94]
     (=ucs@jis		. #x261E)	; &JX1-2D7E;
     (=ucs@ks		. #x261E)	; &JX1-2D7E;
+    (<-fullwidth
+     ((name		  . "WHITE RIGHT POINTING INDEX")
+      (=ucs		  . #x261E)	; ☞
+      ))
     ))
 (define-char
   '((name		. "WHITE DOWN POINTING INDEX")
@@ -585,10 +585,6 @@
      ((name		  . "FEMALE SIGN")
       (=ucs		  . #x2640)	; ♀
       ))
-    (<-fullwidth
-     ((name		  . "FEMALE SIGN")
-      (=ucs		  . #x2640)	; ♀
-      ))
     (=jis-x0208		. #x216A)	; &J90-216A; [01-74]
     (=gb2312		. #x2162)	; &I-G0-2162; [01-66]
     (=ks-x1001		. #x214F)	; &I-K0-214F; [01-47]
@@ -599,6 +595,10 @@
     (=ucs@jis		. #x2640)	; &J90-216A;
     (=ucs@ks		. #x2640)	; &J90-216A;
     (=ucs@big5		. #x2640)	; &J90-216A;
+    (<-fullwidth
+     ((name		  . "FEMALE SIGN")
+      (=ucs		  . #x2640)	; ♀
+      ))
     ))
 (define-char
   '((name		. "EARTH")
@@ -619,10 +619,6 @@
      ((name		  . "MALE SIGN")
       (=ucs		  . #x2642)	; ♂
       ))
-    (<-fullwidth
-     ((name		  . "MALE SIGN")
-      (=ucs		  . #x2642)	; ♂
-      ))
     (=jis-x0208		. #x2169)	; &J90-2169; [01-73]
     (=gb2312		. #x2161)	; &I-G0-2161; [01-65]
     (=ks-x1001		. #x214E)	; &I-K0-214E; [01-46]
@@ -633,6 +629,10 @@
     (=ucs@jis		. #x2642)	; &J90-2169;
     (=ucs@ks		. #x2642)	; &J90-2169;
     (=ucs@big5		. #x2642)	; &J90-2169;
+    (<-fullwidth
+     ((name		  . "MALE SIGN")
+      (=ucs		  . #x2642)	; ♂
+      ))
     ))
 (define-char
   '((name		. "JUPITER")
@@ -849,14 +849,14 @@
      ((name		  . "BLACK SPADE SUIT")
       (=ucs		  . #x2660)	; ♠
       ))
-    (<-fullwidth
-     ((name		  . "BLACK SPADE SUIT")
-      (=ucs		  . #x2660)	; ♠
-      ))
     (=ks-x1001		. #x223C)	; &JX1-263A; [02-28]
     (=jis-x0213-1-2000	. #x263A)	; &I-JX1-263A; [06-26]
     (=ucs@jis		. #x2660)	; &JX1-263A;
     (=ucs@ks		. #x2660)	; &JX1-263A;
+    (<-fullwidth
+     ((name		  . "BLACK SPADE SUIT")
+      (=ucs		  . #x2660)	; ♠
+      ))
     ))
 (define-char
   '((name		. "WHITE HEART SUIT")
@@ -870,15 +870,15 @@
      ((name		  . "WHITE HEART SUIT")
       (=ucs		  . #x2661)	; ♡
       ))
-    (<-fullwidth
-     ((name		  . "WHITE HEART SUIT")
-      (=ucs		  . #x2661)	; ♡
-      ))
     (=ks-x1001		. #x223D)	; &JX1-263D; [02-29]
     (=jis-x0213-1-2000	. #x263D)	; &I-JX1-263D; [06-29]
     (=jef-china3	. #x76B6)	; &I-JC3-76B6;
     (=ucs@jis		. #x2661)	; &JX1-263D;
     (=ucs@ks		. #x2661)	; &JX1-263D;
+    (<-fullwidth
+     ((name		  . "WHITE HEART SUIT")
+      (=ucs		  . #x2661)	; ♡
+      ))
     ))
 (define-char
   '((name		. "WHITE DIAMOND SUIT")
@@ -892,13 +892,13 @@
      ((name		  . "WHITE DIAMOND SUIT")
       (=ucs		  . #x2662)	; ♢
       ))
+    (=jis-x0213-1-2000	. #x263B)	; &JX1-263B; [06-27]
+    (=jef-china3	. #x76B8)	; &I-JC3-76B8;
+    (=ucs@jis		. #x2662)	; &JX1-263B;
     (<-fullwidth
      ((name		  . "WHITE DIAMOND SUIT")
       (=ucs		  . #x2662)	; ♢
       ))
-    (=jis-x0213-1-2000	. #x263B)	; &JX1-263B; [06-27]
-    (=jef-china3	. #x76B8)	; &I-JC3-76B8;
-    (=ucs@jis		. #x2662)	; &JX1-263B;
     ))
 (define-char
   '((name		. "BLACK CLUB SUIT")
@@ -912,14 +912,14 @@
      ((name		  . "BLACK CLUB SUIT")
       (=ucs		  . #x2663)	; ♣
       ))
-    (<-fullwidth
-     ((name		  . "BLACK CLUB SUIT")
-      (=ucs		  . #x2663)	; ♣
-      ))
     (=ks-x1001		. #x2240)	; &JX1-2640; [02-32]
     (=jis-x0213-1-2000	. #x2640)	; &I-JX1-2640; [06-32]
     (=ucs@jis		. #x2663)	; &JX1-2640;
     (=ucs@ks		. #x2663)	; &JX1-2640;
+    (<-fullwidth
+     ((name		  . "BLACK CLUB SUIT")
+      (=ucs		  . #x2663)	; ♣
+      ))
     ))
 (define-char
   '((name		. "WHITE SPADE SUIT")
@@ -933,15 +933,15 @@
      ((name		  . "WHITE SPADE SUIT")
       (=ucs		  . #x2664)	; ♤
       ))
-    (<-fullwidth
-     ((name		  . "WHITE SPADE SUIT")
-      (=ucs		  . #x2664)	; ♤
-      ))
     (=ks-x1001		. #x223B)	; &JX1-2639; [02-27]
     (=jis-x0213-1-2000	. #x2639)	; &I-JX1-2639; [06-25]
     (=jef-china3	. #x76B7)	; &I-JC3-76B7;
     (=ucs@jis		. #x2664)	; &JX1-2639;
     (=ucs@ks		. #x2664)	; &JX1-2639;
+    (<-fullwidth
+     ((name		  . "WHITE SPADE SUIT")
+      (=ucs		  . #x2664)	; ♤
+      ))
     ))
 (define-char
   '((name		. "BLACK HEART SUIT")
@@ -955,14 +955,14 @@
      ((name		  . "BLACK HEART SUIT")
       (=ucs		  . #x2665)	; ♥
       ))
-    (<-fullwidth
-     ((name		  . "BLACK HEART SUIT")
-      (=ucs		  . #x2665)	; ♥
-      ))
     (=ks-x1001		. #x223E)	; &JX1-263E; [02-30]
     (=jis-x0213-1-2000	. #x263E)	; &I-JX1-263E; [06-30]
     (=ucs@jis		. #x2665)	; &JX1-263E;
     (=ucs@ks		. #x2665)	; &JX1-263E;
+    (<-fullwidth
+     ((name		  . "BLACK HEART SUIT")
+      (=ucs		  . #x2665)	; ♥
+      ))
     ))
 (define-char
   '((name		. "BLACK DIAMOND SUIT")
@@ -976,12 +976,12 @@
      ((name		  . "BLACK DIAMOND SUIT")
       (=ucs		  . #x2666)	; ♦
       ))
+    (=jis-x0213-1-2000	. #x263C)	; &JX1-263C; [06-28]
+    (=ucs@jis		. #x2666)	; &JX1-263C;
     (<-fullwidth
      ((name		  . "BLACK DIAMOND SUIT")
       (=ucs		  . #x2666)	; ♦
       ))
-    (=jis-x0213-1-2000	. #x263C)	; &JX1-263C; [06-28]
-    (=ucs@jis		. #x2666)	; &JX1-263C;
     ))
 (define-char
   '((name		. "WHITE CLUB SUIT")
@@ -995,15 +995,15 @@
      ((name		  . "WHITE CLUB SUIT")
       (=ucs		  . #x2667)	; ♧
       ))
-    (<-fullwidth
-     ((name		  . "WHITE CLUB SUIT")
-      (=ucs		  . #x2667)	; ♧
-      ))
     (=ks-x1001		. #x223F)	; &JX1-263F; [02-31]
     (=jis-x0213-1-2000	. #x263F)	; &I-JX1-263F; [06-31]
     (=jef-china3	. #x76B5)	; &I-JC3-76B5;
     (=ucs@jis		. #x2667)	; &JX1-263F;
     (=ucs@ks		. #x2667)	; &JX1-263F;
+    (<-fullwidth
+     ((name		  . "WHITE CLUB SUIT")
+      (=ucs		  . #x2667)	; ♧
+      ))
     ))
 (define-char
   '((name		. "HOT SPRINGS")
@@ -1017,14 +1017,14 @@
      ((name		  . "HOT SPRINGS")
       (=ucs		  . #x2668)	; ♨
       ))
-    (<-fullwidth
-     ((name		  . "HOT SPRINGS")
-      (=ucs		  . #x2668)	; ♨
-      ))
     (=ks-x1001		. #x224D)	; &JX1-266C; [02-45]
     (=jis-x0213-1-2000	. #x266C)	; &I-JX1-266C; [06-76]
     (=ucs@jis		. #x2668)	; &JX1-266C;
     (=ucs@ks		. #x2668)	; &JX1-266C;
+    (<-fullwidth
+     ((name		  . "HOT SPRINGS")
+      (=ucs		  . #x2668)	; ♨
+      ))
     ))
 (define-char
   '((name		. "QUARTER NOTE")
@@ -1038,14 +1038,14 @@
      ((name		  . "QUARTER NOTE")
       (=ucs		  . #x2669)	; ♩
       ))
-    (<-fullwidth
-     ((name		  . "QUARTER NOTE")
-      (=ucs		  . #x2669)	; ♩
-      ))
     (=ks-x1001		. #x225B)	; &JX1-227D; [02-59]
     (=jis-x0213-1-2000	. #x227D)	; &I-JX1-227D; [02-93]
     (=ucs@jis		. #x2669)	; &JX1-227D;
     (=ucs@ks		. #x2669)	; &JX1-227D;
+    (<-fullwidth
+     ((name		  . "QUARTER NOTE")
+      (=ucs		  . #x2669)	; ♩
+      ))
     ))
 (define-char
   '((name		. "EIGHTH NOTE")
@@ -1059,15 +1059,15 @@
      ((name		  . "EIGHTH NOTE")
       (=ucs		  . #x266A)	; ♪
       ))
-    (<-fullwidth
-     ((name		  . "EIGHTH NOTE")
-      (=ucs		  . #x266A)	; ♪
-      ))
     (=jis-x0208@1983	. #x2276)	; &J90-2276; [02-86]
     (=ks-x1001		. #x225C)	; &I-K0-225C; [02-60]
     (=jis-x0208@1990	. #x2276)	; &I-J90-2276; [02-86]
     (=ucs@jis		. #x266A)	; &J90-2276;
     (=ucs@ks		. #x266A)	; &J90-2276;
+    (<-fullwidth
+     ((name		  . "EIGHTH NOTE")
+      (=ucs		  . #x266A)	; ♪
+      ))
     ))
 (define-char
   '((name		. "BEAMED EIGHTH NOTES")
@@ -1081,12 +1081,12 @@
      ((name		  . "BEAMED EIGHTH NOTES")
       (=ucs		  . #x266B)	; ♫
       ))
+    (=jis-x0213-1-2000	. #x227B)	; &JX1-227B; [02-91]
+    (=ucs@jis		. #x266B)	; &JX1-227B;
     (<-fullwidth
      ((name		  . "BEAMED EIGHTH NOTES")
       (=ucs		  . #x266B)	; ♫
       ))
-    (=jis-x0213-1-2000	. #x227B)	; &JX1-227B; [02-91]
-    (=ucs@jis		. #x266B)	; &JX1-227B;
     ))
 (define-char
   '((name		. "BEAMED SIXTEENTH NOTES")
@@ -1100,14 +1100,14 @@
      ((name		  . "BEAMED SIXTEENTH NOTES")
       (=ucs		  . #x266C)	; ♬
       ))
-    (<-fullwidth
-     ((name		  . "BEAMED SIXTEENTH NOTES")
-      (=ucs		  . #x266C)	; ♬
-      ))
     (=ks-x1001		. #x225D)	; &JX1-227C; [02-61]
     (=jis-x0213-1-2000	. #x227C)	; &I-JX1-227C; [02-92]
     (=ucs@jis		. #x266C)	; &JX1-227C;
     (=ucs@ks		. #x266C)	; &JX1-227C;
+    (<-fullwidth
+     ((name		  . "BEAMED SIXTEENTH NOTES")
+      (=ucs		  . #x266C)	; ♬
+      ))
     ))
 (define-char
   '((name		. "MUSIC FLAT SIGN")
@@ -1121,15 +1121,15 @@
      ((name		  . "MUSIC FLAT SIGN")
       (=ucs		  . #x266D)	; ♭
       ))
-    (<-fullwidth
-     ((name		  . "MUSIC FLAT SIGN")
-      (=ucs		  . #x266D)	; ♭
-      ))
     (=jis-x0208@1983	. #x2275)	; &J90-2275; [02-85]
     (=ks-x1001		. #x225A)	; &I-K0-225A; [02-58]
     (=jis-x0208@1990	. #x2275)	; &I-J90-2275; [02-85]
     (=ucs@jis		. #x266D)	; &J90-2275;
     (=ucs@ks		. #x266D)	; &J90-2275;
+    (<-fullwidth
+     ((name		  . "MUSIC FLAT SIGN")
+      (=ucs		  . #x266D)	; ♭
+      ))
     ))
 (define-char
   '((name		. "MUSIC NATURAL SIGN")
@@ -1143,12 +1143,12 @@
      ((name		  . "MUSIC NATURAL SIGN")
       (=ucs		  . #x266E)	; ♮
       ))
+    (=jis-x0213-1-2000	. #x227A)	; &JX1-227A; [02-90]
+    (=ucs@jis		. #x266E)	; &JX1-227A;
     (<-fullwidth
      ((name		  . "MUSIC NATURAL SIGN")
       (=ucs		  . #x266E)	; ♮
       ))
-    (=jis-x0213-1-2000	. #x227A)	; &JX1-227A; [02-90]
-    (=ucs@jis		. #x266E)	; &JX1-227A;
     ))
 (define-char
   '((name		. "MUSIC SHARP SIGN")
@@ -1162,13 +1162,13 @@
      ((name		  . "MUSIC SHARP SIGN")
       (=ucs		  . #x266F)	; ♯
       ))
+    (=jis-x0208@1983	. #x2274)	; &J90-2274; [02-84]
+    (=jis-x0208@1990	. #x2274)	; &I-J90-2274; [02-84]
+    (=ucs@jis		. #x266F)	; &J90-2274;
     (<-fullwidth
      ((name		  . "MUSIC SHARP SIGN")
       (=ucs		  . #x266F)	; ♯
       ))
-    (=jis-x0208@1983	. #x2274)	; &J90-2274; [02-84]
-    (=jis-x0208@1990	. #x2274)	; &I-J90-2274; [02-84]
-    (=ucs@jis		. #x266F)	; &J90-2274;
     ))
 (define-char
   '((name		. "WEST SYRIAC CROSS")
diff --git a/lisp/utf-2000/u02700-Dingbats.el b/lisp/utf-2000/u02700-Dingbats.el
index 73de285..1175b35 100644
--- a/lisp/utf-2000/u02700-Dingbats.el
+++ b/lisp/utf-2000/u02700-Dingbats.el
@@ -116,12 +116,12 @@
      ((name		  . "CHECK MARK")
       (=ucs		  . #x2713)	; ✓
       ))
+    (=jis-x0213-1-2000	. #x277B)	; &JX1-277B; [07-91]
+    (=ucs@jis		. #x2713)	; &JX1-277B;
     (<-fullwidth
      ((name		  . "CHECK MARK")
       (=ucs		  . #x2713)	; ✓
       ))
-    (=jis-x0213-1-2000	. #x277B)	; &JX1-277B; [07-91]
-    (=ucs@jis		. #x2713)	; &JX1-277B;
     ))
 (define-char
   '((name		. "HEAVY CHECK MARK")
@@ -415,12 +415,12 @@
      ((name		  . "HEAVY TEARDROP-SPOKED ASTERISK")
       (=ucs		  . #x273D)	; ✽
       ))
+    (=big5-eten		. #xC6E6)	; &B-C6E6;
+    (=ucs@big5		. #x273D)	; &B-C6E6;
     (<-fullwidth
      ((name		  . "HEAVY TEARDROP-SPOKED ASTERISK")
       (=ucs		  . #x273D)	; ✽
       ))
-    (=big5-eten		. #xC6E6)	; &B-C6E6;
-    (=ucs@big5		. #x273D)	; &B-C6E6;
     ))
 (define-char
   '((name		. "SIX PETALLED BLACK AND WHITE FLORETTE")
@@ -567,12 +567,12 @@
      ((name		  . "BLACK DIAMOND MINUS WHITE X")
       (=ucs		  . #x2756)	; ❖
       ))
+    (=jis-x0213-1-2000	. #x2D7D)	; &JX1-2D7D; [13-93]
+    (=ucs@jis		. #x2756)	; &JX1-2D7D;
     (<-fullwidth
      ((name		  . "BLACK DIAMOND MINUS WHITE X")
       (=ucs		  . #x2756)	; ❖
       ))
-    (=jis-x0213-1-2000	. #x2D7D)	; &JX1-2D7D; [13-93]
-    (=ucs@jis		. #x2756)	; &JX1-2D7D;
     ))
 (define-char
   '((name		. "LIGHT VERTICAL BAR")
diff --git a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el
index 90b062d..c4aa09c 100644
--- a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el
+++ b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el
@@ -4,30 +4,30 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E80)	; ⺀
     (<-formed@component
      ((=ucs		  . #x20120)	; 𠄠
       ))
-    (=ucs		. #x2E80)	; ⺀
     ))
 (define-char
   '((name		. "CJK RADICAL CLIFF")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E81)	; ⺁
     (<-formed@component
      ((=ucs		  . #x5382)	; 厂
       ))
-    (=ucs		. #x2E81)	; ⺁
     ))
 (define-char
   '((name		. "CJK RADICAL SECOND ONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E82)	; ⺂
     (<-unknown
      ((=ucs		  . #x4E5B)	; 乛
       ))
-    (=ucs		. #x2E82)	; ⺂
     ))
 (define-char
   '((name		. "CJK RADICAL SECOND TWO")
@@ -67,10 +67,10 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (total-strokes	 . 2)
+    (=ucs		. #x2E85)	; ⺅
     (<-identical@component/connect-right
      ((=ucs		  . #x4EBB)	; 亻
       ))
-    (=ucs		. #x2E85)	; ⺅
     ))
 (define-char
   '((<-denotational
@@ -81,10 +81,10 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (total-strokes	 . 2)
+    (=ucs		. #x2E86)	; ⺆
     (<-identical@component
      ((=ucs		  . #x5182)	; 冂
       ))
-    (=ucs		. #x2E86)	; ⺆
     ))
 (define-char
   '((=>ucs		. #x2E86)	; ⺆
@@ -102,26 +102,26 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (total-strokes	 . 2)
-    (<-identical@component
-     ((=ucs		  . #x51E0)	; 几
-      ))
     (=ucs		. #x2E87)	; ⺇
     (=big5-cdp		. #x8D66)	; &I-CDP-8D66;
     (=gt		. 02284)	; &I-GT-02284;
     (=gt-k		. 00086)	; &I-GT-K00086;
     (=gt-pj-9		. #x505D)	; &I-GT-02284; [48-61]
+    (<-identical@component
+     ((=ucs		  . #x51E0)	; 几
+      ))
     ))
 (define-char
   '((name		. "CJK RADICAL KNIFE ONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-formed@component/connect-below
-     ((=ucs		  . #x5200)	; 刀
-      ))
     (=ucs		. #x2E88)	; ⺈
     (=gt-k		. 00091)	; &I-GT-K00091;
     (=gt-pj-k1		. #x3234)	; ⺈ [18-20]
+    (<-formed@component/connect-below
+     ((=ucs		  . #x5200)	; 刀
+      ))
     ))
 (define-char
   '((<-denotational
@@ -131,10 +131,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E89)	; ⺉
     (<-identical@component/connect-left
      ((=ucs		  . #x5202)	; 刂
       ))
-    (=ucs		. #x2E89)	; ⺉
     ))
 (define-char
   '((name		. "CJK RADICAL DIVINATION")
@@ -142,13 +142,13 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (total-strokes	 . 2)
-    (<-formed@component
-     ((=ucs		  . #x535C)	; 卜
-      ))
     (=ucs		. #x2E8A)	; ⺊
     (=big5-cdp		. #x8B78)	; &I-CDP-8B78;
     (=gt-k		. 00062)	; &I-GT-K00062;
     (=gt-pj-k1		. #x3D4D)	; ⺊ [29-45]
+    (<-formed@component
+     ((=ucs		  . #x535C)	; 卜
+      ))
     ))
 (define-char
   '((<-denotational
@@ -158,46 +158,46 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E8B)	; ⺋
     (<-formed@component/connect-above
      ((=ucs		  . #x5369)	; 卩
       ))
     (<-identical@component/connect-above
      ((=ucs		  . #x353E)	; 㔾
       ))
-    (=ucs		. #x2E8B)	; ⺋
     ))
 (define-char
   '((name		. "CJK RADICAL SMALL ONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-formed@component/connect-below
-     ((=ucs		  . #x5C0F)	; 小
-      ))
     (=ucs		. #x2E8C)	; ⺌
     (=big5-cdp		. #x8B54)	; &I-CDP-8B54;
     (=gt-k		. 00303)	; &I-GT-K00303;
     (=gt-pj-k1		. #x3233)	; ⺌ [18-19]
+    (<-formed@component/connect-below
+     ((=ucs		  . #x5C0F)	; 小
+      ))
     ))
 (define-char
   '((=>ucs		. #x2E8C)	; ⺌
+    (=gt-k		. 00305)	; &GT-K00305;
+    (=gt-pj-k1		. #x324E)	; &GT-K00305; [18-46]
     (<-formed@component/connect-below
      ((=ucs		  . #x5C0F)	; 小
       ))
-    (=gt-k		. 00305)	; &GT-K00305;
-    (=gt-pj-k1		. #x324E)	; &GT-K00305; [18-46]
     ))
 (define-char
   '((name		. "CJK RADICAL SMALL TWO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-formed@component/connect-below
-     ((=ucs		  . #x5C0F)	; 小
-      ))
     (=ucs		. #x2E8D)	; ⺍
     (=gt-k		. 00325)	; &I-GT-K00325;
     (=gt-pj-k1		. #x3251)	; ⺍ [18-49]
+    (<-formed@component/connect-below
+     ((=ucs		  . #x5C0F)	; 小
+      ))
     ))
 (define-char
   '((<-denotational
@@ -207,13 +207,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E8E)	; ⺎
     (<-formed@component
      ((=ucs		  . #x5C22)	; å°¢
       ))
     (<-identical@component
      ((=daikanwa	  . 07542)	; &M-07542;
       ))
-    (=ucs		. #x2E8E)	; ⺎
     ))
 (define-char
   '((<-denotational
@@ -223,10 +223,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E8F)	; ⺏
     (<-identical@component
      ((=ucs		  . #x5C23)	; å°£
       ))
-    (=ucs		. #x2E8F)	; ⺏
     ))
 (define-char
   '((<-denotational
@@ -236,10 +236,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E90)	; ⺐
     (<-identical@component
      ((=ucs		  . #x5C22)	; å°¢
       ))
-    (=ucs		. #x2E90)	; ⺐
     ))
 (define-char
   '((<-denotational
@@ -249,10 +249,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E91)	; ⺑
     (<-identical@component
      ((=daikanwa	  . 07541)	; &M-07541;
       ))
-    (=ucs		. #x2E91)	; ⺑
     ))
 (define-char
   '((<-denotational
@@ -262,10 +262,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E92)	; ⺒
     (<-identical@component
      ((=ucs		  . #x5DF3)	; å·³
       ))
-    (=ucs		. #x2E92)	; ⺒
     ))
 (define-char
   '((<-denotational
@@ -275,10 +275,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E93)	; ⺓
     (<-identical@component
      ((=ucs		  . #x5E7A)	; 幺
       ))
-    (=ucs		. #x2E93)	; ⺓
     ))
 (define-char
   '((<-denotational
@@ -288,13 +288,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E94)	; ⺔
     (<-formed@component
      ((=ucs		  . #x5F50)	; 彐
       ))
     (<-identical@component
      ((=ucs		  . #x5F51)	; 彑
       ))
-    (=ucs		. #x2E94)	; ⺔
     ))
 (define-char
   '((<-denotational
@@ -339,10 +339,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E96)	; ⺖
     (<-identical@component/connect-right
      ((=ucs		  . #x5FC4)	; 忄
       ))
-    (=ucs		. #x2E96)	; ⺖
     ))
 (define-char
   '((<-denotational
@@ -352,10 +352,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E97)	; ⺗
     (<-identical@component/connect-above
      ((=jis-x0213-2-2000  . #x2C3B)	; &JX2-2C3B; [12-27]
       ))
-    (=ucs		. #x2E97)	; ⺗
     ))
 (define-char
   '((<-denotational
@@ -365,10 +365,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E98)	; ⺘
     (<-identical@component/connect-right
      ((=ucs		  . #x624C)	; 扌
       ))
-    (=ucs		. #x2E98)	; ⺘
     ))
 (define-char
   '((<-denotational
@@ -378,10 +378,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E99)	; ⺙
     (<-identical@component/connect-left
      ((=ucs		  . #x6535)	; 攵
       ))
-    (=ucs		. #x2E99)	; ⺙
     ))
 (define-char
   '((<-denotational
@@ -391,10 +391,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E9B)	; ⺛
     (<-identical@component
      ((=ucs		  . #x65E1)	; 旡
       ))
-    (=ucs		. #x2E9B)	; ⺛
     ))
 (define-char
   '((<-denotational
@@ -405,13 +405,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E9C)	; ⺜
+    (=gt-k		. 00565)	; &I-GT-K00565;
+    (=gt-pj-k1		. #x3229)	; ⺜ [18-09]
     (<-identical@component/connect-below
      ((name*		  . "ideographic component hood")
       (=big5-cdp	  . #x8A78)	; &CDP-8A78;
       ))
-    (=ucs		. #x2E9C)	; ⺜
-    (=gt-k		. 00565)	; &I-GT-K00565;
-    (=gt-pj-k1		. #x3229)	; ⺜ [18-09]
     ))
 (define-char
   '((<-denotational
@@ -422,11 +422,11 @@
     (ideographic-radical . 13)	; ⼌
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (=big5-cdp		. #x8A78)	; &CDP-8A78;
+    (mojikyo		. 070546)	; &MCS-60011392;
     (<-same@component/connect-below
      ((=ucs		  . #x5183)	; 冃
       ))
-    (=big5-cdp		. #x8A78)	; &CDP-8A78;
-    (mojikyo		. 070546)	; &MCS-60011392;
     ))
 (define-char
   '((<-denotational
@@ -436,10 +436,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E9D)	; ⺝
     (<-identical@component
      ((=ucs		  . #x6708)	; 月
       ))
-    (=ucs		. #x2E9D)	; ⺝
     ))
 (define-char
   '((<-denotational
@@ -449,10 +449,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E9E)	; ⺞
     (<-identical@component
      ((=ucs		  . #x6B7A)	; æ­º
       ))
-    (=ucs		. #x2E9E)	; ⺞
     ))
 (define-char
   '((<-denotational
@@ -462,13 +462,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2E9F)	; ⺟
     (<-compat
      ((=ucs		  . #x6BCD)	; 母
       ))
     (<-identical@component
      ((=ucs		  . #x6BCD)	; 母
       ))
-    (=ucs		. #x2E9F)	; ⺟
     ))
 (define-char
   '((<-denotational
@@ -478,10 +478,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA0)	; ⺠
     (<-identical@component
      ((=ucs		  . #x6C11)	; 民
       ))
-    (=ucs		. #x2EA0)	; ⺠
     ))
 (define-char
   '((<-denotational
@@ -491,10 +491,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA1)	; ⺡
     (<-identical@component/connect-right
      ((=ucs		  . #x6C35)	; æ°µ
       ))
-    (=ucs		. #x2EA1)	; ⺡
     ))
 (define-char
   '((<-denotational
@@ -504,11 +504,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA2)	; ⺢
+    (=big5-cdp		. #x8C43)	; &I-CDP-8C43;
     (<-identical@component
      ((=ucs		  . #x6C3A)	; æ°º
       ))
-    (=ucs		. #x2EA2)	; ⺢
-    (=big5-cdp		. #x8C43)	; &I-CDP-8C43;
     ))
 (define-char
   '((<-denotational
@@ -518,10 +518,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA3)	; ⺣
     (<-identical@component/connect-above
      ((=ucs		  . #x706C)	; 灬
       ))
-    (=ucs		. #x2EA3)	; ⺣
     ))
 (define-char
   '((<-denotational
@@ -532,11 +532,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA4)	; ⺤
     (<-identical@component/connect-below
      ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA49")
       (=ucs		  . #xFA49)	; 爫
       ))
-    (=ucs		. #x2EA4)	; ⺤
     ))
 (define-char
   '((<-denotational
@@ -546,31 +546,31 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA5)	; ⺥
     (<-identical@component/connect-below
      ((=ucs		  . #x722A)	; 爪
       ))
-    (=ucs		. #x2EA5)	; ⺥
     ))
 (define-char
   '((name		. "CJK RADICAL SIMPLIFIED HALF TREE TRUNK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA6)	; ⺦
     (<-same@component
      ((=ucs		  . #x723F)	; 爿
       ))
-    (=ucs		. #x2EA6)	; ⺦
     ))
 (define-char
   '((name		. "CJK RADICAL COW")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA7)	; ⺧
+    (=big5-cdp		. #x8B66)	; &I-CDP-8B66;
     (<-formed@component
      ((=ucs		  . #x725B)	; 牛
       ))
-    (=ucs		. #x2EA7)	; ⺧
-    (=big5-cdp		. #x8B66)	; &I-CDP-8B66;
     ))
 (define-char
   '((<-denotational
@@ -580,11 +580,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA8)	; ⺨
+    (=big5-cdp		. #x8BAF)	; &I-CDP-8BAF;
     (<-identical@component
      ((=ucs		  . #x72AD)	; 犭
       ))
-    (=ucs		. #x2EA8)	; ⺨
-    (=big5-cdp		. #x8BAF)	; &I-CDP-8BAF;
     ))
 (define-char
   '((<-denotational
@@ -594,6 +594,9 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EA9)	; ⺩
+    (=gt-k		. 00402)	; &I-GT-K00402;
+    (=gt-pj-k1		. #x3467)	; ⺩ [20-71]
     (<-formed@component/connect-right
      ((=ucs		  . #x738B)	; 王
       )
@@ -602,26 +605,23 @@
     (<-identical@component/connect-right
      ((=ucs		  . #x248E9)	; 𤣩
       ))
-    (=ucs		. #x2EA9)	; ⺩
-    (=gt-k		. 00402)	; &I-GT-K00402;
-    (=gt-pj-k1		. #x3467)	; ⺩ [20-71]
     ))
 (define-char
   '((name		. "CJK RADICAL BOLT OF CLOTH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EAA)	; ⺪
     (<-formed@component/connect-right
      ((=ucs		  . #x758B)	; 疋
       ))
-    (=ucs		. #x2EAA)	; ⺪
     ))
 (define-char
   '((=>ucs		. #x2EAA)	; ⺪
+    (=big5-cdp		. #x8DC5)	; &CDP-8DC5;
     (<-formed@component
      ((=ucs		  . #x758B)	; 疋
       ))
-    (=big5-cdp		. #x8DC5)	; &CDP-8DC5;
     ))
 (define-char
   '((<-denotational
@@ -631,26 +631,26 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EAB)	; ⺫
     (<-formed@component/connect-below
      ((=ucs		  . #x76EE)	; 目
       ))
     (<-identical@component/connect-below
      ((=big5-cdp	  . #x8B48)	; &GT-36329;
       ))
-    (=ucs		. #x2EAB)	; ⺫
     ))
 (define-char
   '((=>ucs		. #x2EAB)	; ⺫
     (ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 0)
     (total-strokes	 . 5)
-    (<-formed@component
-     ((=ucs		  . #x76EE)	; 目
-      ))
     (=big5-cdp		. #x8B48)	; &GT-36329;
     (=gt		. 36329)	; &I-GT-36329;
     (=gt-k		. 01549)	; &I-GT-K01549;
     (=gt-pj-5		. #x7264)	; &I-GT-36329; [82-68]
+    (<-formed@component
+     ((=ucs		  . #x76EE)	; 目
+      ))
     ))
 (define-char
   '((<-denotational
@@ -660,10 +660,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EAC)	; ⺬
     (<-identical@component/connect-right
      ((=ucs		  . #x793A)	; 示
       ))
-    (=ucs		. #x2EAC)	; ⺬
     ))
 (define-char
   '((<-denotational
@@ -673,23 +673,23 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EAD)	; ⺭
     (<-identical@component/connect-right
      ((=ucs		  . #x793B)	; 礻
       ))
-    (=ucs		. #x2EAD)	; ⺭
     ))
 (define-char
   '((name		. "CJK RADICAL BAMBOO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-formed@component/connect-below
-     ((=ucs		  . #x7AF9)	; 竹
-      ))
     (=ucs		. #x2EAE)	; ⺮
     (=big5-cdp		. #x8B4C)	; &I-CDP-8B4C;
     (=gt-k		. 02267)	; &I-GT-K02267;
     (=gt-pj-k1		. #x324D)	; ⺮ [18-45]
+    (<-formed@component/connect-below
+     ((=ucs		  . #x7AF9)	; 竹
+      ))
     ))
 (define-char
   '((<-denotational
@@ -699,13 +699,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EAF)	; ⺯
     (<-formed@component/connect-right
      ((=ucs		  . #x7CF8)	; 糸
       ))
     (<-identical@component/connect-right
      ((=ucs		  . #x7CF9)	; ç³¹
       ))
-    (=ucs		. #x2EAF)	; ⺯
     ))
 (define-char
   '((<-denotational
@@ -715,6 +715,7 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EB0)	; ⺰
     (<-identical@component/connect-right
      ((=ucs		  . #x7E9F)	; 纟
       ))
@@ -725,7 +726,6 @@
     (<-simplified@CN/component/connect-right
      ((=ucs		  . #x7CF8)	; 糸
       ))
-    (=ucs		. #x2EB0)	; ⺰
     ))
 (define-char
   '((<-denotational
@@ -738,11 +738,11 @@
     (ideographic-radical . 122)	; â½¹
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=ucs		. #x2EB1)	; ⺱
+    (=ucs@unicode	. #x7F53)	; ⺱
     (<-identical@component/connect-below
      ((=ucs		  . #x7F53)	; 罓
       ))
-    (=ucs		. #x2EB1)	; ⺱
-    (=ucs@unicode	. #x7F53)	; ⺱
     ))
 (define-char
   '((<-denotational
@@ -752,10 +752,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EB2)	; ⺲
     (<-identical@component/connect-below
      ((=ucs		  . #x7F52)	; 罒
       ))
-    (=ucs		. #x2EB2)	; ⺲
     ))
 (define-char
   '((<-denotational
@@ -765,13 +765,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EB3)	; ⺳
     (<-formed@component/connect-below
      ((=ucs		  . #x7F51)	; 网
       ))
     (<-same@component/connect-below
      ((=ucs		  . #x2626A)	; 𦉪
       ))
-    (=ucs		. #x2EB3)	; ⺳
     ))
 (define-char
   '((<-denotational
@@ -781,6 +781,7 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EB4)	; ⺴
     (<-formed@component
      ((=ucs		  . #x7F51)	; 网
       ))
@@ -789,7 +790,6 @@
       )
      ((=ucs		  . #x34C1)	; 㓁
       ))
-    (=ucs		. #x2EB4)	; ⺴
     ))
 (define-char
   '((<-denotational
@@ -799,54 +799,57 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EB5)	; ⺵
     (<-formed@component/connect-below
      ((=ucs		  . #x7F51)	; 网
       ))
     (<-same@component
      ((=ucs		  . #x2626B)	; 𦉫
       ))
-    (=ucs		. #x2EB5)	; ⺵
     ))
 (define-char
   '((name		. "CJK RADICAL SHEEP")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (ideographic-radical . 123)	; ⽺
+    (ideographic-strokes . 0)
+    (total-strokes	 . 6)
+    (=ucs		. #x2EB6)	; ⺶
     (<-formed@component
      ((=ucs		  . #x7F8A)	; 羊
       ))
-    (=ucs		. #x2EB6)	; ⺶
     ))
 (define-char
   '((=>ucs		. #x2EB6)	; ⺶
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
+    (=gt-k		. 01701)	; &GT-K01701;
+    (=gt-pj-k1		. #x3443)	; &GT-K01701; [20-35]
     (<-formed@component/connect-right
      ((=ucs		  . #x7F8A)	; 羊
       ))
-    (=gt-k		. 01701)	; &GT-K01701;
-    (=gt-pj-k1		. #x3443)	; &GT-K01701; [20-35]
     ))
 (define-char
   '((=>ucs		. #x2EB6)	; ⺶
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
+    (=big5-cdp		. #x8970)	; &CDP-8970;
     (<-formed@component
      ((=ucs		  . #x7F8A)	; 羊
       ))
-    (=big5-cdp		. #x8970)	; &CDP-8970;
     ))
 (define-char
   '((=>ucs		. #x2EB6)	; ⺶
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
+    (=big5-cdp		. #x8CCC)	; &CDP-8CCC;
     (<-formed@component
      ((=ucs		  . #x7F8A)	; 羊
       ))
-    (=big5-cdp		. #x8CCC)	; &CDP-8CCC;
     ))
 (define-char
   '((name		. "CJK RADICAL RAM")
@@ -856,14 +859,14 @@
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
+    (=ucs		. #x2EB7)	; ⺷
+    (=big5-cdp		. #x8B4E)	; &I-CDP-8B4E;
     (<-formed@component/connect-below
      ((=ucs		  . #x7F8A)	; 羊
       ))
     (<-s/male
      ((=ucs		  . #x7F8A)	; 羊
       ))
-    (=ucs		. #x2EB7)	; ⺷
-    (=big5-cdp		. #x8B4E)	; &I-CDP-8B4E;
     (->mistakable
      ((=ucs		  . #x2634C)	; 𦍌
       ))
@@ -877,9 +880,6 @@
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
-    (<-s/female
-     ((=ucs		  . #x7F8A)	; 羊
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -891,6 +891,9 @@
       ))
     (=ucs		. #x2EB8)	; ⺸
     (=cbeta		. 06151)	; &I-CB06151;
+    (<-s/female
+     ((=ucs		  . #x7F8A)	; 羊
+      ))
     (->mistakable
      ((=ucs		  . #x8289)	; 芉
       ))
@@ -903,10 +906,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EB9)	; ⺹
     (<-identical@component
      ((=ucs		  . #x8002)	; 耂
       ))
-    (=ucs		. #x2EB9)	; ⺹
     ))
 (define-char
   '((<-denotational
@@ -916,23 +919,23 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EBA)	; ⺺
     (<-formed@component
      ((=ucs		  . #x807F)	; 聿
       ))
     (<-identical@component
      ((=ucs		  . #x8080)	; 肀
       ))
-    (=ucs		. #x2EBA)	; ⺺
     ))
 (define-char
   '((name		. "CJK RADICAL BRUSH TWO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EBB)	; ⺻
     (<-formed@component
      ((=ucs		  . #x807F)	; 聿
       ))
-    (=ucs		. #x2EBB)	; ⺻
     ))
 (define-char
   '((name		. "CJK RADICAL MEAT")
@@ -942,31 +945,31 @@
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=ucs		. #x2EBC)	; ⺼
     (<-formed@component/connect-right
      ((=ucs		  . #x8089)	; 肉
       ))
-    (=ucs		. #x2EBC)	; ⺼
     (->subsumptive
-     ((<-formed@component/connect-right
+     ((=gt		  . 37857)	; &GT-37857;
+      (=gt-pj-6		  . #x3879)	; &GT-37857; [24-89]
+      (=daikanwa	  . 29237)	; &I-M-29237;
+      (<-formed@component/connect-right
        ((=ucs		    . #x8089)	; 肉
 	(=daikanwa	    . 29236)	; &I-M-29236;
 	))
       (<-formed@component/connect-right*sources
        zihui/char-index zhengzitong daikanwa)
-      (=gt		  . 37857)	; &GT-37857;
-      (=gt-pj-6		  . #x3879)	; &GT-37857; [24-89]
-      (=daikanwa	  . 29237)	; &I-M-29237;
       )
      ((=ucs@unicode	  . #x2EBC)	; &UU+2EBC;
       )
      ((=big5-cdp	  . #x8A73)	; &CDP-8A73;
       )
-     ((<-formed@component/connect-above
-       ((=ucs		    . #x8089)	; 肉
-	))
-      (=big5-cdp	  . #x8958)	; &CDP-8958;
+     ((=big5-cdp	  . #x8958)	; &CDP-8958;
       (=gt-k		  . 00417)	; &I-GT-K00417;
       (=gt-pj-k1	  . #x377D)	; &CDP-8958; [23-93]
+      (<-formed@component/connect-above
+       ((=ucs		    . #x8089)	; 肉
+	))
       ))
     ))
 (define-char
@@ -977,20 +980,20 @@
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=big5-cdp		. #x88F0)	; &CDP-88F0;
     (<-formed@component
      ((=ucs		  . #x8089)	; 肉
       ))
-    (=big5-cdp		. #x88F0)	; &CDP-88F0;
     ))
 (define-char
   '((name		. "CJK RADICAL MORTAR")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EBD)	; ⺽
     (<-identical@component
      ((=ucs		  . #x26951)	; 𦥑
       ))
-    (=ucs		. #x2EBD)	; ⺽
     ))
 (define-char
   '((<-denotational
@@ -1022,11 +1025,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EBF)	; ⺿
     (<-identical@component
      ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA5E")
       (=ucs		  . #xFA5E)	; 艹
       ))
-    (=ucs		. #x2EBF)	; ⺿
     ))
 (define-char
   '((<-denotational
@@ -1037,11 +1040,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC0)	; ⻀
     (<-identical@component
      ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA5D")
       (=ucs		  . #xFA5D)	; 艹
       ))
-    (=ucs		. #x2EC0)	; ⻀
     ))
 (define-char
   '((<-denotational
@@ -1051,10 +1054,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC1)	; ⻁
     (<-identical@component
      ((=ucs		  . #x864E)	; 虎
       ))
-    (=ucs		. #x2EC1)	; ⻁
     ))
 (define-char
   '((<-denotational
@@ -1065,10 +1068,10 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (total-strokes	 . 5)
+    (=ucs		. #x2EC2)	; ⻂
     (<-identical@component/connect-right
      ((=ucs		  . #x8864)	; 衤
       ))
-    (=ucs		. #x2EC2)	; ⻂
     ))
 (define-char
   '((<-denotational
@@ -1078,10 +1081,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-identical@component
+    (=ucs		. #x2EC3)	; ⻃
+    (<-identical@component/connect-below
      ((=ucs		  . #x8980)	; 覀
       ))
-    (=ucs		. #x2EC3)	; ⻃
     ))
 (define-char
   '((<-denotational
@@ -1091,10 +1094,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC4)	; ⻄
     (<-identical@component
      ((=ucs		  . #x897F)	; 西
       ))
-    (=ucs		. #x2EC4)	; ⻄
     ))
 (define-char
   '((<-denotational
@@ -1104,11 +1107,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC5)	; ⻅
+    (=big5-cdp		. #x89A1)	; &I-CDP-89A1;
     (<-identical@component
      ((=ucs		  . #x89C1)	; 见
       ))
-    (=ucs		. #x2EC5)	; ⻅
-    (=big5-cdp		. #x89A1)	; &I-CDP-89A1;
     ))
 (define-char
   '((<-denotational
@@ -1118,10 +1121,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC6)	; ⻆
     (<-identical@component
      ((=ucs		  . #x89D2)	; 角
       ))
-    (=ucs		. #x2EC6)	; ⻆
     ))
 (define-char
   '((<-denotational
@@ -1131,11 +1134,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC7)	; ⻇
     (<-identical@component
      ((=gt		  . 47108)	; &GT-47108;
       (=daikanwa	  . 35005)	; &I-M-35005;
       ))
-    (=ucs		. #x2EC7)	; ⻇
     ))
 (define-char
   '((<-denotational
@@ -1145,10 +1148,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC8)	; ⻈
     (<-identical@component/connect-right
      ((=ucs		  . #x8BA0)	; è® 
       ))
-    (=ucs		. #x2EC8)	; ⻈
     ))
 (define-char
   '((<-denotational
@@ -1158,22 +1161,22 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EC9)	; ⻉
     (<-identical@component
      ((=ucs		  . #x8D1D)	; 贝
       ))
-    (=ucs		. #x2EC9)	; ⻉
     ))
 (define-char
   '((name		. "CJK RADICAL FOOT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-formed@component/connect-right
-     ((=ucs		  . #x8DB3)	; 足
-      ))
     (=ucs		. #x2ECA)	; ⻊
     (=gt-k		. 02600)	; &I-GT-K02600;
     (=gt-pj-k1		. #x3436)	; ⻊ [20-22]
+    (<-formed@component/connect-right
+     ((=ucs		  . #x8DB3)	; 足
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1183,11 +1186,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ECB)	; ⻋
+    (=big5-cdp		. #x8967)	; &I-CDP-8967;
     (<-identical@component
      ((=ucs		  . #x8F66)	; 车
       ))
-    (=ucs		. #x2ECB)	; ⻋
-    (=big5-cdp		. #x8967)	; &I-CDP-8967;
     ))
 (define-char
   '((<-denotational
@@ -1197,6 +1200,8 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ECC)	; ⻌
+    (=big5-cdp		. #x8966)	; &I-CDP-8966;
     (<-identical@component
      ((=ucs		  . #xFA66)	; 辶
       ))
@@ -1204,8 +1209,6 @@
      ((name		  . "CJK RADICAL WALK ONE")
       (=ucs		  . #x2ECD)	; ⻍
       ))
-    (=ucs		. #x2ECC)	; ⻌
-    (=big5-cdp		. #x8966)	; &I-CDP-8966;
     ))
 (define-char
   '((<-denotational
@@ -1218,12 +1221,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-formed@component
-     ((=ucs		  . #x8FB5)	; è¾µ
-      (=daikanwa	  . 38700)	; &I-M-38700;
-      ))
-    (<-formed@component*sources
-     zihui-jianzi daikanwa)
     (=ucs		. #x2ECD)	; ⻍
     (=jis-x0212		. #x6134)	; &I-JSP-6134; [65-20]
     (=jis-x0213-2-2000	. #x796A)	; &I-JX2-796A; [89-74]
@@ -1232,6 +1229,12 @@
     (=gt-pj-7		. #x5530)	; &I-GT-51643; [53-16]
     (=daikanwa		. 38702)	; &I-M-38702;
     (=ucs@jis		. #x8FB6)	; ⻍
+    (<-formed@component
+     ((=ucs		  . #x8FB5)	; è¾µ
+      (=daikanwa	  . 38700)	; &I-M-38700;
+      ))
+    (<-formed@component*sources
+     zihui-jianzi daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -1244,14 +1247,14 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-simplified@component
-     ((name		  . "CJK RADICAL WALK ONE")
-      (=ucs		  . #x2ECD)	; ⻍
-      ))
     (=ucs		. #x2ECE)	; ⻎
     (=cns11643-4	. #x2154)	; &I-C4-2154; [01-52]
     (=big5-cdp		. #x8AF7)	; &I-CDP-8AF7;
     (=ucs@cns		. #x8FB6)	; ⻎
+    (<-simplified@component
+     ((name		  . "CJK RADICAL WALK ONE")
+      (=ucs		  . #x2ECD)	; ⻍
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1264,13 +1267,13 @@
     (ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
+    (=ucs		. #x2ECF)	; ⻏
     (<-formed@component/connect-left
      ((=ucs		  . #x9091)	; 邑
       ))
     (<-identical@component/connect-left
      ((=ucs		  . #x961D)	; 阝
       ))
-    (=ucs		. #x2ECF)	; ⻏
     ))
 (define-char
   '((<-denotational
@@ -1280,6 +1283,7 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED0)	; ⻐
     (<-identical@component/connect-right
      ((=ucs		  . #x9485)	; 钅
       ))
@@ -1287,7 +1291,6 @@
      ((=ucs		  . #x91D1)	; 金
       (=gb2312		  . #x3D70)	; &I-G0-3D70; [29-80]
       ))
-    (=ucs		. #x2ED0)	; ⻐
     ))
 (define-char
   '((<-denotational
@@ -1297,10 +1300,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED1)	; ⻑
     (<-identical@component
      ((=ucs		  . #x9577)	; 長
       ))
-    (=ucs		. #x2ED1)	; ⻑
     ))
 (define-char
   '((<-denotational
@@ -1310,13 +1313,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED2)	; ⻒
     (<-formed@component
      ((=ucs		  . #x9577)	; 長
       ))
     (<-identical@component
      ((=ucs		  . #x9578)	; 镸
       ))
-    (=ucs		. #x2ED2)	; ⻒
     ))
 (define-char
   '((<-denotational
@@ -1326,10 +1329,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED3)	; ⻓
     (<-identical@component
      ((=ucs		  . #x957F)	; 长
       ))
-    (=ucs		. #x2ED3)	; ⻓
     ))
 (define-char
   '((<-denotational
@@ -1339,23 +1342,23 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED4)	; ⻔
     (<-identical@component
      ((=ucs		  . #x95E8)	; 门
       ))
-    (=ucs		. #x2ED4)	; ⻔
     ))
 (define-char
   '((<-denotational
-     ((=daikanwa	  . 41535)	; &I-M-41535;
+     ((=ucs		  . #x28E0F)	; 𨸏
       ))
     (name		. "CJK RADICAL MOUND ONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED5)	; ⻕
     (<-identical@component
-     ((=daikanwa	  . 41535)	; &I-M-41535;
+     ((=ucs		  . #x28E0F)	; 𨸏
       ))
-    (=ucs		. #x2ED5)	; ⻕
     ))
 (define-char
   '((<-denotational
@@ -1368,16 +1371,16 @@
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
+    (=ucs		. #x2ED6)	; ⻖
+    (=gb2312		. #x5A62)	; &I-G0-5A62; [58-66]
+    (=daikanwa		. 41536)	; &I-M-41536;
+    (=ucs@unicode	. #x961D)	; ⻖
     (<-formed@component/connect-right
      ((=ucs		  . #x961C)	; 阜
       ))
     (<-identical@component/connect-right
      ((=ucs		  . #x961D)	; 阝
       ))
-    (=ucs		. #x2ED6)	; ⻖
-    (=gb2312		. #x5A62)	; &I-G0-5A62; [58-66]
-    (=daikanwa		. 41536)	; &I-M-41536;
-    (=ucs@unicode	. #x961D)	; ⻖
     ))
 (define-char
   '((<-denotational
@@ -1387,10 +1390,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED7)	; ⻗
     (<-formed@component/connect-below
      ((=ucs		  . #x96E8)	; 雨
       ))
-    (=ucs		. #x2ED7)	; ⻗
     ))
 (define-char
   '((<-denotational
@@ -1400,13 +1403,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED8)	; ⻘
     (<-formed@component
      ((=ucs		  . #x9751)	; 靑
       ))
     (<-identical@component
      ((=ucs		  . #x9752)	; 青
       ))
-    (=ucs		. #x2ED8)	; ⻘
     ))
 (define-char
   '((<-denotational
@@ -1416,10 +1419,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2ED9)	; ⻙
     (<-identical@component
      ((=ucs		  . #x97E6)	; 韦
       ))
-    (=ucs		. #x2ED9)	; ⻙
     ))
 (define-char
   '((<-denotational
@@ -1429,10 +1432,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EDA)	; ⻚
     (<-identical@component
      ((=ucs		  . #x9875)	; 页
       ))
-    (=ucs		. #x2EDA)	; ⻚
     ))
 (define-char
   '((<-denotational
@@ -1442,10 +1445,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EDB)	; ⻛
     (<-identical@component
      ((=ucs		  . #x98CE)	; 风
       ))
-    (=ucs		. #x2EDB)	; ⻛
     ))
 (define-char
   '((<-denotational
@@ -1455,11 +1458,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EDC)	; ⻜
+    (=big5-cdp		. #x89F8)	; &I-CDP-89F8;
     (<-identical@component
      ((=ucs		  . #x98DE)	; 飞
       ))
-    (=ucs		. #x2EDC)	; ⻜
-    (=big5-cdp		. #x89F8)	; &I-CDP-89F8;
     ))
 (define-char
   '((<-denotational
@@ -1469,10 +1472,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EDD)	; ⻝
     (<-identical@component
      ((=ucs		  . #x98DF)	; 食
       ))
-    (=ucs		. #x2EDD)	; ⻝
     ))
 (define-char
   '((<-denotational
@@ -1482,13 +1485,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EDE)	; ⻞
     (<-formed@component/connect-right
      ((=ucs		  . #x98DF)	; 食
       ))
     (<-identical@component/connect-right
      ((=ucs		  . #x2967F)	; 𩙿
       ))
-    (=ucs		. #x2EDE)	; ⻞
     ))
 (define-char
   '((<-denotational
@@ -1498,10 +1501,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EDF)	; ⻟
     (<-identical@component
      ((=ucs		  . #x98E0)	; 飠
       ))
-    (=ucs		. #x2EDF)	; ⻟
     ))
 (define-char
   '((<-denotational
@@ -1511,23 +1514,23 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE0)	; â» 
     (<-identical@component
      ((=ucs		  . #x9963)	; 饣
       ))
-    (=ucs		. #x2EE0)	; â» 
     ))
 (define-char
   '((<-denotational
-     ((=daikanwa	  . 44490)	; &I-M-44490;
+     ((=ucs		  . #x29810)	; 𩠐
       ))
     (name		. "CJK RADICAL HEAD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE1)	; ⻡
     (<-identical@component
-     ((=daikanwa	  . 44490)	; &I-M-44490;
+     ((=ucs		  . #x29810)	; 𩠐
       ))
-    (=ucs		. #x2EE1)	; ⻡
     ))
 (define-char
   '((<-denotational
@@ -1537,11 +1540,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE2)	; ⻢
+    (=big5-cdp		. #x8A50)	; &I-CDP-8A50;
     (<-identical@component
      ((=ucs		  . #x9A6C)	; 马
       ))
-    (=ucs		. #x2EE2)	; ⻢
-    (=big5-cdp		. #x8A50)	; &I-CDP-8A50;
     ))
 (define-char
   '((<-denotational
@@ -1551,10 +1554,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE3)	; ⻣
     (<-identical@component
      ((=ucs		  . #x9AA8)	; 骨
       ))
-    (=ucs		. #x2EE3)	; ⻣
     ))
 (define-char
   '((<-denotational
@@ -1571,11 +1574,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE4)	; ⻤
+    (=big5-cdp		. #x8A5D)	; &I-CDP-8A5D;
     (<-identical@component
      ((=ucs		  . #x9B3C)	; 鬼
       ))
-    (=ucs		. #x2EE4)	; ⻤
-    (=big5-cdp		. #x8A5D)	; &I-CDP-8A5D;
     ))
 (define-char
   '((<-denotational
@@ -1585,11 +1588,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE5)	; ⻥
+    (=big5-cdp		. #x8A5B)	; &I-CDP-8A5B;
     (<-identical@component
      ((=ucs		  . #x9C7C)	; é±¼
       ))
-    (=ucs		. #x2EE5)	; ⻥
-    (=big5-cdp		. #x8A5B)	; &I-CDP-8A5B;
     ))
 (define-char
   '((<-denotational
@@ -1599,10 +1602,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE6)	; ⻦
     (<-identical@component
      ((=ucs		  . #x9E1F)	; 鸟
       ))
-    (=ucs		. #x2EE6)	; ⻦
     ))
 (define-char
   '((<-denotational
@@ -1612,10 +1615,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE7)	; ⻧
     (<-identical@component
      ((=ucs		  . #x5364)	; 卤
       ))
-    (=ucs		. #x2EE7)	; ⻧
     ))
 (define-char
   '((<-denotational
@@ -1625,10 +1628,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE8)	; ⻨
     (<-identical@component
      ((=ucs		  . #x9EA6)	; 麦
       ))
-    (=ucs		. #x2EE8)	; ⻨
     ))
 (define-char
   '((<-denotational
@@ -1638,11 +1641,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EE9)	; ⻩
+    (=big5-cdp		. #x8A5E)	; &I-CDP-8A5E;
     (<-identical@component
      ((=ucs		  . #x9EC4)	; 黄
       ))
-    (=ucs		. #x2EE9)	; ⻩
-    (=big5-cdp		. #x8A5E)	; &I-CDP-8A5E;
     ))
 (define-char
   '((<-denotational
@@ -1652,10 +1655,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EEA)	; ⻪
     (<-identical@component
      ((=ucs		  . #x9EFE)	; 黾
       ))
-    (=ucs		. #x2EEA)	; ⻪
     ))
 (define-char
   '((<-denotational
@@ -1665,10 +1668,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EEB)	; ⻫
     (<-identical@component
      ((=ucs		  . #x6589)	; 斉
       ))
-    (=ucs		. #x2EEB)	; ⻫
     ))
 (define-char
   '((<-denotational
@@ -1678,13 +1681,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EEC)	; ⻬
     (<-identical@component
      ((=ucs		  . #x9F50)	; 齐
       ))
     (<-simplified@CN/component
      ((=ucs		  . #x9F4A)	; 齊
       ))
-    (=ucs		. #x2EEC)	; ⻬
     ))
 (define-char
   '((<-denotational
@@ -1694,10 +1697,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EED)	; â»­
     (<-identical@component
      ((=ucs		  . #x6B6F)	; æ­¯
       ))
-    (=ucs		. #x2EED)	; â»­
     ))
 (define-char
   '((<-denotational
@@ -1707,10 +1710,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EEE)	; â»®
     (<-identical@component
      ((=ucs		  . #x9F7F)	; 齿
       ))
-    (=ucs		. #x2EEE)	; â»®
     ))
 (define-char
   '((<-denotational
@@ -1720,10 +1723,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EEF)	; ⻯
     (<-identical@component
      ((=ucs		  . #x7ADC)	; 竜
       ))
-    (=ucs		. #x2EEF)	; ⻯
     ))
 (define-char
   '((<-denotational
@@ -1733,10 +1736,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EF0)	; â»°
     (<-identical@component
      ((=ucs		  . #x9F99)	; 龙
       ))
-    (=ucs		. #x2EF0)	; â»°
     ))
 (define-char
   '((<-denotational
@@ -1746,10 +1749,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EF1)	; â»±
     (<-identical@component
      ((=ucs		  . #x9F9C)	; 龜
       ))
-    (=ucs		. #x2EF1)	; â»±
     ))
 (define-char
   '((<-denotational
@@ -1759,10 +1762,10 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EF2)	; ⻲
     (<-identical@component
      ((=ucs		  . #x4E80)	; 亀
       ))
-    (=ucs		. #x2EF2)	; ⻲
     ))
 (define-char
   '((<-denotational
@@ -1772,6 +1775,7 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2EF3)	; ⻳
     (<-compat
      ((=ucs		  . #x9F9F)	; 龟
       ))
@@ -1785,5 +1789,4 @@
     (<-simplified@CN/component
      ((=ucs		  . #x9F9C)	; 龜
       ))
-    (=ucs		. #x2EF3)	; ⻳
     ))
diff --git a/lisp/utf-2000/u02F00-Kangxi-Radicals.el b/lisp/utf-2000/u02F00-Kangxi-Radicals.el
index dfff086..52836d7 100644
--- a/lisp/utf-2000/u02F00-Kangxi-Radicals.el
+++ b/lisp/utf-2000/u02F00-Kangxi-Radicals.el
@@ -4,1898 +4,1898 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F00)	; ⼀
+    (=cns11643-1	. #x2721)	; &I-C1-2721; [07-01]
     (<-compat
      ((=ucs		  . #x4E00)	; 一
       ))
     (<-radical
      ((=ucs		  . #x4E00)	; 一
       ))
-    (=ucs		. #x2F00)	; ⼀
-    (=cns11643-1	. #x2721)	; &I-C1-2721; [07-01]
     ))
 (define-char
   '((name		. "KANGXI RADICAL LINE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F01)	; ⼁
+    (=cns11643-1	. #x2722)	; &I-C1-2722; [07-02]
     (<-compat
      ((=ucs		  . #x4E28)	; 丨
       ))
     (<-radical
      ((=ucs		  . #x4E28)	; 丨
       ))
-    (=ucs		. #x2F01)	; ⼁
-    (=cns11643-1	. #x2722)	; &I-C1-2722; [07-02]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DOT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F02)	; ⼂
+    (=cns11643-1	. #x2723)	; &I-C1-2723; [07-03]
+    (=big5-eten		. #xC6BF)	; &B-C6BF;
     (<-compat
      ((=ucs		  . #x4E36)	; 丶
       ))
     (<-radical
      ((=ucs		  . #x4E36)	; 丶
       ))
-    (=ucs		. #x2F02)	; ⼂
-    (=cns11643-1	. #x2723)	; &I-C1-2723; [07-03]
-    (=big5-eten		. #xC6BF)	; &B-C6BF;
     ))
 (define-char
   '((name		. "KANGXI RADICAL SLASH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F03)	; ⼃
+    (=cns11643-1	. #x2724)	; &I-C1-2724; [07-04]
+    (=big5-eten		. #xC6C0)	; &B-C6C0;
     (<-compat
      ((=ucs		  . #x4E3F)	; 丿
       ))
     (<-radical
      ((=ucs		  . #x4E3F)	; 丿
       ))
-    (=ucs		. #x2F03)	; ⼃
-    (=cns11643-1	. #x2724)	; &I-C1-2724; [07-04]
-    (=big5-eten		. #xC6C0)	; &B-C6C0;
     ))
 (define-char
   '((name		. "KANGXI RADICAL SECOND")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F04)	; ⼄
+    (=cns11643-1	. #x2725)	; &I-C1-2725; [07-05]
     (<-compat
      ((=ucs		  . #x4E59)	; 乙
       ))
     (<-radical
      ((=ucs		  . #x4E59)	; 乙
       ))
-    (=ucs		. #x2F04)	; ⼄
-    (=cns11643-1	. #x2725)	; &I-C1-2725; [07-05]
     ))
 (define-char
   '((name		. "KANGXI RADICAL HOOK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F05)	; ⼅
+    (=cns11643-1	. #x2726)	; &I-C1-2726; [07-06]
+    (=big5-eten		. #xC6C1)	; &B-C6C1;
     (<-compat
      ((=ucs		  . #x4E85)	; 亅
       ))
     (<-radical
      ((=ucs		  . #x4E85)	; 亅
       ))
-    (=ucs		. #x2F05)	; ⼅
-    (=cns11643-1	. #x2726)	; &I-C1-2726; [07-06]
-    (=big5-eten		. #xC6C1)	; &B-C6C1;
     ))
 (define-char
   '((name		. "KANGXI RADICAL TWO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F06)	; ⼆
+    (=cns11643-1	. #x2727)	; &I-C1-2727; [07-07]
     (<-compat
      ((=ucs		  . #x4E8C)	; 二
       ))
     (<-radical
      ((=ucs		  . #x4E8C)	; 二
       ))
-    (=ucs		. #x2F06)	; ⼆
-    (=cns11643-1	. #x2727)	; &I-C1-2727; [07-07]
     ))
 (define-char
   '((name		. "KANGXI RADICAL LID")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F07)	; ⼇
+    (=cns11643-1	. #x2728)	; &I-C1-2728; [07-08]
+    (=big5-eten		. #xC6C2)	; &B-C6C2;
     (<-compat
      ((=ucs		  . #x4EA0)	; 亠
       ))
     (<-radical
      ((=ucs		  . #x4EA0)	; 亠
       ))
-    (=ucs		. #x2F07)	; ⼇
-    (=cns11643-1	. #x2728)	; &I-C1-2728; [07-08]
-    (=big5-eten		. #xC6C2)	; &B-C6C2;
     ))
 (define-char
   '((name		. "KANGXI RADICAL MAN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F08)	; ⼈
+    (=cns11643-1	. #x2729)	; &I-C1-2729; [07-09]
     (<-compat
      ((=ucs		  . #x4EBA)	; 人
       ))
     (<-radical
      ((=ucs		  . #x4EBA)	; 人
       ))
-    (=ucs		. #x2F08)	; ⼈
-    (=cns11643-1	. #x2729)	; &I-C1-2729; [07-09]
     ))
 (define-char
   '((name		. "KANGXI RADICAL LEGS")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F09)	; ⼉
+    (=cns11643-1	. #x272A)	; &I-C1-272A; [07-10]
     (<-compat
      ((=ucs		  . #x513F)	; 儿
       ))
     (<-radical
      ((=ucs		  . #x513F)	; 儿
       ))
-    (=ucs		. #x2F09)	; ⼉
-    (=cns11643-1	. #x272A)	; &I-C1-272A; [07-10]
     ))
 (define-char
   '((name		. "KANGXI RADICAL ENTER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F0A)	; ⼊
+    (=cns11643-1	. #x272B)	; &I-C1-272B; [07-11]
     (<-compat
      ((=ucs		  . #x5165)	; 入
       ))
     (<-radical
      ((=ucs		  . #x5165)	; 入
       ))
-    (=ucs		. #x2F0A)	; ⼊
-    (=cns11643-1	. #x272B)	; &I-C1-272B; [07-11]
     ))
 (define-char
   '((name		. "KANGXI RADICAL EIGHT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F0B)	; ⼋
+    (=cns11643-1	. #x272C)	; &I-C1-272C; [07-12]
     (<-compat
      ((=ucs		  . #x516B)	; 八
       ))
     (<-radical
      ((=ucs		  . #x516B)	; 八
       ))
-    (=ucs		. #x2F0B)	; ⼋
-    (=cns11643-1	. #x272C)	; &I-C1-272C; [07-12]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DOWN BOX")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F0C)	; ⼌
+    (=cns11643-1	. #x272D)	; &I-C1-272D; [07-13]
+    (=big5-eten		. #xC6C3)	; &B-C6C3;
     (<-compat
      ((=ucs		  . #x5182)	; 冂
       ))
     (<-radical
      ((=ucs		  . #x5182)	; 冂
       ))
-    (=ucs		. #x2F0C)	; ⼌
-    (=cns11643-1	. #x272D)	; &I-C1-272D; [07-13]
-    (=big5-eten		. #xC6C3)	; &B-C6C3;
     ))
 (define-char
   '((name		. "KANGXI RADICAL COVER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F0D)	; ⼍
+    (=cns11643-1	. #x272E)	; &I-C1-272E; [07-14]
+    (=big5-eten		. #xC6C4)	; &B-C6C4;
     (<-compat
      ((=ucs		  . #x5196)	; 冖
       ))
     (<-radical
      ((=ucs		  . #x5196)	; 冖
       ))
-    (=ucs		. #x2F0D)	; ⼍
-    (=cns11643-1	. #x272E)	; &I-C1-272E; [07-14]
-    (=big5-eten		. #xC6C4)	; &B-C6C4;
     ))
 (define-char
   '((name		. "KANGXI RADICAL ICE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F0E)	; ⼎
+    (=cns11643-1	. #x272F)	; &I-C1-272F; [07-15]
+    (=big5-eten		. #xC6C5)	; &B-C6C5;
     (<-compat
      ((=ucs		  . #x51AB)	; 冫
       ))
     (<-radical
      ((=ucs		  . #x51AB)	; 冫
       ))
-    (=ucs		. #x2F0E)	; ⼎
-    (=cns11643-1	. #x272F)	; &I-C1-272F; [07-15]
-    (=big5-eten		. #xC6C5)	; &B-C6C5;
     ))
 (define-char
   '((name		. "KANGXI RADICAL TABLE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F0F)	; ⼏
+    (=cns11643-1	. #x2730)	; &I-C1-2730; [07-16]
     (<-compat
      ((=ucs		  . #x51E0)	; 几
       ))
     (<-radical
      ((=ucs		  . #x51E0)	; 几
       ))
-    (=ucs		. #x2F0F)	; ⼏
-    (=cns11643-1	. #x2730)	; &I-C1-2730; [07-16]
     ))
 (define-char
   '((name		. "KANGXI RADICAL OPEN BOX")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F10)	; ⼐
+    (=cns11643-1	. #x2731)	; &I-C1-2731; [07-17]
     (<-compat
      ((=ucs		  . #x51F5)	; 凵
       ))
     (<-radical
      ((=ucs		  . #x51F5)	; 凵
       ))
-    (=ucs		. #x2F10)	; ⼐
-    (=cns11643-1	. #x2731)	; &I-C1-2731; [07-17]
     ))
 (define-char
   '((name		. "KANGXI RADICAL KNIFE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F11)	; ⼑
+    (=cns11643-1	. #x2732)	; &I-C1-2732; [07-18]
     (<-compat
      ((=ucs		  . #x5200)	; 刀
       ))
     (<-radical
      ((=ucs		  . #x5200)	; 刀
       ))
-    (=ucs		. #x2F11)	; ⼑
-    (=cns11643-1	. #x2732)	; &I-C1-2732; [07-18]
     ))
 (define-char
   '((name		. "KANGXI RADICAL POWER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F12)	; ⼒
+    (=cns11643-1	. #x2733)	; &I-C1-2733; [07-19]
     (<-compat
      ((=ucs		  . #x529B)	; 力
       ))
     (<-radical
      ((=ucs		  . #x529B)	; 力
       ))
-    (=ucs		. #x2F12)	; ⼒
-    (=cns11643-1	. #x2733)	; &I-C1-2733; [07-19]
     ))
 (define-char
   '((name		. "KANGXI RADICAL WRAP")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F13)	; ⼓
+    (=cns11643-1	. #x2734)	; &I-C1-2734; [07-20]
+    (=big5-eten		. #xC6C6)	; &B-C6C6;
     (<-compat
      ((=ucs		  . #x52F9)	; 勹
       ))
     (<-radical
      ((=ucs		  . #x52F9)	; 勹
       ))
-    (=ucs		. #x2F13)	; ⼓
-    (=cns11643-1	. #x2734)	; &I-C1-2734; [07-20]
-    (=big5-eten		. #xC6C6)	; &B-C6C6;
     ))
 (define-char
   '((name		. "KANGXI RADICAL SPOON")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F14)	; ⼔
+    (=cns11643-1	. #x2735)	; &I-C1-2735; [07-21]
     (<-compat
      ((=ucs		  . #x5315)	; 匕
       ))
     (<-radical
      ((=ucs		  . #x5315)	; 匕
       ))
-    (=ucs		. #x2F14)	; ⼔
-    (=cns11643-1	. #x2735)	; &I-C1-2735; [07-21]
     ))
 (define-char
   '((name		. "KANGXI RADICAL RIGHT OPEN BOX")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F15)	; ⼕
+    (=cns11643-1	. #x2736)	; &I-C1-2736; [07-22]
     (<-compat
      ((=ucs		  . #x531A)	; 匚
       ))
     (<-radical
      ((=ucs		  . #x531A)	; 匚
       ))
-    (=ucs		. #x2F15)	; ⼕
-    (=cns11643-1	. #x2736)	; &I-C1-2736; [07-22]
     ))
 (define-char
   '((name		. "KANGXI RADICAL HIDING ENCLOSURE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F16)	; ⼖
+    (=cns11643-1	. #x2737)	; &I-C1-2737; [07-23]
+    (=big5-eten		. #xC6C7)	; &B-C6C7;
     (<-compat
      ((=ucs		  . #x5338)	; 匸
       ))
     (<-radical
      ((=ucs		  . #x5338)	; 匸
       ))
-    (=ucs		. #x2F16)	; ⼖
-    (=cns11643-1	. #x2737)	; &I-C1-2737; [07-23]
-    (=big5-eten		. #xC6C7)	; &B-C6C7;
     ))
 (define-char
   '((name		. "KANGXI RADICAL TEN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F17)	; ⼗
+    (=cns11643-1	. #x2738)	; &I-C1-2738; [07-24]
     (<-compat
      ((=ucs		  . #x5341)	; 十
       ))
     (<-radical
      ((=ucs		  . #x5341)	; 十
       ))
-    (=ucs		. #x2F17)	; ⼗
-    (=cns11643-1	. #x2738)	; &I-C1-2738; [07-24]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DIVINATION")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F18)	; ⼘
+    (=cns11643-1	. #x2739)	; &I-C1-2739; [07-25]
     (<-compat
      ((=ucs		  . #x535C)	; 卜
       ))
     (<-radical
      ((=ucs		  . #x535C)	; 卜
       ))
-    (=ucs		. #x2F18)	; ⼘
-    (=cns11643-1	. #x2739)	; &I-C1-2739; [07-25]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SEAL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F19)	; ⼙
+    (=cns11643-1	. #x273A)	; &I-C1-273A; [07-26]
+    (=big5-eten		. #xC6C8)	; &B-C6C8;
     (<-compat
      ((=ucs		  . #x5369)	; 卩
       ))
     (<-radical
      ((=ucs		  . #x5369)	; 卩
       ))
-    (=ucs		. #x2F19)	; ⼙
-    (=cns11643-1	. #x273A)	; &I-C1-273A; [07-26]
-    (=big5-eten		. #xC6C8)	; &B-C6C8;
     ))
 (define-char
   '((name		. "KANGXI RADICAL CLIFF")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F1A)	; ⼚
+    (=cns11643-1	. #x273B)	; &I-C1-273B; [07-27]
     (<-compat
      ((=ucs		  . #x5382)	; 厂
       ))
     (<-radical
      ((=ucs		  . #x5382)	; 厂
       ))
-    (=ucs		. #x2F1A)	; ⼚
-    (=cns11643-1	. #x273B)	; &I-C1-273B; [07-27]
     ))
 (define-char
   '((name		. "KANGXI RADICAL PRIVATE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F1B)	; ⼛
+    (=cns11643-1	. #x273C)	; &I-C1-273C; [07-28]
+    (=big5-eten		. #xC6C9)	; &B-C6C9;
     (<-compat
      ((=ucs		  . #x53B6)	; 厶
       ))
     (<-radical
      ((=ucs		  . #x53B6)	; 厶
       ))
-    (=ucs		. #x2F1B)	; ⼛
-    (=cns11643-1	. #x273C)	; &I-C1-273C; [07-28]
-    (=big5-eten		. #xC6C9)	; &B-C6C9;
     ))
 (define-char
   '((name		. "KANGXI RADICAL AGAIN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F1C)	; ⼜
+    (=cns11643-1	. #x273D)	; &I-C1-273D; [07-29]
     (<-compat
      ((=ucs		  . #x53C8)	; 又
       ))
     (<-radical
      ((=ucs		  . #x53C8)	; 又
       ))
-    (=ucs		. #x2F1C)	; ⼜
-    (=cns11643-1	. #x273D)	; &I-C1-273D; [07-29]
     ))
 (define-char
   '((name		. "KANGXI RADICAL MOUTH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F1D)	; ⼝
+    (=cns11643-1	. #x273E)	; &I-C1-273E; [07-30]
     (<-compat
      ((=ucs		  . #x53E3)	; 口
       ))
     (<-radical
      ((=ucs		  . #x53E3)	; 口
       ))
-    (=ucs		. #x2F1D)	; ⼝
-    (=cns11643-1	. #x273E)	; &I-C1-273E; [07-30]
     ))
 (define-char
   '((name		. "KANGXI RADICAL ENCLOSURE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F1E)	; ⼞
+    (=cns11643-1	. #x273F)	; &I-C1-273F; [07-31]
     (<-compat
      ((=ucs		  . #x56D7)	; 囗
       ))
     (<-radical
      ((=ucs		  . #x56D7)	; 囗
       ))
-    (=ucs		. #x2F1E)	; ⼞
-    (=cns11643-1	. #x273F)	; &I-C1-273F; [07-31]
     ))
 (define-char
   '((name		. "KANGXI RADICAL EARTH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F1F)	; ⼟
+    (=cns11643-1	. #x2740)	; &I-C1-2740; [07-32]
     (<-compat
      ((=ucs		  . #x571F)	; 土
       ))
     (<-radical
      ((=ucs		  . #x571F)	; 土
       ))
-    (=ucs		. #x2F1F)	; ⼟
-    (=cns11643-1	. #x2740)	; &I-C1-2740; [07-32]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SCHOLAR")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F20)	; â¼ 
+    (=cns11643-1	. #x2741)	; &I-C1-2741; [07-33]
     (<-compat
      ((=ucs		  . #x58EB)	; 士
       ))
     (<-radical
      ((=ucs		  . #x58EB)	; 士
       ))
-    (=ucs		. #x2F20)	; â¼ 
-    (=cns11643-1	. #x2741)	; &I-C1-2741; [07-33]
     ))
 (define-char
   '((name		. "KANGXI RADICAL GO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F21)	; ⼡
     (<-compat
      ((=ucs		  . #x5902)	; 夂
       ))
     (<-radical
      ((=ucs		  . #x5902)	; 夂
       ))
-    (=ucs		. #x2F21)	; ⼡
     ))
 (define-char
   '((name		. "KANGXI RADICAL GO SLOWLY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F22)	; â¼¢
+    (=cns11643-1	. #x2742)	; &I-C1-2742; [07-34]
+    (=big5-eten		. #xC6CA)	; &B-C6CA;
     (<-compat
      ((=ucs		  . #x590A)	; 夊
       ))
     (<-radical
      ((=ucs		  . #x590A)	; 夊
       ))
-    (=ucs		. #x2F22)	; â¼¢
-    (=cns11643-1	. #x2742)	; &I-C1-2742; [07-34]
-    (=big5-eten		. #xC6CA)	; &B-C6CA;
     ))
 (define-char
   '((name		. "KANGXI RADICAL EVENING")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F23)	; â¼£
+    (=cns11643-1	. #x2743)	; &I-C1-2743; [07-35]
     (<-compat
      ((=ucs		  . #x5915)	; 夕
       ))
     (<-radical
      ((=ucs		  . #x5915)	; 夕
       ))
-    (=ucs		. #x2F23)	; â¼£
-    (=cns11643-1	. #x2743)	; &I-C1-2743; [07-35]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BIG")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F24)	; ⼤
+    (=cns11643-1	. #x2744)	; &I-C1-2744; [07-36]
     (<-compat
      ((=ucs		  . #x5927)	; 大
       ))
     (<-radical
      ((=ucs		  . #x5927)	; 大
       ))
-    (=ucs		. #x2F24)	; ⼤
-    (=cns11643-1	. #x2744)	; &I-C1-2744; [07-36]
     ))
 (define-char
   '((name		. "KANGXI RADICAL WOMAN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F25)	; â¼¥
+    (=cns11643-1	. #x2745)	; &I-C1-2745; [07-37]
     (<-compat
      ((=ucs		  . #x5973)	; 女
       ))
     (<-radical
      ((=ucs		  . #x5973)	; 女
       ))
-    (=ucs		. #x2F25)	; â¼¥
-    (=cns11643-1	. #x2745)	; &I-C1-2745; [07-37]
     ))
 (define-char
   '((name		. "KANGXI RADICAL CHILD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F26)	; ⼦
+    (=cns11643-1	. #x2746)	; &I-C1-2746; [07-38]
     (<-compat
      ((=ucs		  . #x5B50)	; 子
       ))
     (<-radical
      ((=ucs		  . #x5B50)	; 子
       ))
-    (=ucs		. #x2F26)	; ⼦
-    (=cns11643-1	. #x2746)	; &I-C1-2746; [07-38]
     ))
 (define-char
   '((name		. "KANGXI RADICAL ROOF")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F27)	; ⼧
+    (=cns11643-1	. #x2747)	; &I-C1-2747; [07-39]
+    (=big5-eten		. #xC6CB)	; &B-C6CB;
     (<-compat
      ((=ucs		  . #x5B80)	; 宀
       ))
     (<-radical
      ((=ucs		  . #x5B80)	; 宀
       ))
-    (=ucs		. #x2F27)	; ⼧
-    (=cns11643-1	. #x2747)	; &I-C1-2747; [07-39]
-    (=big5-eten		. #xC6CB)	; &B-C6CB;
     ))
 (define-char
   '((name		. "KANGXI RADICAL INCH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F28)	; ⼨
+    (=cns11643-1	. #x2748)	; &I-C1-2748; [07-40]
     (<-compat
      ((=ucs		  . #x5BF8)	; 寸
       ))
     (<-radical
      ((=ucs		  . #x5BF8)	; 寸
       ))
-    (=ucs		. #x2F28)	; ⼨
-    (=cns11643-1	. #x2748)	; &I-C1-2748; [07-40]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SMALL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F29)	; ⼩
+    (=cns11643-1	. #x2749)	; &I-C1-2749; [07-41]
     (<-compat
      ((=ucs		  . #x5C0F)	; 小
       ))
     (<-radical
      ((=ucs		  . #x5C0F)	; 小
       ))
-    (=ucs		. #x2F29)	; ⼩
-    (=cns11643-1	. #x2749)	; &I-C1-2749; [07-41]
     ))
 (define-char
   '((name		. "KANGXI RADICAL LAME")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F2A)	; ⼪
+    (=cns11643-1	. #x274A)	; &I-C1-274A; [07-42]
     (<-compat
      ((=ucs		  . #x5C22)	; å°¢
       ))
     (<-radical
      ((=ucs		  . #x5C22)	; å°¢
       ))
-    (=ucs		. #x2F2A)	; ⼪
-    (=cns11643-1	. #x274A)	; &I-C1-274A; [07-42]
     ))
 (define-char
   '((name		. "KANGXI RADICAL CORPSE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F2B)	; ⼫
+    (=cns11643-1	. #x274B)	; &I-C1-274B; [07-43]
     (<-compat
      ((=ucs		  . #x5C38)	; å°¸
       ))
     (<-radical
      ((=ucs		  . #x5C38)	; å°¸
       ))
-    (=ucs		. #x2F2B)	; ⼫
-    (=cns11643-1	. #x274B)	; &I-C1-274B; [07-43]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SPROUT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F2C)	; ⼬
+    (=cns11643-1	. #x274C)	; &I-C1-274C; [07-44]
     (<-compat
      ((=ucs		  . #x5C6E)	; å±®
       ))
     (<-radical
      ((=ucs		  . #x5C6E)	; å±®
       ))
-    (=ucs		. #x2F2C)	; ⼬
-    (=cns11643-1	. #x274C)	; &I-C1-274C; [07-44]
     ))
 (define-char
   '((name		. "KANGXI RADICAL MOUNTAIN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F2D)	; â¼­
+    (=cns11643-1	. #x274D)	; &I-C1-274D; [07-45]
     (<-compat
      ((=ucs		  . #x5C71)	; å±±
       ))
     (<-radical
      ((=ucs		  . #x5C71)	; å±±
       ))
-    (=ucs		. #x2F2D)	; â¼­
-    (=cns11643-1	. #x274D)	; &I-C1-274D; [07-45]
     ))
 (define-char
   '((name		. "KANGXI RADICAL RIVER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F2E)	; â¼®
+    (=cns11643-1	. #x274E)	; &I-C1-274E; [07-46]
+    (=big5-eten		. #xC6CC)	; &B-C6CC;
     (<-compat
      ((=ucs		  . #x5DDB)	; 巛
       ))
     (<-radical
      ((=ucs		  . #x5DDB)	; 巛
       ))
-    (=ucs		. #x2F2E)	; â¼®
-    (=cns11643-1	. #x274E)	; &I-C1-274E; [07-46]
-    (=big5-eten		. #xC6CC)	; &B-C6CC;
     ))
 (define-char
   '((name		. "KANGXI RADICAL WORK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F2F)	; ⼯
+    (=cns11643-1	. #x274F)	; &I-C1-274F; [07-47]
     (<-compat
      ((=ucs		  . #x5DE5)	; å·¥
       ))
     (<-radical
      ((=ucs		  . #x5DE5)	; å·¥
       ))
-    (=ucs		. #x2F2F)	; ⼯
-    (=cns11643-1	. #x274F)	; &I-C1-274F; [07-47]
     ))
 (define-char
   '((name		. "KANGXI RADICAL ONESELF")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F30)	; â¼°
+    (=cns11643-1	. #x2750)	; &I-C1-2750; [07-48]
     (<-compat
      ((=ucs		  . #x5DF1)	; å·±
       ))
     (<-radical
      ((=ucs		  . #x5DF1)	; å·±
       ))
-    (=ucs		. #x2F30)	; â¼°
-    (=cns11643-1	. #x2750)	; &I-C1-2750; [07-48]
     ))
 (define-char
   '((name		. "KANGXI RADICAL TURBAN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F31)	; â¼±
+    (=cns11643-1	. #x2751)	; &I-C1-2751; [07-49]
     (<-compat
      ((=ucs		  . #x5DFE)	; å·¾
       ))
     (<-radical
      ((=ucs		  . #x5DFE)	; å·¾
       ))
-    (=ucs		. #x2F31)	; â¼±
-    (=cns11643-1	. #x2751)	; &I-C1-2751; [07-49]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DRY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F32)	; â¼²
+    (=cns11643-1	. #x2752)	; &I-C1-2752; [07-50]
     (<-compat
      ((=ucs		  . #x5E72)	; å¹²
       ))
     (<-radical
      ((=ucs		  . #x5E72)	; å¹²
       ))
-    (=ucs		. #x2F32)	; â¼²
-    (=cns11643-1	. #x2752)	; &I-C1-2752; [07-50]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SHORT THREAD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F33)	; â¼³
+    (=cns11643-1	. #x2753)	; &I-C1-2753; [07-51]
+    (=big5-eten		. #xC6CD)	; &B-C6CD;
     (<-compat
      ((=ucs		  . #x5E7A)	; 幺
       ))
     (<-radical
      ((=ucs		  . #x5E7A)	; 幺
       ))
-    (=ucs		. #x2F33)	; â¼³
-    (=cns11643-1	. #x2753)	; &I-C1-2753; [07-51]
-    (=big5-eten		. #xC6CD)	; &B-C6CD;
     ))
 (define-char
   '((name		. "KANGXI RADICAL DOTTED CLIFF")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F34)	; â¼´
+    (=cns11643-1	. #x2754)	; &I-C1-2754; [07-52]
+    (=big5-eten		. #xC6CE)	; &B-C6CE;
     (<-compat
      ((=ucs		  . #x5E7F)	; 广
       ))
     (<-radical
      ((=ucs		  . #x5E7F)	; 广
       ))
-    (=ucs		. #x2F34)	; â¼´
-    (=cns11643-1	. #x2754)	; &I-C1-2754; [07-52]
-    (=big5-eten		. #xC6CE)	; &B-C6CE;
     ))
 (define-char
   '((name		. "KANGXI RADICAL LONG STRIDE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F35)	; â¼µ
+    (=cns11643-1	. #x2755)	; &I-C1-2755; [07-53]
+    (=big5-eten		. #xC6CF)	; &B-C6CF;
     (<-compat
      ((=ucs		  . #x5EF4)	; å»´
       ))
     (<-radical
      ((=ucs		  . #x5EF4)	; å»´
       ))
-    (=ucs		. #x2F35)	; â¼µ
-    (=cns11643-1	. #x2755)	; &I-C1-2755; [07-53]
-    (=big5-eten		. #xC6CF)	; &B-C6CF;
     ))
 (define-char
   '((name		. "KANGXI RADICAL TWO HANDS")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F36)	; ⼶
+    (=cns11643-1	. #x2756)	; &I-C1-2756; [07-54]
     (<-compat
      ((=ucs		  . #x5EFE)	; 廾
       ))
     (<-radical
      ((=ucs		  . #x5EFE)	; 廾
       ))
-    (=ucs		. #x2F36)	; ⼶
-    (=cns11643-1	. #x2756)	; &I-C1-2756; [07-54]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SHOOT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F37)	; â¼·
+    (=cns11643-1	. #x2757)	; &I-C1-2757; [07-55]
     (<-compat
      ((=ucs		  . #x5F0B)	; 弋
       ))
     (<-radical
      ((=ucs		  . #x5F0B)	; 弋
       ))
-    (=ucs		. #x2F37)	; â¼·
-    (=cns11643-1	. #x2757)	; &I-C1-2757; [07-55]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BOW")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F38)	; ⼸
+    (=cns11643-1	. #x2758)	; &I-C1-2758; [07-56]
     (<-compat
      ((=ucs		  . #x5F13)	; 弓
       ))
     (<-radical
      ((=ucs		  . #x5F13)	; 弓
       ))
-    (=ucs		. #x2F38)	; ⼸
-    (=cns11643-1	. #x2758)	; &I-C1-2758; [07-56]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SNOUT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F39)	; â¼¹
+    (=cns11643-1	. #x2759)	; &I-C1-2759; [07-57]
+    (=big5-eten		. #xC6D0)	; &B-C6D0;
     (<-compat
      ((=ucs		  . #x5F50)	; 彐
       ))
     (<-radical
      ((=ucs		  . #x5F50)	; 彐
       ))
-    (=ucs		. #x2F39)	; â¼¹
-    (=cns11643-1	. #x2759)	; &I-C1-2759; [07-57]
-    (=big5-eten		. #xC6D0)	; &B-C6D0;
     ))
 (define-char
   '((name		. "KANGXI RADICAL BRISTLE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F3A)	; ⼺
+    (=cns11643-1	. #x275A)	; &I-C1-275A; [07-58]
+    (=big5-eten		. #xC6D1)	; &B-C6D1;
     (<-compat
      ((=ucs		  . #x5F61)	; 彡
       ))
     (<-radical
      ((=ucs		  . #x5F61)	; 彡
       ))
-    (=ucs		. #x2F3A)	; ⼺
-    (=cns11643-1	. #x275A)	; &I-C1-275A; [07-58]
-    (=big5-eten		. #xC6D1)	; &B-C6D1;
     ))
 (define-char
   '((name		. "KANGXI RADICAL STEP")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F3B)	; â¼»
+    (=cns11643-1	. #x275B)	; &I-C1-275B; [07-59]
     (<-compat
      ((=ucs		  . #x5F73)	; å½³
       ))
     (<-radical
      ((=ucs		  . #x5F73)	; å½³
       ))
-    (=ucs		. #x2F3B)	; â¼»
-    (=cns11643-1	. #x275B)	; &I-C1-275B; [07-59]
     ))
 (define-char
   '((name		. "KANGXI RADICAL HEART")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F3C)	; â¼¼
+    (=cns11643-1	. #x275C)	; &I-C1-275C; [07-60]
     (<-compat
      ((=ucs		  . #x5FC3)	; 心
       ))
     (<-radical
      ((=ucs		  . #x5FC3)	; 心
       ))
-    (=ucs		. #x2F3C)	; â¼¼
-    (=cns11643-1	. #x275C)	; &I-C1-275C; [07-60]
     ))
 (define-char
   '((name		. "KANGXI RADICAL HALBERD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F3D)	; â¼½
+    (=cns11643-1	. #x275D)	; &I-C1-275D; [07-61]
     (<-compat
      ((=ucs		  . #x6208)	; 戈
       ))
     (<-radical
      ((=ucs		  . #x6208)	; 戈
       ))
-    (=ucs		. #x2F3D)	; â¼½
-    (=cns11643-1	. #x275D)	; &I-C1-275D; [07-61]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DOOR")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F3E)	; â¼¾
+    (=cns11643-1	. #x275E)	; &I-C1-275E; [07-62]
     (<-compat
      ((=ucs		  . #x6236)	; 戶
       ))
     (<-radical
      ((=ucs		  . #x6236)	; 戶
       ))
-    (=ucs		. #x2F3E)	; â¼¾
-    (=cns11643-1	. #x275E)	; &I-C1-275E; [07-62]
     ))
 (define-char
   '((name		. "KANGXI RADICAL HAND")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F3F)	; ⼿
+    (=cns11643-1	. #x275F)	; &I-C1-275F; [07-63]
     (<-compat
      ((=ucs		  . #x624B)	; 手
       ))
     (<-radical
      ((=ucs		  . #x624B)	; 手
       ))
-    (=ucs		. #x2F3F)	; ⼿
-    (=cns11643-1	. #x275F)	; &I-C1-275F; [07-63]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BRANCH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F40)	; ⽀
+    (=cns11643-1	. #x2760)	; &I-C1-2760; [07-64]
     (<-compat
      ((=ucs		  . #x652F)	; 支
       ))
     (<-radical
      ((=ucs		  . #x652F)	; 支
       ))
-    (=ucs		. #x2F40)	; ⽀
-    (=cns11643-1	. #x2760)	; &I-C1-2760; [07-64]
     ))
 (define-char
   '((name		. "KANGXI RADICAL RAP")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F41)	; ⽁
+    (=cns11643-1	. #x2761)	; &I-C1-2761; [07-65]
+    (=big5-eten		. #xC6D2)	; &B-C6D2;
     (<-compat
      ((=ucs		  . #x6534)	; 攴
       ))
     (<-radical
      ((=ucs		  . #x6534)	; 攴
       ))
-    (=ucs		. #x2F41)	; ⽁
-    (=cns11643-1	. #x2761)	; &I-C1-2761; [07-65]
-    (=big5-eten		. #xC6D2)	; &B-C6D2;
     ))
 (define-char
   '((name		. "KANGXI RADICAL SCRIPT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F42)	; ⽂
+    (=cns11643-1	. #x2762)	; &I-C1-2762; [07-66]
     (<-compat
      ((=ucs		  . #x6587)	; 文
       ))
     (<-radical
      ((=ucs		  . #x6587)	; 文
       ))
-    (=ucs		. #x2F42)	; ⽂
-    (=cns11643-1	. #x2762)	; &I-C1-2762; [07-66]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DIPPER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F43)	; ⽃
+    (=cns11643-1	. #x2763)	; &I-C1-2763; [07-67]
     (<-compat
      ((=ucs		  . #x6597)	; 斗
       ))
     (<-radical
      ((=ucs		  . #x6597)	; 斗
       ))
-    (=ucs		. #x2F43)	; ⽃
-    (=cns11643-1	. #x2763)	; &I-C1-2763; [07-67]
     ))
 (define-char
   '((name		. "KANGXI RADICAL AXE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F44)	; ⽄
+    (=cns11643-1	. #x2764)	; &I-C1-2764; [07-68]
     (<-compat
      ((=ucs		  . #x65A4)	; 斤
       ))
     (<-radical
      ((=ucs		  . #x65A4)	; 斤
       ))
-    (=ucs		. #x2F44)	; ⽄
-    (=cns11643-1	. #x2764)	; &I-C1-2764; [07-68]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SQUARE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F45)	; ⽅
+    (=cns11643-1	. #x2765)	; &I-C1-2765; [07-69]
     (<-compat
      ((=ucs		  . #x65B9)	; 方
       ))
     (<-radical
      ((=ucs		  . #x65B9)	; 方
       ))
-    (=ucs		. #x2F45)	; ⽅
-    (=cns11643-1	. #x2765)	; &I-C1-2765; [07-69]
     ))
 (define-char
   '((name		. "KANGXI RADICAL NOT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F46)	; ⽆
+    (=cns11643-1	. #x2766)	; &I-C1-2766; [07-70]
+    (=big5-eten		. #xC6D3)	; &B-C6D3;
     (<-compat
      ((=ucs		  . #x65E0)	; 无
       ))
     (<-radical
      ((=ucs		  . #x65E0)	; 无
       ))
-    (=ucs		. #x2F46)	; ⽆
-    (=cns11643-1	. #x2766)	; &I-C1-2766; [07-70]
-    (=big5-eten		. #xC6D3)	; &B-C6D3;
     ))
 (define-char
   '((name		. "KANGXI RADICAL SUN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F47)	; ⽇
+    (=cns11643-1	. #x2767)	; &I-C1-2767; [07-71]
     (<-compat
      ((=ucs		  . #x65E5)	; 日
       ))
     (<-radical
      ((=ucs		  . #x65E5)	; 日
       ))
-    (=ucs		. #x2F47)	; ⽇
-    (=cns11643-1	. #x2767)	; &I-C1-2767; [07-71]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SAY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F48)	; ⽈
+    (=cns11643-1	. #x2768)	; &I-C1-2768; [07-72]
     (<-compat
      ((=ucs		  . #x66F0)	; 曰
       ))
     (<-radical
      ((=ucs		  . #x66F0)	; 曰
       ))
-    (=ucs		. #x2F48)	; ⽈
-    (=cns11643-1	. #x2768)	; &I-C1-2768; [07-72]
     ))
 (define-char
   '((name		. "KANGXI RADICAL MOON")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F49)	; ⽉
+    (=cns11643-1	. #x2769)	; &I-C1-2769; [07-73]
     (<-compat
      ((=ucs		  . #x6708)	; 月
       ))
     (<-radical
      ((=ucs		  . #x6708)	; 月
       ))
-    (=ucs		. #x2F49)	; ⽉
-    (=cns11643-1	. #x2769)	; &I-C1-2769; [07-73]
     ))
 (define-char
   '((name		. "KANGXI RADICAL TREE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F4A)	; ⽊
+    (=cns11643-1	. #x276A)	; &I-C1-276A; [07-74]
     (<-compat
      ((=ucs		  . #x6728)	; 木
       ))
     (<-radical
      ((=ucs		  . #x6728)	; 木
       ))
-    (=ucs		. #x2F4A)	; ⽊
-    (=cns11643-1	. #x276A)	; &I-C1-276A; [07-74]
     ))
 (define-char
   '((name		. "KANGXI RADICAL LACK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F4B)	; ⽋
+    (=cns11643-1	. #x276B)	; &I-C1-276B; [07-75]
     (<-compat
      ((=ucs		  . #x6B20)	; 欠
       ))
     (<-radical
      ((=ucs		  . #x6B20)	; 欠
       ))
-    (=ucs		. #x2F4B)	; ⽋
-    (=cns11643-1	. #x276B)	; &I-C1-276B; [07-75]
     ))
 (define-char
   '((name		. "KANGXI RADICAL STOP")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F4C)	; ⽌
+    (=cns11643-1	. #x276C)	; &I-C1-276C; [07-76]
     (<-compat
      ((=ucs		  . #x6B62)	; æ­¢
       ))
     (<-radical
      ((=ucs		  . #x6B62)	; æ­¢
       ))
-    (=ucs		. #x2F4C)	; ⽌
-    (=cns11643-1	. #x276C)	; &I-C1-276C; [07-76]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DEATH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F4D)	; ⽍
+    (=cns11643-1	. #x276D)	; &I-C1-276D; [07-77]
     (<-compat
      ((=ucs		  . #x6B79)	; æ­¹
       ))
     (<-radical
      ((=ucs		  . #x6B79)	; æ­¹
       ))
-    (=ucs		. #x2F4D)	; ⽍
-    (=cns11643-1	. #x276D)	; &I-C1-276D; [07-77]
     ))
 (define-char
   '((name		. "KANGXI RADICAL WEAPON")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F4E)	; ⽎
+    (=cns11643-1	. #x276E)	; &I-C1-276E; [07-78]
     (<-compat
      ((=ucs		  . #x6BB3)	; 殳
       ))
     (<-radical
      ((=ucs		  . #x6BB3)	; 殳
       ))
-    (=ucs		. #x2F4E)	; ⽎
-    (=cns11643-1	. #x276E)	; &I-C1-276E; [07-78]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DO NOT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F4F)	; ⽏
+    (=cns11643-1	. #x276F)	; &I-C1-276F; [07-79]
     (<-compat
      ((=ucs		  . #x6BCB)	; 毋
       ))
     (<-radical
      ((=ucs		  . #x6BCB)	; 毋
       ))
-    (=ucs		. #x2F4F)	; ⽏
-    (=cns11643-1	. #x276F)	; &I-C1-276F; [07-79]
     ))
 (define-char
   '((name		. "KANGXI RADICAL COMPARE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F50)	; ⽐
+    (=cns11643-1	. #x2770)	; &I-C1-2770; [07-80]
     (<-compat
      ((=ucs		  . #x6BD4)	; 比
       ))
     (<-radical
      ((=ucs		  . #x6BD4)	; 比
       ))
-    (=ucs		. #x2F50)	; ⽐
-    (=cns11643-1	. #x2770)	; &I-C1-2770; [07-80]
     ))
 (define-char
   '((name		. "KANGXI RADICAL FUR")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F51)	; ⽑
+    (=cns11643-1	. #x2771)	; &I-C1-2771; [07-81]
     (<-compat
      ((=ucs		  . #x6BDB)	; 毛
       ))
     (<-radical
      ((=ucs		  . #x6BDB)	; 毛
       ))
-    (=ucs		. #x2F51)	; ⽑
-    (=cns11643-1	. #x2771)	; &I-C1-2771; [07-81]
     ))
 (define-char
   '((name		. "KANGXI RADICAL CLAN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F52)	; ⽒
+    (=cns11643-1	. #x2772)	; &I-C1-2772; [07-82]
     (<-compat
      ((=ucs		  . #x6C0F)	; 氏
       ))
     (<-radical
      ((=ucs		  . #x6C0F)	; 氏
       ))
-    (=ucs		. #x2F52)	; ⽒
-    (=cns11643-1	. #x2772)	; &I-C1-2772; [07-82]
     ))
 (define-char
   '((name		. "KANGXI RADICAL STEAM")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F53)	; ⽓
+    (=cns11643-1	. #x2773)	; &I-C1-2773; [07-83]
     (<-compat
      ((=ucs		  . #x6C14)	; 气
       ))
     (<-radical
      ((=ucs		  . #x6C14)	; 气
       ))
-    (=ucs		. #x2F53)	; ⽓
-    (=cns11643-1	. #x2773)	; &I-C1-2773; [07-83]
     ))
 (define-char
   '((name		. "KANGXI RADICAL WATER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F54)	; ⽔
+    (=cns11643-1	. #x2774)	; &I-C1-2774; [07-84]
     (<-compat
      ((=ucs		  . #x6C34)	; æ°´
       ))
     (<-radical
      ((=ucs		  . #x6C34)	; æ°´
       ))
-    (=ucs		. #x2F54)	; ⽔
-    (=cns11643-1	. #x2774)	; &I-C1-2774; [07-84]
     ))
 (define-char
   '((name		. "KANGXI RADICAL FIRE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F55)	; ⽕
+    (=cns11643-1	. #x2775)	; &I-C1-2775; [07-85]
     (<-compat
      ((=ucs		  . #x706B)	; 火
       ))
     (<-radical
      ((=ucs		  . #x706B)	; 火
       ))
-    (=ucs		. #x2F55)	; ⽕
-    (=cns11643-1	. #x2775)	; &I-C1-2775; [07-85]
     ))
 (define-char
   '((name		. "KANGXI RADICAL CLAW")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F56)	; ⽖
+    (=cns11643-1	. #x2776)	; &I-C1-2776; [07-86]
     (<-compat
      ((=ucs		  . #x722A)	; 爪
       ))
     (<-radical
      ((=ucs		  . #x722A)	; 爪
       ))
-    (=ucs		. #x2F56)	; ⽖
-    (=cns11643-1	. #x2776)	; &I-C1-2776; [07-86]
     ))
 (define-char
   '((name		. "KANGXI RADICAL FATHER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F57)	; ⽗
+    (=cns11643-1	. #x2777)	; &I-C1-2777; [07-87]
     (<-compat
      ((=ucs		  . #x7236)	; 父
       ))
     (<-radical
      ((=ucs		  . #x7236)	; 父
       ))
-    (=ucs		. #x2F57)	; ⽗
-    (=cns11643-1	. #x2777)	; &I-C1-2777; [07-87]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DOUBLE X")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F58)	; ⽘
+    (=cns11643-1	. #x2778)	; &I-C1-2778; [07-88]
     (<-compat
      ((=ucs		  . #x723B)	; 爻
       ))
     (<-radical
      ((=ucs		  . #x723B)	; 爻
       ))
-    (=ucs		. #x2F58)	; ⽘
-    (=cns11643-1	. #x2778)	; &I-C1-2778; [07-88]
     ))
 (define-char
   '((name		. "KANGXI RADICAL HALF TREE TRUNK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F59)	; ⽙
+    (=cns11643-1	. #x2779)	; &I-C1-2779; [07-89]
     (<-compat
      ((=ucs		  . #x723F)	; 爿
       ))
     (<-radical
      ((=ucs		  . #x723F)	; 爿
       ))
-    (=ucs		. #x2F59)	; ⽙
-    (=cns11643-1	. #x2779)	; &I-C1-2779; [07-89]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SLICE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F5A)	; ⽚
+    (=cns11643-1	. #x277A)	; &I-C1-277A; [07-90]
     (<-compat
      ((=ucs		  . #x7247)	; 片
       ))
     (<-radical
      ((=ucs		  . #x7247)	; 片
       ))
-    (=ucs		. #x2F5A)	; ⽚
-    (=cns11643-1	. #x277A)	; &I-C1-277A; [07-90]
     ))
 (define-char
   '((name		. "KANGXI RADICAL FANG")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F5B)	; ⽛
+    (=cns11643-1	. #x277B)	; &I-C1-277B; [07-91]
     (<-compat
      ((=ucs		  . #x7259)	; 牙
       ))
     (<-radical
      ((=ucs		  . #x7259)	; 牙
       ))
-    (=ucs		. #x2F5B)	; ⽛
-    (=cns11643-1	. #x277B)	; &I-C1-277B; [07-91]
     ))
 (define-char
   '((name		. "KANGXI RADICAL COW")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F5C)	; ⽜
+    (=cns11643-1	. #x277C)	; &I-C1-277C; [07-92]
     (<-compat
      ((=ucs		  . #x725B)	; 牛
       ))
     (<-radical
      ((=ucs		  . #x725B)	; 牛
       ))
-    (=ucs		. #x2F5C)	; ⽜
-    (=cns11643-1	. #x277C)	; &I-C1-277C; [07-92]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DOG")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F5D)	; ⽝
+    (=cns11643-1	. #x277D)	; &I-C1-277D; [07-93]
     (<-compat
      ((=ucs		  . #x72AC)	; 犬
       ))
     (<-radical
      ((=ucs		  . #x72AC)	; 犬
       ))
-    (=ucs		. #x2F5D)	; ⽝
-    (=cns11643-1	. #x277D)	; &I-C1-277D; [07-93]
     ))
 (define-char
   '((name		. "KANGXI RADICAL PROFOUND")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F5E)	; ⽞
+    (=cns11643-1	. #x277E)	; &I-C1-277E; [07-94]
     (<-compat
      ((=ucs		  . #x7384)	; 玄
       ))
     (<-radical
      ((=ucs		  . #x7384)	; 玄
       ))
-    (=ucs		. #x2F5E)	; ⽞
-    (=cns11643-1	. #x277E)	; &I-C1-277E; [07-94]
     ))
 (define-char
   '((name		. "KANGXI RADICAL JADE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F5F)	; ⽟
+    (=cns11643-1	. #x2821)	; &I-C1-2821; [08-01]
     (<-compat
      ((=ucs		  . #x7389)	; 玉
       ))
     (<-radical
      ((=ucs		  . #x7389)	; 玉
       ))
-    (=ucs		. #x2F5F)	; ⽟
-    (=cns11643-1	. #x2821)	; &I-C1-2821; [08-01]
     ))
 (define-char
   '((name		. "KANGXI RADICAL MELON")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F60)	; â½ 
+    (=cns11643-1	. #x2822)	; &I-C1-2822; [08-02]
     (<-compat
      ((=ucs		  . #x74DC)	; 瓜
       ))
     (<-radical
      ((=ucs		  . #x74DC)	; 瓜
       ))
-    (=ucs		. #x2F60)	; â½ 
-    (=cns11643-1	. #x2822)	; &I-C1-2822; [08-02]
     ))
 (define-char
   '((name		. "KANGXI RADICAL TILE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F61)	; ⽡
+    (=cns11643-1	. #x2823)	; &I-C1-2823; [08-03]
     (<-compat
      ((=ucs		  . #x74E6)	; 瓦
       ))
     (<-radical
      ((=ucs		  . #x74E6)	; 瓦
       ))
-    (=ucs		. #x2F61)	; ⽡
-    (=cns11643-1	. #x2823)	; &I-C1-2823; [08-03]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SWEET")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F62)	; â½¢
+    (=cns11643-1	. #x2824)	; &I-C1-2824; [08-04]
     (<-compat
      ((=ucs		  . #x7518)	; 甘
       ))
     (<-radical
      ((=ucs		  . #x7518)	; 甘
       ))
-    (=ucs		. #x2F62)	; â½¢
-    (=cns11643-1	. #x2824)	; &I-C1-2824; [08-04]
     ))
 (define-char
   '((name		. "KANGXI RADICAL LIFE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F63)	; â½£
+    (=cns11643-1	. #x2825)	; &I-C1-2825; [08-05]
     (<-compat
      ((=ucs		  . #x751F)	; 生
       ))
     (<-radical
      ((=ucs		  . #x751F)	; 生
       ))
-    (=ucs		. #x2F63)	; â½£
-    (=cns11643-1	. #x2825)	; &I-C1-2825; [08-05]
     ))
 (define-char
   '((name		. "KANGXI RADICAL USE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F64)	; ⽤
+    (=cns11643-1	. #x2826)	; &I-C1-2826; [08-06]
     (<-compat
      ((=ucs		  . #x7528)	; 用
       ))
     (<-radical
      ((=ucs		  . #x7528)	; 用
       ))
-    (=ucs		. #x2F64)	; ⽤
-    (=cns11643-1	. #x2826)	; &I-C1-2826; [08-06]
     ))
 (define-char
   '((name		. "KANGXI RADICAL FIELD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F65)	; â½¥
+    (=cns11643-1	. #x2827)	; &I-C1-2827; [08-07]
     (<-compat
      ((=ucs		  . #x7530)	; 田
       ))
     (<-radical
      ((=ucs		  . #x7530)	; 田
       ))
-    (=ucs		. #x2F65)	; â½¥
-    (=cns11643-1	. #x2827)	; &I-C1-2827; [08-07]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BOLT OF CLOTH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F66)	; ⽦
+    (=cns11643-1	. #x2828)	; &I-C1-2828; [08-08]
     (<-compat
      ((=ucs		  . #x758B)	; 疋
       ))
     (<-radical
      ((=ucs		  . #x758B)	; 疋
       ))
-    (=ucs		. #x2F66)	; ⽦
-    (=cns11643-1	. #x2828)	; &I-C1-2828; [08-08]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SICKNESS")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F67)	; ⽧
+    (=cns11643-1	. #x2829)	; &I-C1-2829; [08-09]
+    (=big5-eten		. #xC6D4)	; &B-C6D4;
     (<-compat
      ((=ucs		  . #x7592)	; 疒
       ))
     (<-radical
      ((=ucs		  . #x7592)	; 疒
       ))
-    (=ucs		. #x2F67)	; ⽧
-    (=cns11643-1	. #x2829)	; &I-C1-2829; [08-09]
-    (=big5-eten		. #xC6D4)	; &B-C6D4;
     ))
 (define-char
   '((name		. "KANGXI RADICAL DOTTED TENT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F68)	; ⽨
+    (=cns11643-1	. #x282A)	; &I-C1-282A; [08-10]
+    (=big5-eten		. #xC6D5)	; &B-C6D5;
     (<-compat
      ((=ucs		  . #x7676)	; 癶
       ))
     (<-radical
      ((=ucs		  . #x7676)	; 癶
       ))
-    (=ucs		. #x2F68)	; ⽨
-    (=cns11643-1	. #x282A)	; &I-C1-282A; [08-10]
-    (=big5-eten		. #xC6D5)	; &B-C6D5;
     ))
 (define-char
   '((name		. "KANGXI RADICAL WHITE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F69)	; ⽩
+    (=cns11643-1	. #x282B)	; &I-C1-282B; [08-11]
     (<-compat
      ((=ucs		  . #x767D)	; 白
       ))
     (<-radical
      ((=ucs		  . #x767D)	; 白
       ))
-    (=ucs		. #x2F69)	; ⽩
-    (=cns11643-1	. #x282B)	; &I-C1-282B; [08-11]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SKIN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F6A)	; ⽪
+    (=cns11643-1	. #x282C)	; &I-C1-282C; [08-12]
     (<-compat
      ((=ucs		  . #x76AE)	; 皮
       ))
     (<-radical
      ((=ucs		  . #x76AE)	; 皮
       ))
-    (=ucs		. #x2F6A)	; ⽪
-    (=cns11643-1	. #x282C)	; &I-C1-282C; [08-12]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DISH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F6B)	; ⽫
+    (=cns11643-1	. #x282D)	; &I-C1-282D; [08-13]
     (<-compat
      ((=ucs		  . #x76BF)	; 皿
       ))
     (<-radical
      ((=ucs		  . #x76BF)	; 皿
       ))
-    (=ucs		. #x2F6B)	; ⽫
-    (=cns11643-1	. #x282D)	; &I-C1-282D; [08-13]
     ))
 (define-char
   '((name		. "KANGXI RADICAL EYE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F6C)	; ⽬
+    (=cns11643-1	. #x282E)	; &I-C1-282E; [08-14]
     (<-compat
      ((=ucs		  . #x76EE)	; 目
       ))
     (<-radical
      ((=ucs		  . #x76EE)	; 目
       ))
-    (=ucs		. #x2F6C)	; ⽬
-    (=cns11643-1	. #x282E)	; &I-C1-282E; [08-14]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SPEAR")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F6D)	; â½­
+    (=cns11643-1	. #x282F)	; &I-C1-282F; [08-15]
     (<-compat
      ((=ucs		  . #x77DB)	; 矛
       ))
     (<-radical
      ((=ucs		  . #x77DB)	; 矛
       ))
-    (=ucs		. #x2F6D)	; â½­
-    (=cns11643-1	. #x282F)	; &I-C1-282F; [08-15]
     ))
 (define-char
   '((name		. "KANGXI RADICAL ARROW")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F6E)	; â½®
+    (=cns11643-1	. #x2830)	; &I-C1-2830; [08-16]
     (<-compat
      ((=ucs		  . #x77E2)	; 矢
       ))
     (<-radical
      ((=ucs		  . #x77E2)	; 矢
       ))
-    (=ucs		. #x2F6E)	; â½®
-    (=cns11643-1	. #x2830)	; &I-C1-2830; [08-16]
     ))
 (define-char
   '((name		. "KANGXI RADICAL STONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F6F)	; ⽯
+    (=cns11643-1	. #x2831)	; &I-C1-2831; [08-17]
     (<-compat
      ((=ucs		  . #x77F3)	; 石
       ))
     (<-radical
      ((=ucs		  . #x77F3)	; 石
       ))
-    (=ucs		. #x2F6F)	; ⽯
-    (=cns11643-1	. #x2831)	; &I-C1-2831; [08-17]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SPIRIT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F70)	; â½°
+    (=cns11643-1	. #x2832)	; &I-C1-2832; [08-18]
     (<-compat
      ((=ucs		  . #x793A)	; 示
       ))
     (<-radical
      ((=ucs		  . #x793A)	; 示
       ))
-    (=ucs		. #x2F70)	; â½°
-    (=cns11643-1	. #x2832)	; &I-C1-2832; [08-18]
     ))
 (define-char
   '((name		. "KANGXI RADICAL TRACK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F71)	; â½±
+    (=cns11643-1	. #x2833)	; &I-C1-2833; [08-19]
     (<-compat
      ((=ucs		  . #x79B8)	; 禸
       ))
     (<-radical
      ((=ucs		  . #x79B8)	; 禸
       ))
-    (=ucs		. #x2F71)	; â½±
-    (=cns11643-1	. #x2833)	; &I-C1-2833; [08-19]
     ))
 (define-char
   '((name		. "KANGXI RADICAL GRAIN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F72)	; â½²
+    (=cns11643-1	. #x2834)	; &I-C1-2834; [08-20]
     (<-compat
      ((=ucs		  . #x79BE)	; 禾
       ))
     (<-radical
      ((=ucs		  . #x79BE)	; 禾
       ))
-    (=ucs		. #x2F72)	; â½²
-    (=cns11643-1	. #x2834)	; &I-C1-2834; [08-20]
     ))
 (define-char
   '((name		. "KANGXI RADICAL CAVE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F73)	; â½³
+    (=cns11643-1	. #x2835)	; &I-C1-2835; [08-21]
     (<-compat
      ((=ucs		  . #x7A74)	; ç©´
       ))
     (<-radical
      ((=ucs		  . #x7A74)	; ç©´
       ))
-    (=ucs		. #x2F73)	; â½³
-    (=cns11643-1	. #x2835)	; &I-C1-2835; [08-21]
     ))
 (define-char
   '((name		. "KANGXI RADICAL STAND")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F74)	; â½´
+    (=cns11643-1	. #x2836)	; &I-C1-2836; [08-22]
     (<-compat
      ((=ucs		  . #x7ACB)	; 立
       ))
     (<-radical
      ((=ucs		  . #x7ACB)	; 立
       ))
-    (=ucs		. #x2F74)	; â½´
-    (=cns11643-1	. #x2836)	; &I-C1-2836; [08-22]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BAMBOO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F75)	; â½µ
+    (=cns11643-1	. #x2837)	; &I-C1-2837; [08-23]
     (<-compat
      ((=ucs		  . #x7AF9)	; 竹
       ))
     (<-radical
      ((=ucs		  . #x7AF9)	; 竹
       ))
-    (=ucs		. #x2F75)	; â½µ
-    (=cns11643-1	. #x2837)	; &I-C1-2837; [08-23]
     ))
 (define-char
   '((name		. "KANGXI RADICAL RICE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F76)	; ⽶
+    (=cns11643-1	. #x2838)	; &I-C1-2838; [08-24]
     (<-compat
      ((=ucs		  . #x7C73)	; ç±³
       ))
     (<-radical
      ((=ucs		  . #x7C73)	; ç±³
       ))
-    (=ucs		. #x2F76)	; ⽶
-    (=cns11643-1	. #x2838)	; &I-C1-2838; [08-24]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SILK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F77)	; â½·
+    (=cns11643-1	. #x2839)	; &I-C1-2839; [08-25]
     (<-compat
      ((=ucs		  . #x7CF8)	; 糸
       ))
     (<-radical
      ((=ucs		  . #x7CF8)	; 糸
       ))
-    (=ucs		. #x2F77)	; â½·
-    (=cns11643-1	. #x2839)	; &I-C1-2839; [08-25]
     ))
 (define-char
   '((name		. "KANGXI RADICAL JAR")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F78)	; ⽸
+    (=cns11643-1	. #x283A)	; &I-C1-283A; [08-26]
     (<-compat
      ((=ucs		  . #x7F36)	; 缶
       ))
     (<-radical
      ((=ucs		  . #x7F36)	; 缶
       ))
-    (=ucs		. #x2F78)	; ⽸
-    (=cns11643-1	. #x283A)	; &I-C1-283A; [08-26]
     ))
 (define-char
   '((name		. "KANGXI RADICAL NET")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F79)	; â½¹
+    (=cns11643-1	. #x283B)	; &I-C1-283B; [08-27]
     (<-compat
      ((=ucs		  . #x7F51)	; 网
       ))
     (<-radical
      ((=ucs		  . #x7F51)	; 网
       ))
-    (=ucs		. #x2F79)	; â½¹
-    (=cns11643-1	. #x283B)	; &I-C1-283B; [08-27]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SHEEP")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F7A)	; ⽺
+    (=cns11643-1	. #x283C)	; &I-C1-283C; [08-28]
     (<-compat
      ((=ucs		  . #x7F8A)	; 羊
       ))
     (<-radical
      ((=ucs		  . #x7F8A)	; 羊
       ))
-    (=ucs		. #x2F7A)	; ⽺
-    (=cns11643-1	. #x283C)	; &I-C1-283C; [08-28]
     ))
 (define-char
   '((name		. "KANGXI RADICAL FEATHER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F7B)	; â½»
+    (=cns11643-1	. #x283D)	; &I-C1-283D; [08-29]
     (<-compat
      ((=ucs		  . #x7FBD)	; ç¾½
       ))
     (<-radical
      ((=ucs		  . #x7FBD)	; ç¾½
       ))
-    (=ucs		. #x2F7B)	; â½»
-    (=cns11643-1	. #x283D)	; &I-C1-283D; [08-29]
     ))
 (define-char
   '((name		. "KANGXI RADICAL OLD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F7C)	; â½¼
+    (=cns11643-1	. #x283E)	; &I-C1-283E; [08-30]
     (<-compat
      ((=ucs		  . #x8001)	; 老
       ))
     (<-radical
      ((=ucs		  . #x8001)	; 老
       ))
-    (=ucs		. #x2F7C)	; â½¼
-    (=cns11643-1	. #x283E)	; &I-C1-283E; [08-30]
     ))
 (define-char
   '((name		. "KANGXI RADICAL AND")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F7D)	; â½½
+    (=cns11643-1	. #x283F)	; &I-C1-283F; [08-31]
     (<-compat
      ((=ucs		  . #x800C)	; 而
       ))
     (<-radical
      ((=ucs		  . #x800C)	; 而
       ))
-    (=ucs		. #x2F7D)	; â½½
-    (=cns11643-1	. #x283F)	; &I-C1-283F; [08-31]
     ))
 (define-char
   '((name		. "KANGXI RADICAL PLOW")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F7E)	; â½¾
+    (=cns11643-1	. #x2840)	; &I-C1-2840; [08-32]
     (<-compat
      ((=ucs		  . #x8012)	; 耒
       ))
     (<-radical
      ((=ucs		  . #x8012)	; 耒
       ))
-    (=ucs		. #x2F7E)	; â½¾
-    (=cns11643-1	. #x2840)	; &I-C1-2840; [08-32]
     ))
 (define-char
   '((name		. "KANGXI RADICAL EAR")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F7F)	; ⽿
+    (=cns11643-1	. #x2841)	; &I-C1-2841; [08-33]
     (<-compat
      ((=ucs		  . #x8033)	; 耳
       ))
     (<-radical
      ((=ucs		  . #x8033)	; 耳
       ))
-    (=ucs		. #x2F7F)	; ⽿
-    (=cns11643-1	. #x2841)	; &I-C1-2841; [08-33]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BRUSH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F80)	; ⾀
+    (=cns11643-1	. #x2842)	; &I-C1-2842; [08-34]
     (<-compat
      ((=ucs		  . #x807F)	; 聿
       ))
     (<-radical
      ((=ucs		  . #x807F)	; 聿
       ))
-    (=ucs		. #x2F80)	; ⾀
-    (=cns11643-1	. #x2842)	; &I-C1-2842; [08-34]
     ))
 (define-char
   '((name		. "KANGXI RADICAL MEAT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F81)	; ⾁
+    (=cns11643-1	. #x2843)	; &I-C1-2843; [08-35]
     (<-compat
      ((=ucs		  . #x8089)	; 肉
       ))
     (<-radical
      ((=ucs		  . #x8089)	; 肉
       ))
-    (=ucs		. #x2F81)	; ⾁
-    (=cns11643-1	. #x2843)	; &I-C1-2843; [08-35]
     ))
 (define-char
   '((name		. "KANGXI RADICAL MINISTER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F82)	; ⾂
+    (=cns11643-1	. #x2844)	; &I-C1-2844; [08-36]
     (<-compat
      ((=ucs		  . #x81E3)	; 臣
       ))
     (<-radical
      ((=ucs		  . #x81E3)	; 臣
       ))
-    (=ucs		. #x2F82)	; ⾂
-    (=cns11643-1	. #x2844)	; &I-C1-2844; [08-36]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SELF")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F83)	; ⾃
+    (=cns11643-1	. #x2845)	; &I-C1-2845; [08-37]
     (<-compat
      ((=ucs		  . #x81EA)	; 自
       ))
     (<-radical
      ((=ucs		  . #x81EA)	; 自
       ))
-    (=ucs		. #x2F83)	; ⾃
-    (=cns11643-1	. #x2845)	; &I-C1-2845; [08-37]
     ))
 (define-char
   '((name		. "KANGXI RADICAL ARRIVE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F84)	; ⾄
+    (=cns11643-1	. #x2846)	; &I-C1-2846; [08-38]
     (<-compat
      ((=ucs		  . #x81F3)	; 至
       ))
     (<-radical
      ((=ucs		  . #x81F3)	; 至
       ))
-    (=ucs		. #x2F84)	; ⾄
-    (=cns11643-1	. #x2846)	; &I-C1-2846; [08-38]
     ))
 (define-char
   '((name		. "KANGXI RADICAL MORTAR")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F85)	; ⾅
+    (=cns11643-1	. #x2847)	; &I-C1-2847; [08-39]
     (<-compat
      ((=ucs		  . #x81FC)	; 臼
       ))
     (<-radical
      ((=ucs		  . #x81FC)	; 臼
       ))
-    (=ucs		. #x2F85)	; ⾅
-    (=cns11643-1	. #x2847)	; &I-C1-2847; [08-39]
     ))
 (define-char
   '((name		. "KANGXI RADICAL TONGUE")
@@ -1903,12 +1903,6 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (total-strokes	 . 6)
-    (<-compat
-     ((=ucs		  . #x820C)	; 舌
-      ))
-    (<-radical
-     ((=ucs		  . #x820C)	; 舌
-      ))
     (ideograph-cdp	. -693)
     (ideographic-structure
      (:cdp-combinator	2
@@ -1923,1112 +1917,1118 @@
     (=ucs		. #x2F86)	; ⾆
     (=cns11643-1	. #x2848)	; &I-C1-2848; [08-40]
     (=big5-cdp		. #x88EF)	; &I-CDP-88EF;
+    (<-compat
+     ((=ucs		  . #x820C)	; 舌
+      ))
+    (<-radical
+     ((=ucs		  . #x820C)	; 舌
+      ))
     ))
 (define-char
   '((name		. "KANGXI RADICAL OPPOSE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F87)	; ⾇
+    (=cns11643-1	. #x2849)	; &I-C1-2849; [08-41]
     (<-compat
      ((=ucs		  . #x821B)	; 舛
       ))
     (<-radical
      ((=ucs		  . #x821B)	; 舛
       ))
-    (=ucs		. #x2F87)	; ⾇
-    (=cns11643-1	. #x2849)	; &I-C1-2849; [08-41]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BOAT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F88)	; ⾈
+    (=cns11643-1	. #x284A)	; &I-C1-284A; [08-42]
     (<-compat
      ((=ucs		  . #x821F)	; 舟
       ))
     (<-radical
      ((=ucs		  . #x821F)	; 舟
       ))
-    (=ucs		. #x2F88)	; ⾈
-    (=cns11643-1	. #x284A)	; &I-C1-284A; [08-42]
     ))
 (define-char
   '((name		. "KANGXI RADICAL STOPPING")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F89)	; ⾉
+    (=cns11643-1	. #x284B)	; &I-C1-284B; [08-43]
     (<-compat
      ((=ucs		  . #x826E)	; 艮
       ))
     (<-radical
      ((=ucs		  . #x826E)	; 艮
       ))
-    (=ucs		. #x2F89)	; ⾉
-    (=cns11643-1	. #x284B)	; &I-C1-284B; [08-43]
     ))
 (define-char
   '((name		. "KANGXI RADICAL COLOR")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F8A)	; ⾊
+    (=cns11643-1	. #x284C)	; &I-C1-284C; [08-44]
     (<-compat
      ((=ucs		  . #x8272)	; 色
       ))
     (<-radical
      ((=ucs		  . #x8272)	; 色
       ))
-    (=ucs		. #x2F8A)	; ⾊
-    (=cns11643-1	. #x284C)	; &I-C1-284C; [08-44]
     ))
 (define-char
   '((name		. "KANGXI RADICAL GRASS")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F8B)	; ⾋
+    (=cns11643-1	. #x284D)	; &I-C1-284D; [08-45]
     (<-compat
      ((=ucs		  . #x8278)	; 艸
       ))
     (<-radical
      ((=ucs		  . #x8278)	; 艸
       ))
-    (=ucs		. #x2F8B)	; ⾋
-    (=cns11643-1	. #x284D)	; &I-C1-284D; [08-45]
     ))
 (define-char
   '((name		. "KANGXI RADICAL TIGER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F8C)	; ⾌
+    (=cns11643-1	. #x284E)	; &I-C1-284E; [08-46]
     (<-compat
      ((=ucs		  . #x864D)	; 虍
       ))
     (<-radical
      ((=ucs		  . #x864D)	; 虍
       ))
-    (=ucs		. #x2F8C)	; ⾌
-    (=cns11643-1	. #x284E)	; &I-C1-284E; [08-46]
     ))
 (define-char
   '((name		. "KANGXI RADICAL INSECT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F8D)	; ⾍
+    (=cns11643-1	. #x284F)	; &I-C1-284F; [08-47]
     (<-compat
      ((=ucs		  . #x866B)	; 虫
       ))
     (<-radical
      ((=ucs		  . #x866B)	; 虫
       ))
-    (=ucs		. #x2F8D)	; ⾍
-    (=cns11643-1	. #x284F)	; &I-C1-284F; [08-47]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BLOOD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F8E)	; ⾎
+    (=cns11643-1	. #x2850)	; &I-C1-2850; [08-48]
     (<-compat
      ((=ucs		  . #x8840)	; 血
       ))
     (<-radical
      ((=ucs		  . #x8840)	; 血
       ))
-    (=ucs		. #x2F8E)	; ⾎
-    (=cns11643-1	. #x2850)	; &I-C1-2850; [08-48]
     ))
 (define-char
   '((name		. "KANGXI RADICAL WALK ENCLOSURE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F8F)	; ⾏
+    (=cns11643-1	. #x2851)	; &I-C1-2851; [08-49]
     (<-compat
      ((=ucs		  . #x884C)	; 行
       ))
     (<-radical
      ((=ucs		  . #x884C)	; 行
       ))
-    (=ucs		. #x2F8F)	; ⾏
-    (=cns11643-1	. #x2851)	; &I-C1-2851; [08-49]
     ))
 (define-char
   '((name		. "KANGXI RADICAL CLOTHES")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F90)	; ⾐
+    (=cns11643-1	. #x2852)	; &I-C1-2852; [08-50]
     (<-compat
      ((=ucs		  . #x8863)	; è¡£
       ))
     (<-radical
      ((=ucs		  . #x8863)	; è¡£
       ))
-    (=ucs		. #x2F90)	; ⾐
-    (=cns11643-1	. #x2852)	; &I-C1-2852; [08-50]
     ))
 (define-char
   '((name		. "KANGXI RADICAL WEST")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F91)	; ⾑
+    (=cns11643-1	. #x2853)	; &I-C1-2853; [08-51]
     (<-compat
      ((=ucs		  . #x897E)	; 襾
       ))
     (<-radical
      ((=ucs		  . #x897E)	; 襾
       ))
-    (=ucs		. #x2F91)	; ⾑
-    (=cns11643-1	. #x2853)	; &I-C1-2853; [08-51]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SEE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F92)	; ⾒
+    (=cns11643-1	. #x2854)	; &I-C1-2854; [08-52]
     (<-compat
      ((=ucs		  . #x898B)	; 見
       ))
     (<-radical
      ((=ucs		  . #x898B)	; 見
       ))
-    (=ucs		. #x2F92)	; ⾒
-    (=cns11643-1	. #x2854)	; &I-C1-2854; [08-52]
     ))
 (define-char
   '((name		. "KANGXI RADICAL HORN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F93)	; ⾓
+    (=cns11643-1	. #x2855)	; &I-C1-2855; [08-53]
     (<-compat
      ((=ucs		  . #x89D2)	; 角
       ))
     (<-radical
      ((=ucs		  . #x89D2)	; 角
       ))
-    (=ucs		. #x2F93)	; ⾓
-    (=cns11643-1	. #x2855)	; &I-C1-2855; [08-53]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SPEECH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F94)	; ⾔
+    (=cns11643-1	. #x2856)	; &I-C1-2856; [08-54]
     (<-compat
      ((=ucs		  . #x8A00)	; 言
       ))
     (<-radical
      ((=ucs		  . #x8A00)	; 言
       ))
-    (=ucs		. #x2F94)	; ⾔
-    (=cns11643-1	. #x2856)	; &I-C1-2856; [08-54]
     ))
 (define-char
   '((name		. "KANGXI RADICAL VALLEY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F95)	; ⾕
+    (=cns11643-1	. #x2857)	; &I-C1-2857; [08-55]
     (<-compat
      ((=ucs		  . #x8C37)	; è°·
       ))
     (<-radical
      ((=ucs		  . #x8C37)	; è°·
       ))
-    (=ucs		. #x2F95)	; ⾕
-    (=cns11643-1	. #x2857)	; &I-C1-2857; [08-55]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BEAN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F96)	; ⾖
+    (=cns11643-1	. #x2858)	; &I-C1-2858; [08-56]
     (<-compat
      ((=ucs		  . #x8C46)	; 豆
       ))
     (<-radical
      ((=ucs		  . #x8C46)	; 豆
       ))
-    (=ucs		. #x2F96)	; ⾖
-    (=cns11643-1	. #x2858)	; &I-C1-2858; [08-56]
     ))
 (define-char
   '((name		. "KANGXI RADICAL PIG")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F97)	; ⾗
+    (=cns11643-1	. #x2859)	; &I-C1-2859; [08-57]
     (<-compat
      ((=ucs		  . #x8C55)	; 豕
       ))
     (<-radical
      ((=ucs		  . #x8C55)	; 豕
       ))
-    (=ucs		. #x2F97)	; ⾗
-    (=cns11643-1	. #x2859)	; &I-C1-2859; [08-57]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BADGER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F98)	; ⾘
+    (=cns11643-1	. #x285A)	; &I-C1-285A; [08-58]
     (<-compat
      ((=ucs		  . #x8C78)	; 豸
       ))
     (<-radical
      ((=ucs		  . #x8C78)	; 豸
       ))
-    (=ucs		. #x2F98)	; ⾘
-    (=cns11643-1	. #x285A)	; &I-C1-285A; [08-58]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SHELL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F99)	; ⾙
+    (=cns11643-1	. #x285B)	; &I-C1-285B; [08-59]
     (<-compat
      ((=ucs		  . #x8C9D)	; 貝
       ))
     (<-radical
      ((=ucs		  . #x8C9D)	; 貝
       ))
-    (=ucs		. #x2F99)	; ⾙
-    (=cns11643-1	. #x285B)	; &I-C1-285B; [08-59]
     ))
 (define-char
   '((name		. "KANGXI RADICAL RED")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F9A)	; ⾚
+    (=cns11643-1	. #x285C)	; &I-C1-285C; [08-60]
     (<-compat
      ((=ucs		  . #x8D64)	; 赤
       ))
     (<-radical
      ((=ucs		  . #x8D64)	; 赤
       ))
-    (=ucs		. #x2F9A)	; ⾚
-    (=cns11643-1	. #x285C)	; &I-C1-285C; [08-60]
     ))
 (define-char
   '((name		. "KANGXI RADICAL RUN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F9B)	; ⾛
+    (=cns11643-1	. #x285D)	; &I-C1-285D; [08-61]
     (<-compat
      ((=ucs		  . #x8D70)	; èµ°
       ))
     (<-radical
      ((=ucs		  . #x8D70)	; èµ°
       ))
-    (=ucs		. #x2F9B)	; ⾛
-    (=cns11643-1	. #x285D)	; &I-C1-285D; [08-61]
     ))
 (define-char
   '((name		. "KANGXI RADICAL FOOT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F9C)	; ⾜
+    (=cns11643-1	. #x285E)	; &I-C1-285E; [08-62]
     (<-compat
      ((=ucs		  . #x8DB3)	; 足
       ))
     (<-radical
      ((=ucs		  . #x8DB3)	; 足
       ))
-    (=ucs		. #x2F9C)	; ⾜
-    (=cns11643-1	. #x285E)	; &I-C1-285E; [08-62]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BODY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F9D)	; ⾝
+    (=cns11643-1	. #x285F)	; &I-C1-285F; [08-63]
     (<-compat
      ((=ucs		  . #x8EAB)	; 身
       ))
     (<-radical
      ((=ucs		  . #x8EAB)	; 身
       ))
-    (=ucs		. #x2F9D)	; ⾝
-    (=cns11643-1	. #x285F)	; &I-C1-285F; [08-63]
     ))
 (define-char
   '((name		. "KANGXI RADICAL CART")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F9E)	; ⾞
+    (=cns11643-1	. #x2860)	; &I-C1-2860; [08-64]
     (<-compat
      ((=ucs		  . #x8ECA)	; 車
       ))
     (<-radical
      ((=ucs		  . #x8ECA)	; 車
       ))
-    (=ucs		. #x2F9E)	; ⾞
-    (=cns11643-1	. #x2860)	; &I-C1-2860; [08-64]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BITTER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2F9F)	; ⾟
+    (=cns11643-1	. #x2861)	; &I-C1-2861; [08-65]
     (<-compat
      ((=ucs		  . #x8F9B)	; 辛
       ))
     (<-radical
      ((=ucs		  . #x8F9B)	; 辛
       ))
-    (=ucs		. #x2F9F)	; ⾟
-    (=cns11643-1	. #x2861)	; &I-C1-2861; [08-65]
     ))
 (define-char
   '((name		. "KANGXI RADICAL MORNING")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FA0)	; â¾ 
+    (=cns11643-1	. #x2862)	; &I-C1-2862; [08-66]
     (<-compat
      ((=ucs		  . #x8FB0)	; è¾°
       ))
     (<-radical
      ((=ucs		  . #x8FB0)	; è¾°
       ))
-    (=ucs		. #x2FA0)	; â¾ 
-    (=cns11643-1	. #x2862)	; &I-C1-2862; [08-66]
     ))
 (define-char
   '((name		. "KANGXI RADICAL WALK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FA1)	; ⾡
+    (=cns11643-1	. #x2863)	; &I-C1-2863; [08-67]
+    (=big5-eten		. #xC6D6)	; &B-C6D6;
     (<-compat
      ((=ucs		  . #x8FB5)	; è¾µ
       ))
     (<-radical
      ((=ucs		  . #x8FB5)	; è¾µ
       ))
-    (=ucs		. #x2FA1)	; ⾡
-    (=cns11643-1	. #x2863)	; &I-C1-2863; [08-67]
-    (=big5-eten		. #xC6D6)	; &B-C6D6;
     ))
 (define-char
   '((name		. "KANGXI RADICAL CITY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FA2)	; â¾¢
+    (=cns11643-1	. #x2864)	; &I-C1-2864; [08-68]
     (<-compat
      ((=ucs		  . #x9091)	; 邑
       ))
     (<-radical
      ((=ucs		  . #x9091)	; 邑
       ))
-    (=ucs		. #x2FA2)	; â¾¢
-    (=cns11643-1	. #x2864)	; &I-C1-2864; [08-68]
     ))
 (define-char
   '((name		. "KANGXI RADICAL WINE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FA3)	; â¾£
+    (=cns11643-1	. #x2865)	; &I-C1-2865; [08-69]
     (<-compat
      ((=ucs		  . #x9149)	; 酉
       ))
     (<-radical
      ((=ucs		  . #x9149)	; 酉
       ))
-    (=ucs		. #x2FA3)	; â¾£
-    (=cns11643-1	. #x2865)	; &I-C1-2865; [08-69]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DISTINGUISH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FA4)	; ⾤
+    (=cns11643-1	. #x2866)	; &I-C1-2866; [08-70]
     (<-compat
      ((=ucs		  . #x91C6)	; 釆
       ))
     (<-radical
      ((=ucs		  . #x91C6)	; 釆
       ))
-    (=ucs		. #x2FA4)	; ⾤
-    (=cns11643-1	. #x2866)	; &I-C1-2866; [08-70]
     ))
 (define-char
   '((name		. "KANGXI RADICAL VILLAGE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FA5)	; â¾¥
+    (=cns11643-1	. #x2867)	; &I-C1-2867; [08-71]
     (<-compat
      ((=ucs		  . #x91CC)	; 里
       ))
     (<-radical
      ((=ucs		  . #x91CC)	; 里
       ))
-    (=ucs		. #x2FA5)	; â¾¥
-    (=cns11643-1	. #x2867)	; &I-C1-2867; [08-71]
     ))
 (define-char
   '((name		. "KANGXI RADICAL GOLD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FA6)	; ⾦
+    (=cns11643-1	. #x2868)	; &I-C1-2868; [08-72]
     (<-compat
      ((=ucs		  . #x91D1)	; 金
       ))
     (<-radical
      ((=ucs		  . #x91D1)	; 金
       ))
-    (=ucs		. #x2FA6)	; ⾦
-    (=cns11643-1	. #x2868)	; &I-C1-2868; [08-72]
     ))
 (define-char
   '((name		. "KANGXI RADICAL LONG")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FA7)	; ⾧
+    (=cns11643-1	. #x2869)	; &I-C1-2869; [08-73]
     (<-compat
      ((=ucs		  . #x9577)	; 長
       ))
     (<-radical
      ((=ucs		  . #x9577)	; 長
       ))
-    (=ucs		. #x2FA7)	; ⾧
-    (=cns11643-1	. #x2869)	; &I-C1-2869; [08-73]
     ))
 (define-char
   '((name		. "KANGXI RADICAL GATE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FA8)	; ⾨
+    (=cns11643-1	. #x286A)	; &I-C1-286A; [08-74]
     (<-compat
      ((=ucs		  . #x9580)	; 門
       ))
     (<-radical
      ((=ucs		  . #x9580)	; 門
       ))
-    (=ucs		. #x2FA8)	; ⾨
-    (=cns11643-1	. #x286A)	; &I-C1-286A; [08-74]
     ))
 (define-char
   '((name		. "KANGXI RADICAL MOUND")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FA9)	; ⾩
+    (=cns11643-1	. #x286B)	; &I-C1-286B; [08-75]
     (<-compat
      ((=ucs		  . #x961C)	; 阜
       ))
     (<-radical
      ((=ucs		  . #x961C)	; 阜
       ))
-    (=ucs		. #x2FA9)	; ⾩
-    (=cns11643-1	. #x286B)	; &I-C1-286B; [08-75]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SLAVE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FAA)	; ⾪
+    (=cns11643-1	. #x286C)	; &I-C1-286C; [08-76]
+    (=big5-eten		. #xC6D7)	; &B-C6D7;
     (<-compat
      ((=ucs		  . #x96B6)	; 隶
       ))
     (<-radical
      ((=ucs		  . #x96B6)	; 隶
       ))
-    (=ucs		. #x2FAA)	; ⾪
-    (=cns11643-1	. #x286C)	; &I-C1-286C; [08-76]
-    (=big5-eten		. #xC6D7)	; &B-C6D7;
     ))
 (define-char
   '((name		. "KANGXI RADICAL SHORT TAILED BIRD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FAB)	; ⾫
+    (=cns11643-1	. #x286D)	; &I-C1-286D; [08-77]
     (<-compat
      ((=ucs		  . #x96B9)	; 隹
       ))
     (<-radical
      ((=ucs		  . #x96B9)	; 隹
       ))
-    (=ucs		. #x2FAB)	; ⾫
-    (=cns11643-1	. #x286D)	; &I-C1-286D; [08-77]
     ))
 (define-char
   '((name		. "KANGXI RADICAL RAIN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FAC)	; ⾬
+    (=cns11643-1	. #x286E)	; &I-C1-286E; [08-78]
     (<-compat
      ((=ucs		  . #x96E8)	; 雨
       ))
     (<-radical
      ((=ucs		  . #x96E8)	; 雨
       ))
-    (=ucs		. #x2FAC)	; ⾬
-    (=cns11643-1	. #x286E)	; &I-C1-286E; [08-78]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BLUE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FAD)	; â¾­
+    (=cns11643-1	. #x286F)	; &I-C1-286F; [08-79]
     (<-compat
      ((=ucs		  . #x9751)	; 靑
       ))
     (<-radical
      ((=ucs		  . #x9751)	; 靑
       ))
-    (=ucs		. #x2FAD)	; â¾­
-    (=cns11643-1	. #x286F)	; &I-C1-286F; [08-79]
     ))
 (define-char
   '((name		. "KANGXI RADICAL WRONG")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FAE)	; â¾®
+    (=cns11643-1	. #x2870)	; &I-C1-2870; [08-80]
     (<-compat
      ((=ucs		  . #x975E)	; 非
       ))
     (<-radical
      ((=ucs		  . #x975E)	; 非
       ))
-    (=ucs		. #x2FAE)	; â¾®
-    (=cns11643-1	. #x2870)	; &I-C1-2870; [08-80]
     ))
 (define-char
   '((name		. "KANGXI RADICAL FACE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FAF)	; ⾯
+    (=cns11643-1	. #x2871)	; &I-C1-2871; [08-81]
     (<-compat
      ((=ucs		  . #x9762)	; 面
       ))
     (<-radical
      ((=ucs		  . #x9762)	; 面
       ))
-    (=ucs		. #x2FAF)	; ⾯
-    (=cns11643-1	. #x2871)	; &I-C1-2871; [08-81]
     ))
 (define-char
   '((name		. "KANGXI RADICAL LEATHER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FB0)	; â¾°
+    (=cns11643-1	. #x2872)	; &I-C1-2872; [08-82]
     (<-compat
      ((=ucs		  . #x9769)	; 革
       ))
     (<-radical
      ((=ucs		  . #x9769)	; 革
       ))
-    (=ucs		. #x2FB0)	; â¾°
-    (=cns11643-1	. #x2872)	; &I-C1-2872; [08-82]
     ))
 (define-char
   '((name		. "KANGXI RADICAL TANNED LEATHER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FB1)	; â¾±
+    (=cns11643-1	. #x2873)	; &I-C1-2873; [08-83]
     (<-compat
      ((=ucs		  . #x97CB)	; 韋
       ))
     (<-radical
      ((=ucs		  . #x97CB)	; 韋
       ))
-    (=ucs		. #x2FB1)	; â¾±
-    (=cns11643-1	. #x2873)	; &I-C1-2873; [08-83]
     ))
 (define-char
   '((name		. "KANGXI RADICAL LEEK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FB2)	; â¾²
+    (=cns11643-1	. #x2874)	; &I-C1-2874; [08-84]
     (<-compat
      ((=ucs		  . #x97ED)	; 韭
       ))
     (<-radical
      ((=ucs		  . #x97ED)	; 韭
       ))
-    (=ucs		. #x2FB2)	; â¾²
-    (=cns11643-1	. #x2874)	; &I-C1-2874; [08-84]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SOUND")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FB3)	; â¾³
+    (=cns11643-1	. #x2875)	; &I-C1-2875; [08-85]
     (<-compat
      ((=ucs		  . #x97F3)	; 音
       ))
     (<-radical
      ((=ucs		  . #x97F3)	; 音
       ))
-    (=ucs		. #x2FB3)	; â¾³
-    (=cns11643-1	. #x2875)	; &I-C1-2875; [08-85]
     ))
 (define-char
   '((name		. "KANGXI RADICAL LEAF")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FB4)	; â¾´
+    (=cns11643-1	. #x2876)	; &I-C1-2876; [08-86]
     (<-compat
      ((=ucs		  . #x9801)	; 頁
       ))
     (<-radical
      ((=ucs		  . #x9801)	; 頁
       ))
-    (=ucs		. #x2FB4)	; â¾´
-    (=cns11643-1	. #x2876)	; &I-C1-2876; [08-86]
     ))
 (define-char
   '((name		. "KANGXI RADICAL WIND")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FB5)	; â¾µ
+    (=cns11643-1	. #x2877)	; &I-C1-2877; [08-87]
     (<-compat
      ((=ucs		  . #x98A8)	; 風
       ))
     (<-radical
      ((=ucs		  . #x98A8)	; 風
       ))
-    (=ucs		. #x2FB5)	; â¾µ
-    (=cns11643-1	. #x2877)	; &I-C1-2877; [08-87]
     ))
 (define-char
   '((name		. "KANGXI RADICAL FLY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FB6)	; ⾶
+    (=cns11643-1	. #x2878)	; &I-C1-2878; [08-88]
     (<-compat
      ((=ucs		  . #x98DB)	; 飛
       ))
     (<-radical
      ((=ucs		  . #x98DB)	; 飛
       ))
-    (=ucs		. #x2FB6)	; ⾶
-    (=cns11643-1	. #x2878)	; &I-C1-2878; [08-88]
     ))
 (define-char
   '((name		. "KANGXI RADICAL EAT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FB7)	; â¾·
+    (=cns11643-1	. #x2879)	; &I-C1-2879; [08-89]
     (<-compat
      ((=ucs		  . #x98DF)	; 食
       ))
     (<-radical
      ((=ucs		  . #x98DF)	; 食
       ))
-    (=ucs		. #x2FB7)	; â¾·
-    (=cns11643-1	. #x2879)	; &I-C1-2879; [08-89]
     ))
 (define-char
   '((name		. "KANGXI RADICAL HEAD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FB8)	; ⾸
+    (=cns11643-1	. #x287A)	; &I-C1-287A; [08-90]
     (<-compat
      ((=ucs		  . #x9996)	; 首
       ))
     (<-radical
      ((=ucs		  . #x9996)	; 首
       ))
-    (=ucs		. #x2FB8)	; ⾸
-    (=cns11643-1	. #x287A)	; &I-C1-287A; [08-90]
     ))
 (define-char
   '((name		. "KANGXI RADICAL FRAGRANT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FB9)	; â¾¹
+    (=cns11643-1	. #x287B)	; &I-C1-287B; [08-91]
     (<-compat
      ((=ucs		  . #x9999)	; 香
       ))
     (<-radical
      ((=ucs		  . #x9999)	; 香
       ))
-    (=ucs		. #x2FB9)	; â¾¹
-    (=cns11643-1	. #x287B)	; &I-C1-287B; [08-91]
     ))
 (define-char
   '((name		. "KANGXI RADICAL HORSE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FBA)	; ⾺
+    (=cns11643-1	. #x287C)	; &I-C1-287C; [08-92]
     (<-compat
      ((=ucs		  . #x99AC)	; 馬
       ))
     (<-radical
      ((=ucs		  . #x99AC)	; 馬
       ))
-    (=ucs		. #x2FBA)	; ⾺
-    (=cns11643-1	. #x287C)	; &I-C1-287C; [08-92]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FBB)	; â¾»
+    (=cns11643-1	. #x287D)	; &I-C1-287D; [08-93]
     (<-compat
      ((=ucs		  . #x9AA8)	; 骨
       ))
     (<-radical
      ((=ucs		  . #x9AA8)	; 骨
       ))
-    (=ucs		. #x2FBB)	; â¾»
-    (=cns11643-1	. #x287D)	; &I-C1-287D; [08-93]
     ))
 (define-char
   '((name		. "KANGXI RADICAL TALL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FBC)	; â¾¼
+    (=cns11643-1	. #x287E)	; &I-C1-287E; [08-94]
     (<-compat
      ((=ucs		  . #x9AD8)	; 高
       ))
     (<-radical
      ((=ucs		  . #x9AD8)	; 高
       ))
-    (=ucs		. #x2FBC)	; â¾¼
-    (=cns11643-1	. #x287E)	; &I-C1-287E; [08-94]
     ))
 (define-char
   '((name		. "KANGXI RADICAL HAIR")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FBD)	; â¾½
+    (=cns11643-1	. #x2921)	; &I-C1-2921; [09-01]
     (<-compat
      ((=ucs		  . #x9ADF)	; 髟
       ))
     (<-radical
      ((=ucs		  . #x9ADF)	; 髟
       ))
-    (=ucs		. #x2FBD)	; â¾½
-    (=cns11643-1	. #x2921)	; &I-C1-2921; [09-01]
     ))
 (define-char
   '((name		. "KANGXI RADICAL FIGHT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FBE)	; â¾¾
+    (=cns11643-1	. #x2922)	; &I-C1-2922; [09-02]
     (<-compat
      ((=ucs		  . #x9B25)	; 鬥
       ))
     (<-radical
      ((=ucs		  . #x9B25)	; 鬥
       ))
-    (=ucs		. #x2FBE)	; â¾¾
-    (=cns11643-1	. #x2922)	; &I-C1-2922; [09-02]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SACRIFICIAL WINE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FBF)	; ⾿
+    (=cns11643-1	. #x2923)	; &I-C1-2923; [09-03]
     (<-compat
      ((=ucs		  . #x9B2F)	; 鬯
       ))
     (<-radical
      ((=ucs		  . #x9B2F)	; 鬯
       ))
-    (=ucs		. #x2FBF)	; ⾿
-    (=cns11643-1	. #x2923)	; &I-C1-2923; [09-03]
     ))
 (define-char
   '((name		. "KANGXI RADICAL CAULDRON")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FC0)	; ⿀
+    (=cns11643-1	. #x2924)	; &I-C1-2924; [09-04]
     (<-compat
      ((=ucs		  . #x9B32)	; 鬲
       ))
     (<-radical
      ((=ucs		  . #x9B32)	; 鬲
       ))
-    (=ucs		. #x2FC0)	; ⿀
-    (=cns11643-1	. #x2924)	; &I-C1-2924; [09-04]
     ))
 (define-char
   '((name		. "KANGXI RADICAL GHOST")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FC1)	; ⿁
+    (=cns11643-1	. #x2925)	; &I-C1-2925; [09-05]
     (<-compat
      ((=ucs		  . #x9B3C)	; 鬼
       ))
     (<-radical
      ((=ucs		  . #x9B3C)	; 鬼
       ))
-    (=ucs		. #x2FC1)	; ⿁
-    (=cns11643-1	. #x2925)	; &I-C1-2925; [09-05]
     ))
 (define-char
   '((name		. "KANGXI RADICAL FISH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FC2)	; ⿂
+    (=cns11643-1	. #x2926)	; &I-C1-2926; [09-06]
     (<-compat
      ((=ucs		  . #x9B5A)	; 魚
       ))
     (<-radical
      ((=ucs		  . #x9B5A)	; 魚
       ))
-    (=ucs		. #x2FC2)	; ⿂
-    (=cns11643-1	. #x2926)	; &I-C1-2926; [09-06]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BIRD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FC3)	; ⿃
+    (=cns11643-1	. #x2927)	; &I-C1-2927; [09-07]
     (<-compat
      ((=ucs		  . #x9CE5)	; é³¥
       ))
     (<-radical
      ((=ucs		  . #x9CE5)	; é³¥
       ))
-    (=ucs		. #x2FC3)	; ⿃
-    (=cns11643-1	. #x2927)	; &I-C1-2927; [09-07]
     ))
 (define-char
   '((name		. "KANGXI RADICAL SALT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FC4)	; ⿄
+    (=cns11643-1	. #x2928)	; &I-C1-2928; [09-08]
     (<-compat
      ((=ucs		  . #x9E75)	; é¹µ
       ))
     (<-radical
      ((=ucs		  . #x9E75)	; é¹µ
       ))
-    (=ucs		. #x2FC4)	; ⿄
-    (=cns11643-1	. #x2928)	; &I-C1-2928; [09-08]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DEER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FC5)	; ⿅
+    (=cns11643-1	. #x2929)	; &I-C1-2929; [09-09]
     (<-compat
      ((=ucs		  . #x9E7F)	; 鹿
       ))
     (<-radical
      ((=ucs		  . #x9E7F)	; 鹿
       ))
-    (=ucs		. #x2FC5)	; ⿅
-    (=cns11643-1	. #x2929)	; &I-C1-2929; [09-09]
     ))
 (define-char
   '((name		. "KANGXI RADICAL WHEAT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FC6)	; ⿆
+    (=cns11643-1	. #x292A)	; &I-C1-292A; [09-10]
     (<-compat
      ((=ucs		  . #x9EA5)	; 麥
       ))
     (<-radical
      ((=ucs		  . #x9EA5)	; 麥
       ))
-    (=ucs		. #x2FC6)	; ⿆
-    (=cns11643-1	. #x292A)	; &I-C1-292A; [09-10]
     ))
 (define-char
   '((name		. "KANGXI RADICAL HEMP")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FC7)	; ⿇
+    (=cns11643-1	. #x292B)	; &I-C1-292B; [09-11]
     (<-compat
      ((=ucs		  . #x9EBB)	; 麻
       ))
     (<-radical
      ((=ucs		  . #x9EBB)	; 麻
       ))
-    (=ucs		. #x2FC7)	; ⿇
-    (=cns11643-1	. #x292B)	; &I-C1-292B; [09-11]
     ))
 (define-char
   '((name		. "KANGXI RADICAL YELLOW")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FC8)	; ⿈
+    (=cns11643-1	. #x292C)	; &I-C1-292C; [09-12]
     (<-compat
      ((=ucs		  . #x9EC3)	; 黃
       ))
     (<-radical
      ((=ucs		  . #x9EC3)	; 黃
       ))
-    (=ucs		. #x2FC8)	; ⿈
-    (=cns11643-1	. #x292C)	; &I-C1-292C; [09-12]
     ))
 (define-char
   '((name		. "KANGXI RADICAL MILLET")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FC9)	; ⿉
+    (=cns11643-1	. #x292D)	; &I-C1-292D; [09-13]
     (<-compat
      ((=ucs		  . #x9ECD)	; 黍
       ))
     (<-radical
      ((=ucs		  . #x9ECD)	; 黍
       ))
-    (=ucs		. #x2FC9)	; ⿉
-    (=cns11643-1	. #x292D)	; &I-C1-292D; [09-13]
     ))
 (define-char
   '((name		. "KANGXI RADICAL BLACK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FCA)	; ⿊
+    (=cns11643-1	. #x292E)	; &I-C1-292E; [09-14]
     (<-compat
      ((=ucs		  . #x9ED1)	; 黑
       ))
     (<-radical
      ((=ucs		  . #x9ED1)	; 黑
       ))
-    (=ucs		. #x2FCA)	; ⿊
-    (=cns11643-1	. #x292E)	; &I-C1-292E; [09-14]
     ))
 (define-char
   '((name		. "KANGXI RADICAL EMBROIDERY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FCB)	; ⿋
+    (=cns11643-1	. #x292F)	; &I-C1-292F; [09-15]
     (<-compat
      ((=ucs		  . #x9EF9)	; 黹
       ))
     (<-radical
      ((=ucs		  . #x9EF9)	; 黹
       ))
-    (=ucs		. #x2FCB)	; ⿋
-    (=cns11643-1	. #x292F)	; &I-C1-292F; [09-15]
     ))
 (define-char
   '((name		. "KANGXI RADICAL FROG")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FCC)	; ⿌
+    (=cns11643-1	. #x2930)	; &I-C1-2930; [09-16]
     (<-compat
      ((=ucs		  . #x9EFD)	; 黽
       ))
     (<-radical
      ((=ucs		  . #x9EFD)	; 黽
       ))
-    (=ucs		. #x2FCC)	; ⿌
-    (=cns11643-1	. #x2930)	; &I-C1-2930; [09-16]
     ))
 (define-char
   '((name		. "KANGXI RADICAL TRIPOD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FCD)	; ⿍
+    (=cns11643-1	. #x2931)	; &I-C1-2931; [09-17]
     (<-compat
      ((=ucs		  . #x9F0E)	; 鼎
       ))
     (<-radical
      ((=ucs		  . #x9F0E)	; 鼎
       ))
-    (=ucs		. #x2FCD)	; ⿍
-    (=cns11643-1	. #x2931)	; &I-C1-2931; [09-17]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DRUM")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FCE)	; ⿎
+    (=cns11643-1	. #x2932)	; &I-C1-2932; [09-18]
     (<-compat
      ((=ucs		  . #x9F13)	; 鼓
       ))
     (<-radical
      ((=ucs		  . #x9F13)	; 鼓
       ))
-    (=ucs		. #x2FCE)	; ⿎
-    (=cns11643-1	. #x2932)	; &I-C1-2932; [09-18]
     ))
 (define-char
   '((name		. "KANGXI RADICAL RAT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FCF)	; ⿏
+    (=cns11643-1	. #x2933)	; &I-C1-2933; [09-19]
     (<-compat
      ((=ucs		  . #x9F20)	; é¼ 
       ))
     (<-radical
      ((=ucs		  . #x9F20)	; é¼ 
       ))
-    (=ucs		. #x2FCF)	; ⿏
-    (=cns11643-1	. #x2933)	; &I-C1-2933; [09-19]
     ))
 (define-char
   '((name		. "KANGXI RADICAL NOSE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FD0)	; ⿐
+    (=cns11643-1	. #x2934)	; &I-C1-2934; [09-20]
     (<-compat
      ((=ucs		  . #x9F3B)	; é¼»
       ))
     (<-radical
      ((=ucs		  . #x9F3B)	; é¼»
       ))
-    (=ucs		. #x2FD0)	; ⿐
-    (=cns11643-1	. #x2934)	; &I-C1-2934; [09-20]
     ))
 (define-char
   '((name		. "KANGXI RADICAL EVEN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FD1)	; ⿑
+    (=cns11643-1	. #x2935)	; &I-C1-2935; [09-21]
     (<-compat
      ((=ucs		  . #x9F4A)	; 齊
       ))
     (<-radical
      ((=ucs		  . #x9F4A)	; 齊
       ))
-    (=ucs		. #x2FD1)	; ⿑
-    (=cns11643-1	. #x2935)	; &I-C1-2935; [09-21]
     ))
 (define-char
   '((name		. "KANGXI RADICAL TOOTH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FD2)	; ⿒
+    (=cns11643-1	. #x2936)	; &I-C1-2936; [09-22]
     (<-compat
      ((=ucs		  . #x9F52)	; 齒
       ))
     (<-radical
      ((=ucs		  . #x9F52)	; 齒
       ))
-    (=ucs		. #x2FD2)	; ⿒
-    (=cns11643-1	. #x2936)	; &I-C1-2936; [09-22]
     ))
 (define-char
   '((name		. "KANGXI RADICAL DRAGON")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FD3)	; ⿓
+    (=cns11643-1	. #x2937)	; &I-C1-2937; [09-23]
     (<-compat
      ((=ucs		  . #x9F8D)	; 龍
       ))
     (<-radical
      ((=ucs		  . #x9F8D)	; 龍
       ))
-    (=ucs		. #x2FD3)	; ⿓
-    (=cns11643-1	. #x2937)	; &I-C1-2937; [09-23]
     ))
 (define-char
   '((name		. "KANGXI RADICAL TURTLE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FD4)	; ⿔
+    (=cns11643-1	. #x2938)	; &I-C1-2938; [09-24]
     (<-compat
      ((=ucs		  . #x9F9C)	; 龜
       ))
     (<-radical
      ((=ucs		  . #x9F9C)	; 龜
       ))
-    (=ucs		. #x2FD4)	; ⿔
-    (=cns11643-1	. #x2938)	; &I-C1-2938; [09-24]
     ))
 (define-char
   '((name		. "KANGXI RADICAL FLUTE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x2FD5)	; ⿕
+    (=cns11643-1	. #x2939)	; &I-C1-2939; [09-25]
     (<-compat
      ((=ucs		  . #x9FA0)	; é¾ 
       ))
     (<-radical
      ((=ucs		  . #x9FA0)	; é¾ 
       ))
-    (=ucs		. #x2FD5)	; ⿕
-    (=cns11643-1	. #x2939)	; &I-C1-2939; [09-25]
     ))
diff --git a/lisp/utf-2000/u03000-CJK-Symbols-and-Punctuation.el b/lisp/utf-2000/u03000-CJK-Symbols-and-Punctuation.el
index 55f848e..6461bd0 100644
--- a/lisp/utf-2000/u03000-CJK-Symbols-and-Punctuation.el
+++ b/lisp/utf-2000/u03000-CJK-Symbols-and-Punctuation.el
@@ -4,16 +4,16 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
-    (<-ideographic
-     ((name		  . "SPACE")
-      (=ucs		  . #x0020)	;
-      ))
     (=ucs		. #x3000)	; 　
     (=jis-x0208		. #x2121)	; &I-J90-2121; [01-01]
     (=gb2312		. #x2121)	; &I-G0-2121; [01-01]
     (=ks-x1001		. #x2121)	; &I-K0-2121; [01-01]
     (=cns11643-1	. #x2121)	; &I-C1-2121; [01-01]
     (=big5		. #xA140)	; &I-B-A140;
+    (<-ideographic
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      ))
     ))
 (define-char
   '((name		. "IDEOGRAPHIC COMMA")
@@ -534,11 +534,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #x3036)	; 〶
     (<-compat/circled
      ((name		  . "POSTAL MARK")
       (=ucs		  . #x3012)	; 〒
       ))
-    (=ucs		. #x3036)	; 〶
     ))
 (define-char
   '((name . "IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL")
@@ -553,12 +553,12 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 10)
-    (<-compat/Hangzhou-Numeral
-     ((=ucs		  . #x5341)	; 十
-      ))
     (=ucs		. #x3038)	; 〸
     (=cns11643-1	. #x243E)	; &I-C1-243E; [04-30]
     (=big5		. #xA2CC)	; &I-B-A2CC;
+    (<-compat/Hangzhou-Numeral
+     ((=ucs		  . #x5341)	; 十
+      ))
     ))
 (define-char
   '((name		. "HANGZHOU NUMERAL TWENTY")
@@ -566,12 +566,12 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 20)
-    (<-compat/Hangzhou-Numeral
-     ((=ucs		  . #x5344)	; 卄
-      ))
     (=ucs		. #x3039)	; 〹
     (=cns11643-1	. #x243F)	; &I-C1-243F; [04-31]
     (=big5		. #xA2CD)	; &I-B-A2CD;
+    (<-compat/Hangzhou-Numeral
+     ((=ucs		  . #x5344)	; 卄
+      ))
     ))
 (define-char
   '((name		. "HANGZHOU NUMERAL THIRTY")
@@ -579,12 +579,12 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 30)
-    (<-compat/Hangzhou-Numeral
-     ((=ucs		  . #x5345)	; 卅
-      ))
     (=ucs		. #x303A)	; 〺
     (=cns11643-1	. #x2440)	; &I-C1-2440; [04-32]
     (=big5		. #xA2CE)	; &I-B-A2CE;
+    (<-compat/Hangzhou-Numeral
+     ((=ucs		  . #x5345)	; 卅
+      ))
     ))
 (define-char
   '((name		. "VERTICAL IDEOGRAPHIC ITERATION MARK")
diff --git a/lisp/utf-2000/u03100-Bopomofo.el b/lisp/utf-2000/u03100-Bopomofo.el
index 8cf57d4..67f55c5 100644
--- a/lisp/utf-2000/u03100-Bopomofo.el
+++ b/lisp/utf-2000/u03100-Bopomofo.el
@@ -14,13 +14,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-Bopomofo
-     ((=ucs		  . #x6535)	; 攵
-      ))
     (=ucs		. #x3106)	; ㄆ
     (=gb2312		. #x2846)	; &I-G0-2846; [08-38]
     (=cns11643-1	. #x2548)	; &I-C1-2548; [05-40]
     (=big5		. #xA375)	; &I-B-A375;
+    (<-Bopomofo
+     ((=ucs		  . #x6535)	; 攵
+      ))
     ))
 (define-char
   '((name		. "BOPOMOFO LETTER M")
@@ -47,13 +47,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-Bopomofo
-     ((=ucs		  . #x206A3)	; 𠚣
-      ))
     (=ucs		. #x3109)	; ㄉ
     (=gb2312		. #x2849)	; &I-G0-2849; [08-41]
     (=cns11643-1	. #x254B)	; &I-C1-254B; [05-43]
     (=big5		. #xA378)	; &I-B-A378;
+    (<-Bopomofo
+     ((=ucs		  . #x206A3)	; 𠚣
+      ))
     ))
 (define-char
   '((name		. "BOPOMOFO LETTER T")
@@ -101,13 +101,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-Bopomofo
-     ((=ucs		  . #x4E02)	; 丂
-      ))
     (=ucs		. #x310E)	; ㄎ
     (=gb2312		. #x284E)	; &I-G0-284E; [08-46]
     (=cns11643-1	. #x2550)	; &I-C1-2550; [05-48]
     (=big5		. #xA37D)	; &I-B-A37D;
+    (<-Bopomofo
+     ((=ucs		  . #x4E02)	; 丂
+      ))
     ))
 (define-char
   '((name		. "BOPOMOFO LETTER H")
@@ -205,14 +205,14 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-Bopomofo
-     ((=gt		  . 00005)	; &GT-00005;
-      (=daikanwa	  . 00009)	; &I-M-00009;
-      ))
     (=ucs		. #x3118)	; ㄘ
     (=gb2312		. #x2858)	; &I-G0-2858; [08-56]
     (=cns11643-1	. #x255A)	; &I-C1-255A; [05-58]
     (=big5		. #xA3A9)	; &I-B-A3A9;
+    (<-Bopomofo
+     ((=gt		  . 00005)	; &GT-00005;
+      (=daikanwa	  . 00009)	; &I-M-00009;
+      ))
     ))
 (define-char
   '((name		. "BOPOMOFO LETTER S")
@@ -240,13 +240,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-Bopomofo
-     ((=ucs		  . #x20000)	; 𠀀
-      ))
     (=ucs		. #x311B)	; ㄛ
     (=gb2312		. #x285B)	; &I-G0-285B; [08-59]
     (=cns11643-1	. #x255D)	; &I-C1-255D; [05-61]
     (=big5		. #xA3AC)	; &I-B-A3AC;
+    (<-Bopomofo
+     ((=ucs		  . #x20000)	; 𠀀
+      ))
     ))
 (define-char
   '((name		. "BOPOMOFO LETTER E")
@@ -254,14 +254,14 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-Bopomofo
-     ((=gt		  . 00038)	; &GT-00038;
-      (=daikanwa	  . 00005)	; &I-M-00005;
-      ))
     (=ucs		. #x311C)	; ㄜ
     (=gb2312		. #x285C)	; &I-G0-285C; [08-60]
     (=cns11643-1	. #x255E)	; &I-C1-255E; [05-62]
     (=big5		. #xA3AD)	; &I-B-A3AD;
+    (<-Bopomofo
+     ((=gt		  . 00038)	; &GT-00038;
+      (=daikanwa	  . 00005)	; &I-M-00005;
+      ))
     ))
 (define-char
   '((name		. "BOPOMOFO LETTER EH")
@@ -379,13 +379,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-Bopomofo
-     ((=ucs		  . #x3405)	; 㐅
-      ))
     (=ucs		. #x3128)	; ㄨ
     (=gb2312		. #x2868)	; &I-G0-2868; [08-72]
     (=cns11643-1	. #x256A)	; &I-C1-256A; [05-74]
     (=big5		. #xA3B9)	; &I-B-A3B9;
+    (<-Bopomofo
+     ((=ucs		  . #x3405)	; 㐅
+      ))
     ))
 (define-char
   '((name		. "BOPOMOFO LETTER IU")
diff --git a/lisp/utf-2000/u03130-Hangul-Compatibility-Jamo.el b/lisp/utf-2000/u03130-Hangul-Compatibility-Jamo.el
index 1be19a3..569aa49 100644
--- a/lisp/utf-2000/u03130-Hangul-Compatibility-Jamo.el
+++ b/lisp/utf-2000/u03130-Hangul-Compatibility-Jamo.el
@@ -4,1126 +4,1126 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3131)	; ㄱ
+    (=ks-x1001		. #x2421)	; &I-K0-2421; [04-01]
     (<-compat
      ((name		  . "HANGUL CHOSEONG KIYEOK")
       (=ucs		  . #x1100)	; ᄀ
       ))
-    (=ucs		. #x3131)	; ㄱ
-    (=ks-x1001		. #x2421)	; &I-K0-2421; [04-01]
     ))
 (define-char
   '((name		. "HANGUL LETTER SSANGKIYEOK")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3132)	; ㄲ
+    (=ks-x1001		. #x2422)	; &I-K0-2422; [04-02]
     (<-compat
      ((name		  . "HANGUL CHOSEONG SSANGKIYEOK")
       (=ucs		  . #x1101)	; ᄁ
       ))
-    (=ucs		. #x3132)	; ㄲ
-    (=ks-x1001		. #x2422)	; &I-K0-2422; [04-02]
     ))
 (define-char
   '((name		. "HANGUL LETTER KIYEOK-SIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3133)	; ㄳ
+    (=ks-x1001		. #x2423)	; &I-K0-2423; [04-03]
     (<-compat
      ((name		  . "HANGUL JONGSEONG KIYEOK-SIOS")
       (=ucs		  . #x11AA)	; ᆪ
       ))
-    (=ucs		. #x3133)	; ㄳ
-    (=ks-x1001		. #x2423)	; &I-K0-2423; [04-03]
     ))
 (define-char
   '((name		. "HANGUL LETTER NIEUN")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3134)	; ㄴ
+    (=ks-x1001		. #x2424)	; &I-K0-2424; [04-04]
     (<-compat
      ((name		  . "HANGUL CHOSEONG NIEUN")
       (=ucs		  . #x1102)	; ᄂ
       ))
-    (=ucs		. #x3134)	; ㄴ
-    (=ks-x1001		. #x2424)	; &I-K0-2424; [04-04]
     ))
 (define-char
   '((name		. "HANGUL LETTER NIEUN-CIEUC")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3135)	; ㄵ
+    (=ks-x1001		. #x2425)	; &I-K0-2425; [04-05]
     (<-compat
      ((name		  . "HANGUL JONGSEONG NIEUN-CIEUC")
       (=ucs		  . #x11AC)	; ᆬ
       ))
-    (=ucs		. #x3135)	; ㄵ
-    (=ks-x1001		. #x2425)	; &I-K0-2425; [04-05]
     ))
 (define-char
   '((name		. "HANGUL LETTER NIEUN-HIEUH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3136)	; ㄶ
+    (=ks-x1001		. #x2426)	; &I-K0-2426; [04-06]
     (<-compat
      ((name		  . "HANGUL JONGSEONG NIEUN-HIEUH")
       (=ucs		  . #x11AD)	; ᆭ
       ))
-    (=ucs		. #x3136)	; ㄶ
-    (=ks-x1001		. #x2426)	; &I-K0-2426; [04-06]
     ))
 (define-char
   '((name		. "HANGUL LETTER TIKEUT")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3137)	; ㄷ
+    (=ks-x1001		. #x2427)	; &I-K0-2427; [04-07]
     (<-compat
      ((name		  . "HANGUL CHOSEONG TIKEUT")
       (=ucs		  . #x1103)	; ᄃ
       ))
-    (=ucs		. #x3137)	; ㄷ
-    (=ks-x1001		. #x2427)	; &I-K0-2427; [04-07]
     ))
 (define-char
   '((name		. "HANGUL LETTER SSANGTIKEUT")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3138)	; ㄸ
+    (=ks-x1001		. #x2428)	; &I-K0-2428; [04-08]
     (<-compat
      ((name		  . "HANGUL CHOSEONG SSANGTIKEUT")
       (=ucs		  . #x1104)	; ᄄ
       ))
-    (=ucs		. #x3138)	; ㄸ
-    (=ks-x1001		. #x2428)	; &I-K0-2428; [04-08]
     ))
 (define-char
   '((name		. "HANGUL LETTER RIEUL")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3139)	; ㄹ
+    (=ks-x1001		. #x2429)	; &I-K0-2429; [04-09]
     (<-compat
      ((name		  . "HANGUL CHOSEONG RIEUL")
       (=ucs		  . #x1105)	; ᄅ
       ))
-    (=ucs		. #x3139)	; ㄹ
-    (=ks-x1001		. #x2429)	; &I-K0-2429; [04-09]
     ))
 (define-char
   '((name		. "HANGUL LETTER RIEUL-KIYEOK")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x313A)	; ㄺ
+    (=ks-x1001		. #x242A)	; &I-K0-242A; [04-10]
     (<-compat
      ((name		  . "HANGUL JONGSEONG RIEUL-KIYEOK")
       (=ucs		  . #x11B0)	; ᆰ
       ))
-    (=ucs		. #x313A)	; ㄺ
-    (=ks-x1001		. #x242A)	; &I-K0-242A; [04-10]
     ))
 (define-char
   '((name		. "HANGUL LETTER RIEUL-MIEUM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x313B)	; ㄻ
+    (=ks-x1001		. #x242B)	; &I-K0-242B; [04-11]
     (<-compat
      ((name		  . "HANGUL JONGSEONG RIEUL-MIEUM")
       (=ucs		  . #x11B1)	; ᆱ
       ))
-    (=ucs		. #x313B)	; ㄻ
-    (=ks-x1001		. #x242B)	; &I-K0-242B; [04-11]
     ))
 (define-char
   '((name		. "HANGUL LETTER RIEUL-PIEUP")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x313C)	; ㄼ
+    (=ks-x1001		. #x242C)	; &I-K0-242C; [04-12]
     (<-compat
      ((name		  . "HANGUL JONGSEONG RIEUL-PIEUP")
       (=ucs		  . #x11B2)	; ᆲ
       ))
-    (=ucs		. #x313C)	; ㄼ
-    (=ks-x1001		. #x242C)	; &I-K0-242C; [04-12]
     ))
 (define-char
   '((name		. "HANGUL LETTER RIEUL-SIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x313D)	; ㄽ
+    (=ks-x1001		. #x242D)	; &I-K0-242D; [04-13]
     (<-compat
      ((name		  . "HANGUL JONGSEONG RIEUL-SIOS")
       (=ucs		  . #x11B3)	; ᆳ
       ))
-    (=ucs		. #x313D)	; ㄽ
-    (=ks-x1001		. #x242D)	; &I-K0-242D; [04-13]
     ))
 (define-char
   '((name		. "HANGUL LETTER RIEUL-THIEUTH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x313E)	; ㄾ
+    (=ks-x1001		. #x242E)	; &I-K0-242E; [04-14]
     (<-compat
      ((name		  . "HANGUL JONGSEONG RIEUL-THIEUTH")
       (=ucs		  . #x11B4)	; ᆴ
       ))
-    (=ucs		. #x313E)	; ㄾ
-    (=ks-x1001		. #x242E)	; &I-K0-242E; [04-14]
     ))
 (define-char
   '((name		. "HANGUL LETTER RIEUL-PHIEUPH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x313F)	; ㄿ
+    (=ks-x1001		. #x242F)	; &I-K0-242F; [04-15]
     (<-compat
      ((name		  . "HANGUL JONGSEONG RIEUL-PHIEUPH")
       (=ucs		  . #x11B5)	; ᆵ
       ))
-    (=ucs		. #x313F)	; ㄿ
-    (=ks-x1001		. #x242F)	; &I-K0-242F; [04-15]
     ))
 (define-char
   '((name		. "HANGUL LETTER RIEUL-HIEUH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3140)	; ㅀ
+    (=ks-x1001		. #x2430)	; &I-K0-2430; [04-16]
     (<-compat
      ((name		  . "HANGUL CHOSEONG RIEUL-HIEUH")
       (=ucs		  . #x111A)	; ᄚ
       ))
-    (=ucs		. #x3140)	; ㅀ
-    (=ks-x1001		. #x2430)	; &I-K0-2430; [04-16]
     ))
 (define-char
   '((name		. "HANGUL LETTER MIEUM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3141)	; ㅁ
+    (=ks-x1001		. #x2431)	; &I-K0-2431; [04-17]
     (<-compat
      ((name		  . "HANGUL CHOSEONG MIEUM")
       (=ucs		  . #x1106)	; ᄆ
       ))
-    (=ucs		. #x3141)	; ㅁ
-    (=ks-x1001		. #x2431)	; &I-K0-2431; [04-17]
     ))
 (define-char
   '((name		. "HANGUL LETTER PIEUP")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3142)	; ㅂ
+    (=ks-x1001		. #x2432)	; &I-K0-2432; [04-18]
     (<-compat
      ((name		  . "HANGUL CHOSEONG PIEUP")
       (=ucs		  . #x1107)	; ᄇ
       ))
-    (=ucs		. #x3142)	; ㅂ
-    (=ks-x1001		. #x2432)	; &I-K0-2432; [04-18]
     ))
 (define-char
   '((name		. "HANGUL LETTER SSANGPIEUP")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3143)	; ㅃ
+    (=ks-x1001		. #x2433)	; &I-K0-2433; [04-19]
     (<-compat
      ((name		  . "HANGUL CHOSEONG SSANGPIEUP")
       (=ucs		  . #x1108)	; ᄈ
       ))
-    (=ucs		. #x3143)	; ㅃ
-    (=ks-x1001		. #x2433)	; &I-K0-2433; [04-19]
     ))
 (define-char
   '((name		. "HANGUL LETTER PIEUP-SIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3144)	; ㅄ
+    (=ks-x1001		. #x2434)	; &I-K0-2434; [04-20]
     (<-compat
      ((name		  . "HANGUL CHOSEONG PIEUP-SIOS")
       (=ucs		  . #x1121)	; ᄡ
       ))
-    (=ucs		. #x3144)	; ㅄ
-    (=ks-x1001		. #x2434)	; &I-K0-2434; [04-20]
     ))
 (define-char
   '((name		. "HANGUL LETTER SIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3145)	; ㅅ
+    (=ks-x1001		. #x2435)	; &I-K0-2435; [04-21]
     (<-compat
      ((name		  . "HANGUL CHOSEONG SIOS")
       (=ucs		  . #x1109)	; ᄉ
       ))
-    (=ucs		. #x3145)	; ㅅ
-    (=ks-x1001		. #x2435)	; &I-K0-2435; [04-21]
     ))
 (define-char
   '((name		. "HANGUL LETTER SSANGSIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3146)	; ㅆ
+    (=ks-x1001		. #x2436)	; &I-K0-2436; [04-22]
     (<-compat
      ((name		  . "HANGUL CHOSEONG SSANGSIOS")
       (=ucs		  . #x110A)	; ᄊ
       ))
-    (=ucs		. #x3146)	; ㅆ
-    (=ks-x1001		. #x2436)	; &I-K0-2436; [04-22]
     ))
 (define-char
   '((name		. "HANGUL LETTER IEUNG")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3147)	; ㅇ
+    (=ks-x1001		. #x2437)	; &I-K0-2437; [04-23]
     (<-compat
      ((name		  . "HANGUL CHOSEONG IEUNG")
       (=ucs		  . #x110B)	; ᄋ
       ))
-    (=ucs		. #x3147)	; ㅇ
-    (=ks-x1001		. #x2437)	; &I-K0-2437; [04-23]
     ))
 (define-char
   '((name		. "HANGUL LETTER CIEUC")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3148)	; ㅈ
+    (=ks-x1001		. #x2438)	; &I-K0-2438; [04-24]
     (<-compat
      ((name		  . "HANGUL CHOSEONG CIEUC")
       (=ucs		  . #x110C)	; ᄌ
       ))
-    (=ucs		. #x3148)	; ㅈ
-    (=ks-x1001		. #x2438)	; &I-K0-2438; [04-24]
     ))
 (define-char
   '((name		. "HANGUL LETTER SSANGCIEUC")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3149)	; ㅉ
+    (=ks-x1001		. #x2439)	; &I-K0-2439; [04-25]
     (<-compat
      ((name		  . "HANGUL CHOSEONG SSANGCIEUC")
       (=ucs		  . #x110D)	; ᄍ
       ))
-    (=ucs		. #x3149)	; ㅉ
-    (=ks-x1001		. #x2439)	; &I-K0-2439; [04-25]
     ))
 (define-char
   '((name		. "HANGUL LETTER CHIEUCH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x314A)	; ㅊ
+    (=ks-x1001		. #x243A)	; &I-K0-243A; [04-26]
     (<-compat
      ((name		  . "HANGUL CHOSEONG CHIEUCH")
       (=ucs		  . #x110E)	; ᄎ
       ))
-    (=ucs		. #x314A)	; ㅊ
-    (=ks-x1001		. #x243A)	; &I-K0-243A; [04-26]
     ))
 (define-char
   '((name		. "HANGUL LETTER KHIEUKH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x314B)	; ㅋ
+    (=ks-x1001		. #x243B)	; &I-K0-243B; [04-27]
     (<-compat
      ((name		  . "HANGUL CHOSEONG KHIEUKH")
       (=ucs		  . #x110F)	; ᄏ
       ))
-    (=ucs		. #x314B)	; ㅋ
-    (=ks-x1001		. #x243B)	; &I-K0-243B; [04-27]
     ))
 (define-char
   '((name		. "HANGUL LETTER THIEUTH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x314C)	; ㅌ
+    (=ks-x1001		. #x243C)	; &I-K0-243C; [04-28]
     (<-compat
      ((name		  . "HANGUL CHOSEONG THIEUTH")
       (=ucs		  . #x1110)	; ᄐ
       ))
-    (=ucs		. #x314C)	; ㅌ
-    (=ks-x1001		. #x243C)	; &I-K0-243C; [04-28]
     ))
 (define-char
   '((name		. "HANGUL LETTER PHIEUPH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x314D)	; ㅍ
+    (=ks-x1001		. #x243D)	; &I-K0-243D; [04-29]
     (<-compat
      ((name		  . "HANGUL CHOSEONG PHIEUPH")
       (=ucs		  . #x1111)	; ᄑ
       ))
-    (=ucs		. #x314D)	; ㅍ
-    (=ks-x1001		. #x243D)	; &I-K0-243D; [04-29]
     ))
 (define-char
   '((name		. "HANGUL LETTER HIEUH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x314E)	; ㅎ
+    (=ks-x1001		. #x243E)	; &I-K0-243E; [04-30]
     (<-compat
      ((name		  . "HANGUL CHOSEONG HIEUH")
       (=ucs		  . #x1112)	; ᄒ
       ))
-    (=ucs		. #x314E)	; ㅎ
-    (=ks-x1001		. #x243E)	; &I-K0-243E; [04-30]
     ))
 (define-char
   '((name		. "HANGUL LETTER A")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x314F)	; ㅏ
+    (=ks-x1001		. #x243F)	; &I-K0-243F; [04-31]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG A")
       (=ucs		  . #x1161)	; ᅡ
       ))
-    (=ucs		. #x314F)	; ㅏ
-    (=ks-x1001		. #x243F)	; &I-K0-243F; [04-31]
     ))
 (define-char
   '((name		. "HANGUL LETTER AE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3150)	; ㅐ
+    (=ks-x1001		. #x2440)	; &I-K0-2440; [04-32]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG AE")
       (=ucs		  . #x1162)	; ᅢ
       ))
-    (=ucs		. #x3150)	; ㅐ
-    (=ks-x1001		. #x2440)	; &I-K0-2440; [04-32]
     ))
 (define-char
   '((name		. "HANGUL LETTER YA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3151)	; ㅑ
+    (=ks-x1001		. #x2441)	; &I-K0-2441; [04-33]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG YA")
       (=ucs		  . #x1163)	; ᅣ
       ))
-    (=ucs		. #x3151)	; ㅑ
-    (=ks-x1001		. #x2441)	; &I-K0-2441; [04-33]
     ))
 (define-char
   '((name		. "HANGUL LETTER YAE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3152)	; ㅒ
+    (=ks-x1001		. #x2442)	; &I-K0-2442; [04-34]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG YAE")
       (=ucs		  . #x1164)	; ᅤ
       ))
-    (=ucs		. #x3152)	; ㅒ
-    (=ks-x1001		. #x2442)	; &I-K0-2442; [04-34]
     ))
 (define-char
   '((name		. "HANGUL LETTER EO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3153)	; ㅓ
+    (=ks-x1001		. #x2443)	; &I-K0-2443; [04-35]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG EO")
       (=ucs		  . #x1165)	; ᅥ
       ))
-    (=ucs		. #x3153)	; ㅓ
-    (=ks-x1001		. #x2443)	; &I-K0-2443; [04-35]
     ))
 (define-char
   '((name		. "HANGUL LETTER E")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3154)	; ㅔ
+    (=ks-x1001		. #x2444)	; &I-K0-2444; [04-36]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG E")
       (=ucs		  . #x1166)	; ᅦ
       ))
-    (=ucs		. #x3154)	; ㅔ
-    (=ks-x1001		. #x2444)	; &I-K0-2444; [04-36]
     ))
 (define-char
   '((name		. "HANGUL LETTER YEO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3155)	; ㅕ
+    (=ks-x1001		. #x2445)	; &I-K0-2445; [04-37]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG YEO")
       (=ucs		  . #x1167)	; ᅧ
       ))
-    (=ucs		. #x3155)	; ㅕ
-    (=ks-x1001		. #x2445)	; &I-K0-2445; [04-37]
     ))
 (define-char
   '((name		. "HANGUL LETTER YE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3156)	; ㅖ
+    (=ks-x1001		. #x2446)	; &I-K0-2446; [04-38]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG YE")
       (=ucs		  . #x1168)	; ᅨ
       ))
-    (=ucs		. #x3156)	; ㅖ
-    (=ks-x1001		. #x2446)	; &I-K0-2446; [04-38]
     ))
 (define-char
   '((name		. "HANGUL LETTER O")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3157)	; ㅗ
+    (=ks-x1001		. #x2447)	; &I-K0-2447; [04-39]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG O")
       (=ucs		  . #x1169)	; ᅩ
       ))
-    (=ucs		. #x3157)	; ㅗ
-    (=ks-x1001		. #x2447)	; &I-K0-2447; [04-39]
     ))
 (define-char
   '((name		. "HANGUL LETTER WA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3158)	; ㅘ
+    (=ks-x1001		. #x2448)	; &I-K0-2448; [04-40]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG WA")
       (=ucs		  . #x116A)	; ᅪ
       ))
-    (=ucs		. #x3158)	; ㅘ
-    (=ks-x1001		. #x2448)	; &I-K0-2448; [04-40]
     ))
 (define-char
   '((name		. "HANGUL LETTER WAE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3159)	; ㅙ
+    (=ks-x1001		. #x2449)	; &I-K0-2449; [04-41]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG WAE")
       (=ucs		  . #x116B)	; ᅫ
       ))
-    (=ucs		. #x3159)	; ㅙ
-    (=ks-x1001		. #x2449)	; &I-K0-2449; [04-41]
     ))
 (define-char
   '((name		. "HANGUL LETTER OE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x315A)	; ㅚ
+    (=ks-x1001		. #x244A)	; &I-K0-244A; [04-42]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG OE")
       (=ucs		  . #x116C)	; ᅬ
       ))
-    (=ucs		. #x315A)	; ㅚ
-    (=ks-x1001		. #x244A)	; &I-K0-244A; [04-42]
     ))
 (define-char
   '((name		. "HANGUL LETTER YO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x315B)	; ㅛ
+    (=ks-x1001		. #x244B)	; &I-K0-244B; [04-43]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG YO")
       (=ucs		  . #x116D)	; ᅭ
       ))
-    (=ucs		. #x315B)	; ㅛ
-    (=ks-x1001		. #x244B)	; &I-K0-244B; [04-43]
     ))
 (define-char
   '((name		. "HANGUL LETTER U")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x315C)	; ㅜ
+    (=ks-x1001		. #x244C)	; &I-K0-244C; [04-44]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG U")
       (=ucs		  . #x116E)	; ᅮ
       ))
-    (=ucs		. #x315C)	; ㅜ
-    (=ks-x1001		. #x244C)	; &I-K0-244C; [04-44]
     ))
 (define-char
   '((name		. "HANGUL LETTER WEO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x315D)	; ㅝ
+    (=ks-x1001		. #x244D)	; &I-K0-244D; [04-45]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG WEO")
       (=ucs		  . #x116F)	; ᅯ
       ))
-    (=ucs		. #x315D)	; ㅝ
-    (=ks-x1001		. #x244D)	; &I-K0-244D; [04-45]
     ))
 (define-char
   '((name		. "HANGUL LETTER WE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x315E)	; ㅞ
+    (=ks-x1001		. #x244E)	; &I-K0-244E; [04-46]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG WE")
       (=ucs		  . #x1170)	; ᅰ
       ))
-    (=ucs		. #x315E)	; ㅞ
-    (=ks-x1001		. #x244E)	; &I-K0-244E; [04-46]
     ))
 (define-char
   '((name		. "HANGUL LETTER WI")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x315F)	; ㅟ
+    (=ks-x1001		. #x244F)	; &I-K0-244F; [04-47]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG WI")
       (=ucs		  . #x1171)	; ᅱ
       ))
-    (=ucs		. #x315F)	; ㅟ
-    (=ks-x1001		. #x244F)	; &I-K0-244F; [04-47]
     ))
 (define-char
   '((name		. "HANGUL LETTER YU")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3160)	; ㅠ
+    (=ks-x1001		. #x2450)	; &I-K0-2450; [04-48]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG YU")
       (=ucs		  . #x1172)	; ᅲ
       ))
-    (=ucs		. #x3160)	; ㅠ
-    (=ks-x1001		. #x2450)	; &I-K0-2450; [04-48]
     ))
 (define-char
   '((name		. "HANGUL LETTER EU")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3161)	; ㅡ
+    (=ks-x1001		. #x2451)	; &I-K0-2451; [04-49]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG EU")
       (=ucs		  . #x1173)	; ᅳ
       ))
-    (=ucs		. #x3161)	; ㅡ
-    (=ks-x1001		. #x2451)	; &I-K0-2451; [04-49]
     ))
 (define-char
   '((name		. "HANGUL LETTER YI")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3162)	; ㅢ
+    (=ks-x1001		. #x2452)	; &I-K0-2452; [04-50]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG YI")
       (=ucs		  . #x1174)	; ᅴ
       ))
-    (=ucs		. #x3162)	; ㅢ
-    (=ks-x1001		. #x2452)	; &I-K0-2452; [04-50]
     ))
 (define-char
   '((name		. "HANGUL LETTER I")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3163)	; ㅣ
+    (=ks-x1001		. #x2453)	; &I-K0-2453; [04-51]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG I")
       (=ucs		  . #x1175)	; ᅵ
       ))
-    (=ucs		. #x3163)	; ㅣ
-    (=ks-x1001		. #x2453)	; &I-K0-2453; [04-51]
     ))
 (define-char
   '((name		. "HANGUL FILLER")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3164)	; ㅤ
+    (=ks-x1001		. #x2454)	; &I-K0-2454; [04-52]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG FILLER")
       (=ucs		  . #x1160)	; ᅠ
       ))
-    (=ucs		. #x3164)	; ㅤ
-    (=ks-x1001		. #x2454)	; &I-K0-2454; [04-52]
     ))
 (define-char
   '((name		. "HANGUL LETTER SSANGNIEUN")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3165)	; ㅥ
+    (=ks-x1001		. #x2455)	; &I-K0-2455; [04-53]
     (<-compat
      ((name		  . "HANGUL CHOSEONG SSANGNIEUN")
       (=ucs		  . #x1114)	; ᄔ
       ))
-    (=ucs		. #x3165)	; ㅥ
-    (=ks-x1001		. #x2455)	; &I-K0-2455; [04-53]
     ))
 (define-char
   '((name		. "HANGUL LETTER NIEUN-TIKEUT")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3166)	; ㅦ
+    (=ks-x1001		. #x2456)	; &I-K0-2456; [04-54]
     (<-compat
      ((name		  . "HANGUL CHOSEONG NIEUN-TIKEUT")
       (=ucs		  . #x1115)	; ᄕ
       ))
-    (=ucs		. #x3166)	; ㅦ
-    (=ks-x1001		. #x2456)	; &I-K0-2456; [04-54]
     ))
 (define-char
   '((name		. "HANGUL LETTER NIEUN-SIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3167)	; ㅧ
+    (=ks-x1001		. #x2457)	; &I-K0-2457; [04-55]
     (<-compat
      ((name		  . "HANGUL JONGSEONG NIEUN-SIOS")
       (=ucs		  . #x11C7)	; ᇇ
       ))
-    (=ucs		. #x3167)	; ㅧ
-    (=ks-x1001		. #x2457)	; &I-K0-2457; [04-55]
     ))
 (define-char
   '((name		. "HANGUL LETTER NIEUN-PANSIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3168)	; ㅨ
+    (=ks-x1001		. #x2458)	; &I-K0-2458; [04-56]
     (<-compat
      ((name		  . "HANGUL JONGSEONG NIEUN-PANSIOS")
       (=ucs		  . #x11C8)	; ᇈ
       ))
-    (=ucs		. #x3168)	; ㅨ
-    (=ks-x1001		. #x2458)	; &I-K0-2458; [04-56]
     ))
 (define-char
   '((name		. "HANGUL LETTER RIEUL-KIYEOK-SIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3169)	; ㅩ
+    (=ks-x1001		. #x2459)	; &I-K0-2459; [04-57]
     (<-compat
      ((name		  . "HANGUL JONGSEONG RIEUL-KIYEOK-SIOS")
       (=ucs		  . #x11CC)	; ᇌ
       ))
-    (=ucs		. #x3169)	; ㅩ
-    (=ks-x1001		. #x2459)	; &I-K0-2459; [04-57]
     ))
 (define-char
   '((name		. "HANGUL LETTER RIEUL-TIKEUT")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x316A)	; ㅪ
+    (=ks-x1001		. #x245A)	; &I-K0-245A; [04-58]
     (<-compat
      ((name		  . "HANGUL JONGSEONG RIEUL-TIKEUT")
       (=ucs		  . #x11CE)	; ᇎ
       ))
-    (=ucs		. #x316A)	; ㅪ
-    (=ks-x1001		. #x245A)	; &I-K0-245A; [04-58]
     ))
 (define-char
   '((name		. "HANGUL LETTER RIEUL-PIEUP-SIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x316B)	; ㅫ
+    (=ks-x1001		. #x245B)	; &I-K0-245B; [04-59]
     (<-compat
      ((name		  . "HANGUL JONGSEONG RIEUL-PIEUP-SIOS")
       (=ucs		  . #x11D3)	; ᇓ
       ))
-    (=ucs		. #x316B)	; ㅫ
-    (=ks-x1001		. #x245B)	; &I-K0-245B; [04-59]
     ))
 (define-char
   '((name		. "HANGUL LETTER RIEUL-PANSIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x316C)	; ㅬ
+    (=ks-x1001		. #x245C)	; &I-K0-245C; [04-60]
     (<-compat
      ((name		  . "HANGUL JONGSEONG RIEUL-PANSIOS")
       (=ucs		  . #x11D7)	; ᇗ
       ))
-    (=ucs		. #x316C)	; ㅬ
-    (=ks-x1001		. #x245C)	; &I-K0-245C; [04-60]
     ))
 (define-char
   '((name		. "HANGUL LETTER RIEUL-YEORINHIEUH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x316D)	; ㅭ
+    (=ks-x1001		. #x245D)	; &I-K0-245D; [04-61]
     (<-compat
      ((name		  . "HANGUL JONGSEONG RIEUL-YEORINHIEUH")
       (=ucs		  . #x11D9)	; ᇙ
       ))
-    (=ucs		. #x316D)	; ㅭ
-    (=ks-x1001		. #x245D)	; &I-K0-245D; [04-61]
     ))
 (define-char
   '((name		. "HANGUL LETTER MIEUM-PIEUP")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x316E)	; ㅮ
+    (=ks-x1001		. #x245E)	; &I-K0-245E; [04-62]
     (<-compat
      ((name		  . "HANGUL CHOSEONG MIEUM-PIEUP")
       (=ucs		  . #x111C)	; ᄜ
       ))
-    (=ucs		. #x316E)	; ㅮ
-    (=ks-x1001		. #x245E)	; &I-K0-245E; [04-62]
     ))
 (define-char
   '((name		. "HANGUL LETTER MIEUM-SIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x316F)	; ㅯ
+    (=ks-x1001		. #x245F)	; &I-K0-245F; [04-63]
     (<-compat
      ((name		  . "HANGUL JONGSEONG MIEUM-SIOS")
       (=ucs		  . #x11DD)	; ᇝ
       ))
-    (=ucs		. #x316F)	; ㅯ
-    (=ks-x1001		. #x245F)	; &I-K0-245F; [04-63]
     ))
 (define-char
   '((name		. "HANGUL LETTER MIEUM-PANSIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3170)	; ㅰ
+    (=ks-x1001		. #x2460)	; &I-K0-2460; [04-64]
     (<-compat
      ((name		  . "HANGUL JONGSEONG MIEUM-PANSIOS")
       (=ucs		  . #x11DF)	; ᇟ
       ))
-    (=ucs		. #x3170)	; ㅰ
-    (=ks-x1001		. #x2460)	; &I-K0-2460; [04-64]
     ))
 (define-char
   '((name		. "HANGUL LETTER KAPYEOUNMIEUM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3171)	; ㅱ
+    (=ks-x1001		. #x2461)	; &I-K0-2461; [04-65]
     (<-compat
      ((name		  . "HANGUL CHOSEONG KAPYEOUNMIEUM")
       (=ucs		  . #x111D)	; ᄝ
       ))
-    (=ucs		. #x3171)	; ㅱ
-    (=ks-x1001		. #x2461)	; &I-K0-2461; [04-65]
     ))
 (define-char
   '((name		. "HANGUL LETTER PIEUP-KIYEOK")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3172)	; ㅲ
+    (=ks-x1001		. #x2462)	; &I-K0-2462; [04-66]
     (<-compat
      ((name		  . "HANGUL CHOSEONG PIEUP-KIYEOK")
       (=ucs		  . #x111E)	; ᄞ
       ))
-    (=ucs		. #x3172)	; ㅲ
-    (=ks-x1001		. #x2462)	; &I-K0-2462; [04-66]
     ))
 (define-char
   '((name		. "HANGUL LETTER PIEUP-TIKEUT")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3173)	; ㅳ
+    (=ks-x1001		. #x2463)	; &I-K0-2463; [04-67]
     (<-compat
      ((name		  . "HANGUL CHOSEONG PIEUP-TIKEUT")
       (=ucs		  . #x1120)	; ᄠ
       ))
-    (=ucs		. #x3173)	; ㅳ
-    (=ks-x1001		. #x2463)	; &I-K0-2463; [04-67]
     ))
 (define-char
   '((name		. "HANGUL LETTER PIEUP-SIOS-KIYEOK")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3174)	; ㅴ
+    (=ks-x1001		. #x2464)	; &I-K0-2464; [04-68]
     (<-compat
      ((name		  . "HANGUL CHOSEONG PIEUP-SIOS-KIYEOK")
       (=ucs		  . #x1122)	; ᄢ
       ))
-    (=ucs		. #x3174)	; ㅴ
-    (=ks-x1001		. #x2464)	; &I-K0-2464; [04-68]
     ))
 (define-char
   '((name		. "HANGUL LETTER PIEUP-SIOS-TIKEUT")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3175)	; ㅵ
+    (=ks-x1001		. #x2465)	; &I-K0-2465; [04-69]
     (<-compat
      ((name		  . "HANGUL CHOSEONG PIEUP-SIOS-TIKEUT")
       (=ucs		  . #x1123)	; ᄣ
       ))
-    (=ucs		. #x3175)	; ㅵ
-    (=ks-x1001		. #x2465)	; &I-K0-2465; [04-69]
     ))
 (define-char
   '((name		. "HANGUL LETTER PIEUP-CIEUC")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3176)	; ㅶ
+    (=ks-x1001		. #x2466)	; &I-K0-2466; [04-70]
     (<-compat
      ((name		  . "HANGUL CHOSEONG PIEUP-CIEUC")
       (=ucs		  . #x1127)	; ᄧ
       ))
-    (=ucs		. #x3176)	; ㅶ
-    (=ks-x1001		. #x2466)	; &I-K0-2466; [04-70]
     ))
 (define-char
   '((name		. "HANGUL LETTER PIEUP-THIEUTH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3177)	; ㅷ
+    (=ks-x1001		. #x2467)	; &I-K0-2467; [04-71]
     (<-compat
      ((name		  . "HANGUL CHOSEONG PIEUP-THIEUTH")
       (=ucs		  . #x1129)	; ᄩ
       ))
-    (=ucs		. #x3177)	; ㅷ
-    (=ks-x1001		. #x2467)	; &I-K0-2467; [04-71]
     ))
 (define-char
   '((name		. "HANGUL LETTER KAPYEOUNPIEUP")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3178)	; ㅸ
+    (=ks-x1001		. #x2468)	; &I-K0-2468; [04-72]
     (<-compat
      ((name		  . "HANGUL CHOSEONG KAPYEOUNPIEUP")
       (=ucs		  . #x112B)	; ᄫ
       ))
-    (=ucs		. #x3178)	; ㅸ
-    (=ks-x1001		. #x2468)	; &I-K0-2468; [04-72]
     ))
 (define-char
   '((name		. "HANGUL LETTER KAPYEOUNSSANGPIEUP")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3179)	; ㅹ
+    (=ks-x1001		. #x2469)	; &I-K0-2469; [04-73]
     (<-compat
      ((name		  . "HANGUL CHOSEONG KAPYEOUNSSANGPIEUP")
       (=ucs		  . #x112C)	; ᄬ
       ))
-    (=ucs		. #x3179)	; ㅹ
-    (=ks-x1001		. #x2469)	; &I-K0-2469; [04-73]
     ))
 (define-char
   '((name		. "HANGUL LETTER SIOS-KIYEOK")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x317A)	; ㅺ
+    (=ks-x1001		. #x246A)	; &I-K0-246A; [04-74]
     (<-compat
      ((name		  . "HANGUL CHOSEONG SIOS-KIYEOK")
       (=ucs		  . #x112D)	; ᄭ
       ))
-    (=ucs		. #x317A)	; ㅺ
-    (=ks-x1001		. #x246A)	; &I-K0-246A; [04-74]
     ))
 (define-char
   '((name		. "HANGUL LETTER SIOS-NIEUN")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x317B)	; ㅻ
+    (=ks-x1001		. #x246B)	; &I-K0-246B; [04-75]
     (<-compat
      ((name		  . "HANGUL CHOSEONG SIOS-NIEUN")
       (=ucs		  . #x112E)	; ᄮ
       ))
-    (=ucs		. #x317B)	; ㅻ
-    (=ks-x1001		. #x246B)	; &I-K0-246B; [04-75]
     ))
 (define-char
   '((name		. "HANGUL LETTER SIOS-TIKEUT")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x317C)	; ㅼ
+    (=ks-x1001		. #x246C)	; &I-K0-246C; [04-76]
     (<-compat
      ((name		  . "HANGUL CHOSEONG SIOS-TIKEUT")
       (=ucs		  . #x112F)	; ᄯ
       ))
-    (=ucs		. #x317C)	; ㅼ
-    (=ks-x1001		. #x246C)	; &I-K0-246C; [04-76]
     ))
 (define-char
   '((name		. "HANGUL LETTER SIOS-PIEUP")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x317D)	; ㅽ
+    (=ks-x1001		. #x246D)	; &I-K0-246D; [04-77]
     (<-compat
      ((name		  . "HANGUL CHOSEONG SIOS-PIEUP")
       (=ucs		  . #x1132)	; ᄲ
       ))
-    (=ucs		. #x317D)	; ㅽ
-    (=ks-x1001		. #x246D)	; &I-K0-246D; [04-77]
     ))
 (define-char
   '((name		. "HANGUL LETTER SIOS-CIEUC")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x317E)	; ㅾ
+    (=ks-x1001		. #x246E)	; &I-K0-246E; [04-78]
     (<-compat
      ((name		  . "HANGUL CHOSEONG SIOS-CIEUC")
       (=ucs		  . #x1136)	; ᄶ
       ))
-    (=ucs		. #x317E)	; ㅾ
-    (=ks-x1001		. #x246E)	; &I-K0-246E; [04-78]
     ))
 (define-char
   '((name		. "HANGUL LETTER PANSIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x317F)	; ㅿ
+    (=ks-x1001		. #x246F)	; &I-K0-246F; [04-79]
     (<-compat
      ((name		  . "HANGUL CHOSEONG PANSIOS")
       (=ucs		  . #x1140)	; ᅀ
       ))
-    (=ucs		. #x317F)	; ㅿ
-    (=ks-x1001		. #x246F)	; &I-K0-246F; [04-79]
     ))
 (define-char
   '((name		. "HANGUL LETTER SSANGIEUNG")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3180)	; ㆀ
+    (=ks-x1001		. #x2470)	; &I-K0-2470; [04-80]
     (<-compat
      ((name		  . "HANGUL CHOSEONG SSANGIEUNG")
       (=ucs		  . #x1147)	; ᅇ
       ))
-    (=ucs		. #x3180)	; ㆀ
-    (=ks-x1001		. #x2470)	; &I-K0-2470; [04-80]
     ))
 (define-char
   '((name		. "HANGUL LETTER YESIEUNG")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3181)	; ㆁ
+    (=ks-x1001		. #x2471)	; &I-K0-2471; [04-81]
     (<-compat
      ((name		  . "HANGUL CHOSEONG YESIEUNG")
       (=ucs		  . #x114C)	; ᅌ
       ))
-    (=ucs		. #x3181)	; ㆁ
-    (=ks-x1001		. #x2471)	; &I-K0-2471; [04-81]
     ))
 (define-char
   '((name		. "HANGUL LETTER YESIEUNG-SIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3182)	; ㆂ
+    (=ks-x1001		. #x2472)	; &I-K0-2472; [04-82]
     (<-compat
      ((name		  . "HANGUL JONGSEONG YESIEUNG-SIOS")
       (=ucs		  . #x11F1)	; ᇱ
       ))
-    (=ucs		. #x3182)	; ㆂ
-    (=ks-x1001		. #x2472)	; &I-K0-2472; [04-82]
     ))
 (define-char
   '((name		. "HANGUL LETTER YESIEUNG-PANSIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3183)	; ㆃ
+    (=ks-x1001		. #x2473)	; &I-K0-2473; [04-83]
     (<-compat
      ((name		  . "HANGUL JONGSEONG YESIEUNG-PANSIOS")
       (=ucs		  . #x11F2)	; ᇲ
       ))
-    (=ucs		. #x3183)	; ㆃ
-    (=ks-x1001		. #x2473)	; &I-K0-2473; [04-83]
     ))
 (define-char
   '((name		. "HANGUL LETTER KAPYEOUNPHIEUPH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3184)	; ㆄ
+    (=ks-x1001		. #x2474)	; &I-K0-2474; [04-84]
     (<-compat
      ((name		  . "HANGUL CHOSEONG KAPYEOUNPHIEUPH")
       (=ucs		  . #x1157)	; ᅗ
       ))
-    (=ucs		. #x3184)	; ㆄ
-    (=ks-x1001		. #x2474)	; &I-K0-2474; [04-84]
     ))
 (define-char
   '((name		. "HANGUL LETTER SSANGHIEUH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3185)	; ㆅ
+    (=ks-x1001		. #x2475)	; &I-K0-2475; [04-85]
     (<-compat
      ((name		  . "HANGUL CHOSEONG SSANGHIEUH")
       (=ucs		  . #x1158)	; ᅘ
       ))
-    (=ucs		. #x3185)	; ㆅ
-    (=ks-x1001		. #x2475)	; &I-K0-2475; [04-85]
     ))
 (define-char
   '((name		. "HANGUL LETTER YEORINHIEUH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3186)	; ㆆ
+    (=ks-x1001		. #x2476)	; &I-K0-2476; [04-86]
     (<-compat
      ((name		  . "HANGUL CHOSEONG YEORINHIEUH")
       (=ucs		  . #x1159)	; ᅙ
       ))
-    (=ucs		. #x3186)	; ㆆ
-    (=ks-x1001		. #x2476)	; &I-K0-2476; [04-86]
     ))
 (define-char
   '((name		. "HANGUL LETTER YO-YA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3187)	; ㆇ
+    (=ks-x1001		. #x2477)	; &I-K0-2477; [04-87]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG YO-YA")
       (=ucs		  . #x1184)	; ᆄ
       ))
-    (=ucs		. #x3187)	; ㆇ
-    (=ks-x1001		. #x2477)	; &I-K0-2477; [04-87]
     ))
 (define-char
   '((name		. "HANGUL LETTER YO-YAE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3188)	; ㆈ
+    (=ks-x1001		. #x2478)	; &I-K0-2478; [04-88]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG YO-YAE")
       (=ucs		  . #x1185)	; ᆅ
       ))
-    (=ucs		. #x3188)	; ㆈ
-    (=ks-x1001		. #x2478)	; &I-K0-2478; [04-88]
     ))
 (define-char
   '((name		. "HANGUL LETTER YO-I")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3189)	; ㆉ
+    (=ks-x1001		. #x2479)	; &I-K0-2479; [04-89]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG YO-I")
       (=ucs		  . #x1188)	; ᆈ
       ))
-    (=ucs		. #x3189)	; ㆉ
-    (=ks-x1001		. #x2479)	; &I-K0-2479; [04-89]
     ))
 (define-char
   '((name		. "HANGUL LETTER YU-YEO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x318A)	; ㆊ
+    (=ks-x1001		. #x247A)	; &I-K0-247A; [04-90]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG YU-YEO")
       (=ucs		  . #x1191)	; ᆑ
       ))
-    (=ucs		. #x318A)	; ㆊ
-    (=ks-x1001		. #x247A)	; &I-K0-247A; [04-90]
     ))
 (define-char
   '((name		. "HANGUL LETTER YU-YE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x318B)	; ㆋ
+    (=ks-x1001		. #x247B)	; &I-K0-247B; [04-91]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG YU-YE")
       (=ucs		  . #x1192)	; ᆒ
       ))
-    (=ucs		. #x318B)	; ㆋ
-    (=ks-x1001		. #x247B)	; &I-K0-247B; [04-91]
     ))
 (define-char
   '((name		. "HANGUL LETTER YU-I")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x318C)	; ㆌ
+    (=ks-x1001		. #x247C)	; &I-K0-247C; [04-92]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG YU-I")
       (=ucs		  . #x1194)	; ᆔ
       ))
-    (=ucs		. #x318C)	; ㆌ
-    (=ks-x1001		. #x247C)	; &I-K0-247C; [04-92]
     ))
 (define-char
   '((name		. "HANGUL LETTER ARAEA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x318D)	; ㆍ
+    (=ks-x1001		. #x247D)	; &I-K0-247D; [04-93]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG ARAEA")
       (=ucs		  . #x119E)	; ᆞ
       ))
-    (=ucs		. #x318D)	; ㆍ
-    (=ks-x1001		. #x247D)	; &I-K0-247D; [04-93]
     ))
 (define-char
   '((name		. "HANGUL LETTER ARAEAE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x318E)	; ㆎ
+    (=ks-x1001		. #x247E)	; &I-K0-247E; [04-94]
     (<-compat
      ((name		  . "HANGUL JUNGSEONG ARAEA-I")
       (=ucs		  . #x11A1)	; ᆡ
       ))
-    (=ucs		. #x318E)	; ㆎ
-    (=ks-x1001		. #x247E)	; &I-K0-247E; [04-94]
     ))
diff --git a/lisp/utf-2000/u03190-Kanbun.el b/lisp/utf-2000/u03190-Kanbun.el
index 79fbdfa..93f4153 100644
--- a/lisp/utf-2000/u03190-Kanbun.el
+++ b/lisp/utf-2000/u03190-Kanbun.el
@@ -21,10 +21,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Kaeriten")
+    (=ucs		. #x3192)	; ㆒
     (<-superscript
      ((=ucs		  . #x4E00)	; 一
       ))
-    (=ucs		. #x3192)	; ㆒
     ))
 (define-char
   '((name		. "IDEOGRAPHIC ANNOTATION TWO MARK")
@@ -32,10 +32,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Kaeriten")
+    (=ucs		. #x3193)	; ㆓
     (<-superscript
      ((=ucs		  . #x4E8C)	; 二
       ))
-    (=ucs		. #x3193)	; ㆓
     ))
 (define-char
   '((name		. "IDEOGRAPHIC ANNOTATION THREE MARK")
@@ -43,10 +43,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Kaeriten")
+    (=ucs		. #x3194)	; ㆔
     (<-superscript
      ((=ucs		  . #x4E09)	; 三
       ))
-    (=ucs		. #x3194)	; ㆔
     ))
 (define-char
   '((name		. "IDEOGRAPHIC ANNOTATION FOUR MARK")
@@ -54,10 +54,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Kaeriten")
+    (=ucs		. #x3195)	; ㆕
     (<-superscript
      ((=ucs		  . #x56DB)	; 四
       ))
-    (=ucs		. #x3195)	; ㆕
     ))
 (define-char
   '((name		. "IDEOGRAPHIC ANNOTATION TOP MARK")
@@ -65,10 +65,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Kaeriten")
+    (=ucs		. #x3196)	; ㆖
     (<-superscript
      ((=ucs		  . #x4E0A)	; 上
       ))
-    (=ucs		. #x3196)	; ㆖
     ))
 (define-char
   '((name		. "IDEOGRAPHIC ANNOTATION MIDDLE MARK")
@@ -76,10 +76,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Kaeriten")
+    (=ucs		. #x3197)	; ㆗
     (<-superscript
      ((=ucs		  . #x4E2D)	; 中
       ))
-    (=ucs		. #x3197)	; ㆗
     ))
 (define-char
   '((name		. "IDEOGRAPHIC ANNOTATION BOTTOM MARK")
@@ -87,10 +87,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Kaeriten")
+    (=ucs		. #x3198)	; ㆘
     (<-superscript
      ((=ucs		  . #x4E0B)	; 下
       ))
-    (=ucs		. #x3198)	; ㆘
     ))
 (define-char
   '((name		. "IDEOGRAPHIC ANNOTATION FIRST MARK")
@@ -98,10 +98,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Kaeriten")
+    (=ucs		. #x3199)	; ㆙
     (<-superscript
      ((=ucs		  . #x7532)	; 甲
       ))
-    (=ucs		. #x3199)	; ㆙
     ))
 (define-char
   '((name		. "IDEOGRAPHIC ANNOTATION SECOND MARK")
@@ -109,10 +109,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Kaeriten")
+    (=ucs		. #x319A)	; ㆚
     (<-superscript
      ((=ucs		  . #x4E59)	; 乙
       ))
-    (=ucs		. #x319A)	; ㆚
     ))
 (define-char
   '((name		. "IDEOGRAPHIC ANNOTATION THIRD MARK")
@@ -120,10 +120,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Kaeriten")
+    (=ucs		. #x319B)	; ㆛
     (<-superscript
      ((=ucs		  . #x4E19)	; 丙
       ))
-    (=ucs		. #x319B)	; ㆛
     ))
 (define-char
   '((name		. "IDEOGRAPHIC ANNOTATION FOURTH MARK")
@@ -131,10 +131,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Kaeriten")
+    (=ucs		. #x319C)	; ㆜
     (<-superscript
      ((=ucs		  . #x4E01)	; 丁
       ))
-    (=ucs		. #x319C)	; ㆜
     ))
 (define-char
   '((name		. "IDEOGRAPHIC ANNOTATION HEAVEN MARK")
@@ -142,10 +142,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Kaeriten")
+    (=ucs		. #x319D)	; ㆝
     (<-superscript
      ((=ucs		  . #x5929)	; 天
       ))
-    (=ucs		. #x319D)	; ㆝
     ))
 (define-char
   '((name		. "IDEOGRAPHIC ANNOTATION EARTH MARK")
@@ -153,10 +153,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Kaeriten")
+    (=ucs		. #x319E)	; ㆞
     (<-superscript
      ((=ucs		  . #x5730)	; 地
       ))
-    (=ucs		. #x319E)	; ㆞
     ))
 (define-char
   '((name		. "IDEOGRAPHIC ANNOTATION MAN MARK")
@@ -164,8 +164,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Kaeriten")
+    (=ucs		. #x319F)	; ㆟
     (<-superscript
      ((=ucs		  . #x4EBA)	; 人
       ))
-    (=ucs		. #x319F)	; ㆟
     ))
diff --git a/lisp/utf-2000/u03200-Enclosed-CJK-Letters-and-Months.el b/lisp/utf-2000/u03200-Enclosed-CJK-Letters-and-Months.el
index 2fc0b26..62feea6 100644
--- a/lisp/utf-2000/u03200-Enclosed-CJK-Letters-and-Months.el
+++ b/lisp/utf-2000/u03200-Enclosed-CJK-Letters-and-Months.el
@@ -1357,168 +1357,168 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3260)	; ㉠
+    (=ks-x1001		. #x2831)	; &I-K0-2831; [08-17]
     (<-circled
      ((name		  . "HANGUL CHOSEONG KIYEOK")
       (=ucs		  . #x1100)	; ᄀ
       ))
-    (=ucs		. #x3260)	; ㉠
-    (=ks-x1001		. #x2831)	; &I-K0-2831; [08-17]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL NIEUN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3261)	; ㉡
+    (=ks-x1001		. #x2832)	; &I-K0-2832; [08-18]
     (<-circled
      ((name		  . "HANGUL CHOSEONG NIEUN")
       (=ucs		  . #x1102)	; ᄂ
       ))
-    (=ucs		. #x3261)	; ㉡
-    (=ks-x1001		. #x2832)	; &I-K0-2832; [08-18]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL TIKEUT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3262)	; ㉢
+    (=ks-x1001		. #x2833)	; &I-K0-2833; [08-19]
     (<-circled
      ((name		  . "HANGUL CHOSEONG TIKEUT")
       (=ucs		  . #x1103)	; ᄃ
       ))
-    (=ucs		. #x3262)	; ㉢
-    (=ks-x1001		. #x2833)	; &I-K0-2833; [08-19]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL RIEUL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3263)	; ㉣
+    (=ks-x1001		. #x2834)	; &I-K0-2834; [08-20]
     (<-circled
      ((name		  . "HANGUL CHOSEONG RIEUL")
       (=ucs		  . #x1105)	; ᄅ
       ))
-    (=ucs		. #x3263)	; ㉣
-    (=ks-x1001		. #x2834)	; &I-K0-2834; [08-20]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL MIEUM")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3264)	; ㉤
+    (=ks-x1001		. #x2835)	; &I-K0-2835; [08-21]
     (<-circled
      ((name		  . "HANGUL CHOSEONG MIEUM")
       (=ucs		  . #x1106)	; ᄆ
       ))
-    (=ucs		. #x3264)	; ㉤
-    (=ks-x1001		. #x2835)	; &I-K0-2835; [08-21]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL PIEUP")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3265)	; ㉥
+    (=ks-x1001		. #x2836)	; &I-K0-2836; [08-22]
     (<-circled
      ((name		  . "HANGUL CHOSEONG PIEUP")
       (=ucs		  . #x1107)	; ᄇ
       ))
-    (=ucs		. #x3265)	; ㉥
-    (=ks-x1001		. #x2836)	; &I-K0-2836; [08-22]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL SIOS")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3266)	; ㉦
+    (=ks-x1001		. #x2837)	; &I-K0-2837; [08-23]
     (<-circled
      ((name		  . "HANGUL CHOSEONG SIOS")
       (=ucs		  . #x1109)	; ᄉ
       ))
-    (=ucs		. #x3266)	; ㉦
-    (=ks-x1001		. #x2837)	; &I-K0-2837; [08-23]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL IEUNG")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3267)	; ㉧
+    (=ks-x1001		. #x2838)	; &I-K0-2838; [08-24]
     (<-circled
      ((name		  . "HANGUL CHOSEONG IEUNG")
       (=ucs		  . #x110B)	; ᄋ
       ))
-    (=ucs		. #x3267)	; ㉧
-    (=ks-x1001		. #x2838)	; &I-K0-2838; [08-24]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL CIEUC")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3268)	; ㉨
+    (=ks-x1001		. #x2839)	; &I-K0-2839; [08-25]
     (<-circled
      ((name		  . "HANGUL CHOSEONG CIEUC")
       (=ucs		  . #x110C)	; ᄌ
       ))
-    (=ucs		. #x3268)	; ㉨
-    (=ks-x1001		. #x2839)	; &I-K0-2839; [08-25]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL CHIEUCH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3269)	; ㉩
+    (=ks-x1001		. #x283A)	; &I-K0-283A; [08-26]
     (<-circled
      ((name		  . "HANGUL CHOSEONG CHIEUCH")
       (=ucs		  . #x110E)	; ᄎ
       ))
-    (=ucs		. #x3269)	; ㉩
-    (=ks-x1001		. #x283A)	; &I-K0-283A; [08-26]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL KHIEUKH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x326A)	; ㉪
+    (=ks-x1001		. #x283B)	; &I-K0-283B; [08-27]
     (<-circled
      ((name		  . "HANGUL CHOSEONG KHIEUKH")
       (=ucs		  . #x110F)	; ᄏ
       ))
-    (=ucs		. #x326A)	; ㉪
-    (=ks-x1001		. #x283B)	; &I-K0-283B; [08-27]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL THIEUTH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x326B)	; ㉫
+    (=ks-x1001		. #x283C)	; &I-K0-283C; [08-28]
     (<-circled
      ((name		  . "HANGUL CHOSEONG THIEUTH")
       (=ucs		  . #x1110)	; ᄐ
       ))
-    (=ucs		. #x326B)	; ㉫
-    (=ks-x1001		. #x283C)	; &I-K0-283C; [08-28]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL PHIEUPH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x326C)	; ㉬
+    (=ks-x1001		. #x283D)	; &I-K0-283D; [08-29]
     (<-circled
      ((name		  . "HANGUL CHOSEONG PHIEUPH")
       (=ucs		  . #x1111)	; ᄑ
       ))
-    (=ucs		. #x326C)	; ㉬
-    (=ks-x1001		. #x283D)	; &I-K0-283D; [08-29]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL HIEUH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x326D)	; ㉭
+    (=ks-x1001		. #x283E)	; &I-K0-283E; [08-30]
     (<-circled
      ((name		  . "HANGUL CHOSEONG HIEUH")
       (=ucs		  . #x1112)	; ᄒ
       ))
-    (=ucs		. #x326D)	; ㉭
-    (=ks-x1001		. #x283E)	; &I-K0-283E; [08-30]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL KIYEOK A")
@@ -1744,10 +1744,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 1)
+    (=ucs		. #x3280)	; ㊀
     (<-circled
      ((=ucs		  . #x4E00)	; 一
       ))
-    (=ucs		. #x3280)	; ㊀
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH TWO")
@@ -1755,10 +1755,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 2)
+    (=ucs		. #x3281)	; ㊁
     (<-circled
      ((=ucs		  . #x4E8C)	; 二
       ))
-    (=ucs		. #x3281)	; ㊁
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH THREE")
@@ -1766,10 +1766,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 3)
+    (=ucs		. #x3282)	; ㊂
     (<-circled
      ((=ucs		  . #x4E09)	; 三
       ))
-    (=ucs		. #x3282)	; ㊂
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH FOUR")
@@ -1777,10 +1777,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 4)
+    (=ucs		. #x3283)	; ㊃
     (<-circled
      ((=ucs		  . #x56DB)	; 四
       ))
-    (=ucs		. #x3283)	; ㊃
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH FIVE")
@@ -1788,10 +1788,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 5)
+    (=ucs		. #x3284)	; ㊄
     (<-circled
      ((=ucs		  . #x4E94)	; 五
       ))
-    (=ucs		. #x3284)	; ㊄
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SIX")
@@ -1799,10 +1799,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 6)
+    (=ucs		. #x3285)	; ㊅
     (<-circled
      ((=ucs		  . #x516D)	; 六
       ))
-    (=ucs		. #x3285)	; ㊅
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SEVEN")
@@ -1810,10 +1810,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 7)
+    (=ucs		. #x3286)	; ㊆
     (<-circled
      ((=ucs		  . #x4E03)	; 七
       ))
-    (=ucs		. #x3286)	; ㊆
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH EIGHT")
@@ -1821,10 +1821,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 8)
+    (=ucs		. #x3287)	; ㊇
     (<-circled
      ((=ucs		  . #x516B)	; 八
       ))
-    (=ucs		. #x3287)	; ㊇
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH NINE")
@@ -1832,10 +1832,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 9)
+    (=ucs		. #x3288)	; ㊈
     (<-circled
      ((=ucs		  . #x4E5D)	; 九
       ))
-    (=ucs		. #x3288)	; ㊈
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH TEN")
@@ -1843,421 +1843,421 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 10)
+    (=ucs		. #x3289)	; ㊉
     (<-circled
      ((=ucs		  . #x5341)	; 十
       ))
-    (=ucs		. #x3289)	; ㊉
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH MOON")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x328A)	; ㊊
     (<-circled
      ((=ucs		  . #x6708)	; 月
       ))
-    (=ucs		. #x328A)	; ㊊
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH FIRE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x328B)	; ㊋
     (<-circled
      ((=ucs		  . #x706B)	; 火
       ))
-    (=ucs		. #x328B)	; ㊋
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH WATER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x328C)	; ㊌
     (<-circled
      ((=ucs		  . #x6C34)	; æ°´
       ))
-    (=ucs		. #x328C)	; ㊌
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH WOOD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x328D)	; ㊍
     (<-circled
      ((=ucs		  . #x6728)	; 木
       ))
-    (=ucs		. #x328D)	; ㊍
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH METAL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x328E)	; ㊎
     (<-circled
      ((=ucs		  . #x91D1)	; 金
       ))
-    (=ucs		. #x328E)	; ㊎
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH EARTH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x328F)	; ㊏
     (<-circled
      ((=ucs		  . #x571F)	; 土
       ))
-    (=ucs		. #x328F)	; ㊏
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SUN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3290)	; ㊐
     (<-circled
      ((=ucs		  . #x65E5)	; 日
       ))
-    (=ucs		. #x3290)	; ㊐
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH STOCK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3291)	; ㊑
+    (=jef-china3	. #x78E6)	; &I-JC3-78E6;
     (<-circled
      ((=ucs		  . #x682A)	; æ ª
       ))
-    (=ucs		. #x3291)	; ㊑
-    (=jef-china3	. #x78E6)	; &I-JC3-78E6;
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH HAVE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3292)	; ㊒
+    (=jef-china3	. #x78E5)	; &I-JC3-78E5;
     (<-circled
      ((=ucs		  . #x6709)	; 有
       ))
-    (=ucs		. #x3292)	; ㊒
-    (=jef-china3	. #x78E5)	; &I-JC3-78E5;
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SOCIETY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3293)	; ㊓
+    (=jef-china3	. #x78E7)	; &I-JC3-78E7;
     (<-circled
      ((=ucs		  . #x793E)	; 社
       ))
-    (=ucs		. #x3293)	; ㊓
-    (=jef-china3	. #x78E7)	; &I-JC3-78E7;
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH NAME")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3294)	; ㊔
+    (=jef-china3	. #x78E1)	; &I-JC3-78E1;
     (<-circled
      ((=ucs		  . #x540D)	; 名
       ))
-    (=ucs		. #x3294)	; ㊔
-    (=jef-china3	. #x78E1)	; &I-JC3-78E1;
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SPECIAL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3295)	; ㊕
     (<-circled
      ((=ucs		  . #x7279)	; 特
       ))
-    (=ucs		. #x3295)	; ㊕
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH FINANCIAL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3296)	; ㊖
+    (=jef-china3	. #x78EA)	; &I-JC3-78EA;
     (<-circled
      ((=ucs		  . #x8CA1)	; 財
       ))
-    (=ucs		. #x3296)	; ㊖
-    (=jef-china3	. #x78EA)	; &I-JC3-78EA;
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH CONGRATULATION")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3297)	; ㊗
     (<-circled
      ((=ucs		  . #x795D)	; 祝
       ))
-    (=ucs		. #x3297)	; ㊗
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH LABOR")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3298)	; ㊘
+    (=jef-china3	. #x78E3)	; &I-JC3-78E3;
     (<-circled
      ((=ucs		  . #x52B4)	; 労
       ))
-    (=ucs		. #x3298)	; ㊘
-    (=jef-china3	. #x78E3)	; &I-JC3-78E3;
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SECRET")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x3299)	; ㊙
     (<-circled
      ((=ucs		  . #x79D8)	; 秘
       ))
-    (=ucs		. #x3299)	; ㊙
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH MALE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x329A)	; ㊚
     (<-circled
      ((=ucs		  . #x7537)	; 男
       ))
-    (=ucs		. #x329A)	; ㊚
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH FEMALE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x329B)	; ㊛
     (<-circled
      ((=ucs		  . #x5973)	; 女
       ))
-    (=ucs		. #x329B)	; ㊛
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SUITABLE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x329C)	; ㊜
     (<-circled
      ((=ucs		  . #x9069)	; 適
       ))
-    (=ucs		. #x329C)	; ㊜
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH EXCELLENT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x329D)	; ㊝
     (<-circled
      ((=ucs		  . #x512A)	; 優
       ))
-    (=ucs		. #x329D)	; ㊝
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH PRINT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x329E)	; ㊞
     (<-circled
      ((=ucs		  . #x5370)	; 印
       ))
-    (=ucs		. #x329E)	; ㊞
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH ATTENTION")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x329F)	; ㊟
     (<-circled
      ((=ucs		  . #x6CE8)	; 注
       ))
-    (=ucs		. #x329F)	; ㊟
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH ITEM")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32A0)	; ㊠
     (<-circled
      ((=ucs		  . #x9805)	; 項
       ))
-    (=ucs		. #x32A0)	; ㊠
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH REST")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32A1)	; ㊡
     (<-circled
      ((=ucs		  . #x4F11)	; 休
       ))
-    (=ucs		. #x32A1)	; ㊡
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH COPY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32A2)	; ㊢
     (<-circled
      ((=ucs		  . #x5199)	; 写
       ))
-    (=ucs		. #x32A2)	; ㊢
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH CORRECT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-circled
-     ((=ucs		  . #x6B63)	; æ­£
-      ))
     (=ucs		. #x32A3)	; ㊣
     (=cns11643-1	. #x2221)	; &I-C1-2221; [02-01]
     (=big5		. #xA1C0)	; &I-B-A1C0;
+    (<-circled
+     ((=ucs		  . #x6B63)	; æ­£
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH HIGH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32A4)	; ㊤
+    (=jis-x0213-1-2000	. #x2D65)	; &I-JX1-2D65; [13-69]
     (<-circled
      ((=ucs		  . #x4E0A)	; 上
       ))
-    (=ucs		. #x32A4)	; ㊤
-    (=jis-x0213-1-2000	. #x2D65)	; &I-JX1-2D65; [13-69]
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH CENTRE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32A5)	; ㊥
+    (=jis-x0213-1-2000	. #x2D66)	; &I-JX1-2D66; [13-70]
     (<-circled
      ((=ucs		  . #x4E2D)	; 中
       ))
-    (=ucs		. #x32A5)	; ㊥
-    (=jis-x0213-1-2000	. #x2D66)	; &I-JX1-2D66; [13-70]
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH LOW")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32A6)	; ㊦
+    (=jis-x0213-1-2000	. #x2D67)	; &I-JX1-2D67; [13-71]
     (<-circled
      ((=ucs		  . #x4E0B)	; 下
       ))
-    (=ucs		. #x32A6)	; ㊦
-    (=jis-x0213-1-2000	. #x2D67)	; &I-JX1-2D67; [13-71]
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH LEFT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32A7)	; ㊧
+    (=jis-x0213-1-2000	. #x2D68)	; &I-JX1-2D68; [13-72]
     (<-circled
      ((=ucs		  . #x5DE6)	; å·¦
       ))
-    (=ucs		. #x32A7)	; ㊧
-    (=jis-x0213-1-2000	. #x2D68)	; &I-JX1-2D68; [13-72]
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH RIGHT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32A8)	; ㊨
+    (=jis-x0213-1-2000	. #x2D69)	; &I-JX1-2D69; [13-73]
     (<-circled
      ((=ucs		  . #x53F3)	; 右
       ))
-    (=ucs		. #x32A8)	; ㊨
-    (=jis-x0213-1-2000	. #x2D69)	; &I-JX1-2D69; [13-73]
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH MEDICINE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32A9)	; ㊩
+    (=jef-china3	. #x78DF)	; &I-JC3-78DF;
     (<-circled
      ((=ucs		  . #x533B)	; 医
       ))
-    (=ucs		. #x32A9)	; ㊩
-    (=jef-china3	. #x78DF)	; &I-JC3-78DF;
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH RELIGION")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32AA)	; ㊪
+    (=jef-china3	. #x78E2)	; &I-JC3-78E2;
     (<-circled
      ((=ucs		  . #x5B97)	; 宗
       ))
-    (=ucs		. #x32AA)	; ㊪
-    (=jef-china3	. #x78E2)	; &I-JC3-78E2;
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH STUDY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32AB)	; ㊫
+    (=jef-china3	. #x78E4)	; &I-JC3-78E4;
     (<-circled
      ((=ucs		  . #x5B66)	; å­¦
       ))
-    (=ucs		. #x32AB)	; ㊫
-    (=jef-china3	. #x78E4)	; &I-JC3-78E4;
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SUPERVISE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32AC)	; ㊬
+    (=jef-china3	. #x78E8)	; &I-JC3-78E8;
     (<-circled
      ((=ucs		  . #x76E3)	; 監
       ))
-    (=ucs		. #x32AC)	; ㊬
-    (=jef-china3	. #x78E8)	; &I-JC3-78E8;
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH ENTERPRISE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32AD)	; ㊭
+    (=jef-china3	. #x78DE)	; &I-JC3-78DE;
     (<-circled
      ((=ucs		  . #x4F01)	; 企
       ))
-    (=ucs		. #x32AD)	; ㊭
-    (=jef-china3	. #x78DE)	; &I-JC3-78DE;
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH RESOURCE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32AE)	; ㊮
+    (=jef-china3	. #x78E9)	; &I-JC3-78E9;
     (<-circled
      ((=ucs		  . #x8CC7)	; 資
       ))
-    (=ucs		. #x32AE)	; ㊮
-    (=jef-china3	. #x78E9)	; &I-JC3-78E9;
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH ALLIANCE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32AF)	; ㊯
+    (=jef-china3	. #x78E0)	; &I-JC3-78E0;
     (<-circled
      ((=ucs		  . #x5354)	; 協
       ))
-    (=ucs		. #x32AF)	; ㊯
-    (=jef-china3	. #x78E0)	; &I-JC3-78E0;
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH NIGHT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32B0)	; ㊰
+    (=jef-china3	. #x78DD)	; &I-JC3-78DD;
     (<-circled
      ((=ucs		  . #x591C)	; 夜
       ))
-    (=ucs		. #x32B0)	; ㊰
-    (=jef-china3	. #x78DD)	; &I-JC3-78DD;
     ))
 (define-char
   '((name		. "CIRCLED NUMBER THIRTY SIX")
@@ -2609,540 +2609,540 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32D0)	; ㋐
+    (=jis-x0213-1-2000	. #x2C5B)	; &I-JX1-2C5B; [12-59]
     (<-circled
      ((name		  . "KATAKANA LETTER A")
       (=ucs		  . #x30A2)	; ア
       ))
-    (=ucs		. #x32D0)	; ㋐
-    (=jis-x0213-1-2000	. #x2C5B)	; &I-JX1-2C5B; [12-59]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA I")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32D1)	; ㋑
+    (=jis-x0213-1-2000	. #x2C5C)	; &I-JX1-2C5C; [12-60]
     (<-circled
      ((name		  . "KATAKANA LETTER I")
       (=ucs		  . #x30A4)	; イ
       ))
-    (=ucs		. #x32D1)	; ㋑
-    (=jis-x0213-1-2000	. #x2C5C)	; &I-JX1-2C5C; [12-60]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA U")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32D2)	; ㋒
+    (=jis-x0213-1-2000	. #x2C5D)	; &I-JX1-2C5D; [12-61]
     (<-circled
      ((name		  . "KATAKANA LETTER U")
       (=ucs		  . #x30A6)	; ウ
       ))
-    (=ucs		. #x32D2)	; ㋒
-    (=jis-x0213-1-2000	. #x2C5D)	; &I-JX1-2C5D; [12-61]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA E")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32D3)	; ㋓
+    (=jis-x0213-1-2000	. #x2C5E)	; &I-JX1-2C5E; [12-62]
     (<-circled
      ((name		  . "KATAKANA LETTER E")
       (=ucs		  . #x30A8)	; エ
       ))
-    (=ucs		. #x32D3)	; ㋓
-    (=jis-x0213-1-2000	. #x2C5E)	; &I-JX1-2C5E; [12-62]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA O")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32D4)	; ㋔
+    (=jis-x0213-1-2000	. #x2C5F)	; &I-JX1-2C5F; [12-63]
     (<-circled
      ((name		  . "KATAKANA LETTER O")
       (=ucs		  . #x30AA)	; オ
       ))
-    (=ucs		. #x32D4)	; ㋔
-    (=jis-x0213-1-2000	. #x2C5F)	; &I-JX1-2C5F; [12-63]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA KA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32D5)	; ㋕
+    (=jis-x0213-1-2000	. #x2C60)	; &I-JX1-2C60; [12-64]
     (<-circled
      ((name		  . "KATAKANA LETTER KA")
       (=ucs		  . #x30AB)	; カ
       ))
-    (=ucs		. #x32D5)	; ㋕
-    (=jis-x0213-1-2000	. #x2C60)	; &I-JX1-2C60; [12-64]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA KI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32D6)	; ㋖
+    (=jis-x0213-1-2000	. #x2C61)	; &I-JX1-2C61; [12-65]
     (<-circled
      ((name		  . "KATAKANA LETTER KI")
       (=ucs		  . #x30AD)	; キ
       ))
-    (=ucs		. #x32D6)	; ㋖
-    (=jis-x0213-1-2000	. #x2C61)	; &I-JX1-2C61; [12-65]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA KU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32D7)	; ㋗
+    (=jis-x0213-1-2000	. #x2C62)	; &I-JX1-2C62; [12-66]
     (<-circled
      ((name		  . "KATAKANA LETTER KU")
       (=ucs		  . #x30AF)	; ク
       ))
-    (=ucs		. #x32D7)	; ㋗
-    (=jis-x0213-1-2000	. #x2C62)	; &I-JX1-2C62; [12-66]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA KE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32D8)	; ㋘
+    (=jis-x0213-1-2000	. #x2C63)	; &I-JX1-2C63; [12-67]
     (<-circled
      ((name		  . "KATAKANA LETTER KE")
       (=ucs		  . #x30B1)	; ケ
       ))
-    (=ucs		. #x32D8)	; ㋘
-    (=jis-x0213-1-2000	. #x2C63)	; &I-JX1-2C63; [12-67]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA KO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32D9)	; ㋙
+    (=jis-x0213-1-2000	. #x2C64)	; &I-JX1-2C64; [12-68]
     (<-circled
      ((name		  . "KATAKANA LETTER KO")
       (=ucs		  . #x30B3)	; コ
       ))
-    (=ucs		. #x32D9)	; ㋙
-    (=jis-x0213-1-2000	. #x2C64)	; &I-JX1-2C64; [12-68]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA SA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32DA)	; ㋚
+    (=jis-x0213-1-2000	. #x2C65)	; &I-JX1-2C65; [12-69]
     (<-circled
      ((name		  . "KATAKANA LETTER SA")
       (=ucs		  . #x30B5)	; サ
       ))
-    (=ucs		. #x32DA)	; ㋚
-    (=jis-x0213-1-2000	. #x2C65)	; &I-JX1-2C65; [12-69]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA SI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32DB)	; ㋛
+    (=jis-x0213-1-2000	. #x2C66)	; &I-JX1-2C66; [12-70]
     (<-circled
      ((name		  . "KATAKANA LETTER SI")
       (=ucs		  . #x30B7)	; シ
       ))
-    (=ucs		. #x32DB)	; ㋛
-    (=jis-x0213-1-2000	. #x2C66)	; &I-JX1-2C66; [12-70]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA SU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32DC)	; ㋜
+    (=jis-x0213-1-2000	. #x2C67)	; &I-JX1-2C67; [12-71]
     (<-circled
      ((name		  . "KATAKANA LETTER SU")
       (=ucs		  . #x30B9)	; ス
       ))
-    (=ucs		. #x32DC)	; ㋜
-    (=jis-x0213-1-2000	. #x2C67)	; &I-JX1-2C67; [12-71]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA SE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32DD)	; ㋝
+    (=jis-x0213-1-2000	. #x2C68)	; &I-JX1-2C68; [12-72]
     (<-circled
      ((name		  . "KATAKANA LETTER SE")
       (=ucs		  . #x30BB)	; セ
       ))
-    (=ucs		. #x32DD)	; ㋝
-    (=jis-x0213-1-2000	. #x2C68)	; &I-JX1-2C68; [12-72]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA SO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32DE)	; ㋞
+    (=jis-x0213-1-2000	. #x2C69)	; &I-JX1-2C69; [12-73]
     (<-circled
      ((name		  . "KATAKANA LETTER SO")
       (=ucs		  . #x30BD)	; ソ
       ))
-    (=ucs		. #x32DE)	; ㋞
-    (=jis-x0213-1-2000	. #x2C69)	; &I-JX1-2C69; [12-73]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA TA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32DF)	; ㋟
+    (=jis-x0213-1-2000	. #x2C6A)	; &I-JX1-2C6A; [12-74]
     (<-circled
      ((name		  . "KATAKANA LETTER TA")
       (=ucs		  . #x30BF)	; タ
       ))
-    (=ucs		. #x32DF)	; ㋟
-    (=jis-x0213-1-2000	. #x2C6A)	; &I-JX1-2C6A; [12-74]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA TI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32E0)	; ㋠
+    (=jis-x0213-1-2000	. #x2C6B)	; &I-JX1-2C6B; [12-75]
     (<-circled
      ((name		  . "KATAKANA LETTER TI")
       (=ucs		  . #x30C1)	; チ
       ))
-    (=ucs		. #x32E0)	; ㋠
-    (=jis-x0213-1-2000	. #x2C6B)	; &I-JX1-2C6B; [12-75]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA TU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32E1)	; ㋡
+    (=jis-x0213-1-2000	. #x2C6C)	; &I-JX1-2C6C; [12-76]
     (<-circled
      ((name		  . "KATAKANA LETTER TU")
       (=ucs		  . #x30C4)	; ツ
       ))
-    (=ucs		. #x32E1)	; ㋡
-    (=jis-x0213-1-2000	. #x2C6C)	; &I-JX1-2C6C; [12-76]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA TE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32E2)	; ㋢
+    (=jis-x0213-1-2000	. #x2C6D)	; &I-JX1-2C6D; [12-77]
     (<-circled
      ((name		  . "KATAKANA LETTER TE")
       (=ucs		  . #x30C6)	; テ
       ))
-    (=ucs		. #x32E2)	; ㋢
-    (=jis-x0213-1-2000	. #x2C6D)	; &I-JX1-2C6D; [12-77]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA TO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32E3)	; ㋣
+    (=jis-x0213-1-2000	. #x2C6E)	; &I-JX1-2C6E; [12-78]
     (<-circled
      ((name		  . "KATAKANA LETTER TO")
       (=ucs		  . #x30C8)	; ト
       ))
-    (=ucs		. #x32E3)	; ㋣
-    (=jis-x0213-1-2000	. #x2C6E)	; &I-JX1-2C6E; [12-78]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA NA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32E4)	; ㋤
     (<-circled
      ((name		  . "KATAKANA LETTER NA")
       (=ucs		  . #x30CA)	; ナ
       ))
-    (=ucs		. #x32E4)	; ㋤
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA NI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32E5)	; ㋥
+    (=jis-x0213-1-2000	. #x2C71)	; &I-JX1-2C71; [12-81]
     (<-circled
      ((name		  . "KATAKANA LETTER NI")
       (=ucs		  . #x30CB)	; ニ
       ))
-    (=ucs		. #x32E5)	; ㋥
-    (=jis-x0213-1-2000	. #x2C71)	; &I-JX1-2C71; [12-81]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA NU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32E6)	; ㋦
     (<-circled
      ((name		  . "KATAKANA LETTER NU")
       (=ucs		  . #x30CC)	; ヌ
       ))
-    (=ucs		. #x32E6)	; ㋦
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA NE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32E7)	; ㋧
     (<-circled
      ((name		  . "KATAKANA LETTER NE")
       (=ucs		  . #x30CD)	; ネ
       ))
-    (=ucs		. #x32E7)	; ㋧
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA NO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32E8)	; ㋨
     (<-circled
      ((name		  . "KATAKANA LETTER NO")
       (=ucs		  . #x30CE)	; ノ
       ))
-    (=ucs		. #x32E8)	; ㋨
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA HA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32E9)	; ㋩
+    (=jis-x0213-1-2000	. #x2C70)	; &I-JX1-2C70; [12-80]
     (<-circled
      ((name		  . "KATAKANA LETTER HA")
       (=ucs		  . #x30CF)	; ハ
       ))
-    (=ucs		. #x32E9)	; ㋩
-    (=jis-x0213-1-2000	. #x2C70)	; &I-JX1-2C70; [12-80]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA HI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32EA)	; ㋪
     (<-circled
      ((name		  . "KATAKANA LETTER HI")
       (=ucs		  . #x30D2)	; ヒ
       ))
-    (=ucs		. #x32EA)	; ㋪
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA HU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32EB)	; ㋫
     (<-circled
      ((name		  . "KATAKANA LETTER HU")
       (=ucs		  . #x30D5)	; フ
       ))
-    (=ucs		. #x32EB)	; ㋫
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA HE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32EC)	; ㋬
+    (=jis-x0213-1-2000	. #x2C73)	; &I-JX1-2C73; [12-83]
     (<-circled
      ((name		  . "KATAKANA LETTER HE")
       (=ucs		  . #x30D8)	; ヘ
       ))
-    (=ucs		. #x32EC)	; ㋬
-    (=jis-x0213-1-2000	. #x2C73)	; &I-JX1-2C73; [12-83]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA HO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32ED)	; ㋭
+    (=jis-x0213-1-2000	. #x2C72)	; &I-JX1-2C72; [12-82]
     (<-circled
      ((name		  . "KATAKANA LETTER HO")
       (=ucs		  . #x30DB)	; ホ
       ))
-    (=ucs		. #x32ED)	; ㋭
-    (=jis-x0213-1-2000	. #x2C72)	; &I-JX1-2C72; [12-82]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA MA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32EE)	; ㋮
     (<-circled
      ((name		  . "KATAKANA LETTER MA")
       (=ucs		  . #x30DE)	; マ
       ))
-    (=ucs		. #x32EE)	; ㋮
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA MI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32EF)	; ㋯
     (<-circled
      ((name		  . "KATAKANA LETTER MI")
       (=ucs		  . #x30DF)	; ミ
       ))
-    (=ucs		. #x32EF)	; ㋯
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA MU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32F0)	; ㋰
     (<-circled
      ((name		  . "KATAKANA LETTER MU")
       (=ucs		  . #x30E0)	; ム
       ))
-    (=ucs		. #x32F0)	; ㋰
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA ME")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32F1)	; ㋱
     (<-circled
      ((name		  . "KATAKANA LETTER ME")
       (=ucs		  . #x30E1)	; メ
       ))
-    (=ucs		. #x32F1)	; ㋱
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA MO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32F2)	; ㋲
     (<-circled
      ((name		  . "KATAKANA LETTER MO")
       (=ucs		  . #x30E2)	; モ
       ))
-    (=ucs		. #x32F2)	; ㋲
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA YA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32F3)	; ㋳
     (<-circled
      ((name		  . "KATAKANA LETTER YA")
       (=ucs		  . #x30E4)	; ヤ
       ))
-    (=ucs		. #x32F3)	; ㋳
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA YU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32F4)	; ㋴
     (<-circled
      ((name		  . "KATAKANA LETTER YU")
       (=ucs		  . #x30E6)	; ユ
       ))
-    (=ucs		. #x32F4)	; ㋴
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA YO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32F5)	; ㋵
     (<-circled
      ((name		  . "KATAKANA LETTER YO")
       (=ucs		  . #x30E8)	; ヨ
       ))
-    (=ucs		. #x32F5)	; ㋵
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA RA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32F6)	; ㋶
     (<-circled
      ((name		  . "KATAKANA LETTER RA")
       (=ucs		  . #x30E9)	; ラ
       ))
-    (=ucs		. #x32F6)	; ㋶
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA RI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32F7)	; ㋷
     (<-circled
      ((name		  . "KATAKANA LETTER RI")
       (=ucs		  . #x30EA)	; リ
       ))
-    (=ucs		. #x32F7)	; ㋷
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA RU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32F8)	; ㋸
     (<-circled
      ((name		  . "KATAKANA LETTER RU")
       (=ucs		  . #x30EB)	; ル
       ))
-    (=ucs		. #x32F8)	; ㋸
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA RE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32F9)	; ㋹
     (<-circled
      ((name		  . "KATAKANA LETTER RE")
       (=ucs		  . #x30EC)	; レ
       ))
-    (=ucs		. #x32F9)	; ㋹
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA RO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32FA)	; ㋺
+    (=jis-x0213-1-2000	. #x2C6F)	; &I-JX1-2C6F; [12-79]
     (<-circled
      ((name		  . "KATAKANA LETTER RO")
       (=ucs		  . #x30ED)	; ロ
       ))
-    (=ucs		. #x32FA)	; ㋺
-    (=jis-x0213-1-2000	. #x2C6F)	; &I-JX1-2C6F; [12-79]
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA WA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32FB)	; ㋻
     (<-circled
      ((name		  . "KATAKANA LETTER WA")
       (=ucs		  . #x30EF)	; ワ
       ))
-    (=ucs		. #x32FB)	; ㋻
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA WI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32FC)	; ㋼
     (<-circled
      ((name		  . "KATAKANA LETTER WI")
       (=ucs		  . #x30F0)	; ヰ
       ))
-    (=ucs		. #x32FC)	; ㋼
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA WE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32FD)	; ㋽
     (<-circled
      ((name		  . "KATAKANA LETTER WE")
       (=ucs		  . #x30F1)	; ヱ
       ))
-    (=ucs		. #x32FD)	; ㋽
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA WO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x32FE)	; ㋾
     (<-circled
      ((name		  . "KATAKANA LETTER WO")
       (=ucs		  . #x30F2)	; ヲ
       ))
-    (=ucs		. #x32FE)	; ㋾
     ))
diff --git a/lisp/utf-2000/u0FB00-Alphabetic-Presentation-Forms.el b/lisp/utf-2000/u0FB00-Alphabetic-Presentation-Forms.el
index a3a74bc..ba4cf9e 100644
--- a/lisp/utf-2000/u0FB00-Alphabetic-Presentation-Forms.el
+++ b/lisp/utf-2000/u0FB00-Alphabetic-Presentation-Forms.el
@@ -213,110 +213,110 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "R")
     (mirrored		. nil)
+    (=ucs		. #xFB20)	; ﬠ
     (<-font
      ((name		  . "HEBREW LETTER AYIN")
       (=ucs		  . #x05E2)	; ×¢
       ))
-    (=ucs		. #xFB20)	; ﬠ
     ))
 (define-char
   '((name		. "HEBREW LETTER WIDE ALEF")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "R")
     (mirrored		. nil)
+    (=ucs		. #xFB21)	; ﬡ
     (<-font
      ((name		  . "HEBREW LETTER ALEF")
       (=ucs		  . #x05D0)	; א
       ))
-    (=ucs		. #xFB21)	; ﬡ
     ))
 (define-char
   '((name		. "HEBREW LETTER WIDE DALET")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "R")
     (mirrored		. nil)
+    (=ucs		. #xFB22)	; ﬢ
     (<-font
      ((name		  . "HEBREW LETTER DALET")
       (=ucs		  . #x05D3)	; ד
       ))
-    (=ucs		. #xFB22)	; ﬢ
     ))
 (define-char
   '((name		. "HEBREW LETTER WIDE HE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "R")
     (mirrored		. nil)
+    (=ucs		. #xFB23)	; ﬣ
     (<-font
      ((name		  . "HEBREW LETTER HE")
       (=ucs		  . #x05D4)	; ה
       ))
-    (=ucs		. #xFB23)	; ﬣ
     ))
 (define-char
   '((name		. "HEBREW LETTER WIDE KAF")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "R")
     (mirrored		. nil)
+    (=ucs		. #xFB24)	; ﬤ
     (<-font
      ((name		  . "HEBREW LETTER KAF")
       (=ucs		  . #x05DB)	; כ
       ))
-    (=ucs		. #xFB24)	; ﬤ
     ))
 (define-char
   '((name		. "HEBREW LETTER WIDE LAMED")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "R")
     (mirrored		. nil)
+    (=ucs		. #xFB25)	; ﬥ
     (<-font
      ((name		  . "HEBREW LETTER LAMED")
       (=ucs		  . #x05DC)	; ל
       ))
-    (=ucs		. #xFB25)	; ﬥ
     ))
 (define-char
   '((name		. "HEBREW LETTER WIDE FINAL MEM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "R")
     (mirrored		. nil)
+    (=ucs		. #xFB26)	; ﬦ
     (<-font
      ((name		  . "HEBREW LETTER FINAL MEM")
       (=ucs		  . #x05DD)	; ם
       ))
-    (=ucs		. #xFB26)	; ﬦ
     ))
 (define-char
   '((name		. "HEBREW LETTER WIDE RESH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "R")
     (mirrored		. nil)
+    (=ucs		. #xFB27)	; ﬧ
     (<-font
      ((name		  . "HEBREW LETTER RESH")
       (=ucs		  . #x05E8)	; ר
       ))
-    (=ucs		. #xFB27)	; ﬧ
     ))
 (define-char
   '((name		. "HEBREW LETTER WIDE TAV")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "R")
     (mirrored		. nil)
+    (=ucs		. #xFB28)	; ﬨ
     (<-font
      ((name		  . "HEBREW LETTER TAV")
       (=ucs		  . #x05EA)	; ת
       ))
-    (=ucs		. #xFB28)	; ﬨ
     ))
 (define-char
   '((name		. "HEBREW LETTER ALTERNATIVE PLUS SIGN")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
+    (=ucs		. #xFB29)	; ﬩
     (<-font
      ((name		  . "PLUS SIGN")
       (=ucs		  . #x002B)	; +
       ))
-    (=ucs		. #xFB29)	; ﬩
     ))
 (define-char
   '((name		. "HEBREW LETTER SHIN WITH SHIN DOT")
diff --git a/lisp/utf-2000/u0FB50-Arabic-Presentation-Forms-A.el b/lisp/utf-2000/u0FB50-Arabic-Presentation-Forms-A.el
index a31007e..e90d0d6 100644
--- a/lisp/utf-2000/u0FB50-Arabic-Presentation-Forms-A.el
+++ b/lisp/utf-2000/u0FB50-Arabic-Presentation-Forms-A.el
@@ -4,1345 +4,1345 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB50)	; ﭐ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER ALEF WASLA")
       (=ucs		  . #x0671)	; Ù±
       ))
-    (=ucs		. #xFB50)	; ﭐ
     ))
 (define-char
   '((name		. "ARABIC LETTER ALEF WASLA FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB51)	; ﭑ
     (<-formed@final
      ((name		  . "ARABIC LETTER ALEF WASLA")
       (=ucs		  . #x0671)	; Ù±
       ))
-    (=ucs		. #xFB51)	; ﭑ
     ))
 (define-char
   '((name		. "ARABIC LETTER BEEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB52)	; ﭒ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER BEEH")
       (=ucs		  . #x067B)	; Ù»
       ))
-    (=ucs		. #xFB52)	; ﭒ
     ))
 (define-char
   '((name		. "ARABIC LETTER BEEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB53)	; ﭓ
     (<-formed@final
      ((name		  . "ARABIC LETTER BEEH")
       (=ucs		  . #x067B)	; Ù»
       ))
-    (=ucs		. #xFB53)	; ﭓ
     ))
 (define-char
   '((name		. "ARABIC LETTER BEEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB54)	; ﭔ
     (<-formed@initial
      ((name		  . "ARABIC LETTER BEEH")
       (=ucs		  . #x067B)	; Ù»
       ))
-    (=ucs		. #xFB54)	; ﭔ
     ))
 (define-char
   '((name		. "ARABIC LETTER BEEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB55)	; ﭕ
     (<-formed@medial
      ((name		  . "ARABIC LETTER BEEH")
       (=ucs		  . #x067B)	; Ù»
       ))
-    (=ucs		. #xFB55)	; ﭕ
     ))
 (define-char
   '((name		. "ARABIC LETTER PEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB56)	; ﭖ
+    (arabic-2-column	. #x65)	; &I-MULE-ARB2-65;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER PEH")
       (=ucs		  . #x067E)	; Ù¾
       ))
-    (=ucs		. #xFB56)	; ﭖ
-    (arabic-2-column	. #x65)	; &I-MULE-ARB2-65;
     ))
 (define-char
   '((name		. "ARABIC LETTER PEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB57)	; ﭗ
+    (arabic-2-column	. #x66)	; &I-MULE-ARB2-66;
     (<-formed@final
      ((name		  . "ARABIC LETTER PEH")
       (=ucs		  . #x067E)	; Ù¾
       ))
-    (=ucs		. #xFB57)	; ﭗ
-    (arabic-2-column	. #x66)	; &I-MULE-ARB2-66;
     ))
 (define-char
   '((name		. "ARABIC LETTER PEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB58)	; ﭘ
+    (arabic-1-column	. #x66)	; &I-MULE-ARB1-66;
     (<-formed@initial
      ((name		  . "ARABIC LETTER PEH")
       (=ucs		  . #x067E)	; Ù¾
       ))
-    (=ucs		. #xFB58)	; ﭘ
-    (arabic-1-column	. #x66)	; &I-MULE-ARB1-66;
     ))
 (define-char
   '((name		. "ARABIC LETTER PEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB59)	; ﭙ
+    (arabic-1-column	. #x67)	; &I-MULE-ARB1-67;
     (<-formed@medial
      ((name		  . "ARABIC LETTER PEH")
       (=ucs		  . #x067E)	; Ù¾
       ))
-    (=ucs		. #xFB59)	; ﭙ
-    (arabic-1-column	. #x67)	; &I-MULE-ARB1-67;
     ))
 (define-char
   '((name		. "ARABIC LETTER BEHEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB5A)	; ﭚ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER BEHEH")
       (=ucs		  . #x0680)	; ڀ
       ))
-    (=ucs		. #xFB5A)	; ﭚ
     ))
 (define-char
   '((name		. "ARABIC LETTER BEHEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB5B)	; ﭛ
     (<-formed@final
      ((name		  . "ARABIC LETTER BEHEH")
       (=ucs		  . #x0680)	; ڀ
       ))
-    (=ucs		. #xFB5B)	; ﭛ
     ))
 (define-char
   '((name		. "ARABIC LETTER BEHEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB5C)	; ﭜ
     (<-formed@initial
      ((name		  . "ARABIC LETTER BEHEH")
       (=ucs		  . #x0680)	; ڀ
       ))
-    (=ucs		. #xFB5C)	; ﭜ
     ))
 (define-char
   '((name		. "ARABIC LETTER BEHEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB5D)	; ﭝ
     (<-formed@medial
      ((name		  . "ARABIC LETTER BEHEH")
       (=ucs		  . #x0680)	; ڀ
       ))
-    (=ucs		. #xFB5D)	; ﭝ
     ))
 (define-char
   '((name		. "ARABIC LETTER TTEHEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB5E)	; ﭞ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER TTEHEH")
       (=ucs		  . #x067A)	; Ùº
       ))
-    (=ucs		. #xFB5E)	; ﭞ
     ))
 (define-char
   '((name		. "ARABIC LETTER TTEHEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB5F)	; ﭟ
     (<-formed@final
      ((name		  . "ARABIC LETTER TTEHEH")
       (=ucs		  . #x067A)	; Ùº
       ))
-    (=ucs		. #xFB5F)	; ﭟ
     ))
 (define-char
   '((name		. "ARABIC LETTER TTEHEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB60)	; ï­ 
     (<-formed@initial
      ((name		  . "ARABIC LETTER TTEHEH")
       (=ucs		  . #x067A)	; Ùº
       ))
-    (=ucs		. #xFB60)	; ï­ 
     ))
 (define-char
   '((name		. "ARABIC LETTER TTEHEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB61)	; ï­¡
     (<-formed@medial
      ((name		  . "ARABIC LETTER TTEHEH")
       (=ucs		  . #x067A)	; Ùº
       ))
-    (=ucs		. #xFB61)	; ï­¡
     ))
 (define-char
   '((name		. "ARABIC LETTER TEHEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB62)	; ï­¢
     (<-formed@isolated
      ((name		  . "ARABIC LETTER TEHEH")
       (=ucs		  . #x067F)	; Ù¿
       ))
-    (=ucs		. #xFB62)	; ï­¢
     ))
 (define-char
   '((name		. "ARABIC LETTER TEHEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB63)	; ï­£
     (<-formed@final
      ((name		  . "ARABIC LETTER TEHEH")
       (=ucs		  . #x067F)	; Ù¿
       ))
-    (=ucs		. #xFB63)	; ï­£
     ))
 (define-char
   '((name		. "ARABIC LETTER TEHEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB64)	; ï­¤
     (<-formed@initial
      ((name		  . "ARABIC LETTER TEHEH")
       (=ucs		  . #x067F)	; Ù¿
       ))
-    (=ucs		. #xFB64)	; ï­¤
     ))
 (define-char
   '((name		. "ARABIC LETTER TEHEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB65)	; ï­¥
     (<-formed@medial
      ((name		  . "ARABIC LETTER TEHEH")
       (=ucs		  . #x067F)	; Ù¿
       ))
-    (=ucs		. #xFB65)	; ï­¥
     ))
 (define-char
   '((name		. "ARABIC LETTER TTEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB66)	; ï­¦
     (<-formed@isolated
      ((name		  . "ARABIC LETTER TTEH")
       (=ucs		  . #x0679)	; Ù¹
       ))
-    (=ucs		. #xFB66)	; ï­¦
     ))
 (define-char
   '((name		. "ARABIC LETTER TTEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB67)	; ï­§
     (<-formed@final
      ((name		  . "ARABIC LETTER TTEH")
       (=ucs		  . #x0679)	; Ù¹
       ))
-    (=ucs		. #xFB67)	; ï­§
     ))
 (define-char
   '((name		. "ARABIC LETTER TTEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB68)	; ï­¨
     (<-formed@initial
      ((name		  . "ARABIC LETTER TTEH")
       (=ucs		  . #x0679)	; Ù¹
       ))
-    (=ucs		. #xFB68)	; ï­¨
     ))
 (define-char
   '((name		. "ARABIC LETTER TTEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB69)	; ï­©
     (<-formed@medial
      ((name		  . "ARABIC LETTER TTEH")
       (=ucs		  . #x0679)	; Ù¹
       ))
-    (=ucs		. #xFB69)	; ï­©
     ))
 (define-char
   '((name		. "ARABIC LETTER VEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB6A)	; ï­ª
     (<-formed@isolated
      ((name		  . "ARABIC LETTER VEH")
       (=ucs		  . #x06A4)	; Ú¤
       ))
-    (=ucs		. #xFB6A)	; ï­ª
     ))
 (define-char
   '((name		. "ARABIC LETTER VEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB6B)	; ï­«
     (<-formed@final
      ((name		  . "ARABIC LETTER VEH")
       (=ucs		  . #x06A4)	; Ú¤
       ))
-    (=ucs		. #xFB6B)	; ï­«
     ))
 (define-char
   '((name		. "ARABIC LETTER VEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB6C)	; ï­¬
     (<-formed@initial
      ((name		  . "ARABIC LETTER VEH")
       (=ucs		  . #x06A4)	; Ú¤
       ))
-    (=ucs		. #xFB6C)	; ï­¬
     ))
 (define-char
   '((name		. "ARABIC LETTER VEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB6D)	; ï­­
     (<-formed@medial
      ((name		  . "ARABIC LETTER VEH")
       (=ucs		  . #x06A4)	; Ú¤
       ))
-    (=ucs		. #xFB6D)	; ï­­
     ))
 (define-char
   '((name		. "ARABIC LETTER PEHEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB6E)	; ï­®
     (<-formed@isolated
      ((name		  . "ARABIC LETTER PEHEH")
       (=ucs		  . #x06A6)	; Ú¦
       ))
-    (=ucs		. #xFB6E)	; ï­®
     ))
 (define-char
   '((name		. "ARABIC LETTER PEHEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB6F)	; ï­¯
     (<-formed@final
      ((name		  . "ARABIC LETTER PEHEH")
       (=ucs		  . #x06A6)	; Ú¦
       ))
-    (=ucs		. #xFB6F)	; ï­¯
     ))
 (define-char
   '((name		. "ARABIC LETTER PEHEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB70)	; ï­°
     (<-formed@initial
      ((name		  . "ARABIC LETTER PEHEH")
       (=ucs		  . #x06A6)	; Ú¦
       ))
-    (=ucs		. #xFB70)	; ï­°
     ))
 (define-char
   '((name		. "ARABIC LETTER PEHEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB71)	; ï­±
     (<-formed@medial
      ((name		  . "ARABIC LETTER PEHEH")
       (=ucs		  . #x06A6)	; Ú¦
       ))
-    (=ucs		. #xFB71)	; ï­±
     ))
 (define-char
   '((name		. "ARABIC LETTER DYEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB72)	; ï­²
     (<-formed@isolated
      ((name		  . "ARABIC LETTER DYEH")
       (=ucs		  . #x0684)	; ڄ
       ))
-    (=ucs		. #xFB72)	; ï­²
     ))
 (define-char
   '((name		. "ARABIC LETTER DYEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB73)	; ï­³
     (<-formed@final
      ((name		  . "ARABIC LETTER DYEH")
       (=ucs		  . #x0684)	; ڄ
       ))
-    (=ucs		. #xFB73)	; ï­³
     ))
 (define-char
   '((name		. "ARABIC LETTER DYEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB74)	; ï­´
     (<-formed@initial
      ((name		  . "ARABIC LETTER DYEH")
       (=ucs		  . #x0684)	; ڄ
       ))
-    (=ucs		. #xFB74)	; ï­´
     ))
 (define-char
   '((name		. "ARABIC LETTER DYEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB75)	; ï­µ
     (<-formed@medial
      ((name		  . "ARABIC LETTER DYEH")
       (=ucs		  . #x0684)	; ڄ
       ))
-    (=ucs		. #xFB75)	; ï­µ
     ))
 (define-char
   '((name		. "ARABIC LETTER NYEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB76)	; ï­¶
     (<-formed@isolated
      ((name		  . "ARABIC LETTER NYEH")
       (=ucs		  . #x0683)	; ڃ
       ))
-    (=ucs		. #xFB76)	; ï­¶
     ))
 (define-char
   '((name		. "ARABIC LETTER NYEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB77)	; ï­·
     (<-formed@final
      ((name		  . "ARABIC LETTER NYEH")
       (=ucs		  . #x0683)	; ڃ
       ))
-    (=ucs		. #xFB77)	; ï­·
     ))
 (define-char
   '((name		. "ARABIC LETTER NYEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB78)	; ï­¸
     (<-formed@initial
      ((name		  . "ARABIC LETTER NYEH")
       (=ucs		  . #x0683)	; ڃ
       ))
-    (=ucs		. #xFB78)	; ï­¸
     ))
 (define-char
   '((name		. "ARABIC LETTER NYEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB79)	; ï­¹
     (<-formed@medial
      ((name		  . "ARABIC LETTER NYEH")
       (=ucs		  . #x0683)	; ڃ
       ))
-    (=ucs		. #xFB79)	; ï­¹
     ))
 (define-char
   '((name		. "ARABIC LETTER TCHEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB7A)	; ï­º
+    (arabic-2-column	. #x67)	; &I-MULE-ARB2-67;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER TCHEH")
       (=ucs		  . #x0686)	; چ
       ))
-    (=ucs		. #xFB7A)	; ï­º
-    (arabic-2-column	. #x67)	; &I-MULE-ARB2-67;
     ))
 (define-char
   '((name		. "ARABIC LETTER TCHEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB7B)	; ï­»
+    (arabic-2-column	. #x6A)	; &I-MULE-ARB2-6A;
     (<-formed@final
      ((name		  . "ARABIC LETTER TCHEH")
       (=ucs		  . #x0686)	; چ
       ))
-    (=ucs		. #xFB7B)	; ï­»
-    (arabic-2-column	. #x6A)	; &I-MULE-ARB2-6A;
     ))
 (define-char
   '((name		. "ARABIC LETTER TCHEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB7C)	; ï­¼
+    (arabic-2-column	. #x68)	; &I-MULE-ARB2-68;
     (<-formed@initial
      ((name		  . "ARABIC LETTER TCHEH")
       (=ucs		  . #x0686)	; چ
       ))
-    (=ucs		. #xFB7C)	; ï­¼
-    (arabic-2-column	. #x68)	; &I-MULE-ARB2-68;
     ))
 (define-char
   '((name		. "ARABIC LETTER TCHEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB7D)	; ï­½
+    (arabic-2-column	. #x69)	; &I-MULE-ARB2-69;
     (<-formed@medial
      ((name		  . "ARABIC LETTER TCHEH")
       (=ucs		  . #x0686)	; چ
       ))
-    (=ucs		. #xFB7D)	; ï­½
-    (arabic-2-column	. #x69)	; &I-MULE-ARB2-69;
     ))
 (define-char
   '((name		. "ARABIC LETTER TCHEHEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB7E)	; ï­¾
     (<-formed@isolated
      ((name		  . "ARABIC LETTER TCHEHEH")
       (=ucs		  . #x0687)	; ڇ
       ))
-    (=ucs		. #xFB7E)	; ï­¾
     ))
 (define-char
   '((name		. "ARABIC LETTER TCHEHEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB7F)	; ï­¿
     (<-formed@final
      ((name		  . "ARABIC LETTER TCHEHEH")
       (=ucs		  . #x0687)	; ڇ
       ))
-    (=ucs		. #xFB7F)	; ï­¿
     ))
 (define-char
   '((name		. "ARABIC LETTER TCHEHEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB80)	; ﮀ
     (<-formed@initial
      ((name		  . "ARABIC LETTER TCHEHEH")
       (=ucs		  . #x0687)	; ڇ
       ))
-    (=ucs		. #xFB80)	; ﮀ
     ))
 (define-char
   '((name		. "ARABIC LETTER TCHEHEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB81)	; ﮁ
     (<-formed@medial
      ((name		  . "ARABIC LETTER TCHEHEH")
       (=ucs		  . #x0687)	; ڇ
       ))
-    (=ucs		. #xFB81)	; ﮁ
     ))
 (define-char
   '((name		. "ARABIC LETTER DDAHAL ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB82)	; ﮂ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER DDAHAL")
       (=ucs		  . #x068D)	; ڍ
       ))
-    (=ucs		. #xFB82)	; ﮂ
     ))
 (define-char
   '((name		. "ARABIC LETTER DDAHAL FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB83)	; ﮃ
     (<-formed@final
      ((name		  . "ARABIC LETTER DDAHAL")
       (=ucs		  . #x068D)	; ڍ
       ))
-    (=ucs		. #xFB83)	; ﮃ
     ))
 (define-char
   '((name		. "ARABIC LETTER DAHAL ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB84)	; ﮄ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER DAHAL")
       (=ucs		  . #x068C)	; ڌ
       ))
-    (=ucs		. #xFB84)	; ﮄ
     ))
 (define-char
   '((name		. "ARABIC LETTER DAHAL FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB85)	; ﮅ
     (<-formed@final
      ((name		  . "ARABIC LETTER DAHAL")
       (=ucs		  . #x068C)	; ڌ
       ))
-    (=ucs		. #xFB85)	; ﮅ
     ))
 (define-char
   '((name		. "ARABIC LETTER DUL ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB86)	; ﮆ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER DUL")
       (=ucs		  . #x068E)	; ڎ
       ))
-    (=ucs		. #xFB86)	; ﮆ
     ))
 (define-char
   '((name		. "ARABIC LETTER DUL FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB87)	; ﮇ
     (<-formed@final
      ((name		  . "ARABIC LETTER DUL")
       (=ucs		  . #x068E)	; ڎ
       ))
-    (=ucs		. #xFB87)	; ﮇ
     ))
 (define-char
   '((name		. "ARABIC LETTER DDAL ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB88)	; ﮈ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER DDAL")
       (=ucs		  . #x0688)	; ڈ
       ))
-    (=ucs		. #xFB88)	; ﮈ
     ))
 (define-char
   '((name		. "ARABIC LETTER DDAL FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB89)	; ﮉ
     (<-formed@final
      ((name		  . "ARABIC LETTER DDAL")
       (=ucs		  . #x0688)	; ڈ
       ))
-    (=ucs		. #xFB89)	; ﮉ
     ))
 (define-char
   '((name		. "ARABIC LETTER JEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB8A)	; ﮊ
+    (arabic-1-column	. #x68)	; &I-MULE-ARB1-68;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER JEH")
       (=ucs		  . #x0698)	; ژ
       ))
-    (=ucs		. #xFB8A)	; ﮊ
-    (arabic-1-column	. #x68)	; &I-MULE-ARB1-68;
     ))
 (define-char
   '((name		. "ARABIC LETTER JEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB8B)	; ﮋ
+    (arabic-1-column	. #x69)	; &I-MULE-ARB1-69;
     (<-formed@final
      ((name		  . "ARABIC LETTER JEH")
       (=ucs		  . #x0698)	; ژ
       ))
-    (=ucs		. #xFB8B)	; ﮋ
-    (arabic-1-column	. #x69)	; &I-MULE-ARB1-69;
     ))
 (define-char
   '((name		. "ARABIC LETTER RREH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB8C)	; ﮌ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER RREH")
       (=ucs		  . #x0691)	; ڑ
       ))
-    (=ucs		. #xFB8C)	; ﮌ
     ))
 (define-char
   '((name		. "ARABIC LETTER RREH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB8D)	; ﮍ
     (<-formed@final
      ((name		  . "ARABIC LETTER RREH")
       (=ucs		  . #x0691)	; ڑ
       ))
-    (=ucs		. #xFB8D)	; ﮍ
     ))
 (define-char
   '((name		. "ARABIC LETTER KEHEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB8E)	; ﮎ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER KEHEH")
       (=ucs		  . #x06A9)	; Ú©
       ))
-    (=ucs		. #xFB8E)	; ﮎ
     ))
 (define-char
   '((name		. "ARABIC LETTER KEHEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB8F)	; ﮏ
     (<-formed@final
      ((name		  . "ARABIC LETTER KEHEH")
       (=ucs		  . #x06A9)	; Ú©
       ))
-    (=ucs		. #xFB8F)	; ﮏ
     ))
 (define-char
   '((name		. "ARABIC LETTER KEHEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB90)	; ﮐ
     (<-formed@initial
      ((name		  . "ARABIC LETTER KEHEH")
       (=ucs		  . #x06A9)	; Ú©
       ))
-    (=ucs		. #xFB90)	; ﮐ
     ))
 (define-char
   '((name		. "ARABIC LETTER KEHEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB91)	; ﮑ
     (<-formed@medial
      ((name		  . "ARABIC LETTER KEHEH")
       (=ucs		  . #x06A9)	; Ú©
       ))
-    (=ucs		. #xFB91)	; ﮑ
     ))
 (define-char
   '((name		. "ARABIC LETTER GAF ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB92)	; ﮒ
+    (arabic-2-column	. #x6B)	; &I-MULE-ARB2-6B;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER GAF")
       (=ucs		  . #x06AF)	; Ú¯
       ))
-    (=ucs		. #xFB92)	; ﮒ
-    (arabic-2-column	. #x6B)	; &I-MULE-ARB2-6B;
     ))
 (define-char
   '((name		. "ARABIC LETTER GAF FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB93)	; ﮓ
+    (arabic-2-column	. #x6E)	; &I-MULE-ARB2-6E;
     (<-formed@final
      ((name		  . "ARABIC LETTER GAF")
       (=ucs		  . #x06AF)	; Ú¯
       ))
-    (=ucs		. #xFB93)	; ﮓ
-    (arabic-2-column	. #x6E)	; &I-MULE-ARB2-6E;
     ))
 (define-char
   '((name		. "ARABIC LETTER GAF INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB94)	; ﮔ
+    (arabic-2-column	. #x6C)	; &I-MULE-ARB2-6C;
     (<-formed@initial
      ((name		  . "ARABIC LETTER GAF")
       (=ucs		  . #x06AF)	; Ú¯
       ))
-    (=ucs		. #xFB94)	; ﮔ
-    (arabic-2-column	. #x6C)	; &I-MULE-ARB2-6C;
     ))
 (define-char
   '((name		. "ARABIC LETTER GAF MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB95)	; ﮕ
+    (arabic-2-column	. #x6D)	; &I-MULE-ARB2-6D;
     (<-formed@medial
      ((name		  . "ARABIC LETTER GAF")
       (=ucs		  . #x06AF)	; Ú¯
       ))
-    (=ucs		. #xFB95)	; ﮕ
-    (arabic-2-column	. #x6D)	; &I-MULE-ARB2-6D;
     ))
 (define-char
   '((name		. "ARABIC LETTER GUEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB96)	; ﮖ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER GUEH")
       (=ucs		  . #x06B3)	; Ú³
       ))
-    (=ucs		. #xFB96)	; ﮖ
     ))
 (define-char
   '((name		. "ARABIC LETTER GUEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB97)	; ﮗ
     (<-formed@final
      ((name		  . "ARABIC LETTER GUEH")
       (=ucs		  . #x06B3)	; Ú³
       ))
-    (=ucs		. #xFB97)	; ﮗ
     ))
 (define-char
   '((name		. "ARABIC LETTER GUEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB98)	; ﮘ
     (<-formed@initial
      ((name		  . "ARABIC LETTER GUEH")
       (=ucs		  . #x06B3)	; Ú³
       ))
-    (=ucs		. #xFB98)	; ﮘ
     ))
 (define-char
   '((name		. "ARABIC LETTER GUEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB99)	; ﮙ
     (<-formed@medial
      ((name		  . "ARABIC LETTER GUEH")
       (=ucs		  . #x06B3)	; Ú³
       ))
-    (=ucs		. #xFB99)	; ﮙ
     ))
 (define-char
   '((name		. "ARABIC LETTER NGOEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB9A)	; ﮚ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER NGOEH")
       (=ucs		  . #x06B1)	; Ú±
       ))
-    (=ucs		. #xFB9A)	; ﮚ
     ))
 (define-char
   '((name		. "ARABIC LETTER NGOEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB9B)	; ﮛ
     (<-formed@final
      ((name		  . "ARABIC LETTER NGOEH")
       (=ucs		  . #x06B1)	; Ú±
       ))
-    (=ucs		. #xFB9B)	; ﮛ
     ))
 (define-char
   '((name		. "ARABIC LETTER NGOEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB9C)	; ﮜ
     (<-formed@initial
      ((name		  . "ARABIC LETTER NGOEH")
       (=ucs		  . #x06B1)	; Ú±
       ))
-    (=ucs		. #xFB9C)	; ﮜ
     ))
 (define-char
   '((name		. "ARABIC LETTER NGOEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB9D)	; ﮝ
     (<-formed@medial
      ((name		  . "ARABIC LETTER NGOEH")
       (=ucs		  . #x06B1)	; Ú±
       ))
-    (=ucs		. #xFB9D)	; ﮝ
     ))
 (define-char
   '((name		. "ARABIC LETTER NOON GHUNNA ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB9E)	; ﮞ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER NOON GHUNNA")
       (=ucs		  . #x06BA)	; Úº
       ))
-    (=ucs		. #xFB9E)	; ﮞ
     ))
 (define-char
   '((name		. "ARABIC LETTER NOON GHUNNA FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFB9F)	; ﮟ
     (<-formed@final
      ((name		  . "ARABIC LETTER NOON GHUNNA")
       (=ucs		  . #x06BA)	; Úº
       ))
-    (=ucs		. #xFB9F)	; ﮟ
     ))
 (define-char
   '((name		. "ARABIC LETTER RNOON ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBA0)	; ï® 
     (<-formed@isolated
      ((name		  . "ARABIC LETTER RNOON")
       (=ucs		  . #x06BB)	; Ú»
       ))
-    (=ucs		. #xFBA0)	; ï® 
     ))
 (define-char
   '((name		. "ARABIC LETTER RNOON FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBA1)	; ﮡ
     (<-formed@final
      ((name		  . "ARABIC LETTER RNOON")
       (=ucs		  . #x06BB)	; Ú»
       ))
-    (=ucs		. #xFBA1)	; ﮡ
     ))
 (define-char
   '((name		. "ARABIC LETTER RNOON INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBA2)	; ﮢ
     (<-formed@initial
      ((name		  . "ARABIC LETTER RNOON")
       (=ucs		  . #x06BB)	; Ú»
       ))
-    (=ucs		. #xFBA2)	; ﮢ
     ))
 (define-char
   '((name		. "ARABIC LETTER RNOON MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBA3)	; ﮣ
     (<-formed@medial
      ((name		  . "ARABIC LETTER RNOON")
       (=ucs		  . #x06BB)	; Ú»
       ))
-    (=ucs		. #xFBA3)	; ﮣ
     ))
 (define-char
   '((name . "ARABIC LETTER HEH WITH YEH ABOVE ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBA4)	; ﮤ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER HEH WITH YEH ABOVE")
       (=ucs		  . #x06C0)	; ۀ
       ))
-    (=ucs		. #xFBA4)	; ﮤ
     ))
 (define-char
   '((name		. "ARABIC LETTER HEH WITH YEH ABOVE FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBA5)	; ﮥ
     (<-formed@final
      ((name		  . "ARABIC LETTER HEH WITH YEH ABOVE")
       (=ucs		  . #x06C0)	; ۀ
       ))
-    (=ucs		. #xFBA5)	; ﮥ
     ))
 (define-char
   '((name		. "ARABIC LETTER HEH GOAL ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBA6)	; ﮦ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER HEH GOAL")
       (=ucs		  . #x06C1)	; ہ
       ))
-    (=ucs		. #xFBA6)	; ﮦ
     ))
 (define-char
   '((name		. "ARABIC LETTER HEH GOAL FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBA7)	; ﮧ
     (<-formed@final
      ((name		  . "ARABIC LETTER HEH GOAL")
       (=ucs		  . #x06C1)	; ہ
       ))
-    (=ucs		. #xFBA7)	; ﮧ
     ))
 (define-char
   '((name		. "ARABIC LETTER HEH GOAL INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBA8)	; ﮨ
     (<-formed@initial
      ((name		  . "ARABIC LETTER HEH GOAL")
       (=ucs		  . #x06C1)	; ہ
       ))
-    (=ucs		. #xFBA8)	; ﮨ
     ))
 (define-char
   '((name		. "ARABIC LETTER HEH GOAL MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBA9)	; ﮩ
     (<-formed@medial
      ((name		  . "ARABIC LETTER HEH GOAL")
       (=ucs		  . #x06C1)	; ہ
       ))
-    (=ucs		. #xFBA9)	; ﮩ
     ))
 (define-char
   '((name		. "ARABIC LETTER HEH DOACHASHMEE ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBAA)	; ﮪ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER HEH DOACHASHMEE")
       (=ucs		  . #x06BE)	; Ú¾
       ))
-    (=ucs		. #xFBAA)	; ﮪ
     ))
 (define-char
   '((name		. "ARABIC LETTER HEH DOACHASHMEE FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBAB)	; ﮫ
     (<-formed@final
      ((name		  . "ARABIC LETTER HEH DOACHASHMEE")
       (=ucs		  . #x06BE)	; Ú¾
       ))
-    (=ucs		. #xFBAB)	; ﮫ
     ))
 (define-char
   '((name		. "ARABIC LETTER HEH DOACHASHMEE INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBAC)	; ﮬ
     (<-formed@initial
      ((name		  . "ARABIC LETTER HEH DOACHASHMEE")
       (=ucs		  . #x06BE)	; Ú¾
       ))
-    (=ucs		. #xFBAC)	; ﮬ
     ))
 (define-char
   '((name		. "ARABIC LETTER HEH DOACHASHMEE MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBAD)	; ï®­
     (<-formed@medial
      ((name		  . "ARABIC LETTER HEH DOACHASHMEE")
       (=ucs		  . #x06BE)	; Ú¾
       ))
-    (=ucs		. #xFBAD)	; ï®­
     ))
 (define-char
   '((name		. "ARABIC LETTER YEH BARREE ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBAE)	; ï®®
     (<-formed@isolated
      ((name		  . "ARABIC LETTER YEH BARREE")
       (=ucs		  . #x06D2)	; ے
       ))
-    (=ucs		. #xFBAE)	; ï®®
     ))
 (define-char
   '((name		. "ARABIC LETTER YEH BARREE FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBAF)	; ﮯ
     (<-formed@final
      ((name		  . "ARABIC LETTER YEH BARREE")
       (=ucs		  . #x06D2)	; ے
       ))
-    (=ucs		. #xFBAF)	; ﮯ
     ))
 (define-char
   '((name . "ARABIC LETTER YEH BARREE WITH HAMZA ABOVE ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBB0)	; ï®°
     (<-formed@isolated
      ((name		  . "ARABIC LETTER YEH BARREE WITH HAMZA ABOVE")
       (=ucs		  . #x06D3)	; ۓ
       ))
-    (=ucs		. #xFBB0)	; ï®°
     ))
 (define-char
   '((name . "ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBB1)	; ï®±
     (<-formed@final
      ((name		  . "ARABIC LETTER YEH BARREE WITH HAMZA ABOVE")
       (=ucs		  . #x06D3)	; ۓ
       ))
-    (=ucs		. #xFBB1)	; ï®±
     ))
 (define-char
   '((name		. "ARABIC LETTER NG ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBD3)	; ﯓ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER NG")
       (=ucs		  . #x06AD)	; Ú­
       ))
-    (=ucs		. #xFBD3)	; ﯓ
     ))
 (define-char
   '((name		. "ARABIC LETTER NG FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBD4)	; ﯔ
     (<-formed@final
      ((name		  . "ARABIC LETTER NG")
       (=ucs		  . #x06AD)	; Ú­
       ))
-    (=ucs		. #xFBD4)	; ﯔ
     ))
 (define-char
   '((name		. "ARABIC LETTER NG INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBD5)	; ﯕ
     (<-formed@initial
      ((name		  . "ARABIC LETTER NG")
       (=ucs		  . #x06AD)	; Ú­
       ))
-    (=ucs		. #xFBD5)	; ﯕ
     ))
 (define-char
   '((name		. "ARABIC LETTER NG MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBD6)	; ﯖ
     (<-formed@medial
      ((name		  . "ARABIC LETTER NG")
       (=ucs		  . #x06AD)	; Ú­
       ))
-    (=ucs		. #xFBD6)	; ﯖ
     ))
 (define-char
   '((name		. "ARABIC LETTER U ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBD7)	; ﯗ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER U")
       (=ucs		  . #x06C7)	; ۇ
       ))
-    (=ucs		. #xFBD7)	; ﯗ
     ))
 (define-char
   '((name		. "ARABIC LETTER U FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBD8)	; ﯘ
     (<-formed@final
      ((name		  . "ARABIC LETTER U")
       (=ucs		  . #x06C7)	; ۇ
       ))
-    (=ucs		. #xFBD8)	; ﯘ
     ))
 (define-char
   '((name		. "ARABIC LETTER OE ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBD9)	; ﯙ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER OE")
       (=ucs		  . #x06C6)	; ۆ
       ))
-    (=ucs		. #xFBD9)	; ﯙ
     ))
 (define-char
   '((name		. "ARABIC LETTER OE FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBDA)	; ﯚ
     (<-formed@final
      ((name		  . "ARABIC LETTER OE")
       (=ucs		  . #x06C6)	; ۆ
       ))
-    (=ucs		. #xFBDA)	; ﯚ
     ))
 (define-char
   '((name		. "ARABIC LETTER YU ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBDB)	; ﯛ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER YU")
       (=ucs		  . #x06C8)	; ۈ
       ))
-    (=ucs		. #xFBDB)	; ﯛ
     ))
 (define-char
   '((name		. "ARABIC LETTER YU FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBDC)	; ﯜ
     (<-formed@final
      ((name		  . "ARABIC LETTER YU")
       (=ucs		  . #x06C8)	; ۈ
       ))
-    (=ucs		. #xFBDC)	; ﯜ
     ))
 (define-char
   '((name . "ARABIC LETTER U WITH HAMZA ABOVE ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBDD)	; ﯝ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER U WITH HAMZA ABOVE")
       (=ucs		  . #x0677)	; Ù·
       ))
-    (=ucs		. #xFBDD)	; ﯝ
     ))
 (define-char
   '((name		. "ARABIC LETTER VE ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBDE)	; ﯞ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER VE")
       (=ucs		  . #x06CB)	; ۋ
       ))
-    (=ucs		. #xFBDE)	; ﯞ
     ))
 (define-char
   '((name		. "ARABIC LETTER VE FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBDF)	; ﯟ
     (<-formed@final
      ((name		  . "ARABIC LETTER VE")
       (=ucs		  . #x06CB)	; ۋ
       ))
-    (=ucs		. #xFBDF)	; ﯟ
     ))
 (define-char
   '((name		. "ARABIC LETTER KIRGHIZ OE ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBE0)	; ﯠ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER KIRGHIZ OE")
       (=ucs		  . #x06C5)	; ۅ
       ))
-    (=ucs		. #xFBE0)	; ﯠ
     ))
 (define-char
   '((name		. "ARABIC LETTER KIRGHIZ OE FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBE1)	; ﯡ
     (<-formed@final
      ((name		  . "ARABIC LETTER KIRGHIZ OE")
       (=ucs		  . #x06C5)	; ۅ
       ))
-    (=ucs		. #xFBE1)	; ﯡ
     ))
 (define-char
   '((name		. "ARABIC LETTER KIRGHIZ YU ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBE2)	; ﯢ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER KIRGHIZ YU")
       (=ucs		  . #x06C9)	; ۉ
       ))
-    (=ucs		. #xFBE2)	; ﯢ
     ))
 (define-char
   '((name		. "ARABIC LETTER KIRGHIZ YU FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBE3)	; ﯣ
     (<-formed@final
      ((name		  . "ARABIC LETTER KIRGHIZ YU")
       (=ucs		  . #x06C9)	; ۉ
       ))
-    (=ucs		. #xFBE3)	; ﯣ
     ))
 (define-char
   '((name		. "ARABIC LETTER E ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBE4)	; ﯤ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER E")
       (=ucs		  . #x06D0)	; ې
       ))
-    (=ucs		. #xFBE4)	; ﯤ
     ))
 (define-char
   '((name		. "ARABIC LETTER E FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBE5)	; ﯥ
     (<-formed@final
      ((name		  . "ARABIC LETTER E")
       (=ucs		  . #x06D0)	; ې
       ))
-    (=ucs		. #xFBE5)	; ﯥ
     ))
 (define-char
   '((name		. "ARABIC LETTER E INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBE6)	; ﯦ
     (<-formed@initial
      ((name		  . "ARABIC LETTER E")
       (=ucs		  . #x06D0)	; ې
       ))
-    (=ucs		. #xFBE6)	; ﯦ
     ))
 (define-char
   '((name		. "ARABIC LETTER E MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBE7)	; ﯧ
     (<-formed@medial
      ((name		  . "ARABIC LETTER E")
       (=ucs		  . #x06D0)	; ې
       ))
-    (=ucs		. #xFBE7)	; ﯧ
     ))
 (define-char
   '((name . "ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBE8)	; ﯨ
     (<-formed@initial
      ((name		  . "ARABIC LETTER ALEF MAKSURA")
       (=ucs		  . #x0649)	; ى
       ))
-    (=ucs		. #xFBE8)	; ﯨ
     ))
 (define-char
   '((name . "ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBE9)	; ﯩ
     (<-formed@medial
      ((name		  . "ARABIC LETTER ALEF MAKSURA")
       (=ucs		  . #x0649)	; ى
       ))
-    (=ucs		. #xFBE9)	; ﯩ
     ))
 (define-char
   '((name . "ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF ISOLATED FORM")
@@ -1601,44 +1601,44 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBFC)	; ﯼ
     (<-formed@isolated
      ((name		  . "ARABIC LETTER FARSI YEH")
       (=ucs		  . #x06CC)	; ی
       ))
-    (=ucs		. #xFBFC)	; ﯼ
     ))
 (define-char
   '((name		. "ARABIC LETTER FARSI YEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBFD)	; ﯽ
     (<-formed@final
      ((name		  . "ARABIC LETTER FARSI YEH")
       (=ucs		  . #x06CC)	; ی
       ))
-    (=ucs		. #xFBFD)	; ﯽ
     ))
 (define-char
   '((name		. "ARABIC LETTER FARSI YEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBFE)	; ﯾ
     (<-formed@initial
      ((name		  . "ARABIC LETTER FARSI YEH")
       (=ucs		  . #x06CC)	; ی
       ))
-    (=ucs		. #xFBFE)	; ﯾ
     ))
 (define-char
   '((name		. "ARABIC LETTER FARSI YEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFBFF)	; ﯿ
     (<-formed@medial
      ((name		  . "ARABIC LETTER FARSI YEH")
       (=ucs		  . #x06CC)	; ی
       ))
-    (=ucs		. #xFBFF)	; ﯿ
     ))
 (define-char
   '((name . "ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM ISOLATED FORM")
diff --git a/lisp/utf-2000/u0FE30-CJK-Compatibility-Forms.el b/lisp/utf-2000/u0FE30-CJK-Compatibility-Forms.el
index ffeb3e2..3eef04e 100644
--- a/lisp/utf-2000/u0FE30-CJK-Compatibility-Forms.el
+++ b/lisp/utf-2000/u0FE30-CJK-Compatibility-Forms.el
@@ -4,272 +4,272 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE30)	; ︰
+    (=cns11643-1	. #x212B)	; &I-C1-212B; [01-11]
+    (=big5		. #xA14A)	; &I-B-A14A;
     (<-vertical
      ((name		  . "TWO DOT LEADER")
       (=ucs		  . #x2025)	; ‥
       ))
-    (=ucs		. #xFE30)	; ︰
-    (=cns11643-1	. #x212B)	; &I-C1-212B; [01-11]
-    (=big5		. #xA14A)	; &I-B-A14A;
     ))
 (define-char
   '((name		. "PRESENTATION FORM FOR VERTICAL EM DASH")
     (general-category	punctuation dash) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE31)	; ︱
+    (=cns11643-1	. #x2136)	; &I-C1-2136; [01-22]
+    (=big5		. #xA157)	; &I-B-A157;
     (<-vertical
      ((name		  . "EM DASH")
       (=ucs		  . #x2014)	; —
       ))
-    (=ucs		. #xFE31)	; ︱
-    (=cns11643-1	. #x2136)	; &I-C1-2136; [01-22]
-    (=big5		. #xA157)	; &I-B-A157;
     ))
 (define-char
   '((name		. "PRESENTATION FORM FOR VERTICAL EN DASH")
     (general-category	punctuation dash) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE32)	; ︲
+    (=cns11643-1	. #x2138)	; &I-C1-2138; [01-24]
     (<-vertical
      ((name		  . "EN DASH")
       (=ucs		  . #x2013)	; –
       ))
-    (=ucs		. #xFE32)	; ︲
-    (=cns11643-1	. #x2138)	; &I-C1-2138; [01-24]
     ))
 (define-char
   '((name		. "PRESENTATION FORM FOR VERTICAL LOW LINE")
     (general-category	punctuation connector) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE33)	; ︳
+    (=cns11643-1	. #x213A)	; &I-C1-213A; [01-26]
+    (=big5		. #xA159)	; &I-B-A159;
     (<-vertical
      ((name		  . "LOW LINE")
       (=ucs		  . #x005F)	; _
       ))
-    (=ucs		. #xFE33)	; ︳
-    (=cns11643-1	. #x213A)	; &I-C1-213A; [01-26]
-    (=big5		. #xA159)	; &I-B-A159;
     ))
 (define-char
   '((name		. "PRESENTATION FORM FOR VERTICAL WAVY LOW LINE")
     (general-category	punctuation connector) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE34)	; ︴
+    (=cns11643-1	. #x213C)	; &I-C1-213C; [01-28]
+    (=big5		. #xA15B)	; &I-B-A15B;
     (<-vertical
      ((name		  . "LOW LINE")
       (=ucs		  . #x005F)	; _
       ))
-    (=ucs		. #xFE34)	; ︴
-    (=cns11643-1	. #x213C)	; &I-C1-213C; [01-28]
-    (=big5		. #xA15B)	; &I-B-A15B;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE35)	; ︵
+    (=cns11643-1	. #x2140)	; &I-C1-2140; [01-32]
+    (=big5		. #xA15F)	; &I-B-A15F;
     (<-vertical
      ((name		  . "LEFT PARENTHESIS")
       (=ucs		  . #x0028)	; (
       ))
-    (=ucs		. #xFE35)	; ︵
-    (=cns11643-1	. #x2140)	; &I-C1-2140; [01-32]
-    (=big5		. #xA15F)	; &I-B-A15F;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE36)	; ︶
+    (=cns11643-1	. #x2141)	; &I-C1-2141; [01-33]
+    (=big5		. #xA160)	; &I-B-A160;
     (<-vertical
      ((name		  . "RIGHT PARENTHESIS")
       (=ucs		  . #x0029)	; )
       ))
-    (=ucs		. #xFE36)	; ︶
-    (=cns11643-1	. #x2141)	; &I-C1-2141; [01-33]
-    (=big5		. #xA160)	; &I-B-A160;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE37)	; ︷
+    (=cns11643-1	. #x2144)	; &I-C1-2144; [01-36]
+    (=big5		. #xA163)	; &I-B-A163;
     (<-vertical
      ((name		  . "LEFT CURLY BRACKET")
       (=ucs		  . #x007B)	; {
       ))
-    (=ucs		. #xFE37)	; ︷
-    (=cns11643-1	. #x2144)	; &I-C1-2144; [01-36]
-    (=big5		. #xA163)	; &I-B-A163;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE38)	; ︸
+    (=cns11643-1	. #x2145)	; &I-C1-2145; [01-37]
+    (=big5		. #xA164)	; &I-B-A164;
     (<-vertical
      ((name		  . "RIGHT CURLY BRACKET")
       (=ucs		  . #x007D)	; }
       ))
-    (=ucs		. #xFE38)	; ︸
-    (=cns11643-1	. #x2145)	; &I-C1-2145; [01-37]
-    (=big5		. #xA164)	; &I-B-A164;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE39)	; ︹
+    (=cns11643-1	. #x2148)	; &I-C1-2148; [01-40]
+    (=big5		. #xA167)	; &I-B-A167;
     (<-vertical
      ((name		  . "LEFT TORTOISE SHELL BRACKET")
       (=ucs		  . #x3014)	; 〔
       ))
-    (=ucs		. #xFE39)	; ︹
-    (=cns11643-1	. #x2148)	; &I-C1-2148; [01-40]
-    (=big5		. #xA167)	; &I-B-A167;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE3A)	; ︺
+    (=cns11643-1	. #x2149)	; &I-C1-2149; [01-41]
+    (=big5		. #xA168)	; &I-B-A168;
     (<-vertical
      ((name		  . "RIGHT TORTOISE SHELL BRACKET")
       (=ucs		  . #x3015)	; 〕
       ))
-    (=ucs		. #xFE3A)	; ︺
-    (=cns11643-1	. #x2149)	; &I-C1-2149; [01-41]
-    (=big5		. #xA168)	; &I-B-A168;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE3B)	; ︻
+    (=cns11643-1	. #x214C)	; &I-C1-214C; [01-44]
+    (=big5		. #xA16B)	; &I-B-A16B;
     (<-vertical
      ((name		  . "LEFT BLACK LENTICULAR BRACKET")
       (=ucs		  . #x3010)	; 【
       ))
-    (=ucs		. #xFE3B)	; ︻
-    (=cns11643-1	. #x214C)	; &I-C1-214C; [01-44]
-    (=big5		. #xA16B)	; &I-B-A16B;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE3C)	; ︼
+    (=cns11643-1	. #x214D)	; &I-C1-214D; [01-45]
+    (=big5		. #xA16C)	; &I-B-A16C;
     (<-vertical
      ((name		  . "RIGHT BLACK LENTICULAR BRACKET")
       (=ucs		  . #x3011)	; 】
       ))
-    (=ucs		. #xFE3C)	; ︼
-    (=cns11643-1	. #x214D)	; &I-C1-214D; [01-45]
-    (=big5		. #xA16C)	; &I-B-A16C;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE3D)	; ︽
+    (=cns11643-1	. #x2150)	; &I-C1-2150; [01-48]
+    (=big5		. #xA16F)	; &I-B-A16F;
     (<-vertical
      ((name		  . "LEFT DOUBLE ANGLE BRACKET")
       (=ucs		  . #x300A)	; 《
       ))
-    (=ucs		. #xFE3D)	; ︽
-    (=cns11643-1	. #x2150)	; &I-C1-2150; [01-48]
-    (=big5		. #xA16F)	; &I-B-A16F;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE3E)	; ︾
+    (=cns11643-1	. #x2151)	; &I-C1-2151; [01-49]
+    (=big5		. #xA170)	; &I-B-A170;
     (<-vertical
      ((name		  . "RIGHT DOUBLE ANGLE BRACKET")
       (=ucs		  . #x300B)	; 》
       ))
-    (=ucs		. #xFE3E)	; ︾
-    (=cns11643-1	. #x2151)	; &I-C1-2151; [01-49]
-    (=big5		. #xA170)	; &I-B-A170;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE3F)	; ︿
+    (=cns11643-1	. #x2154)	; &I-C1-2154; [01-52]
+    (=big5		. #xA173)	; &I-B-A173;
     (<-vertical
      ((name		  . "LEFT ANGLE BRACKET")
       (=ucs		  . #x3008)	; 〈
       ))
-    (=ucs		. #xFE3F)	; ︿
-    (=cns11643-1	. #x2154)	; &I-C1-2154; [01-52]
-    (=big5		. #xA173)	; &I-B-A173;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE40)	; ﹀
+    (=cns11643-1	. #x2155)	; &I-C1-2155; [01-53]
+    (=big5		. #xA174)	; &I-B-A174;
     (<-vertical
      ((name		  . "RIGHT ANGLE BRACKET")
       (=ucs		  . #x3009)	; 〉
       ))
-    (=ucs		. #xFE40)	; ﹀
-    (=cns11643-1	. #x2155)	; &I-C1-2155; [01-53]
-    (=big5		. #xA174)	; &I-B-A174;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE41)	; ﹁
+    (=cns11643-1	. #x2158)	; &I-C1-2158; [01-56]
+    (=big5		. #xA177)	; &I-B-A177;
     (<-vertical
      ((name		  . "LEFT CORNER BRACKET")
       (=ucs		  . #x300C)	; 「
       ))
-    (=ucs		. #xFE41)	; ﹁
-    (=cns11643-1	. #x2158)	; &I-C1-2158; [01-56]
-    (=big5		. #xA177)	; &I-B-A177;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE42)	; ﹂
+    (=cns11643-1	. #x2159)	; &I-C1-2159; [01-57]
+    (=big5		. #xA178)	; &I-B-A178;
     (<-vertical
      ((name		  . "RIGHT CORNER BRACKET")
       (=ucs		  . #x300D)	; 」
       ))
-    (=ucs		. #xFE42)	; ﹂
-    (=cns11643-1	. #x2159)	; &I-C1-2159; [01-57]
-    (=big5		. #xA178)	; &I-B-A178;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE43)	; ﹃
+    (=cns11643-1	. #x215C)	; &I-C1-215C; [01-60]
+    (=big5		. #xA17B)	; &I-B-A17B;
     (<-vertical
      ((name		  . "LEFT WHITE CORNER BRACKET")
       (=ucs		  . #x300E)	; 『
       ))
-    (=ucs		. #xFE43)	; ﹃
-    (=cns11643-1	. #x215C)	; &I-C1-215C; [01-60]
-    (=big5		. #xA17B)	; &I-B-A17B;
     ))
 (define-char
   '((name . "PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE44)	; ﹄
+    (=cns11643-1	. #x215D)	; &I-C1-215D; [01-61]
+    (=big5		. #xA17C)	; &I-B-A17C;
     (<-vertical
      ((name		  . "RIGHT WHITE CORNER BRACKET")
       (=ucs		  . #x300F)	; 』
       ))
-    (=ucs		. #xFE44)	; ﹄
-    (=cns11643-1	. #x215D)	; &I-C1-215D; [01-61]
-    (=big5		. #xA17C)	; &I-B-A17C;
     ))
 (define-char
   '((name		. "SESAME DOT")
@@ -286,89 +286,89 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE49)	; ﹉
+    (=cns11643-1	. #x2227)	; &I-C1-2227; [02-07]
+    (=big5		. #xA1C6)	; &I-B-A1C6;
     (<-compat
      ((name		  . "OVERLINE")
       (=ucs		  . #x203E)	; ‾
       ))
-    (=ucs		. #xFE49)	; ﹉
-    (=cns11643-1	. #x2227)	; &I-C1-2227; [02-07]
-    (=big5		. #xA1C6)	; &I-B-A1C6;
     ))
 (define-char
   '((name		. "CENTRELINE OVERLINE")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE4A)	; ﹊
+    (=cns11643-1	. #x2228)	; &I-C1-2228; [02-08]
+    (=big5		. #xA1C7)	; &I-B-A1C7;
     (<-compat
      ((name		  . "OVERLINE")
       (=ucs		  . #x203E)	; ‾
       ))
-    (=ucs		. #xFE4A)	; ﹊
-    (=cns11643-1	. #x2228)	; &I-C1-2228; [02-08]
-    (=big5		. #xA1C7)	; &I-B-A1C7;
     ))
 (define-char
   '((name		. "WAVY OVERLINE")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE4B)	; ﹋
+    (=cns11643-1	. #x222B)	; &I-C1-222B; [02-11]
+    (=big5		. #xA1CA)	; &I-B-A1CA;
     (<-compat
      ((name		  . "OVERLINE")
       (=ucs		  . #x203E)	; ‾
       ))
-    (=ucs		. #xFE4B)	; ﹋
-    (=cns11643-1	. #x222B)	; &I-C1-222B; [02-11]
-    (=big5		. #xA1CA)	; &I-B-A1CA;
     ))
 (define-char
   '((name		. "DOUBLE WAVY OVERLINE")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE4C)	; ﹌
+    (=cns11643-1	. #x222C)	; &I-C1-222C; [02-12]
+    (=big5		. #xA1CB)	; &I-B-A1CB;
     (<-compat
      ((name		  . "OVERLINE")
       (=ucs		  . #x203E)	; ‾
       ))
-    (=ucs		. #xFE4C)	; ﹌
-    (=cns11643-1	. #x222C)	; &I-C1-222C; [02-12]
-    (=big5		. #xA1CB)	; &I-B-A1CB;
     ))
 (define-char
   '((name		. "DASHED LOW LINE")
     (general-category	punctuation connector) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE4D)	; ﹍
+    (=cns11643-1	. #x2229)	; &I-C1-2229; [02-09]
+    (=big5		. #xA1C8)	; &I-B-A1C8;
     (<-compat
      ((name		  . "LOW LINE")
       (=ucs		  . #x005F)	; _
       ))
-    (=ucs		. #xFE4D)	; ﹍
-    (=cns11643-1	. #x2229)	; &I-C1-2229; [02-09]
-    (=big5		. #xA1C8)	; &I-B-A1C8;
     ))
 (define-char
   '((name		. "CENTRELINE LOW LINE")
     (general-category	punctuation connector) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE4E)	; ﹎
+    (=cns11643-1	. #x222A)	; &I-C1-222A; [02-10]
+    (=big5		. #xA1C9)	; &I-B-A1C9;
     (<-compat
      ((name		  . "LOW LINE")
       (=ucs		  . #x005F)	; _
       ))
-    (=ucs		. #xFE4E)	; ﹎
-    (=cns11643-1	. #x222A)	; &I-C1-222A; [02-10]
-    (=big5		. #xA1C9)	; &I-B-A1C9;
     ))
 (define-char
   '((name		. "WAVY LOW LINE")
     (general-category	punctuation connector) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE4F)	; ﹏
+    (=cns11643-1	. #x213D)	; &I-C1-213D; [01-29]
+    (=big5		. #xA15C)	; &I-B-A15C;
     (<-compat
      ((name		  . "LOW LINE")
       (=ucs		  . #x005F)	; _
       ))
-    (=ucs		. #xFE4F)	; ﹏
-    (=cns11643-1	. #x213D)	; &I-C1-213D; [01-29]
-    (=big5		. #xA15C)	; &I-B-A15C;
     ))
diff --git a/lisp/utf-2000/u0FE50-Small-Form-Variants.el b/lisp/utf-2000/u0FE50-Small-Form-Variants.el
index 8864ea1..b81ceb6 100644
--- a/lisp/utf-2000/u0FE50-Small-Form-Variants.el
+++ b/lisp/utf-2000/u0FE50-Small-Form-Variants.el
@@ -4,334 +4,334 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "CS")
     (mirrored		. nil)
+    (=ucs		. #xFE50)	; ﹐
+    (=cns11643-1	. #x212E)	; &I-C1-212E; [01-14]
+    (=big5		. #xA14D)	; &I-B-A14D;
     (<-small
      ((name		  . "COMMA")
       (=ucs		  . #x002C)	; ,
       ))
-    (=ucs		. #xFE50)	; ﹐
-    (=cns11643-1	. #x212E)	; &I-C1-212E; [01-14]
-    (=big5		. #xA14D)	; &I-B-A14D;
     ))
 (define-char
   '((name		. "SMALL IDEOGRAPHIC COMMA")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE51)	; ﹑
+    (=cns11643-1	. #x212F)	; &I-C1-212F; [01-15]
+    (=big5		. #xA14E)	; &I-B-A14E;
     (<-small
      ((name		  . "IDEOGRAPHIC COMMA")
       (=ucs		  . #x3001)	; 、
       ))
-    (=ucs		. #xFE51)	; ﹑
-    (=cns11643-1	. #x212F)	; &I-C1-212F; [01-15]
-    (=big5		. #xA14E)	; &I-B-A14E;
     ))
 (define-char
   '((name		. "SMALL FULL STOP")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "CS")
     (mirrored		. nil)
+    (=ucs		. #xFE52)	; ﹒
+    (=cns11643-1	. #x2130)	; &I-C1-2130; [01-16]
+    (=big5		. #xA14F)	; &I-B-A14F;
     (<-small
      ((name		  . "FULL STOP")
       (=ucs		  . #x002E)	; .
       ))
-    (=ucs		. #xFE52)	; ﹒
-    (=cns11643-1	. #x2130)	; &I-C1-2130; [01-16]
-    (=big5		. #xA14F)	; &I-B-A14F;
     ))
 (define-char
   '((name		. "SMALL SEMICOLON")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE54)	; ﹔
+    (=cns11643-1	. #x2132)	; &I-C1-2132; [01-18]
+    (=big5		. #xA151)	; &I-B-A151;
     (<-small
      ((name		  . "SEMICOLON")
       (=ucs		  . #x003B)	; ;
       ))
-    (=ucs		. #xFE54)	; ﹔
-    (=cns11643-1	. #x2132)	; &I-C1-2132; [01-18]
-    (=big5		. #xA151)	; &I-B-A151;
     ))
 (define-char
   '((name		. "SMALL COLON")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "CS")
     (mirrored		. nil)
+    (=ucs		. #xFE55)	; ﹕
+    (=cns11643-1	. #x2133)	; &I-C1-2133; [01-19]
+    (=big5		. #xA152)	; &I-B-A152;
     (<-small
      ((name		  . "COLON")
       (=ucs		  . #x003A)	; :
       ))
-    (=ucs		. #xFE55)	; ﹕
-    (=cns11643-1	. #x2133)	; &I-C1-2133; [01-19]
-    (=big5		. #xA152)	; &I-B-A152;
     ))
 (define-char
   '((name		. "SMALL QUESTION MARK")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE56)	; ﹖
+    (=cns11643-1	. #x2134)	; &I-C1-2134; [01-20]
+    (=big5		. #xA153)	; &I-B-A153;
     (<-small
      ((name		  . "QUESTION MARK")
       (=ucs		  . #x003F)	; ?
       ))
-    (=ucs		. #xFE56)	; ﹖
-    (=cns11643-1	. #x2134)	; &I-C1-2134; [01-20]
-    (=big5		. #xA153)	; &I-B-A153;
     ))
 (define-char
   '((name		. "SMALL EXCLAMATION MARK")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE57)	; ﹗
+    (=cns11643-1	. #x2135)	; &I-C1-2135; [01-21]
+    (=big5		. #xA154)	; &I-B-A154;
     (<-small
      ((name		  . "EXCLAMATION MARK")
       (=ucs		  . #x0021)	; !
       ))
-    (=ucs		. #xFE57)	; ﹗
-    (=cns11643-1	. #x2135)	; &I-C1-2135; [01-21]
-    (=big5		. #xA154)	; &I-B-A154;
     ))
 (define-char
   '((name		. "SMALL EM DASH")
     (general-category	punctuation dash) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE58)	; ﹘
     (<-small
      ((name		  . "EM DASH")
       (=ucs		  . #x2014)	; —
       ))
-    (=ucs		. #xFE58)	; ﹘
     ))
 (define-char
   '((name		. "SMALL LEFT PARENTHESIS")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE59)	; ﹙
+    (=cns11643-1	. #x215E)	; &I-C1-215E; [01-62]
+    (=big5		. #xA17D)	; &I-B-A17D;
     (<-small
      ((name		  . "LEFT PARENTHESIS")
       (=ucs		  . #x0028)	; (
       ))
-    (=ucs		. #xFE59)	; ﹙
-    (=cns11643-1	. #x215E)	; &I-C1-215E; [01-62]
-    (=big5		. #xA17D)	; &I-B-A17D;
     ))
 (define-char
   '((name		. "SMALL RIGHT PARENTHESIS")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE5A)	; ﹚
+    (=cns11643-1	. #x215F)	; &I-C1-215F; [01-63]
+    (=big5		. #xA17E)	; &I-B-A17E;
     (<-small
      ((name		  . "RIGHT PARENTHESIS")
       (=ucs		  . #x0029)	; )
       ))
-    (=ucs		. #xFE5A)	; ﹚
-    (=cns11643-1	. #x215F)	; &I-C1-215F; [01-63]
-    (=big5		. #xA17E)	; &I-B-A17E;
     ))
 (define-char
   '((name		. "SMALL LEFT CURLY BRACKET")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE5B)	; ﹛
+    (=cns11643-1	. #x2160)	; &I-C1-2160; [01-64]
+    (=big5		. #xA1A1)	; &I-B-A1A1;
     (<-small
      ((name		  . "LEFT CURLY BRACKET")
       (=ucs		  . #x007B)	; {
       ))
-    (=ucs		. #xFE5B)	; ﹛
-    (=cns11643-1	. #x2160)	; &I-C1-2160; [01-64]
-    (=big5		. #xA1A1)	; &I-B-A1A1;
     ))
 (define-char
   '((name		. "SMALL RIGHT CURLY BRACKET")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE5C)	; ﹜
+    (=cns11643-1	. #x2161)	; &I-C1-2161; [01-65]
+    (=big5		. #xA1A2)	; &I-B-A1A2;
     (<-small
      ((name		  . "RIGHT CURLY BRACKET")
       (=ucs		  . #x007D)	; }
       ))
-    (=ucs		. #xFE5C)	; ﹜
-    (=cns11643-1	. #x2161)	; &I-C1-2161; [01-65]
-    (=big5		. #xA1A2)	; &I-B-A1A2;
     ))
 (define-char
   '((name		. "SMALL LEFT TORTOISE SHELL BRACKET")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE5D)	; ﹝
+    (=cns11643-1	. #x2162)	; &I-C1-2162; [01-66]
+    (=big5		. #xA1A3)	; &I-B-A1A3;
     (<-small
      ((name		  . "LEFT TORTOISE SHELL BRACKET")
       (=ucs		  . #x3014)	; 〔
       ))
-    (=ucs		. #xFE5D)	; ﹝
-    (=cns11643-1	. #x2162)	; &I-C1-2162; [01-66]
-    (=big5		. #xA1A3)	; &I-B-A1A3;
     ))
 (define-char
   '((name		. "SMALL RIGHT TORTOISE SHELL BRACKET")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE5E)	; ﹞
+    (=cns11643-1	. #x2163)	; &I-C1-2163; [01-67]
+    (=big5		. #xA1A4)	; &I-B-A1A4;
     (<-small
      ((name		  . "RIGHT TORTOISE SHELL BRACKET")
       (=ucs		  . #x3015)	; 〕
       ))
-    (=ucs		. #xFE5E)	; ﹞
-    (=cns11643-1	. #x2163)	; &I-C1-2163; [01-67]
-    (=big5		. #xA1A4)	; &I-B-A1A4;
     ))
 (define-char
   '((name		. "SMALL NUMBER SIGN")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
+    (=ucs		. #xFE5F)	; ﹟
+    (=cns11643-1	. #x222D)	; &I-C1-222D; [02-13]
+    (=big5		. #xA1CC)	; &I-B-A1CC;
     (<-small
      ((name		  . "NUMBER SIGN")
       (=ucs		  . #x0023)	; #
       ))
-    (=ucs		. #xFE5F)	; ﹟
-    (=cns11643-1	. #x222D)	; &I-C1-222D; [02-13]
-    (=big5		. #xA1CC)	; &I-B-A1CC;
     ))
 (define-char
   '((name		. "SMALL AMPERSAND")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE60)	; ï¹ 
+    (=cns11643-1	. #x222E)	; &I-C1-222E; [02-14]
+    (=big5		. #xA1CD)	; &I-B-A1CD;
     (<-small
      ((name		  . "AMPERSAND")
       (=ucs		  . #x0026)	; &
       ))
-    (=ucs		. #xFE60)	; ï¹ 
-    (=cns11643-1	. #x222E)	; &I-C1-222E; [02-14]
-    (=big5		. #xA1CD)	; &I-B-A1CD;
     ))
 (define-char
   '((name		. "SMALL ASTERISK")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE61)	; ﹡
+    (=cns11643-1	. #x222F)	; &I-C1-222F; [02-15]
+    (=big5		. #xA1CE)	; &I-B-A1CE;
     (<-small
      ((name		  . "ASTERISK")
       (=ucs		  . #x002A)	; *
       ))
-    (=ucs		. #xFE61)	; ﹡
-    (=cns11643-1	. #x222F)	; &I-C1-222F; [02-15]
-    (=big5		. #xA1CE)	; &I-B-A1CE;
     ))
 (define-char
   '((name		. "SMALL PLUS SIGN")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
+    (=ucs		. #xFE62)	; ï¹¢
+    (=cns11643-1	. #x223F)	; &I-C1-223F; [02-31]
+    (=big5		. #xA1DE)	; &I-B-A1DE;
     (<-small
      ((name		  . "PLUS SIGN")
       (=ucs		  . #x002B)	; +
       ))
-    (=ucs		. #xFE62)	; ï¹¢
-    (=cns11643-1	. #x223F)	; &I-C1-223F; [02-31]
-    (=big5		. #xA1DE)	; &I-B-A1DE;
     ))
 (define-char
   '((name		. "SMALL HYPHEN-MINUS")
     (general-category	punctuation dash) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
+    (=ucs		. #xFE63)	; ï¹£
+    (=cns11643-1	. #x2240)	; &I-C1-2240; [02-32]
+    (=big5		. #xA1DF)	; &I-B-A1DF;
     (<-small
      ((name		  . "HYPHEN-MINUS")
       (=ucs		  . #x002D)	; -
       ))
-    (=ucs		. #xFE63)	; ï¹£
-    (=cns11643-1	. #x2240)	; &I-C1-2240; [02-32]
-    (=big5		. #xA1DF)	; &I-B-A1DF;
     ))
 (define-char
   '((name		. "SMALL LESS-THAN SIGN")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE64)	; ﹤
+    (=cns11643-1	. #x2241)	; &I-C1-2241; [02-33]
+    (=big5		. #xA1E0)	; &I-B-A1E0;
     (<-small
      ((name		  . "LESS-THAN SIGN")
       (=ucs		  . #x003C)	; <
       ))
-    (=ucs		. #xFE64)	; ﹤
-    (=cns11643-1	. #x2241)	; &I-C1-2241; [02-33]
-    (=big5		. #xA1E0)	; &I-B-A1E0;
     ))
 (define-char
   '((name		. "SMALL GREATER-THAN SIGN")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE65)	; ï¹¥
+    (=cns11643-1	. #x2242)	; &I-C1-2242; [02-34]
+    (=big5		. #xA1E1)	; &I-B-A1E1;
     (<-small
      ((name		  . "GREATER-THAN SIGN")
       (=ucs		  . #x003E)	; >
       ))
-    (=ucs		. #xFE65)	; ï¹¥
-    (=cns11643-1	. #x2242)	; &I-C1-2242; [02-34]
-    (=big5		. #xA1E1)	; &I-B-A1E1;
     ))
 (define-char
   '((name		. "SMALL EQUALS SIGN")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE66)	; ﹦
+    (=cns11643-1	. #x2243)	; &I-C1-2243; [02-35]
+    (=big5		. #xA1E2)	; &I-B-A1E2;
     (<-small
      ((name		  . "EQUALS SIGN")
       (=ucs		  . #x003D)	; =
       ))
-    (=ucs		. #xFE66)	; ﹦
-    (=cns11643-1	. #x2243)	; &I-C1-2243; [02-35]
-    (=big5		. #xA1E2)	; &I-B-A1E2;
     ))
 (define-char
   '((name		. "SMALL REVERSE SOLIDUS")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE68)	; ﹨
+    (=cns11643-1	. #x2262)	; &I-C1-2262; [02-66]
+    (=big5		. #xA242)	; &I-B-A242;
     (<-small
      ((name		  . "REVERSE SOLIDUS")
       (=ucs		  . #x005C)	; \
       ))
-    (=ucs		. #xFE68)	; ﹨
-    (=cns11643-1	. #x2262)	; &I-C1-2262; [02-66]
-    (=big5		. #xA242)	; &I-B-A242;
     ))
 (define-char
   '((name		. "SMALL DOLLAR SIGN")
     (general-category	symbol currency) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
+    (=ucs		. #xFE69)	; ﹩
+    (=cns11643-1	. #x226C)	; &I-C1-226C; [02-76]
+    (=big5		. #xA24C)	; &I-B-A24C;
     (<-small
      ((name		  . "DOLLAR SIGN")
       (=ucs		  . #x0024)	; $
       ))
-    (=ucs		. #xFE69)	; ﹩
-    (=cns11643-1	. #x226C)	; &I-C1-226C; [02-76]
-    (=big5		. #xA24C)	; &I-B-A24C;
     ))
 (define-char
   '((name		. "SMALL PERCENT SIGN")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
+    (=ucs		. #xFE6A)	; ﹪
+    (=cns11643-1	. #x226D)	; &I-C1-226D; [02-77]
+    (=big5		. #xA24D)	; &I-B-A24D;
     (<-small
      ((name		  . "PERCENT SIGN")
       (=ucs		  . #x0025)	; %
       ))
-    (=ucs		. #xFE6A)	; ﹪
-    (=cns11643-1	. #x226D)	; &I-C1-226D; [02-77]
-    (=big5		. #xA24D)	; &I-B-A24D;
     ))
 (define-char
   '((name		. "SMALL COMMERCIAL AT")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFE6B)	; ﹫
+    (=cns11643-1	. #x226E)	; &I-C1-226E; [02-78]
+    (=big5		. #xA24E)	; &I-B-A24E;
     (<-small
      ((name		  . "COMMERCIAL AT")
       (=ucs		  . #x0040)	; @
       ))
-    (=ucs		. #xFE6B)	; ﹫
-    (=cns11643-1	. #x226E)	; &I-C1-226E; [02-78]
-    (=big5		. #xA24E)	; &I-B-A24E;
     ))
diff --git a/lisp/utf-2000/u0FE70-Arabic-Presentation-Forms-B.el b/lisp/utf-2000/u0FE70-Arabic-Presentation-Forms-B.el
index 56f13d3..7f1d57e 100644
--- a/lisp/utf-2000/u0FE70-Arabic-Presentation-Forms-B.el
+++ b/lisp/utf-2000/u0FE70-Arabic-Presentation-Forms-B.el
@@ -200,1404 +200,1404 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE80)	; ﺀ
+    (arabic-1-column	. #x2D)	; &I-MULE-ARB1-2D;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER HAMZA")
       (=ucs		  . #x0621)	; Ø¡
       ))
-    (=ucs		. #xFE80)	; ﺀ
-    (arabic-1-column	. #x2D)	; &I-MULE-ARB1-2D;
     ))
 (define-char
   '((name . "ARABIC LETTER ALEF WITH MADDA ABOVE ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE81)	; ﺁ
+    (arabic-1-column	. #x2E)	; &I-MULE-ARB1-2E;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER ALEF WITH MADDA ABOVE")
       (=ucs		  . #x0622)	; آ
       ))
-    (=ucs		. #xFE81)	; ﺁ
-    (arabic-1-column	. #x2E)	; &I-MULE-ARB1-2E;
     ))
 (define-char
   '((name . "ARABIC LETTER ALEF WITH MADDA ABOVE FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE82)	; ﺂ
+    (arabic-1-column	. #x2F)	; &I-MULE-ARB1-2F;
     (<-formed@final
      ((name		  . "ARABIC LETTER ALEF WITH MADDA ABOVE")
       (=ucs		  . #x0622)	; آ
       ))
-    (=ucs		. #xFE82)	; ﺂ
-    (arabic-1-column	. #x2F)	; &I-MULE-ARB1-2F;
     ))
 (define-char
   '((name . "ARABIC LETTER ALEF WITH HAMZA ABOVE ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE83)	; ﺃ
+    (arabic-1-column	. #x30)	; &I-MULE-ARB1-30;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER ALEF WITH HAMZA ABOVE")
       (=ucs		  . #x0623)	; أ
       ))
-    (=ucs		. #xFE83)	; ﺃ
-    (arabic-1-column	. #x30)	; &I-MULE-ARB1-30;
     ))
 (define-char
   '((name . "ARABIC LETTER ALEF WITH HAMZA ABOVE FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE84)	; ﺄ
+    (arabic-1-column	. #x31)	; &I-MULE-ARB1-31;
     (<-formed@final
      ((name		  . "ARABIC LETTER ALEF WITH HAMZA ABOVE")
       (=ucs		  . #x0623)	; أ
       ))
-    (=ucs		. #xFE84)	; ﺄ
-    (arabic-1-column	. #x31)	; &I-MULE-ARB1-31;
     ))
 (define-char
   '((name . "ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE85)	; ﺅ
+    (arabic-1-column	. #x32)	; &I-MULE-ARB1-32;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER WAW WITH HAMZA ABOVE")
       (=ucs		  . #x0624)	; ؤ
       ))
-    (=ucs		. #xFE85)	; ﺅ
-    (arabic-1-column	. #x32)	; &I-MULE-ARB1-32;
     ))
 (define-char
   '((name . "ARABIC LETTER WAW WITH HAMZA ABOVE FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE86)	; ﺆ
+    (arabic-1-column	. #x33)	; &I-MULE-ARB1-33;
     (<-formed@final
      ((name		  . "ARABIC LETTER WAW WITH HAMZA ABOVE")
       (=ucs		  . #x0624)	; ؤ
       ))
-    (=ucs		. #xFE86)	; ﺆ
-    (arabic-1-column	. #x33)	; &I-MULE-ARB1-33;
     ))
 (define-char
   '((name . "ARABIC LETTER ALEF WITH HAMZA BELOW ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE87)	; ﺇ
+    (arabic-1-column	. #x34)	; &I-MULE-ARB1-34;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER ALEF WITH HAMZA BELOW")
       (=ucs		  . #x0625)	; إ
       ))
-    (=ucs		. #xFE87)	; ﺇ
-    (arabic-1-column	. #x34)	; &I-MULE-ARB1-34;
     ))
 (define-char
   '((name . "ARABIC LETTER ALEF WITH HAMZA BELOW FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE88)	; ﺈ
+    (arabic-1-column	. #x35)	; &I-MULE-ARB1-35;
     (<-formed@final
      ((name		  . "ARABIC LETTER ALEF WITH HAMZA BELOW")
       (=ucs		  . #x0625)	; إ
       ))
-    (=ucs		. #xFE88)	; ﺈ
-    (arabic-1-column	. #x35)	; &I-MULE-ARB1-35;
     ))
 (define-char
   '((name . "ARABIC LETTER YEH WITH HAMZA ABOVE ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE89)	; ﺉ
+    (arabic-2-column	. #x21)	; &I-MULE-ARB2-21;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER YEH WITH HAMZA ABOVE")
       (=ucs		  . #x0626)	; ئ
       ))
-    (=ucs		. #xFE89)	; ﺉ
-    (arabic-2-column	. #x21)	; &I-MULE-ARB2-21;
     ))
 (define-char
   '((name . "ARABIC LETTER YEH WITH HAMZA ABOVE FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE8A)	; ﺊ
+    (arabic-2-column	. #x22)	; &I-MULE-ARB2-22;
     (<-formed@final
      ((name		  . "ARABIC LETTER YEH WITH HAMZA ABOVE")
       (=ucs		  . #x0626)	; ئ
       ))
-    (=ucs		. #xFE8A)	; ﺊ
-    (arabic-2-column	. #x22)	; &I-MULE-ARB2-22;
     ))
 (define-char
   '((name . "ARABIC LETTER YEH WITH HAMZA ABOVE INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE8B)	; ﺋ
+    (arabic-1-column	. #x36)	; &I-MULE-ARB1-36;
     (<-formed@initial
      ((name		  . "ARABIC LETTER YEH WITH HAMZA ABOVE")
       (=ucs		  . #x0626)	; ئ
       ))
-    (=ucs		. #xFE8B)	; ﺋ
-    (arabic-1-column	. #x36)	; &I-MULE-ARB1-36;
     ))
 (define-char
   '((name . "ARABIC LETTER YEH WITH HAMZA ABOVE MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE8C)	; ﺌ
+    (arabic-1-column	. #x37)	; &I-MULE-ARB1-37;
     (<-formed@medial
      ((name		  . "ARABIC LETTER YEH WITH HAMZA ABOVE")
       (=ucs		  . #x0626)	; ئ
       ))
-    (=ucs		. #xFE8C)	; ﺌ
-    (arabic-1-column	. #x37)	; &I-MULE-ARB1-37;
     ))
 (define-char
   '((name		. "ARABIC LETTER ALEF ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE8D)	; ﺍ
+    (arabic-1-column	. #x38)	; &I-MULE-ARB1-38;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER ALEF")
       (=ucs		  . #x0627)	; ا
       ))
-    (=ucs		. #xFE8D)	; ﺍ
-    (arabic-1-column	. #x38)	; &I-MULE-ARB1-38;
     ))
 (define-char
   '((name		. "ARABIC LETTER ALEF FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE8E)	; ﺎ
+    (arabic-1-column	. #x39)	; &I-MULE-ARB1-39;
     (<-formed@final
      ((name		  . "ARABIC LETTER ALEF")
       (=ucs		  . #x0627)	; ا
       ))
-    (=ucs		. #xFE8E)	; ﺎ
-    (arabic-1-column	. #x39)	; &I-MULE-ARB1-39;
     ))
 (define-char
   '((name		. "ARABIC LETTER BEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE8F)	; ﺏ
+    (arabic-2-column	. #x23)	; &I-MULE-ARB2-23;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER BEH")
       (=ucs		  . #x0628)	; ب
       ))
-    (=ucs		. #xFE8F)	; ﺏ
-    (arabic-2-column	. #x23)	; &I-MULE-ARB2-23;
     ))
 (define-char
   '((name		. "ARABIC LETTER BEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE90)	; ﺐ
+    (arabic-2-column	. #x24)	; &I-MULE-ARB2-24;
     (<-formed@final
      ((name		  . "ARABIC LETTER BEH")
       (=ucs		  . #x0628)	; ب
       ))
-    (=ucs		. #xFE90)	; ﺐ
-    (arabic-2-column	. #x24)	; &I-MULE-ARB2-24;
     ))
 (define-char
   '((name		. "ARABIC LETTER BEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE91)	; ﺑ
+    (arabic-1-column	. #x3A)	; &I-MULE-ARB1-3A;
     (<-formed@initial
      ((name		  . "ARABIC LETTER BEH")
       (=ucs		  . #x0628)	; ب
       ))
-    (=ucs		. #xFE91)	; ﺑ
-    (arabic-1-column	. #x3A)	; &I-MULE-ARB1-3A;
     ))
 (define-char
   '((name		. "ARABIC LETTER BEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE92)	; ﺒ
+    (arabic-1-column	. #x3B)	; &I-MULE-ARB1-3B;
     (<-formed@medial
      ((name		  . "ARABIC LETTER BEH")
       (=ucs		  . #x0628)	; ب
       ))
-    (=ucs		. #xFE92)	; ﺒ
-    (arabic-1-column	. #x3B)	; &I-MULE-ARB1-3B;
     ))
 (define-char
   '((name		. "ARABIC LETTER TEH MARBUTA ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE93)	; ﺓ
+    (arabic-1-column	. #x3C)	; &I-MULE-ARB1-3C;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER TEH MARBUTA")
       (=ucs		  . #x0629)	; Ø©
       ))
-    (=ucs		. #xFE93)	; ﺓ
-    (arabic-1-column	. #x3C)	; &I-MULE-ARB1-3C;
     ))
 (define-char
   '((name		. "ARABIC LETTER TEH MARBUTA FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE94)	; ﺔ
+    (arabic-1-column	. #x3D)	; &I-MULE-ARB1-3D;
     (<-formed@final
      ((name		  . "ARABIC LETTER TEH MARBUTA")
       (=ucs		  . #x0629)	; Ø©
       ))
-    (=ucs		. #xFE94)	; ﺔ
-    (arabic-1-column	. #x3D)	; &I-MULE-ARB1-3D;
     ))
 (define-char
   '((name		. "ARABIC LETTER TEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE95)	; ﺕ
+    (arabic-2-column	. #x25)	; &I-MULE-ARB2-25;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER TEH")
       (=ucs		  . #x062A)	; ت
       ))
-    (=ucs		. #xFE95)	; ﺕ
-    (arabic-2-column	. #x25)	; &I-MULE-ARB2-25;
     ))
 (define-char
   '((name		. "ARABIC LETTER TEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE96)	; ﺖ
+    (arabic-2-column	. #x26)	; &I-MULE-ARB2-26;
     (<-formed@final
      ((name		  . "ARABIC LETTER TEH")
       (=ucs		  . #x062A)	; ت
       ))
-    (=ucs		. #xFE96)	; ﺖ
-    (arabic-2-column	. #x26)	; &I-MULE-ARB2-26;
     ))
 (define-char
   '((name		. "ARABIC LETTER TEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE97)	; ﺗ
+    (arabic-1-column	. #x3E)	; &I-MULE-ARB1-3E;
     (<-formed@initial
      ((name		  . "ARABIC LETTER TEH")
       (=ucs		  . #x062A)	; ت
       ))
-    (=ucs		. #xFE97)	; ﺗ
-    (arabic-1-column	. #x3E)	; &I-MULE-ARB1-3E;
     ))
 (define-char
   '((name		. "ARABIC LETTER TEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE98)	; ﺘ
+    (arabic-1-column	. #x3F)	; &I-MULE-ARB1-3F;
     (<-formed@medial
      ((name		  . "ARABIC LETTER TEH")
       (=ucs		  . #x062A)	; ت
       ))
-    (=ucs		. #xFE98)	; ﺘ
-    (arabic-1-column	. #x3F)	; &I-MULE-ARB1-3F;
     ))
 (define-char
   '((name		. "ARABIC LETTER THEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE99)	; ﺙ
+    (arabic-2-column	. #x27)	; &I-MULE-ARB2-27;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER THEH")
       (=ucs		  . #x062B)	; Ø«
       ))
-    (=ucs		. #xFE99)	; ﺙ
-    (arabic-2-column	. #x27)	; &I-MULE-ARB2-27;
     ))
 (define-char
   '((name		. "ARABIC LETTER THEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE9A)	; ﺚ
+    (arabic-2-column	. #x28)	; &I-MULE-ARB2-28;
     (<-formed@final
      ((name		  . "ARABIC LETTER THEH")
       (=ucs		  . #x062B)	; Ø«
       ))
-    (=ucs		. #xFE9A)	; ﺚ
-    (arabic-2-column	. #x28)	; &I-MULE-ARB2-28;
     ))
 (define-char
   '((name		. "ARABIC LETTER THEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE9B)	; ﺛ
+    (arabic-1-column	. #x40)	; &I-MULE-ARB1-40;
     (<-formed@initial
      ((name		  . "ARABIC LETTER THEH")
       (=ucs		  . #x062B)	; Ø«
       ))
-    (=ucs		. #xFE9B)	; ﺛ
-    (arabic-1-column	. #x40)	; &I-MULE-ARB1-40;
     ))
 (define-char
   '((name		. "ARABIC LETTER THEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE9C)	; ﺜ
+    (arabic-1-column	. #x41)	; &I-MULE-ARB1-41;
     (<-formed@medial
      ((name		  . "ARABIC LETTER THEH")
       (=ucs		  . #x062B)	; Ø«
       ))
-    (=ucs		. #xFE9C)	; ﺜ
-    (arabic-1-column	. #x41)	; &I-MULE-ARB1-41;
     ))
 (define-char
   '((name		. "ARABIC LETTER JEEM ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE9D)	; ﺝ
+    (arabic-2-column	. #x29)	; &I-MULE-ARB2-29;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER JEEM")
       (=ucs		  . #x062C)	; ج
       ))
-    (=ucs		. #xFE9D)	; ﺝ
-    (arabic-2-column	. #x29)	; &I-MULE-ARB2-29;
     ))
 (define-char
   '((name		. "ARABIC LETTER JEEM FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE9E)	; ﺞ
+    (arabic-2-column	. #x2C)	; &I-MULE-ARB2-2C;
     (<-formed@final
      ((name		  . "ARABIC LETTER JEEM")
       (=ucs		  . #x062C)	; ج
       ))
-    (=ucs		. #xFE9E)	; ﺞ
-    (arabic-2-column	. #x2C)	; &I-MULE-ARB2-2C;
     ))
 (define-char
   '((name		. "ARABIC LETTER JEEM INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFE9F)	; ﺟ
+    (arabic-2-column	. #x2A)	; &I-MULE-ARB2-2A;
     (<-formed@initial
      ((name		  . "ARABIC LETTER JEEM")
       (=ucs		  . #x062C)	; ج
       ))
-    (=ucs		. #xFE9F)	; ﺟ
-    (arabic-2-column	. #x2A)	; &I-MULE-ARB2-2A;
     ))
 (define-char
   '((name		. "ARABIC LETTER JEEM MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEA0)	; ﺠ
+    (arabic-2-column	. #x2B)	; &I-MULE-ARB2-2B;
     (<-formed@medial
      ((name		  . "ARABIC LETTER JEEM")
       (=ucs		  . #x062C)	; ج
       ))
-    (=ucs		. #xFEA0)	; ﺠ
-    (arabic-2-column	. #x2B)	; &I-MULE-ARB2-2B;
     ))
 (define-char
   '((name		. "ARABIC LETTER HAH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEA1)	; ﺡ
+    (arabic-2-column	. #x2D)	; &I-MULE-ARB2-2D;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER HAH")
       (=ucs		  . #x062D)	; Ø­
       ))
-    (=ucs		. #xFEA1)	; ﺡ
-    (arabic-2-column	. #x2D)	; &I-MULE-ARB2-2D;
     ))
 (define-char
   '((name		. "ARABIC LETTER HAH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEA2)	; ﺢ
+    (arabic-2-column	. #x30)	; &I-MULE-ARB2-30;
     (<-formed@final
      ((name		  . "ARABIC LETTER HAH")
       (=ucs		  . #x062D)	; Ø­
       ))
-    (=ucs		. #xFEA2)	; ﺢ
-    (arabic-2-column	. #x30)	; &I-MULE-ARB2-30;
     ))
 (define-char
   '((name		. "ARABIC LETTER HAH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEA3)	; ﺣ
+    (arabic-2-column	. #x2E)	; &I-MULE-ARB2-2E;
     (<-formed@initial
      ((name		  . "ARABIC LETTER HAH")
       (=ucs		  . #x062D)	; Ø­
       ))
-    (=ucs		. #xFEA3)	; ﺣ
-    (arabic-2-column	. #x2E)	; &I-MULE-ARB2-2E;
     ))
 (define-char
   '((name		. "ARABIC LETTER HAH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEA4)	; ﺤ
+    (arabic-2-column	. #x2F)	; &I-MULE-ARB2-2F;
     (<-formed@medial
      ((name		  . "ARABIC LETTER HAH")
       (=ucs		  . #x062D)	; Ø­
       ))
-    (=ucs		. #xFEA4)	; ﺤ
-    (arabic-2-column	. #x2F)	; &I-MULE-ARB2-2F;
     ))
 (define-char
   '((name		. "ARABIC LETTER KHAH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEA5)	; ﺥ
+    (arabic-2-column	. #x31)	; &I-MULE-ARB2-31;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER KHAH")
       (=ucs		  . #x062E)	; Ø®
       ))
-    (=ucs		. #xFEA5)	; ﺥ
-    (arabic-2-column	. #x31)	; &I-MULE-ARB2-31;
     ))
 (define-char
   '((name		. "ARABIC LETTER KHAH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEA6)	; ﺦ
+    (arabic-2-column	. #x34)	; &I-MULE-ARB2-34;
     (<-formed@final
      ((name		  . "ARABIC LETTER KHAH")
       (=ucs		  . #x062E)	; Ø®
       ))
-    (=ucs		. #xFEA6)	; ﺦ
-    (arabic-2-column	. #x34)	; &I-MULE-ARB2-34;
     ))
 (define-char
   '((name		. "ARABIC LETTER KHAH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEA7)	; ﺧ
+    (arabic-2-column	. #x32)	; &I-MULE-ARB2-32;
     (<-formed@initial
      ((name		  . "ARABIC LETTER KHAH")
       (=ucs		  . #x062E)	; Ø®
       ))
-    (=ucs		. #xFEA7)	; ﺧ
-    (arabic-2-column	. #x32)	; &I-MULE-ARB2-32;
     ))
 (define-char
   '((name		. "ARABIC LETTER KHAH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEA8)	; ﺨ
+    (arabic-2-column	. #x33)	; &I-MULE-ARB2-33;
     (<-formed@medial
      ((name		  . "ARABIC LETTER KHAH")
       (=ucs		  . #x062E)	; Ø®
       ))
-    (=ucs		. #xFEA8)	; ﺨ
-    (arabic-2-column	. #x33)	; &I-MULE-ARB2-33;
     ))
 (define-char
   '((name		. "ARABIC LETTER DAL ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEA9)	; ﺩ
+    (arabic-1-column	. #x42)	; &I-MULE-ARB1-42;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER DAL")
       (=ucs		  . #x062F)	; د
       ))
-    (=ucs		. #xFEA9)	; ﺩ
-    (arabic-1-column	. #x42)	; &I-MULE-ARB1-42;
     ))
 (define-char
   '((name		. "ARABIC LETTER DAL FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEAA)	; ﺪ
+    (arabic-1-column	. #x43)	; &I-MULE-ARB1-43;
     (<-formed@final
      ((name		  . "ARABIC LETTER DAL")
       (=ucs		  . #x062F)	; د
       ))
-    (=ucs		. #xFEAA)	; ﺪ
-    (arabic-1-column	. #x43)	; &I-MULE-ARB1-43;
     ))
 (define-char
   '((name		. "ARABIC LETTER THAL ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEAB)	; ﺫ
+    (arabic-1-column	. #x44)	; &I-MULE-ARB1-44;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER THAL")
       (=ucs		  . #x0630)	; Ø°
       ))
-    (=ucs		. #xFEAB)	; ﺫ
-    (arabic-1-column	. #x44)	; &I-MULE-ARB1-44;
     ))
 (define-char
   '((name		. "ARABIC LETTER THAL FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEAC)	; ﺬ
+    (arabic-1-column	. #x45)	; &I-MULE-ARB1-45;
     (<-formed@final
      ((name		  . "ARABIC LETTER THAL")
       (=ucs		  . #x0630)	; Ø°
       ))
-    (=ucs		. #xFEAC)	; ﺬ
-    (arabic-1-column	. #x45)	; &I-MULE-ARB1-45;
     ))
 (define-char
   '((name		. "ARABIC LETTER REH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEAD)	; ﺭ
+    (arabic-1-column	. #x46)	; &I-MULE-ARB1-46;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER REH")
       (=ucs		  . #x0631)	; ر
       ))
-    (=ucs		. #xFEAD)	; ﺭ
-    (arabic-1-column	. #x46)	; &I-MULE-ARB1-46;
     ))
 (define-char
   '((name		. "ARABIC LETTER REH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEAE)	; ﺮ
+    (arabic-1-column	. #x47)	; &I-MULE-ARB1-47;
     (<-formed@final
      ((name		  . "ARABIC LETTER REH")
       (=ucs		  . #x0631)	; ر
       ))
-    (=ucs		. #xFEAE)	; ﺮ
-    (arabic-1-column	. #x47)	; &I-MULE-ARB1-47;
     ))
 (define-char
   '((name		. "ARABIC LETTER ZAIN ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEAF)	; ﺯ
+    (arabic-1-column	. #x48)	; &I-MULE-ARB1-48;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER ZAIN")
       (=ucs		  . #x0632)	; ز
       ))
-    (=ucs		. #xFEAF)	; ﺯ
-    (arabic-1-column	. #x48)	; &I-MULE-ARB1-48;
     ))
 (define-char
   '((name		. "ARABIC LETTER ZAIN FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEB0)	; ﺰ
+    (arabic-1-column	. #x49)	; &I-MULE-ARB1-49;
     (<-formed@final
      ((name		  . "ARABIC LETTER ZAIN")
       (=ucs		  . #x0632)	; ز
       ))
-    (=ucs		. #xFEB0)	; ﺰ
-    (arabic-1-column	. #x49)	; &I-MULE-ARB1-49;
     ))
 (define-char
   '((name		. "ARABIC LETTER SEEN ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEB1)	; ﺱ
+    (arabic-2-column	. #x35)	; &I-MULE-ARB2-35;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER SEEN")
       (=ucs		  . #x0633)	; س
       ))
-    (=ucs		. #xFEB1)	; ﺱ
-    (arabic-2-column	. #x35)	; &I-MULE-ARB2-35;
     ))
 (define-char
   '((name		. "ARABIC LETTER SEEN FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEB2)	; ﺲ
+    (arabic-2-column	. #x38)	; &I-MULE-ARB2-38;
     (<-formed@final
      ((name		  . "ARABIC LETTER SEEN")
       (=ucs		  . #x0633)	; س
       ))
-    (=ucs		. #xFEB2)	; ﺲ
-    (arabic-2-column	. #x38)	; &I-MULE-ARB2-38;
     ))
 (define-char
   '((name		. "ARABIC LETTER SEEN INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEB3)	; ﺳ
+    (arabic-2-column	. #x36)	; &I-MULE-ARB2-36;
     (<-formed@initial
      ((name		  . "ARABIC LETTER SEEN")
       (=ucs		  . #x0633)	; س
       ))
-    (=ucs		. #xFEB3)	; ﺳ
-    (arabic-2-column	. #x36)	; &I-MULE-ARB2-36;
     ))
 (define-char
   '((name		. "ARABIC LETTER SEEN MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEB4)	; ﺴ
+    (arabic-2-column	. #x37)	; &I-MULE-ARB2-37;
     (<-formed@medial
      ((name		  . "ARABIC LETTER SEEN")
       (=ucs		  . #x0633)	; س
       ))
-    (=ucs		. #xFEB4)	; ﺴ
-    (arabic-2-column	. #x37)	; &I-MULE-ARB2-37;
     ))
 (define-char
   '((name		. "ARABIC LETTER SHEEN ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEB5)	; ﺵ
+    (arabic-2-column	. #x39)	; &I-MULE-ARB2-39;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER SHEEN")
       (=ucs		  . #x0634)	; Ø´
       ))
-    (=ucs		. #xFEB5)	; ﺵ
-    (arabic-2-column	. #x39)	; &I-MULE-ARB2-39;
     ))
 (define-char
   '((name		. "ARABIC LETTER SHEEN FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEB6)	; ﺶ
+    (arabic-2-column	. #x3C)	; &I-MULE-ARB2-3C;
     (<-formed@final
      ((name		  . "ARABIC LETTER SHEEN")
       (=ucs		  . #x0634)	; Ø´
       ))
-    (=ucs		. #xFEB6)	; ﺶ
-    (arabic-2-column	. #x3C)	; &I-MULE-ARB2-3C;
     ))
 (define-char
   '((name		. "ARABIC LETTER SHEEN INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEB7)	; ﺷ
+    (arabic-2-column	. #x3A)	; &I-MULE-ARB2-3A;
     (<-formed@initial
      ((name		  . "ARABIC LETTER SHEEN")
       (=ucs		  . #x0634)	; Ø´
       ))
-    (=ucs		. #xFEB7)	; ﺷ
-    (arabic-2-column	. #x3A)	; &I-MULE-ARB2-3A;
     ))
 (define-char
   '((name		. "ARABIC LETTER SHEEN MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEB8)	; ﺸ
+    (arabic-2-column	. #x3B)	; &I-MULE-ARB2-3B;
     (<-formed@medial
      ((name		  . "ARABIC LETTER SHEEN")
       (=ucs		  . #x0634)	; Ø´
       ))
-    (=ucs		. #xFEB8)	; ﺸ
-    (arabic-2-column	. #x3B)	; &I-MULE-ARB2-3B;
     ))
 (define-char
   '((name		. "ARABIC LETTER SAD ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEB9)	; ﺹ
+    (arabic-2-column	. #x3D)	; &I-MULE-ARB2-3D;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER SAD")
       (=ucs		  . #x0635)	; ص
       ))
-    (=ucs		. #xFEB9)	; ﺹ
-    (arabic-2-column	. #x3D)	; &I-MULE-ARB2-3D;
     ))
 (define-char
   '((name		. "ARABIC LETTER SAD FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEBA)	; ﺺ
+    (arabic-2-column	. #x40)	; &I-MULE-ARB2-40;
     (<-formed@final
      ((name		  . "ARABIC LETTER SAD")
       (=ucs		  . #x0635)	; ص
       ))
-    (=ucs		. #xFEBA)	; ﺺ
-    (arabic-2-column	. #x40)	; &I-MULE-ARB2-40;
     ))
 (define-char
   '((name		. "ARABIC LETTER SAD INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEBB)	; ﺻ
+    (arabic-2-column	. #x3E)	; &I-MULE-ARB2-3E;
     (<-formed@initial
      ((name		  . "ARABIC LETTER SAD")
       (=ucs		  . #x0635)	; ص
       ))
-    (=ucs		. #xFEBB)	; ﺻ
-    (arabic-2-column	. #x3E)	; &I-MULE-ARB2-3E;
     ))
 (define-char
   '((name		. "ARABIC LETTER SAD MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEBC)	; ﺼ
+    (arabic-2-column	. #x3F)	; &I-MULE-ARB2-3F;
     (<-formed@medial
      ((name		  . "ARABIC LETTER SAD")
       (=ucs		  . #x0635)	; ص
       ))
-    (=ucs		. #xFEBC)	; ﺼ
-    (arabic-2-column	. #x3F)	; &I-MULE-ARB2-3F;
     ))
 (define-char
   '((name		. "ARABIC LETTER DAD ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEBD)	; ﺽ
+    (arabic-2-column	. #x41)	; &I-MULE-ARB2-41;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER DAD")
       (=ucs		  . #x0636)	; ض
       ))
-    (=ucs		. #xFEBD)	; ﺽ
-    (arabic-2-column	. #x41)	; &I-MULE-ARB2-41;
     ))
 (define-char
   '((name		. "ARABIC LETTER DAD FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEBE)	; ﺾ
+    (arabic-2-column	. #x44)	; &I-MULE-ARB2-44;
     (<-formed@final
      ((name		  . "ARABIC LETTER DAD")
       (=ucs		  . #x0636)	; ض
       ))
-    (=ucs		. #xFEBE)	; ﺾ
-    (arabic-2-column	. #x44)	; &I-MULE-ARB2-44;
     ))
 (define-char
   '((name		. "ARABIC LETTER DAD INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEBF)	; ﺿ
+    (arabic-2-column	. #x42)	; &I-MULE-ARB2-42;
     (<-formed@initial
      ((name		  . "ARABIC LETTER DAD")
       (=ucs		  . #x0636)	; ض
       ))
-    (=ucs		. #xFEBF)	; ﺿ
-    (arabic-2-column	. #x42)	; &I-MULE-ARB2-42;
     ))
 (define-char
   '((name		. "ARABIC LETTER DAD MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEC0)	; ﻀ
+    (arabic-2-column	. #x43)	; &I-MULE-ARB2-43;
     (<-formed@medial
      ((name		  . "ARABIC LETTER DAD")
       (=ucs		  . #x0636)	; ض
       ))
-    (=ucs		. #xFEC0)	; ﻀ
-    (arabic-2-column	. #x43)	; &I-MULE-ARB2-43;
     ))
 (define-char
   '((name		. "ARABIC LETTER TAH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEC1)	; ﻁ
+    (arabic-2-column	. #x45)	; &I-MULE-ARB2-45;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER TAH")
       (=ucs		  . #x0637)	; Ø·
       ))
-    (=ucs		. #xFEC1)	; ﻁ
-    (arabic-2-column	. #x45)	; &I-MULE-ARB2-45;
     ))
 (define-char
   '((name		. "ARABIC LETTER TAH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEC2)	; ﻂ
+    (arabic-2-column	. #x48)	; &I-MULE-ARB2-48;
     (<-formed@final
      ((name		  . "ARABIC LETTER TAH")
       (=ucs		  . #x0637)	; Ø·
       ))
-    (=ucs		. #xFEC2)	; ﻂ
-    (arabic-2-column	. #x48)	; &I-MULE-ARB2-48;
     ))
 (define-char
   '((name		. "ARABIC LETTER TAH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEC3)	; ﻃ
+    (arabic-2-column	. #x46)	; &I-MULE-ARB2-46;
     (<-formed@initial
      ((name		  . "ARABIC LETTER TAH")
       (=ucs		  . #x0637)	; Ø·
       ))
-    (=ucs		. #xFEC3)	; ﻃ
-    (arabic-2-column	. #x46)	; &I-MULE-ARB2-46;
     ))
 (define-char
   '((name		. "ARABIC LETTER TAH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEC4)	; ﻄ
+    (arabic-2-column	. #x47)	; &I-MULE-ARB2-47;
     (<-formed@medial
      ((name		  . "ARABIC LETTER TAH")
       (=ucs		  . #x0637)	; Ø·
       ))
-    (=ucs		. #xFEC4)	; ﻄ
-    (arabic-2-column	. #x47)	; &I-MULE-ARB2-47;
     ))
 (define-char
   '((name		. "ARABIC LETTER ZAH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEC5)	; ﻅ
+    (arabic-2-column	. #x49)	; &I-MULE-ARB2-49;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER ZAH")
       (=ucs		  . #x0638)	; ظ
       ))
-    (=ucs		. #xFEC5)	; ﻅ
-    (arabic-2-column	. #x49)	; &I-MULE-ARB2-49;
     ))
 (define-char
   '((name		. "ARABIC LETTER ZAH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEC6)	; ﻆ
+    (arabic-2-column	. #x4C)	; &I-MULE-ARB2-4C;
     (<-formed@final
      ((name		  . "ARABIC LETTER ZAH")
       (=ucs		  . #x0638)	; ظ
       ))
-    (=ucs		. #xFEC6)	; ﻆ
-    (arabic-2-column	. #x4C)	; &I-MULE-ARB2-4C;
     ))
 (define-char
   '((name		. "ARABIC LETTER ZAH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEC7)	; ﻇ
+    (arabic-2-column	. #x4A)	; &I-MULE-ARB2-4A;
     (<-formed@initial
      ((name		  . "ARABIC LETTER ZAH")
       (=ucs		  . #x0638)	; ظ
       ))
-    (=ucs		. #xFEC7)	; ﻇ
-    (arabic-2-column	. #x4A)	; &I-MULE-ARB2-4A;
     ))
 (define-char
   '((name		. "ARABIC LETTER ZAH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEC8)	; ﻈ
+    (arabic-2-column	. #x4B)	; &I-MULE-ARB2-4B;
     (<-formed@medial
      ((name		  . "ARABIC LETTER ZAH")
       (=ucs		  . #x0638)	; ظ
       ))
-    (=ucs		. #xFEC8)	; ﻈ
-    (arabic-2-column	. #x4B)	; &I-MULE-ARB2-4B;
     ))
 (define-char
   '((name		. "ARABIC LETTER AIN ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEC9)	; ﻉ
+    (arabic-2-column	. #x4D)	; &I-MULE-ARB2-4D;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER AIN")
       (=ucs		  . #x0639)	; ع
       ))
-    (=ucs		. #xFEC9)	; ﻉ
-    (arabic-2-column	. #x4D)	; &I-MULE-ARB2-4D;
     ))
 (define-char
   '((name		. "ARABIC LETTER AIN FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFECA)	; ﻊ
+    (arabic-2-column	. #x4E)	; &I-MULE-ARB2-4E;
     (<-formed@final
      ((name		  . "ARABIC LETTER AIN")
       (=ucs		  . #x0639)	; ع
       ))
-    (=ucs		. #xFECA)	; ﻊ
-    (arabic-2-column	. #x4E)	; &I-MULE-ARB2-4E;
     ))
 (define-char
   '((name		. "ARABIC LETTER AIN INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFECB)	; ﻋ
+    (arabic-1-column	. #x4A)	; &I-MULE-ARB1-4A;
     (<-formed@initial
      ((name		  . "ARABIC LETTER AIN")
       (=ucs		  . #x0639)	; ع
       ))
-    (=ucs		. #xFECB)	; ﻋ
-    (arabic-1-column	. #x4A)	; &I-MULE-ARB1-4A;
     ))
 (define-char
   '((name		. "ARABIC LETTER AIN MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFECC)	; ﻌ
+    (arabic-1-column	. #x4B)	; &I-MULE-ARB1-4B;
     (<-formed@medial
      ((name		  . "ARABIC LETTER AIN")
       (=ucs		  . #x0639)	; ع
       ))
-    (=ucs		. #xFECC)	; ﻌ
-    (arabic-1-column	. #x4B)	; &I-MULE-ARB1-4B;
     ))
 (define-char
   '((name		. "ARABIC LETTER GHAIN ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFECD)	; ﻍ
+    (arabic-2-column	. #x4F)	; &I-MULE-ARB2-4F;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER GHAIN")
       (=ucs		  . #x063A)	; غ
       ))
-    (=ucs		. #xFECD)	; ﻍ
-    (arabic-2-column	. #x4F)	; &I-MULE-ARB2-4F;
     ))
 (define-char
   '((name		. "ARABIC LETTER GHAIN FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFECE)	; ﻎ
+    (arabic-2-column	. #x50)	; &I-MULE-ARB2-50;
     (<-formed@final
      ((name		  . "ARABIC LETTER GHAIN")
       (=ucs		  . #x063A)	; غ
       ))
-    (=ucs		. #xFECE)	; ﻎ
-    (arabic-2-column	. #x50)	; &I-MULE-ARB2-50;
     ))
 (define-char
   '((name		. "ARABIC LETTER GHAIN INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFECF)	; ﻏ
+    (arabic-1-column	. #x4C)	; &I-MULE-ARB1-4C;
     (<-formed@initial
      ((name		  . "ARABIC LETTER GHAIN")
       (=ucs		  . #x063A)	; غ
       ))
-    (=ucs		. #xFECF)	; ﻏ
-    (arabic-1-column	. #x4C)	; &I-MULE-ARB1-4C;
     ))
 (define-char
   '((name		. "ARABIC LETTER GHAIN MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFED0)	; ﻐ
+    (arabic-1-column	. #x4D)	; &I-MULE-ARB1-4D;
     (<-formed@medial
      ((name		  . "ARABIC LETTER GHAIN")
       (=ucs		  . #x063A)	; غ
       ))
-    (=ucs		. #xFED0)	; ﻐ
-    (arabic-1-column	. #x4D)	; &I-MULE-ARB1-4D;
     ))
 (define-char
   '((name		. "ARABIC LETTER FEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFED1)	; ﻑ
+    (arabic-2-column	. #x51)	; &I-MULE-ARB2-51;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER FEH")
       (=ucs		  . #x0641)	; ف
       ))
-    (=ucs		. #xFED1)	; ﻑ
-    (arabic-2-column	. #x51)	; &I-MULE-ARB2-51;
     ))
 (define-char
   '((name		. "ARABIC LETTER FEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFED2)	; ﻒ
+    (arabic-2-column	. #x52)	; &I-MULE-ARB2-52;
     (<-formed@final
      ((name		  . "ARABIC LETTER FEH")
       (=ucs		  . #x0641)	; ف
       ))
-    (=ucs		. #xFED2)	; ﻒ
-    (arabic-2-column	. #x52)	; &I-MULE-ARB2-52;
     ))
 (define-char
   '((name		. "ARABIC LETTER FEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFED3)	; ﻓ
+    (arabic-1-column	. #x4E)	; &I-MULE-ARB1-4E;
     (<-formed@initial
      ((name		  . "ARABIC LETTER FEH")
       (=ucs		  . #x0641)	; ف
       ))
-    (=ucs		. #xFED3)	; ﻓ
-    (arabic-1-column	. #x4E)	; &I-MULE-ARB1-4E;
     ))
 (define-char
   '((name		. "ARABIC LETTER FEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFED4)	; ﻔ
+    (arabic-1-column	. #x4F)	; &I-MULE-ARB1-4F;
     (<-formed@medial
      ((name		  . "ARABIC LETTER FEH")
       (=ucs		  . #x0641)	; ف
       ))
-    (=ucs		. #xFED4)	; ﻔ
-    (arabic-1-column	. #x4F)	; &I-MULE-ARB1-4F;
     ))
 (define-char
   '((name		. "ARABIC LETTER QAF ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFED5)	; ﻕ
+    (arabic-2-column	. #x53)	; &I-MULE-ARB2-53;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER QAF")
       (=ucs		  . #x0642)	; ق
       ))
-    (=ucs		. #xFED5)	; ﻕ
-    (arabic-2-column	. #x53)	; &I-MULE-ARB2-53;
     ))
 (define-char
   '((name		. "ARABIC LETTER QAF FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFED6)	; ﻖ
+    (arabic-2-column	. #x54)	; &I-MULE-ARB2-54;
     (<-formed@final
      ((name		  . "ARABIC LETTER QAF")
       (=ucs		  . #x0642)	; ق
       ))
-    (=ucs		. #xFED6)	; ﻖ
-    (arabic-2-column	. #x54)	; &I-MULE-ARB2-54;
     ))
 (define-char
   '((name		. "ARABIC LETTER QAF INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFED7)	; ﻗ
+    (arabic-1-column	. #x50)	; &I-MULE-ARB1-50;
     (<-formed@initial
      ((name		  . "ARABIC LETTER QAF")
       (=ucs		  . #x0642)	; ق
       ))
-    (=ucs		. #xFED7)	; ﻗ
-    (arabic-1-column	. #x50)	; &I-MULE-ARB1-50;
     ))
 (define-char
   '((name		. "ARABIC LETTER QAF MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFED8)	; ﻘ
+    (arabic-1-column	. #x51)	; &I-MULE-ARB1-51;
     (<-formed@medial
      ((name		  . "ARABIC LETTER QAF")
       (=ucs		  . #x0642)	; ق
       ))
-    (=ucs		. #xFED8)	; ﻘ
-    (arabic-1-column	. #x51)	; &I-MULE-ARB1-51;
     ))
 (define-char
   '((name		. "ARABIC LETTER KAF ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFED9)	; ﻙ
+    (arabic-2-column	. #x55)	; &I-MULE-ARB2-55;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER KAF")
       (=ucs		  . #x0643)	; ك
       ))
-    (=ucs		. #xFED9)	; ﻙ
-    (arabic-2-column	. #x55)	; &I-MULE-ARB2-55;
     ))
 (define-char
   '((name		. "ARABIC LETTER KAF FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEDA)	; ﻚ
+    (arabic-2-column	. #x58)	; &I-MULE-ARB2-58;
     (<-formed@final
      ((name		  . "ARABIC LETTER KAF")
       (=ucs		  . #x0643)	; ك
       ))
-    (=ucs		. #xFEDA)	; ﻚ
-    (arabic-2-column	. #x58)	; &I-MULE-ARB2-58;
     ))
 (define-char
   '((name		. "ARABIC LETTER KAF INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEDB)	; ﻛ
+    (arabic-2-column	. #x56)	; &I-MULE-ARB2-56;
     (<-formed@initial
      ((name		  . "ARABIC LETTER KAF")
       (=ucs		  . #x0643)	; ك
       ))
-    (=ucs		. #xFEDB)	; ﻛ
-    (arabic-2-column	. #x56)	; &I-MULE-ARB2-56;
     ))
 (define-char
   '((name		. "ARABIC LETTER KAF MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEDC)	; ﻜ
+    (arabic-2-column	. #x57)	; &I-MULE-ARB2-57;
     (<-formed@medial
      ((name		  . "ARABIC LETTER KAF")
       (=ucs		  . #x0643)	; ك
       ))
-    (=ucs		. #xFEDC)	; ﻜ
-    (arabic-2-column	. #x57)	; &I-MULE-ARB2-57;
     ))
 (define-char
   '((name		. "ARABIC LETTER LAM ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEDD)	; ﻝ
+    (arabic-2-column	. #x59)	; &I-MULE-ARB2-59;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER LAM")
       (=ucs		  . #x0644)	; ل
       ))
-    (=ucs		. #xFEDD)	; ﻝ
-    (arabic-2-column	. #x59)	; &I-MULE-ARB2-59;
     ))
 (define-char
   '((name		. "ARABIC LETTER LAM FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEDE)	; ﻞ
+    (arabic-2-column	. #x5A)	; &I-MULE-ARB2-5A;
     (<-formed@final
      ((name		  . "ARABIC LETTER LAM")
       (=ucs		  . #x0644)	; ل
       ))
-    (=ucs		. #xFEDE)	; ﻞ
-    (arabic-2-column	. #x5A)	; &I-MULE-ARB2-5A;
     ))
 (define-char
   '((name		. "ARABIC LETTER LAM INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEDF)	; ﻟ
+    (arabic-1-column	. #x52)	; &I-MULE-ARB1-52;
     (<-formed@initial
      ((name		  . "ARABIC LETTER LAM")
       (=ucs		  . #x0644)	; ل
       ))
-    (=ucs		. #xFEDF)	; ﻟ
-    (arabic-1-column	. #x52)	; &I-MULE-ARB1-52;
     ))
 (define-char
   '((name		. "ARABIC LETTER LAM MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEE0)	; ï» 
+    (arabic-1-column	. #x53)	; &I-MULE-ARB1-53;
     (<-formed@medial
      ((name		  . "ARABIC LETTER LAM")
       (=ucs		  . #x0644)	; ل
       ))
-    (=ucs		. #xFEE0)	; ï» 
-    (arabic-1-column	. #x53)	; &I-MULE-ARB1-53;
     ))
 (define-char
   '((name		. "ARABIC LETTER MEEM ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEE1)	; ﻡ
+    (arabic-1-column	. #x54)	; &I-MULE-ARB1-54;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER MEEM")
       (=ucs		  . #x0645)	; م
       ))
-    (=ucs		. #xFEE1)	; ﻡ
-    (arabic-1-column	. #x54)	; &I-MULE-ARB1-54;
     ))
 (define-char
   '((name		. "ARABIC LETTER MEEM FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEE2)	; ﻢ
+    (arabic-1-column	. #x57)	; &I-MULE-ARB1-57;
     (<-formed@final
      ((name		  . "ARABIC LETTER MEEM")
       (=ucs		  . #x0645)	; م
       ))
-    (=ucs		. #xFEE2)	; ﻢ
-    (arabic-1-column	. #x57)	; &I-MULE-ARB1-57;
     ))
 (define-char
   '((name		. "ARABIC LETTER MEEM INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEE3)	; ﻣ
+    (arabic-1-column	. #x55)	; &I-MULE-ARB1-55;
     (<-formed@initial
      ((name		  . "ARABIC LETTER MEEM")
       (=ucs		  . #x0645)	; م
       ))
-    (=ucs		. #xFEE3)	; ﻣ
-    (arabic-1-column	. #x55)	; &I-MULE-ARB1-55;
     ))
 (define-char
   '((name		. "ARABIC LETTER MEEM MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEE4)	; ﻤ
+    (arabic-1-column	. #x56)	; &I-MULE-ARB1-56;
     (<-formed@medial
      ((name		  . "ARABIC LETTER MEEM")
       (=ucs		  . #x0645)	; م
       ))
-    (=ucs		. #xFEE4)	; ﻤ
-    (arabic-1-column	. #x56)	; &I-MULE-ARB1-56;
     ))
 (define-char
   '((name		. "ARABIC LETTER NOON ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEE5)	; ﻥ
+    (arabic-2-column	. #x5B)	; &I-MULE-ARB2-5B;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER NOON")
       (=ucs		  . #x0646)	; ن
       ))
-    (=ucs		. #xFEE5)	; ﻥ
-    (arabic-2-column	. #x5B)	; &I-MULE-ARB2-5B;
     ))
 (define-char
   '((name		. "ARABIC LETTER NOON FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEE6)	; ﻦ
+    (arabic-2-column	. #x5C)	; &I-MULE-ARB2-5C;
     (<-formed@final
      ((name		  . "ARABIC LETTER NOON")
       (=ucs		  . #x0646)	; ن
       ))
-    (=ucs		. #xFEE6)	; ﻦ
-    (arabic-2-column	. #x5C)	; &I-MULE-ARB2-5C;
     ))
 (define-char
   '((name		. "ARABIC LETTER NOON INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEE7)	; ﻧ
+    (arabic-1-column	. #x58)	; &I-MULE-ARB1-58;
     (<-formed@initial
      ((name		  . "ARABIC LETTER NOON")
       (=ucs		  . #x0646)	; ن
       ))
-    (=ucs		. #xFEE7)	; ﻧ
-    (arabic-1-column	. #x58)	; &I-MULE-ARB1-58;
     ))
 (define-char
   '((name		. "ARABIC LETTER NOON MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEE8)	; ﻨ
+    (arabic-1-column	. #x59)	; &I-MULE-ARB1-59;
     (<-formed@medial
      ((name		  . "ARABIC LETTER NOON")
       (=ucs		  . #x0646)	; ن
       ))
-    (=ucs		. #xFEE8)	; ﻨ
-    (arabic-1-column	. #x59)	; &I-MULE-ARB1-59;
     ))
 (define-char
   '((name		. "ARABIC LETTER HEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEE9)	; ﻩ
+    (arabic-1-column	. #x5A)	; &I-MULE-ARB1-5A;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER HEH")
       (=ucs		  . #x0647)	; ه
       ))
-    (=ucs		. #xFEE9)	; ﻩ
-    (arabic-1-column	. #x5A)	; &I-MULE-ARB1-5A;
     ))
 (define-char
   '((name		. "ARABIC LETTER HEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEEA)	; ﻪ
+    (arabic-1-column	. #x5D)	; &I-MULE-ARB1-5D;
     (<-formed@final
      ((name		  . "ARABIC LETTER HEH")
       (=ucs		  . #x0647)	; ه
       ))
-    (=ucs		. #xFEEA)	; ﻪ
-    (arabic-1-column	. #x5D)	; &I-MULE-ARB1-5D;
     ))
 (define-char
   '((name		. "ARABIC LETTER HEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEEB)	; ﻫ
+    (arabic-1-column	. #x5B)	; &I-MULE-ARB1-5B;
     (<-formed@initial
      ((name		  . "ARABIC LETTER HEH")
       (=ucs		  . #x0647)	; ه
       ))
-    (=ucs		. #xFEEB)	; ﻫ
-    (arabic-1-column	. #x5B)	; &I-MULE-ARB1-5B;
     ))
 (define-char
   '((name		. "ARABIC LETTER HEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEEC)	; ﻬ
+    (arabic-1-column	. #x5C)	; &I-MULE-ARB1-5C;
     (<-formed@medial
      ((name		  . "ARABIC LETTER HEH")
       (=ucs		  . #x0647)	; ه
       ))
-    (=ucs		. #xFEEC)	; ﻬ
-    (arabic-1-column	. #x5C)	; &I-MULE-ARB1-5C;
     ))
 (define-char
   '((name		. "ARABIC LETTER WAW ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEED)	; ï»­
+    (arabic-1-column	. #x5E)	; &I-MULE-ARB1-5E;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER WAW")
       (=ucs		  . #x0648)	; و
       ))
-    (=ucs		. #xFEED)	; ï»­
-    (arabic-1-column	. #x5E)	; &I-MULE-ARB1-5E;
     ))
 (define-char
   '((name		. "ARABIC LETTER WAW FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEEE)	; ï»®
+    (arabic-1-column	. #x5F)	; &I-MULE-ARB1-5F;
     (<-formed@final
      ((name		  . "ARABIC LETTER WAW")
       (=ucs		  . #x0648)	; و
       ))
-    (=ucs		. #xFEEE)	; ï»®
-    (arabic-1-column	. #x5F)	; &I-MULE-ARB1-5F;
     ))
 (define-char
   '((name		. "ARABIC LETTER ALEF MAKSURA ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEEF)	; ﻯ
+    (arabic-2-column	. #x5D)	; &I-MULE-ARB2-5D;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER ALEF MAKSURA")
       (=ucs		  . #x0649)	; ى
       ))
-    (=ucs		. #xFEEF)	; ﻯ
-    (arabic-2-column	. #x5D)	; &I-MULE-ARB2-5D;
     ))
 (define-char
   '((name		. "ARABIC LETTER ALEF MAKSURA FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEF0)	; ï»°
+    (arabic-2-column	. #x5E)	; &I-MULE-ARB2-5E;
     (<-formed@final
      ((name		  . "ARABIC LETTER ALEF MAKSURA")
       (=ucs		  . #x0649)	; ى
       ))
-    (=ucs		. #xFEF0)	; ï»°
-    (arabic-2-column	. #x5E)	; &I-MULE-ARB2-5E;
     ))
 (define-char
   '((name		. "ARABIC LETTER YEH ISOLATED FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEF1)	; ï»±
+    (arabic-2-column	. #x5F)	; &I-MULE-ARB2-5F;
     (<-formed@isolated
      ((name		  . "ARABIC LETTER YEH")
       (=ucs		  . #x064A)	; ي
       ))
-    (=ucs		. #xFEF1)	; ï»±
-    (arabic-2-column	. #x5F)	; &I-MULE-ARB2-5F;
     ))
 (define-char
   '((name		. "ARABIC LETTER YEH FINAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEF2)	; ﻲ
+    (arabic-2-column	. #x60)	; &I-MULE-ARB2-60;
     (<-formed@final
      ((name		  . "ARABIC LETTER YEH")
       (=ucs		  . #x064A)	; ي
       ))
-    (=ucs		. #xFEF2)	; ﻲ
-    (arabic-2-column	. #x60)	; &I-MULE-ARB2-60;
     ))
 (define-char
   '((name		. "ARABIC LETTER YEH INITIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEF3)	; ﻳ
+    (arabic-1-column	. #x60)	; &I-MULE-ARB1-60;
     (<-formed@initial
      ((name		  . "ARABIC LETTER YEH")
       (=ucs		  . #x064A)	; ي
       ))
-    (=ucs		. #xFEF3)	; ﻳ
-    (arabic-1-column	. #x60)	; &I-MULE-ARB1-60;
     ))
 (define-char
   '((name		. "ARABIC LETTER YEH MEDIAL FORM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
+    (=ucs		. #xFEF4)	; ï»´
+    (arabic-1-column	. #x61)	; &I-MULE-ARB1-61;
     (<-formed@medial
      ((name		  . "ARABIC LETTER YEH")
       (=ucs		  . #x064A)	; ي
       ))
-    (=ucs		. #xFEF4)	; ï»´
-    (arabic-1-column	. #x61)	; &I-MULE-ARB1-61;
     ))
 (define-char
   '((name . "ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM")
diff --git a/lisp/utf-2000/u0FF00-Halfwidth-and-Fullwidth-Forms.el b/lisp/utf-2000/u0FF00-Halfwidth-and-Fullwidth-Forms.el
index 7045cfd..aedbb33 100644
--- a/lisp/utf-2000/u0FF00-Halfwidth-and-Fullwidth-Forms.el
+++ b/lisp/utf-2000/u0FF00-Halfwidth-and-Fullwidth-Forms.el
@@ -4,238 +4,238 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "EXCLAMATION MARK")
-      (=ucs		  . #x0021)	; !
-      ))
     (=ucs		. #xFF01)	; ！
     (=jis-x0208		. #x212A)	; &I-J90-212A; [01-10]
     (=gb2312		. #x2321)	; &I-G0-2321; [03-01]
     (=ks-x1001		. #x2321)	; &I-K0-2321; [03-01]
     (=cns11643-1	. #x212A)	; &I-C1-212A; [01-10]
     (=big5		. #xA149)	; &I-B-A149;
+    (<-fullwidth
+     ((name		  . "EXCLAMATION MARK")
+      (=ucs		  . #x0021)	; !
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH QUOTATION MARK")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "QUOTATION MARK")
-      (=ucs		  . #x0022)	; "
-      ))
     (=ucs		. #xFF02)	; ＂
     (=gb2312		. #x2322)	; &I-G0-2322; [03-02]
     (=ks-x1001		. #x2322)	; &I-K0-2322; [03-02]
     (=jis-x0213-1-2000	. #x2230)	; &I-JX1-2230; [02-16]
     (=big5-eten		. #xC8D0)	; &B-C8D0;
+    (<-fullwidth
+     ((name		  . "QUOTATION MARK")
+      (=ucs		  . #x0022)	; "
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH NUMBER SIGN")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "NUMBER SIGN")
-      (=ucs		  . #x0023)	; #
-      ))
     (=ucs		. #xFF03)	; ＃
     (=jis-x0208		. #x2174)	; &I-J90-2174; [01-84]
     (=gb2312		. #x2323)	; &I-G0-2323; [03-03]
     (=ks-x1001		. #x2323)	; &I-K0-2323; [03-03]
     (=cns11643-1	. #x216C)	; &I-C1-216C; [01-76]
     (=big5		. #xA1AD)	; &I-B-A1AD;
+    (<-fullwidth
+     ((name		  . "NUMBER SIGN")
+      (=ucs		  . #x0023)	; #
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH DOLLAR SIGN")
     (general-category	symbol currency) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "DOLLAR SIGN")
-      (=ucs		  . #x0024)	; $
-      ))
     (=ucs		. #xFF04)	; ＄
     (=jis-x0208		. #x2170)	; &I-J90-2170; [01-80]
     (=gb2312		. #x2167)	; &I-G0-2167; [01-71]
     (=ks-x1001		. #x2324)	; &I-K0-2324; [03-04]
     (=cns11643-1	. #x2263)	; &I-C1-2263; [02-67]
     (=big5		. #xA243)	; &I-B-A243;
+    (<-fullwidth
+     ((name		  . "DOLLAR SIGN")
+      (=ucs		  . #x0024)	; $
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH PERCENT SIGN")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "PERCENT SIGN")
-      (=ucs		  . #x0025)	; %
-      ))
     (=ucs		. #xFF05)	; ％
     (=jis-x0208		. #x2173)	; &I-J90-2173; [01-83]
     (=gb2312		. #x2325)	; &I-G0-2325; [03-05]
     (=ks-x1001		. #x2325)	; &I-K0-2325; [03-05]
     (=cns11643-1	. #x2268)	; &I-C1-2268; [02-72]
     (=big5		. #xA248)	; &I-B-A248;
+    (<-fullwidth
+     ((name		  . "PERCENT SIGN")
+      (=ucs		  . #x0025)	; %
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH AMPERSAND")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "AMPERSAND")
-      (=ucs		  . #x0026)	; &
-      ))
     (=ucs		. #xFF06)	; ＆
     (=jis-x0208		. #x2175)	; &I-J90-2175; [01-85]
     (=gb2312		. #x2326)	; &I-G0-2326; [03-06]
     (=ks-x1001		. #x2326)	; &I-K0-2326; [03-06]
     (=cns11643-1	. #x216D)	; &I-C1-216D; [01-77]
     (=big5		. #xA1AE)	; &I-B-A1AE;
+    (<-fullwidth
+     ((name		  . "AMPERSAND")
+      (=ucs		  . #x0026)	; &
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH APOSTROPHE")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "APOSTROPHE")
-      (=ucs		  . #x0027)	; '
-      ))
     (=ucs		. #xFF07)	; ＇
     (=gb2312		. #x2327)	; &I-G0-2327; [03-07]
     (=ks-x1001		. #x2327)	; &I-K0-2327; [03-07]
     (=jis-x0213-1-2000	. #x222F)	; &I-JX1-222F; [02-15]
     (=big5-eten		. #xC8CF)	; &B-C8CF;
+    (<-fullwidth
+     ((name		  . "APOSTROPHE")
+      (=ucs		  . #x0027)	; '
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH LEFT PARENTHESIS")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LEFT PARENTHESIS")
-      (=ucs		  . #x0028)	; (
-      ))
     (=ucs		. #xFF08)	; （
     (=jis-x0208		. #x214A)	; &I-J90-214A; [01-42]
     (=gb2312		. #x2328)	; &I-G0-2328; [03-08]
     (=ks-x1001		. #x2328)	; &I-K0-2328; [03-08]
     (=cns11643-1	. #x213E)	; &I-C1-213E; [01-30]
     (=big5		. #xA15D)	; &I-B-A15D;
+    (<-fullwidth
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH RIGHT PARENTHESIS")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "RIGHT PARENTHESIS")
-      (=ucs		  . #x0029)	; )
-      ))
     (=ucs		. #xFF09)	; ）
     (=jis-x0208		. #x214B)	; &I-J90-214B; [01-43]
     (=gb2312		. #x2329)	; &I-G0-2329; [03-09]
     (=ks-x1001		. #x2329)	; &I-K0-2329; [03-09]
     (=cns11643-1	. #x213F)	; &I-C1-213F; [01-31]
     (=big5		. #xA15E)	; &I-B-A15E;
+    (<-fullwidth
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH ASTERISK")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "ASTERISK")
-      (=ucs		  . #x002A)	; *
-      ))
     (=ucs		. #xFF0A)	; ＊
     (=jis-x0208		. #x2176)	; &I-J90-2176; [01-86]
     (=gb2312		. #x232A)	; &I-G0-232A; [03-10]
     (=ks-x1001		. #x232A)	; &I-K0-232A; [03-10]
     (=cns11643-1	. #x216E)	; &I-C1-216E; [01-78]
     (=big5		. #xA1AF)	; &I-B-A1AF;
+    (<-fullwidth
+     ((name		  . "ASTERISK")
+      (=ucs		  . #x002A)	; *
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH PLUS SIGN")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "PLUS SIGN")
-      (=ucs		  . #x002B)	; +
-      ))
     (=ucs		. #xFF0B)	; ＋
     (=jis-x0208		. #x215C)	; &I-J90-215C; [01-60]
     (=gb2312		. #x232B)	; &I-G0-232B; [03-11]
     (=ks-x1001		. #x232B)	; &I-K0-232B; [03-11]
     (=cns11643-1	. #x2230)	; &I-C1-2230; [02-16]
     (=big5		. #xA1CF)	; &I-B-A1CF;
+    (<-fullwidth
+     ((name		  . "PLUS SIGN")
+      (=ucs		  . #x002B)	; +
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH COMMA")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "CS")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "COMMA")
-      (=ucs		  . #x002C)	; ,
-      ))
     (=ucs		. #xFF0C)	; ，
     (=jis-x0208		. #x2124)	; &I-J90-2124; [01-04]
     (=gb2312		. #x232C)	; &I-G0-232C; [03-12]
     (=ks-x1001		. #x232C)	; &I-K0-232C; [03-12]
     (=cns11643-1	. #x2122)	; &I-C1-2122; [01-02]
     (=big5		. #xA141)	; &I-B-A141;
+    (<-fullwidth
+     ((name		  . "COMMA")
+      (=ucs		  . #x002C)	; ,
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH HYPHEN-MINUS")
     (general-category	punctuation dash) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "HYPHEN-MINUS")
-      (=ucs		  . #x002D)	; -
-      ))
     (=ucs		. #xFF0D)	; －
     (=gb2312		. #x232D)	; &I-G0-232D; [03-13]
     (=ks-x1001		. #x232D)	; &I-K0-232D; [03-13]
     (=cns11643-1	. #x2231)	; &I-C1-2231; [02-17]
     (=jis-x0213-1-2000	. #x2231)	; &I-JX1-2231; [02-17]
     (=big5		. #xA1D0)	; &I-B-A1D0;
+    (<-fullwidth
+     ((name		  . "HYPHEN-MINUS")
+      (=ucs		  . #x002D)	; -
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH FULL STOP")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "CS")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "FULL STOP")
-      (=ucs		  . #x002E)	; .
-      ))
     (=ucs		. #xFF0E)	; ．
     (=jis-x0208		. #x2125)	; &I-J90-2125; [01-05]
     (=gb2312		. #x232E)	; &I-G0-232E; [03-14]
     (=ks-x1001		. #x232E)	; &I-K0-232E; [03-14]
     (=cns11643-1	. #x2125)	; &I-C1-2125; [01-05]
     (=big5		. #xA144)	; &I-B-A144;
+    (<-fullwidth
+     ((name		  . "FULL STOP")
+      (=ucs		  . #x002E)	; .
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH SOLIDUS")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ES")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "SOLIDUS")
-      (=ucs		  . #x002F)	; /
-      ))
     (=ucs		. #xFF0F)	; ／
     (=jis-x0208		. #x213F)	; &I-J90-213F; [01-31]
     (=gb2312		. #x232F)	; &I-G0-232F; [03-15]
     (=ks-x1001		. #x232F)	; &I-K0-232F; [03-15]
     (=cns11643-1	. #x225F)	; &I-C1-225F; [02-63]
     (=big5		. #xA1FE)	; &I-B-A1FE;
+    (<-fullwidth
+     ((name		  . "SOLIDUS")
+      (=ucs		  . #x002F)	; /
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH DIGIT ZERO")
@@ -245,16 +245,16 @@
     (decimal-digit-value . 0)
     (digit-value	 . 0)
     (numeric-value	 . 0)
-    (<-fullwidth
-     ((name		  . "DIGIT ZERO")
-      (=ucs		  . #x0030)	; 0
-      ))
     (=ucs		. #xFF10)	; ０
     (=jis-x0208		. #x2330)	; &I-J90-2330; [03-16]
     (=gb2312		. #x2330)	; &I-G0-2330; [03-16]
     (=ks-x1001		. #x2330)	; &I-K0-2330; [03-16]
     (=cns11643-1	. #x2421)	; &I-C1-2421; [04-01]
     (=big5		. #xA2AF)	; &I-B-A2AF;
+    (<-fullwidth
+     ((name		  . "DIGIT ZERO")
+      (=ucs		  . #x0030)	; 0
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH DIGIT ONE")
@@ -264,16 +264,16 @@
     (decimal-digit-value . 1)
     (digit-value	 . 1)
     (numeric-value	 . 1)
-    (<-fullwidth
-     ((name		  . "DIGIT ONE")
-      (=ucs		  . #x0031)	; 1
-      ))
     (=ucs		. #xFF11)	; １
     (=jis-x0208		. #x2331)	; &I-J90-2331; [03-17]
     (=gb2312		. #x2331)	; &I-G0-2331; [03-17]
     (=ks-x1001		. #x2331)	; &I-K0-2331; [03-17]
     (=cns11643-1	. #x2422)	; &I-C1-2422; [04-02]
     (=big5		. #xA2B0)	; &I-B-A2B0;
+    (<-fullwidth
+     ((name		  . "DIGIT ONE")
+      (=ucs		  . #x0031)	; 1
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH DIGIT TWO")
@@ -283,16 +283,16 @@
     (decimal-digit-value . 2)
     (digit-value	 . 2)
     (numeric-value	 . 2)
-    (<-fullwidth
-     ((name		  . "DIGIT TWO")
-      (=ucs		  . #x0032)	; 2
-      ))
     (=ucs		. #xFF12)	; ２
     (=jis-x0208		. #x2332)	; &I-J90-2332; [03-18]
     (=gb2312		. #x2332)	; &I-G0-2332; [03-18]
     (=ks-x1001		. #x2332)	; &I-K0-2332; [03-18]
     (=cns11643-1	. #x2423)	; &I-C1-2423; [04-03]
     (=big5		. #xA2B1)	; &I-B-A2B1;
+    (<-fullwidth
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH DIGIT THREE")
@@ -302,16 +302,16 @@
     (decimal-digit-value . 3)
     (digit-value	 . 3)
     (numeric-value	 . 3)
-    (<-fullwidth
-     ((name		  . "DIGIT THREE")
-      (=ucs		  . #x0033)	; 3
-      ))
     (=ucs		. #xFF13)	; ３
     (=jis-x0208		. #x2333)	; &I-J90-2333; [03-19]
     (=gb2312		. #x2333)	; &I-G0-2333; [03-19]
     (=ks-x1001		. #x2333)	; &I-K0-2333; [03-19]
     (=cns11643-1	. #x2424)	; &I-C1-2424; [04-04]
     (=big5		. #xA2B2)	; &I-B-A2B2;
+    (<-fullwidth
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH DIGIT FOUR")
@@ -321,16 +321,16 @@
     (decimal-digit-value . 4)
     (digit-value	 . 4)
     (numeric-value	 . 4)
-    (<-fullwidth
-     ((name		  . "DIGIT FOUR")
-      (=ucs		  . #x0034)	; 4
-      ))
     (=ucs		. #xFF14)	; ４
     (=jis-x0208		. #x2334)	; &I-J90-2334; [03-20]
     (=gb2312		. #x2334)	; &I-G0-2334; [03-20]
     (=ks-x1001		. #x2334)	; &I-K0-2334; [03-20]
     (=cns11643-1	. #x2425)	; &I-C1-2425; [04-05]
     (=big5		. #xA2B3)	; &I-B-A2B3;
+    (<-fullwidth
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH DIGIT FIVE")
@@ -340,16 +340,16 @@
     (decimal-digit-value . 5)
     (digit-value	 . 5)
     (numeric-value	 . 5)
-    (<-fullwidth
-     ((name		  . "DIGIT FIVE")
-      (=ucs		  . #x0035)	; 5
-      ))
     (=ucs		. #xFF15)	; ５
     (=jis-x0208		. #x2335)	; &I-J90-2335; [03-21]
     (=gb2312		. #x2335)	; &I-G0-2335; [03-21]
     (=ks-x1001		. #x2335)	; &I-K0-2335; [03-21]
     (=cns11643-1	. #x2426)	; &I-C1-2426; [04-06]
     (=big5		. #xA2B4)	; &I-B-A2B4;
+    (<-fullwidth
+     ((name		  . "DIGIT FIVE")
+      (=ucs		  . #x0035)	; 5
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH DIGIT SIX")
@@ -359,16 +359,16 @@
     (decimal-digit-value . 6)
     (digit-value	 . 6)
     (numeric-value	 . 6)
-    (<-fullwidth
-     ((name		  . "DIGIT SIX")
-      (=ucs		  . #x0036)	; 6
-      ))
     (=ucs		. #xFF16)	; ６
     (=jis-x0208		. #x2336)	; &I-J90-2336; [03-22]
     (=gb2312		. #x2336)	; &I-G0-2336; [03-22]
     (=ks-x1001		. #x2336)	; &I-K0-2336; [03-22]
     (=cns11643-1	. #x2427)	; &I-C1-2427; [04-07]
     (=big5		. #xA2B5)	; &I-B-A2B5;
+    (<-fullwidth
+     ((name		  . "DIGIT SIX")
+      (=ucs		  . #x0036)	; 6
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH DIGIT SEVEN")
@@ -378,16 +378,16 @@
     (decimal-digit-value . 7)
     (digit-value	 . 7)
     (numeric-value	 . 7)
-    (<-fullwidth
-     ((name		  . "DIGIT SEVEN")
-      (=ucs		  . #x0037)	; 7
-      ))
     (=ucs		. #xFF17)	; ７
     (=jis-x0208		. #x2337)	; &I-J90-2337; [03-23]
     (=gb2312		. #x2337)	; &I-G0-2337; [03-23]
     (=ks-x1001		. #x2337)	; &I-K0-2337; [03-23]
     (=cns11643-1	. #x2428)	; &I-C1-2428; [04-08]
     (=big5		. #xA2B6)	; &I-B-A2B6;
+    (<-fullwidth
+     ((name		  . "DIGIT SEVEN")
+      (=ucs		  . #x0037)	; 7
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH DIGIT EIGHT")
@@ -397,16 +397,16 @@
     (decimal-digit-value . 8)
     (digit-value	 . 8)
     (numeric-value	 . 8)
-    (<-fullwidth
-     ((name		  . "DIGIT EIGHT")
-      (=ucs		  . #x0038)	; 8
-      ))
     (=ucs		. #xFF18)	; ８
     (=jis-x0208		. #x2338)	; &I-J90-2338; [03-24]
     (=gb2312		. #x2338)	; &I-G0-2338; [03-24]
     (=ks-x1001		. #x2338)	; &I-K0-2338; [03-24]
     (=cns11643-1	. #x2429)	; &I-C1-2429; [04-09]
     (=big5		. #xA2B7)	; &I-B-A2B7;
+    (<-fullwidth
+     ((name		  . "DIGIT EIGHT")
+      (=ucs		  . #x0038)	; 8
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH DIGIT NINE")
@@ -416,144 +416,144 @@
     (decimal-digit-value . 9)
     (digit-value	 . 9)
     (numeric-value	 . 9)
-    (<-fullwidth
-     ((name		  . "DIGIT NINE")
-      (=ucs		  . #x0039)	; 9
-      ))
     (=ucs		. #xFF19)	; ９
     (=jis-x0208		. #x2339)	; &I-J90-2339; [03-25]
     (=gb2312		. #x2339)	; &I-G0-2339; [03-25]
     (=ks-x1001		. #x2339)	; &I-K0-2339; [03-25]
     (=cns11643-1	. #x242A)	; &I-C1-242A; [04-10]
     (=big5		. #xA2B8)	; &I-B-A2B8;
+    (<-fullwidth
+     ((name		  . "DIGIT NINE")
+      (=ucs		  . #x0039)	; 9
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH COLON")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "CS")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "COLON")
-      (=ucs		  . #x003A)	; :
-      ))
     (=ucs		. #xFF1A)	; ：
     (=jis-x0208		. #x2127)	; &I-J90-2127; [01-07]
     (=gb2312		. #x233A)	; &I-G0-233A; [03-26]
     (=ks-x1001		. #x233A)	; &I-K0-233A; [03-26]
     (=cns11643-1	. #x2128)	; &I-C1-2128; [01-08]
     (=big5		. #xA147)	; &I-B-A147;
+    (<-fullwidth
+     ((name		  . "COLON")
+      (=ucs		  . #x003A)	; :
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH SEMICOLON")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "SEMICOLON")
-      (=ucs		  . #x003B)	; ;
-      ))
     (=ucs		. #xFF1B)	; ；
     (=jis-x0208		. #x2128)	; &I-J90-2128; [01-08]
     (=gb2312		. #x233B)	; &I-G0-233B; [03-27]
     (=ks-x1001		. #x233B)	; &I-K0-233B; [03-27]
     (=cns11643-1	. #x2127)	; &I-C1-2127; [01-07]
     (=big5		. #xA146)	; &I-B-A146;
+    (<-fullwidth
+     ((name		  . "SEMICOLON")
+      (=ucs		  . #x003B)	; ;
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH LESS-THAN SIGN")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LESS-THAN SIGN")
-      (=ucs		  . #x003C)	; <
-      ))
     (=ucs		. #xFF1C)	; ＜
     (=jis-x0208		. #x2163)	; &I-J90-2163; [01-67]
     (=gb2312		. #x233C)	; &I-G0-233C; [03-28]
     (=ks-x1001		. #x233C)	; &I-K0-233C; [03-28]
     (=cns11643-1	. #x2236)	; &I-C1-2236; [02-22]
     (=big5		. #xA1D5)	; &I-B-A1D5;
+    (<-fullwidth
+     ((name		  . "LESS-THAN SIGN")
+      (=ucs		  . #x003C)	; <
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH EQUALS SIGN")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "EQUALS SIGN")
-      (=ucs		  . #x003D)	; =
-      ))
     (=ucs		. #xFF1D)	; ＝
     (=jis-x0208		. #x2161)	; &I-J90-2161; [01-65]
     (=gb2312		. #x233D)	; &I-G0-233D; [03-29]
     (=ks-x1001		. #x233D)	; &I-K0-233D; [03-29]
     (=cns11643-1	. #x2238)	; &I-C1-2238; [02-24]
     (=big5		. #xA1D7)	; &I-B-A1D7;
+    (<-fullwidth
+     ((name		  . "EQUALS SIGN")
+      (=ucs		  . #x003D)	; =
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH GREATER-THAN SIGN")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "GREATER-THAN SIGN")
-      (=ucs		  . #x003E)	; >
-      ))
     (=ucs		. #xFF1E)	; ＞
     (=jis-x0208		. #x2164)	; &I-J90-2164; [01-68]
     (=gb2312		. #x233E)	; &I-G0-233E; [03-30]
     (=ks-x1001		. #x233E)	; &I-K0-233E; [03-30]
     (=cns11643-1	. #x2237)	; &I-C1-2237; [02-23]
     (=big5		. #xA1D6)	; &I-B-A1D6;
+    (<-fullwidth
+     ((name		  . "GREATER-THAN SIGN")
+      (=ucs		  . #x003E)	; >
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH QUESTION MARK")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "QUESTION MARK")
-      (=ucs		  . #x003F)	; ?
-      ))
     (=ucs		. #xFF1F)	; ？
     (=jis-x0208		. #x2129)	; &I-J90-2129; [01-09]
     (=gb2312		. #x233F)	; &I-G0-233F; [03-31]
     (=ks-x1001		. #x233F)	; &I-K0-233F; [03-31]
     (=cns11643-1	. #x2129)	; &I-C1-2129; [01-09]
     (=big5		. #xA148)	; &I-B-A148;
+    (<-fullwidth
+     ((name		  . "QUESTION MARK")
+      (=ucs		  . #x003F)	; ?
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH COMMERCIAL AT")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "COMMERCIAL AT")
-      (=ucs		  . #x0040)	; @
-      ))
     (=ucs		. #xFF20)	; ï¼ 
     (=jis-x0208		. #x2177)	; &I-J90-2177; [01-87]
     (=gb2312		. #x2340)	; &I-G0-2340; [03-32]
     (=ks-x1001		. #x2340)	; &I-K0-2340; [03-32]
     (=cns11643-1	. #x2269)	; &I-C1-2269; [02-73]
     (=big5		. #xA249)	; &I-B-A249;
+    (<-fullwidth
+     ((name		  . "COMMERCIAL AT")
+      (=ucs		  . #x0040)	; @
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH LATIN CAPITAL LETTER A")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER A")
-      (=ucs		  . #x0041)	; A
-      ))
     (=ucs		. #xFF21)	; Ａ
     (=jis-x0208		. #x2341)	; &I-J90-2341; [03-33]
     (=gb2312		. #x2341)	; &I-G0-2341; [03-33]
     (=ks-x1001		. #x2341)	; &I-K0-2341; [03-33]
     (=cns11643-1	. #x2441)	; &I-C1-2441; [04-33]
     (=big5		. #xA2CF)	; &I-B-A2CF;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER A")
+      (=ucs		  . #x0041)	; A
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER A")
       (=ucs		  . #xFF41)	; ａ
@@ -564,16 +564,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER B")
-      (=ucs		  . #x0042)	; B
-      ))
     (=ucs		. #xFF22)	; ï¼¢
     (=jis-x0208		. #x2342)	; &I-J90-2342; [03-34]
     (=gb2312		. #x2342)	; &I-G0-2342; [03-34]
     (=ks-x1001		. #x2342)	; &I-K0-2342; [03-34]
     (=cns11643-1	. #x2442)	; &I-C1-2442; [04-34]
     (=big5		. #xA2D0)	; &I-B-A2D0;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER B")
+      (=ucs		  . #x0042)	; B
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER B")
       (=ucs		  . #xFF42)	; ｂ
@@ -584,16 +584,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER C")
-      (=ucs		  . #x0043)	; C
-      ))
     (=ucs		. #xFF23)	; ï¼£
     (=jis-x0208		. #x2343)	; &I-J90-2343; [03-35]
     (=gb2312		. #x2343)	; &I-G0-2343; [03-35]
     (=ks-x1001		. #x2343)	; &I-K0-2343; [03-35]
     (=cns11643-1	. #x2443)	; &I-C1-2443; [04-35]
     (=big5		. #xA2D1)	; &I-B-A2D1;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER C")
+      (=ucs		  . #x0043)	; C
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER C")
       (=ucs		  . #xFF43)	; ｃ
@@ -604,16 +604,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER D")
-      (=ucs		  . #x0044)	; D
-      ))
     (=ucs		. #xFF24)	; Ｄ
     (=jis-x0208		. #x2344)	; &I-J90-2344; [03-36]
     (=gb2312		. #x2344)	; &I-G0-2344; [03-36]
     (=ks-x1001		. #x2344)	; &I-K0-2344; [03-36]
     (=cns11643-1	. #x2444)	; &I-C1-2444; [04-36]
     (=big5		. #xA2D2)	; &I-B-A2D2;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER D")
+      (=ucs		  . #x0044)	; D
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER D")
       (=ucs		  . #xFF44)	; ｄ
@@ -624,16 +624,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER E")
-      (=ucs		  . #x0045)	; E
-      ))
     (=ucs		. #xFF25)	; ï¼¥
     (=jis-x0208		. #x2345)	; &I-J90-2345; [03-37]
     (=gb2312		. #x2345)	; &I-G0-2345; [03-37]
     (=ks-x1001		. #x2345)	; &I-K0-2345; [03-37]
     (=cns11643-1	. #x2445)	; &I-C1-2445; [04-37]
     (=big5		. #xA2D3)	; &I-B-A2D3;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER E")
+      (=ucs		  . #x0045)	; E
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER E")
       (=ucs		  . #xFF45)	; ｅ
@@ -644,16 +644,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER F")
-      (=ucs		  . #x0046)	; F
-      ))
     (=ucs		. #xFF26)	; Ｆ
     (=jis-x0208		. #x2346)	; &I-J90-2346; [03-38]
     (=gb2312		. #x2346)	; &I-G0-2346; [03-38]
     (=ks-x1001		. #x2346)	; &I-K0-2346; [03-38]
     (=cns11643-1	. #x2446)	; &I-C1-2446; [04-38]
     (=big5		. #xA2D4)	; &I-B-A2D4;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER F")
+      (=ucs		  . #x0046)	; F
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER F")
       (=ucs		  . #xFF46)	; ｆ
@@ -664,16 +664,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER G")
-      (=ucs		  . #x0047)	; G
-      ))
     (=ucs		. #xFF27)	; Ｇ
     (=jis-x0208		. #x2347)	; &I-J90-2347; [03-39]
     (=gb2312		. #x2347)	; &I-G0-2347; [03-39]
     (=ks-x1001		. #x2347)	; &I-K0-2347; [03-39]
     (=cns11643-1	. #x2447)	; &I-C1-2447; [04-39]
     (=big5		. #xA2D5)	; &I-B-A2D5;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER G")
+      (=ucs		  . #x0047)	; G
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER G")
       (=ucs		  . #xFF47)	; ｇ
@@ -684,16 +684,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER H")
-      (=ucs		  . #x0048)	; H
-      ))
     (=ucs		. #xFF28)	; Ｈ
     (=jis-x0208		. #x2348)	; &I-J90-2348; [03-40]
     (=gb2312		. #x2348)	; &I-G0-2348; [03-40]
     (=ks-x1001		. #x2348)	; &I-K0-2348; [03-40]
     (=cns11643-1	. #x2448)	; &I-C1-2448; [04-40]
     (=big5		. #xA2D6)	; &I-B-A2D6;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER H")
+      (=ucs		  . #x0048)	; H
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER H")
       (=ucs		  . #xFF48)	; ｈ
@@ -704,16 +704,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER I")
-      (=ucs		  . #x0049)	; I
-      ))
     (=ucs		. #xFF29)	; Ｉ
     (=jis-x0208		. #x2349)	; &I-J90-2349; [03-41]
     (=gb2312		. #x2349)	; &I-G0-2349; [03-41]
     (=ks-x1001		. #x2349)	; &I-K0-2349; [03-41]
     (=cns11643-1	. #x2449)	; &I-C1-2449; [04-41]
     (=big5		. #xA2D7)	; &I-B-A2D7;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER I")
+      (=ucs		  . #x0049)	; I
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER I")
       (=ucs		  . #xFF49)	; ｉ
@@ -724,16 +724,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER J")
-      (=ucs		  . #x004A)	; J
-      ))
     (=ucs		. #xFF2A)	; Ｊ
     (=jis-x0208		. #x234A)	; &I-J90-234A; [03-42]
     (=gb2312		. #x234A)	; &I-G0-234A; [03-42]
     (=ks-x1001		. #x234A)	; &I-K0-234A; [03-42]
     (=cns11643-1	. #x244A)	; &I-C1-244A; [04-42]
     (=big5		. #xA2D8)	; &I-B-A2D8;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER J")
+      (=ucs		  . #x004A)	; J
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER J")
       (=ucs		  . #xFF4A)	; ｊ
@@ -744,16 +744,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER K")
-      (=ucs		  . #x004B)	; K
-      ))
     (=ucs		. #xFF2B)	; Ｋ
     (=jis-x0208		. #x234B)	; &I-J90-234B; [03-43]
     (=gb2312		. #x234B)	; &I-G0-234B; [03-43]
     (=ks-x1001		. #x234B)	; &I-K0-234B; [03-43]
     (=cns11643-1	. #x244B)	; &I-C1-244B; [04-43]
     (=big5		. #xA2D9)	; &I-B-A2D9;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER K")
+      (=ucs		  . #x004B)	; K
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER K")
       (=ucs		  . #xFF4B)	; ｋ
@@ -764,16 +764,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER L")
-      (=ucs		  . #x004C)	; L
-      ))
     (=ucs		. #xFF2C)	; Ｌ
     (=jis-x0208		. #x234C)	; &I-J90-234C; [03-44]
     (=gb2312		. #x234C)	; &I-G0-234C; [03-44]
     (=ks-x1001		. #x234C)	; &I-K0-234C; [03-44]
     (=cns11643-1	. #x244C)	; &I-C1-244C; [04-44]
     (=big5		. #xA2DA)	; &I-B-A2DA;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER L")
+      (=ucs		  . #x004C)	; L
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER L")
       (=ucs		  . #xFF4C)	; ｌ
@@ -784,16 +784,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER M")
-      (=ucs		  . #x004D)	; M
-      ))
     (=ucs		. #xFF2D)	; ï¼­
     (=jis-x0208		. #x234D)	; &I-J90-234D; [03-45]
     (=gb2312		. #x234D)	; &I-G0-234D; [03-45]
     (=ks-x1001		. #x234D)	; &I-K0-234D; [03-45]
     (=cns11643-1	. #x244D)	; &I-C1-244D; [04-45]
     (=big5		. #xA2DB)	; &I-B-A2DB;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER M")
+      (=ucs		  . #x004D)	; M
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER M")
       (=ucs		  . #xFF4D)	; ｍ
@@ -804,16 +804,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER N")
-      (=ucs		  . #x004E)	; N
-      ))
     (=ucs		. #xFF2E)	; ï¼®
     (=jis-x0208		. #x234E)	; &I-J90-234E; [03-46]
     (=gb2312		. #x234E)	; &I-G0-234E; [03-46]
     (=ks-x1001		. #x234E)	; &I-K0-234E; [03-46]
     (=cns11643-1	. #x244E)	; &I-C1-244E; [04-46]
     (=big5		. #xA2DC)	; &I-B-A2DC;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER N")
+      (=ucs		  . #x004E)	; N
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER N")
       (=ucs		  . #xFF4E)	; ｎ
@@ -824,16 +824,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER O")
-      (=ucs		  . #x004F)	; O
-      ))
     (=ucs		. #xFF2F)	; Ｏ
     (=jis-x0208		. #x234F)	; &I-J90-234F; [03-47]
     (=gb2312		. #x234F)	; &I-G0-234F; [03-47]
     (=ks-x1001		. #x234F)	; &I-K0-234F; [03-47]
     (=cns11643-1	. #x244F)	; &I-C1-244F; [04-47]
     (=big5		. #xA2DD)	; &I-B-A2DD;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER O")
+      (=ucs		  . #x004F)	; O
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER O")
       (=ucs		  . #xFF4F)	; ｏ
@@ -844,16 +844,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER P")
-      (=ucs		  . #x0050)	; P
-      ))
     (=ucs		. #xFF30)	; ï¼°
     (=jis-x0208		. #x2350)	; &I-J90-2350; [03-48]
     (=gb2312		. #x2350)	; &I-G0-2350; [03-48]
     (=ks-x1001		. #x2350)	; &I-K0-2350; [03-48]
     (=cns11643-1	. #x2450)	; &I-C1-2450; [04-48]
     (=big5		. #xA2DE)	; &I-B-A2DE;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER P")
+      (=ucs		  . #x0050)	; P
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER P")
       (=ucs		  . #xFF50)	; ｐ
@@ -864,16 +864,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER Q")
-      (=ucs		  . #x0051)	; Q
-      ))
     (=ucs		. #xFF31)	; ï¼±
     (=jis-x0208		. #x2351)	; &I-J90-2351; [03-49]
     (=gb2312		. #x2351)	; &I-G0-2351; [03-49]
     (=ks-x1001		. #x2351)	; &I-K0-2351; [03-49]
     (=cns11643-1	. #x2451)	; &I-C1-2451; [04-49]
     (=big5		. #xA2DF)	; &I-B-A2DF;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER Q")
+      (=ucs		  . #x0051)	; Q
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER Q")
       (=ucs		  . #xFF51)	; ｑ
@@ -884,16 +884,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER R")
-      (=ucs		  . #x0052)	; R
-      ))
     (=ucs		. #xFF32)	; ï¼²
     (=jis-x0208		. #x2352)	; &I-J90-2352; [03-50]
     (=gb2312		. #x2352)	; &I-G0-2352; [03-50]
     (=ks-x1001		. #x2352)	; &I-K0-2352; [03-50]
     (=cns11643-1	. #x2452)	; &I-C1-2452; [04-50]
     (=big5		. #xA2E0)	; &I-B-A2E0;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER R")
+      (=ucs		  . #x0052)	; R
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER R")
       (=ucs		  . #xFF52)	; ｒ
@@ -904,16 +904,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER S")
-      (=ucs		  . #x0053)	; S
-      ))
     (=ucs		. #xFF33)	; ï¼³
     (=jis-x0208		. #x2353)	; &I-J90-2353; [03-51]
     (=gb2312		. #x2353)	; &I-G0-2353; [03-51]
     (=ks-x1001		. #x2353)	; &I-K0-2353; [03-51]
     (=cns11643-1	. #x2453)	; &I-C1-2453; [04-51]
     (=big5		. #xA2E1)	; &I-B-A2E1;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER S")
+      (=ucs		  . #x0053)	; S
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER S")
       (=ucs		  . #xFF53)	; ｓ
@@ -924,16 +924,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER T")
-      (=ucs		  . #x0054)	; T
-      ))
     (=ucs		. #xFF34)	; ï¼´
     (=jis-x0208		. #x2354)	; &I-J90-2354; [03-52]
     (=gb2312		. #x2354)	; &I-G0-2354; [03-52]
     (=ks-x1001		. #x2354)	; &I-K0-2354; [03-52]
     (=cns11643-1	. #x2454)	; &I-C1-2454; [04-52]
     (=big5		. #xA2E2)	; &I-B-A2E2;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER T")
+      (=ucs		  . #x0054)	; T
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER T")
       (=ucs		  . #xFF54)	; ｔ
@@ -944,16 +944,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U")
-      (=ucs		  . #x0055)	; U
-      ))
     (=ucs		. #xFF35)	; ï¼µ
     (=jis-x0208		. #x2355)	; &I-J90-2355; [03-53]
     (=gb2312		. #x2355)	; &I-G0-2355; [03-53]
     (=ks-x1001		. #x2355)	; &I-K0-2355; [03-53]
     (=cns11643-1	. #x2455)	; &I-C1-2455; [04-53]
     (=big5		. #xA2E3)	; &I-B-A2E3;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER U")
+      (=ucs		  . #x0055)	; U
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER U")
       (=ucs		  . #xFF55)	; ｕ
@@ -964,16 +964,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER V")
-      (=ucs		  . #x0056)	; V
-      ))
     (=ucs		. #xFF36)	; Ｖ
     (=jis-x0208		. #x2356)	; &I-J90-2356; [03-54]
     (=gb2312		. #x2356)	; &I-G0-2356; [03-54]
     (=ks-x1001		. #x2356)	; &I-K0-2356; [03-54]
     (=cns11643-1	. #x2456)	; &I-C1-2456; [04-54]
     (=big5		. #xA2E4)	; &I-B-A2E4;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER V")
+      (=ucs		  . #x0056)	; V
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER V")
       (=ucs		  . #xFF56)	; ｖ
@@ -984,16 +984,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER W")
-      (=ucs		  . #x0057)	; W
-      ))
     (=ucs		. #xFF37)	; ï¼·
     (=jis-x0208		. #x2357)	; &I-J90-2357; [03-55]
     (=gb2312		. #x2357)	; &I-G0-2357; [03-55]
     (=ks-x1001		. #x2357)	; &I-K0-2357; [03-55]
     (=cns11643-1	. #x2457)	; &I-C1-2457; [04-55]
     (=big5		. #xA2E5)	; &I-B-A2E5;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER W")
+      (=ucs		  . #x0057)	; W
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER W")
       (=ucs		  . #xFF57)	; ｗ
@@ -1004,16 +1004,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER X")
-      (=ucs		  . #x0058)	; X
-      ))
     (=ucs		. #xFF38)	; Ｘ
     (=jis-x0208		. #x2358)	; &I-J90-2358; [03-56]
     (=gb2312		. #x2358)	; &I-G0-2358; [03-56]
     (=ks-x1001		. #x2358)	; &I-K0-2358; [03-56]
     (=cns11643-1	. #x2458)	; &I-C1-2458; [04-56]
     (=big5		. #xA2E6)	; &I-B-A2E6;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER X")
+      (=ucs		  . #x0058)	; X
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER X")
       (=ucs		  . #xFF58)	; ｘ
@@ -1024,16 +1024,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER Y")
-      (=ucs		  . #x0059)	; Y
-      ))
     (=ucs		. #xFF39)	; ï¼¹
     (=jis-x0208		. #x2359)	; &I-J90-2359; [03-57]
     (=gb2312		. #x2359)	; &I-G0-2359; [03-57]
     (=ks-x1001		. #x2359)	; &I-K0-2359; [03-57]
     (=cns11643-1	. #x2459)	; &I-C1-2459; [04-57]
     (=big5		. #xA2E7)	; &I-B-A2E7;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER Y")
+      (=ucs		  . #x0059)	; Y
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER Y")
       (=ucs		  . #xFF59)	; ｙ
@@ -1044,16 +1044,16 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER Z")
-      (=ucs		  . #x005A)	; Z
-      ))
     (=ucs		. #xFF3A)	; Ｚ
     (=jis-x0208		. #x235A)	; &I-J90-235A; [03-58]
     (=gb2312		. #x235A)	; &I-G0-235A; [03-58]
     (=ks-x1001		. #x235A)	; &I-K0-235A; [03-58]
     (=cns11643-1	. #x245A)	; &I-C1-245A; [04-58]
     (=big5		. #xA2E8)	; &I-B-A2E8;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER Z")
+      (=ucs		  . #x005A)	; Z
+      ))
     (->lowercase
      ((name		  . "FULLWIDTH LATIN SMALL LETTER Z")
       (=ucs		  . #xFF5A)	; ｚ
@@ -1064,102 +1064,98 @@
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LEFT SQUARE BRACKET")
-      (=ucs		  . #x005B)	; [
-      ))
     (=ucs		. #xFF3B)	; ï¼»
     (=jis-x0208		. #x214E)	; &I-J90-214E; [01-46]
     (=gb2312		. #x235B)	; &I-G0-235B; [03-59]
     (=ks-x1001		. #x235B)	; &I-K0-235B; [03-59]
     (=big5-eten		. #xC6E4)	; &B-C6E4;
+    (<-fullwidth
+     ((name		  . "LEFT SQUARE BRACKET")
+      (=ucs		  . #x005B)	; [
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH REVERSE SOLIDUS")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "REVERSE SOLIDUS")
-      (=ucs		  . #x005C)	; \
-      ))
     (=ucs		. #xFF3C)	; ï¼¼
     (=jis-x0208		. #x2140)	; &I-J90-2140; [01-32]
     (=gb2312		. #x235C)	; &I-G0-235C; [03-60]
     (=ks-x1001		. #x212C)	; &I-K0-212C; [01-12]
     (=cns11643-1	. #x2260)	; &I-C1-2260; [02-64]
     (=big5		. #xA240)	; &I-B-A240;
+    (<-fullwidth
+     ((name		  . "REVERSE SOLIDUS")
+      (=ucs		  . #x005C)	; \
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH RIGHT SQUARE BRACKET")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "RIGHT SQUARE BRACKET")
-      (=ucs		  . #x005D)	; ]
-      ))
     (=ucs		. #xFF3D)	; ï¼½
     (=jis-x0208		. #x214F)	; &I-J90-214F; [01-47]
     (=gb2312		. #x235D)	; &I-G0-235D; [03-61]
     (=ks-x1001		. #x235D)	; &I-K0-235D; [03-61]
     (=big5-eten		. #xC6E5)	; &B-C6E5;
+    (<-fullwidth
+     ((name		  . "RIGHT SQUARE BRACKET")
+      (=ucs		  . #x005D)	; ]
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH CIRCUMFLEX ACCENT")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "CIRCUMFLEX ACCENT")
-      (=ucs		  . #x005E)	; ^
-      ))
     (=ucs		. #xFF3E)	; ï¼¾
     (=jis-x0208		. #x2130)	; &I-J90-2130; [01-16]
     (=gb2312		. #x235E)	; &I-G0-235E; [03-62]
     (=ks-x1001		. #x235E)	; &I-K0-235E; [03-62]
     (=jef-china3	. #x81A5)	; &I-JC3-81A5;
+    (<-fullwidth
+     ((name		  . "CIRCUMFLEX ACCENT")
+      (=ucs		  . #x005E)	; ^
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH LOW LINE")
     (general-category	punctuation connector) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LOW LINE")
-      (=ucs		  . #x005F)	; _
-      ))
     (=ucs		. #xFF3F)	; ＿
     (=jis-x0208		. #x2132)	; &I-J90-2132; [01-18]
     (=gb2312		. #x235F)	; &I-G0-235F; [03-63]
     (=ks-x1001		. #x235F)	; &I-K0-235F; [03-63]
     (=cns11643-1	. #x2225)	; &I-C1-2225; [02-05]
     (=big5		. #xA1C4)	; &I-B-A1C4;
+    (<-fullwidth
+     ((name		  . "LOW LINE")
+      (=ucs		  . #x005F)	; _
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH GRAVE ACCENT")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "GRAVE ACCENT")
-      (=ucs		  . #x0060)	; `
-      ))
     (=ucs		. #xFF40)	; ｀
     (=jis-x0208		. #x212E)	; &I-J90-212E; [01-14]
     (=gb2312		. #x2360)	; &I-G0-2360; [03-64]
     (=ks-x1001		. #x2360)	; &I-K0-2360; [03-64]
     (=jef-china3	. #x81A3)	; &I-JC3-81A3;
+    (<-fullwidth
+     ((name		  . "GRAVE ACCENT")
+      (=ucs		  . #x0060)	; `
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH LATIN SMALL LETTER A")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER A")
-      (=ucs		  . #x0061)	; a
-      ))
     (=ucs		. #xFF41)	; ａ
     (=jis-x0208		. #x2361)	; &I-J90-2361; [03-65]
     (=gb2312		. #x2361)	; &I-G0-2361; [03-65]
@@ -1167,6 +1163,10 @@
     (=cns11643-1	. #x245B)	; &I-C1-245B; [04-59]
     (=big5		. #xA2E9)	; &I-B-A2E9;
     (=jef-china3	. #x83E1)	; &I-JC3-83E1;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER A")
+      (=ucs		  . #x0061)	; a
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER A")
       (=ucs		  . #xFF21)	; Ａ
@@ -1177,16 +1177,16 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER B")
-      (=ucs		  . #x0062)	; b
-      ))
     (=ucs		. #xFF42)	; ｂ
     (=jis-x0208		. #x2362)	; &I-J90-2362; [03-66]
     (=gb2312		. #x2362)	; &I-G0-2362; [03-66]
     (=ks-x1001		. #x2362)	; &I-K0-2362; [03-66]
     (=cns11643-1	. #x245C)	; &I-C1-245C; [04-60]
     (=big5		. #xA2EA)	; &I-B-A2EA;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER B")
+      (=ucs		  . #x0062)	; b
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER B")
       (=ucs		  . #xFF22)	; ï¼¢
@@ -1197,10 +1197,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER C")
-      (=ucs		  . #x0063)	; c
-      ))
     (=ucs		. #xFF43)	; ｃ
     (=jis-x0208		. #x2363)	; &I-J90-2363; [03-67]
     (=gb2312		. #x2363)	; &I-G0-2363; [03-67]
@@ -1208,6 +1204,10 @@
     (=cns11643-1	. #x245D)	; &I-C1-245D; [04-61]
     (=big5		. #xA2EB)	; &I-B-A2EB;
     (=jef-china3	. #x83E2)	; &I-JC3-83E2;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER C")
+      (=ucs		  . #x0063)	; c
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER C")
       (=ucs		  . #xFF23)	; ï¼£
@@ -1218,10 +1218,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER D")
-      (=ucs		  . #x0064)	; d
-      ))
     (=ucs		. #xFF44)	; ｄ
     (=jis-x0208		. #x2364)	; &I-J90-2364; [03-68]
     (=gb2312		. #x2364)	; &I-G0-2364; [03-68]
@@ -1229,6 +1225,10 @@
     (=cns11643-1	. #x245E)	; &I-C1-245E; [04-62]
     (=big5		. #xA2EC)	; &I-B-A2EC;
     (=jef-china3	. #x83E3)	; &I-JC3-83E3;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER D")
+      (=ucs		  . #x0064)	; d
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER D")
       (=ucs		  . #xFF24)	; Ｄ
@@ -1239,10 +1239,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER E")
-      (=ucs		  . #x0065)	; e
-      ))
     (=ucs		. #xFF45)	; ｅ
     (=jis-x0208		. #x2365)	; &I-J90-2365; [03-69]
     (=gb2312		. #x2365)	; &I-G0-2365; [03-69]
@@ -1250,6 +1246,10 @@
     (=cns11643-1	. #x245F)	; &I-C1-245F; [04-63]
     (=big5		. #xA2ED)	; &I-B-A2ED;
     (=jef-china3	. #x83E4)	; &I-JC3-83E4;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER E")
+      (=ucs		  . #x0065)	; e
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER E")
       (=ucs		  . #xFF25)	; ï¼¥
@@ -1260,16 +1260,16 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER F")
-      (=ucs		  . #x0066)	; f
-      ))
     (=ucs		. #xFF46)	; ｆ
     (=jis-x0208		. #x2366)	; &I-J90-2366; [03-70]
     (=gb2312		. #x2366)	; &I-G0-2366; [03-70]
     (=ks-x1001		. #x2366)	; &I-K0-2366; [03-70]
     (=cns11643-1	. #x2460)	; &I-C1-2460; [04-64]
     (=big5		. #xA2EE)	; &I-B-A2EE;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER F")
+      (=ucs		  . #x0066)	; f
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER F")
       (=ucs		  . #xFF26)	; Ｆ
@@ -1280,10 +1280,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER G")
-      (=ucs		  . #x0067)	; g
-      ))
     (=ucs		. #xFF47)	; ｇ
     (=jis-x0208		. #x2367)	; &I-J90-2367; [03-71]
     (=gb2312		. #x2367)	; &I-G0-2367; [03-71]
@@ -1291,6 +1287,10 @@
     (=cns11643-1	. #x2461)	; &I-C1-2461; [04-65]
     (=big5		. #xA2EF)	; &I-B-A2EF;
     (=jef-china3	. #x83E5)	; &I-JC3-83E5;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER G")
+      (=ucs		  . #x0067)	; g
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER G")
       (=ucs		  . #xFF27)	; Ｇ
@@ -1301,10 +1301,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER H")
-      (=ucs		  . #x0068)	; h
-      ))
     (=ucs		. #xFF48)	; ｈ
     (=jis-x0208		. #x2368)	; &I-J90-2368; [03-72]
     (=gb2312		. #x2368)	; &I-G0-2368; [03-72]
@@ -1312,6 +1308,10 @@
     (=cns11643-1	. #x2462)	; &I-C1-2462; [04-66]
     (=big5		. #xA2F0)	; &I-B-A2F0;
     (=jef-china3	. #x83E6)	; &I-JC3-83E6;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER H")
+      (=ucs		  . #x0068)	; h
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER H")
       (=ucs		  . #xFF28)	; Ｈ
@@ -1322,10 +1322,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER I")
-      (=ucs		  . #x0069)	; i
-      ))
     (=ucs		. #xFF49)	; ｉ
     (=jis-x0208		. #x2369)	; &I-J90-2369; [03-73]
     (=gb2312		. #x2369)	; &I-G0-2369; [03-73]
@@ -1333,6 +1329,10 @@
     (=cns11643-1	. #x2463)	; &I-C1-2463; [04-67]
     (=big5		. #xA2F1)	; &I-B-A2F1;
     (=jef-china3	. #x83E7)	; &I-JC3-83E7;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER I")
+      (=ucs		  . #x0069)	; i
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER I")
       (=ucs		  . #xFF29)	; Ｉ
@@ -1343,10 +1343,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER J")
-      (=ucs		  . #x006A)	; j
-      ))
     (=ucs		. #xFF4A)	; ｊ
     (=jis-x0208		. #x236A)	; &I-J90-236A; [03-74]
     (=gb2312		. #x236A)	; &I-G0-236A; [03-74]
@@ -1354,6 +1350,10 @@
     (=cns11643-1	. #x2464)	; &I-C1-2464; [04-68]
     (=big5		. #xA2F2)	; &I-B-A2F2;
     (=jef-china3	. #x83E8)	; &I-JC3-83E8;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER J")
+      (=ucs		  . #x006A)	; j
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER J")
       (=ucs		  . #xFF2A)	; Ｊ
@@ -1364,16 +1364,16 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER K")
-      (=ucs		  . #x006B)	; k
-      ))
     (=ucs		. #xFF4B)	; ｋ
     (=jis-x0208		. #x236B)	; &I-J90-236B; [03-75]
     (=gb2312		. #x236B)	; &I-G0-236B; [03-75]
     (=ks-x1001		. #x236B)	; &I-K0-236B; [03-75]
     (=cns11643-1	. #x2465)	; &I-C1-2465; [04-69]
     (=big5		. #xA2F3)	; &I-B-A2F3;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER K")
+      (=ucs		  . #x006B)	; k
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER K")
       (=ucs		  . #xFF2B)	; Ｋ
@@ -1384,10 +1384,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER L")
-      (=ucs		  . #x006C)	; l
-      ))
     (=ucs		. #xFF4C)	; ｌ
     (=jis-x0208		. #x236C)	; &I-J90-236C; [03-76]
     (=gb2312		. #x236C)	; &I-G0-236C; [03-76]
@@ -1395,6 +1391,10 @@
     (=cns11643-1	. #x2466)	; &I-C1-2466; [04-70]
     (=big5		. #xA2F4)	; &I-B-A2F4;
     (=jef-china3	. #x83E9)	; &I-JC3-83E9;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER L")
+      (=ucs		  . #x006C)	; l
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER L")
       (=ucs		  . #xFF2C)	; Ｌ
@@ -1405,10 +1405,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER M")
-      (=ucs		  . #x006D)	; m
-      ))
     (=ucs		. #xFF4D)	; ｍ
     (=jis-x0208		. #x236D)	; &I-J90-236D; [03-77]
     (=gb2312		. #x236D)	; &I-G0-236D; [03-77]
@@ -1416,6 +1412,10 @@
     (=cns11643-1	. #x2467)	; &I-C1-2467; [04-71]
     (=big5		. #xA2F5)	; &I-B-A2F5;
     (=jef-china3	. #x83EA)	; &I-JC3-83EA;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER M")
+      (=ucs		  . #x006D)	; m
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER M")
       (=ucs		  . #xFF2D)	; ï¼­
@@ -1426,10 +1426,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER N")
-      (=ucs		  . #x006E)	; n
-      ))
     (=ucs		. #xFF4E)	; ｎ
     (=jis-x0208		. #x236E)	; &I-J90-236E; [03-78]
     (=gb2312		. #x236E)	; &I-G0-236E; [03-78]
@@ -1437,6 +1433,10 @@
     (=cns11643-1	. #x2468)	; &I-C1-2468; [04-72]
     (=big5		. #xA2F6)	; &I-B-A2F6;
     (=jef-china3	. #x83EB)	; &I-JC3-83EB;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER N")
+      (=ucs		  . #x006E)	; n
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER N")
       (=ucs		  . #xFF2E)	; ï¼®
@@ -1447,10 +1447,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER O")
-      (=ucs		  . #x006F)	; o
-      ))
     (=ucs		. #xFF4F)	; ｏ
     (=jis-x0208		. #x236F)	; &I-J90-236F; [03-79]
     (=gb2312		. #x236F)	; &I-G0-236F; [03-79]
@@ -1458,6 +1454,10 @@
     (=cns11643-1	. #x2469)	; &I-C1-2469; [04-73]
     (=big5		. #xA2F7)	; &I-B-A2F7;
     (=jef-china3	. #x83EC)	; &I-JC3-83EC;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER O")
+      (=ucs		  . #x006F)	; o
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER O")
       (=ucs		  . #xFF2F)	; Ｏ
@@ -1468,16 +1468,16 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER P")
-      (=ucs		  . #x0070)	; p
-      ))
     (=ucs		. #xFF50)	; ｐ
     (=jis-x0208		. #x2370)	; &I-J90-2370; [03-80]
     (=gb2312		. #x2370)	; &I-G0-2370; [03-80]
     (=ks-x1001		. #x2370)	; &I-K0-2370; [03-80]
     (=cns11643-1	. #x246A)	; &I-C1-246A; [04-74]
     (=big5		. #xA2F8)	; &I-B-A2F8;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER P")
+      (=ucs		  . #x0070)	; p
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER P")
       (=ucs		  . #xFF30)	; ï¼°
@@ -1488,16 +1488,16 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER Q")
-      (=ucs		  . #x0071)	; q
-      ))
     (=ucs		. #xFF51)	; ｑ
     (=jis-x0208		. #x2371)	; &I-J90-2371; [03-81]
     (=gb2312		. #x2371)	; &I-G0-2371; [03-81]
     (=ks-x1001		. #x2371)	; &I-K0-2371; [03-81]
     (=cns11643-1	. #x246B)	; &I-C1-246B; [04-75]
     (=big5		. #xA2F9)	; &I-B-A2F9;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER Q")
+      (=ucs		  . #x0071)	; q
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER Q")
       (=ucs		  . #xFF31)	; ï¼±
@@ -1508,10 +1508,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER R")
-      (=ucs		  . #x0072)	; r
-      ))
     (=ucs		. #xFF52)	; ｒ
     (=jis-x0208		. #x2372)	; &I-J90-2372; [03-82]
     (=gb2312		. #x2372)	; &I-G0-2372; [03-82]
@@ -1519,6 +1515,10 @@
     (=cns11643-1	. #x246C)	; &I-C1-246C; [04-76]
     (=big5		. #xA2FA)	; &I-B-A2FA;
     (=jef-china3	. #x83ED)	; &I-JC3-83ED;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER R")
+      (=ucs		  . #x0072)	; r
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER R")
       (=ucs		  . #xFF32)	; ï¼²
@@ -1529,10 +1529,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER S")
-      (=ucs		  . #x0073)	; s
-      ))
     (=ucs		. #xFF53)	; ｓ
     (=jis-x0208		. #x2373)	; &I-J90-2373; [03-83]
     (=gb2312		. #x2373)	; &I-G0-2373; [03-83]
@@ -1540,6 +1536,10 @@
     (=cns11643-1	. #x246D)	; &I-C1-246D; [04-77]
     (=big5		. #xA2FB)	; &I-B-A2FB;
     (=jef-china3	. #x83EE)	; &I-JC3-83EE;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER S")
+      (=ucs		  . #x0073)	; s
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER S")
       (=ucs		  . #xFF33)	; ï¼³
@@ -1550,10 +1550,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER T")
-      (=ucs		  . #x0074)	; t
-      ))
     (=ucs		. #xFF54)	; ｔ
     (=jis-x0208		. #x2374)	; &I-J90-2374; [03-84]
     (=gb2312		. #x2374)	; &I-G0-2374; [03-84]
@@ -1561,6 +1557,10 @@
     (=cns11643-1	. #x246E)	; &I-C1-246E; [04-78]
     (=big5		. #xA2FC)	; &I-B-A2FC;
     (=jef-china3	. #x83EF)	; &I-JC3-83EF;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER T")
+      (=ucs		  . #x0074)	; t
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER T")
       (=ucs		  . #xFF34)	; ï¼´
@@ -1571,10 +1571,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U")
-      (=ucs		  . #x0075)	; u
-      ))
     (=ucs		. #xFF55)	; ｕ
     (=jis-x0208		. #x2375)	; &I-J90-2375; [03-85]
     (=gb2312		. #x2375)	; &I-G0-2375; [03-85]
@@ -1582,6 +1578,10 @@
     (=cns11643-1	. #x246F)	; &I-C1-246F; [04-79]
     (=big5		. #xA2FD)	; &I-B-A2FD;
     (=jef-china3	. #x83F0)	; &I-JC3-83F0;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER U")
+      (=ucs		  . #x0075)	; u
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER U")
       (=ucs		  . #xFF35)	; ï¼µ
@@ -1592,16 +1592,16 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER V")
-      (=ucs		  . #x0076)	; v
-      ))
     (=ucs		. #xFF56)	; ｖ
     (=jis-x0208		. #x2376)	; &I-J90-2376; [03-86]
     (=gb2312		. #x2376)	; &I-G0-2376; [03-86]
     (=ks-x1001		. #x2376)	; &I-K0-2376; [03-86]
     (=cns11643-1	. #x2470)	; &I-C1-2470; [04-80]
     (=big5		. #xA2FE)	; &I-B-A2FE;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER V")
+      (=ucs		  . #x0076)	; v
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER V")
       (=ucs		  . #xFF36)	; Ｖ
@@ -1612,16 +1612,16 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER W")
-      (=ucs		  . #x0077)	; w
-      ))
     (=ucs		. #xFF57)	; ｗ
     (=jis-x0208		. #x2377)	; &I-J90-2377; [03-87]
     (=gb2312		. #x2377)	; &I-G0-2377; [03-87]
     (=ks-x1001		. #x2377)	; &I-K0-2377; [03-87]
     (=cns11643-1	. #x2471)	; &I-C1-2471; [04-81]
     (=big5		. #xA340)	; &I-B-A340;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER W")
+      (=ucs		  . #x0077)	; w
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER W")
       (=ucs		  . #xFF37)	; ï¼·
@@ -1632,16 +1632,16 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER X")
-      (=ucs		  . #x0078)	; x
-      ))
     (=ucs		. #xFF58)	; ｘ
     (=jis-x0208		. #x2378)	; &I-J90-2378; [03-88]
     (=gb2312		. #x2378)	; &I-G0-2378; [03-88]
     (=ks-x1001		. #x2378)	; &I-K0-2378; [03-88]
     (=cns11643-1	. #x2472)	; &I-C1-2472; [04-82]
     (=big5		. #xA341)	; &I-B-A341;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER X")
+      (=ucs		  . #x0078)	; x
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER X")
       (=ucs		  . #xFF38)	; Ｘ
@@ -1652,10 +1652,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER Y")
-      (=ucs		  . #x0079)	; y
-      ))
     (=ucs		. #xFF59)	; ｙ
     (=jis-x0208		. #x2379)	; &I-J90-2379; [03-89]
     (=gb2312		. #x2379)	; &I-G0-2379; [03-89]
@@ -1663,6 +1659,10 @@
     (=cns11643-1	. #x2473)	; &I-C1-2473; [04-83]
     (=big5		. #xA342)	; &I-B-A342;
     (=jef-china3	. #x83F1)	; &I-JC3-83F1;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER Y")
+      (=ucs		  . #x0079)	; y
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER Y")
       (=ucs		  . #xFF39)	; ï¼¹
@@ -1673,10 +1673,6 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER Z")
-      (=ucs		  . #x007A)	; z
-      ))
     (=ucs		. #xFF5A)	; ｚ
     (=jis-x0208		. #x237A)	; &I-J90-237A; [03-90]
     (=gb2312		. #x237A)	; &I-G0-237A; [03-90]
@@ -1684,6 +1680,10 @@
     (=cns11643-1	. #x2474)	; &I-C1-2474; [04-84]
     (=big5		. #xA343)	; &I-B-A343;
     (=jef-china3	. #x83F2)	; &I-JC3-83F2;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER Z")
+      (=ucs		  . #x007A)	; z
+      ))
     (->uppercase
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER Z")
       (=ucs		  . #xFF3A)	; Ｚ
@@ -1694,64 +1694,64 @@
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "LEFT CURLY BRACKET")
-      (=ucs		  . #x007B)	; {
-      ))
     (=ucs		. #xFF5B)	; ｛
     (=jis-x0208		. #x2150)	; &I-J90-2150; [01-48]
     (=gb2312		. #x237B)	; &I-G0-237B; [03-91]
     (=ks-x1001		. #x237B)	; &I-K0-237B; [03-91]
     (=cns11643-1	. #x2142)	; &I-C1-2142; [01-34]
     (=big5		. #xA161)	; &I-B-A161;
+    (<-fullwidth
+     ((name		  . "LEFT CURLY BRACKET")
+      (=ucs		  . #x007B)	; {
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH VERTICAL LINE")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "VERTICAL LINE")
-      (=ucs		  . #x007C)	; |
-      ))
     (=ucs		. #xFF5C)	; ｜
     (=jis-x0208		. #x2143)	; &I-J90-2143; [01-35]
     (=gb2312		. #x237C)	; &I-G0-237C; [03-92]
     (=ks-x1001		. #x237C)	; &I-K0-237C; [03-92]
     (=cns11643-1	. #x225E)	; &I-C1-225E; [02-62]
     (=big5		. #xA155)	; &I-B-A155;
+    (<-fullwidth
+     ((name		  . "VERTICAL LINE")
+      (=ucs		  . #x007C)	; |
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH RIGHT CURLY BRACKET")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "RIGHT CURLY BRACKET")
-      (=ucs		  . #x007D)	; }
-      ))
     (=ucs		. #xFF5D)	; ｝
     (=jis-x0208		. #x2151)	; &I-J90-2151; [01-49]
     (=gb2312		. #x237D)	; &I-G0-237D; [03-93]
     (=ks-x1001		. #x237D)	; &I-K0-237D; [03-93]
     (=cns11643-1	. #x2143)	; &I-C1-2143; [01-35]
     (=big5		. #xA162)	; &I-B-A162;
+    (<-fullwidth
+     ((name		  . "RIGHT CURLY BRACKET")
+      (=ucs		  . #x007D)	; }
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH TILDE")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "TILDE")
-      (=ucs		  . #x007E)	; ~
-      ))
     (=ucs		. #xFF5E)	; ～
     (=gb2312		. #x212B)	; &I-G0-212B; [01-11]
     (=ks-x1001		. #x2226)	; &I-K0-2226; [02-06]
     (=jis-x0212		. #x2237)	; &I-JSP-2237; [02-23]
     (=jis-x0213-1-2000	. #x2232)	; &I-JX1-2232; [02-18]
     (=jef-china3	. #x81A6)	; &I-JC3-81A6;
+    (<-fullwidth
+     ((name		  . "TILDE")
+      (=ucs		  . #x007E)	; ~
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH LEFT WHITE PARENTHESIS")
@@ -1768,732 +1768,732 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFF61)	; ｡
+    (katakana-jisx0201	. #xA1)	; &I-KATAKANA-21;
     (<-halfwidth
      ((name		  . "IDEOGRAPHIC FULL STOP")
       (=ucs		  . #x3002)	; 。
       ))
-    (=ucs		. #xFF61)	; ｡
-    (katakana-jisx0201	. #xA1)	; &I-KATAKANA-21;
     ))
 (define-char
   '((name		. "HALFWIDTH LEFT CORNER BRACKET")
     (general-category	punctuation open) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFF62)	; ï½¢
+    (katakana-jisx0201	. #xA2)	; &I-KATAKANA-22;
     (<-halfwidth
      ((name		  . "LEFT CORNER BRACKET")
       (=ucs		  . #x300C)	; 「
       ))
-    (=ucs		. #xFF62)	; ï½¢
-    (katakana-jisx0201	. #xA2)	; &I-KATAKANA-22;
     ))
 (define-char
   '((name		. "HALFWIDTH RIGHT CORNER BRACKET")
     (general-category	punctuation close) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFF63)	; ï½£
+    (katakana-jisx0201	. #xA3)	; &I-KATAKANA-23;
     (<-halfwidth
      ((name		  . "RIGHT CORNER BRACKET")
       (=ucs		  . #x300D)	; 」
       ))
-    (=ucs		. #xFF63)	; ï½£
-    (katakana-jisx0201	. #xA3)	; &I-KATAKANA-23;
     ))
 (define-char
   '((name		. "HALFWIDTH IDEOGRAPHIC COMMA")
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFF64)	; ､
+    (katakana-jisx0201	. #xA4)	; &I-KATAKANA-24;
     (<-halfwidth
      ((name		  . "IDEOGRAPHIC COMMA")
       (=ucs		  . #x3001)	; 、
       ))
-    (=ucs		. #xFF64)	; ､
-    (katakana-jisx0201	. #xA4)	; &I-KATAKANA-24;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA MIDDLE DOT")
     (general-category	punctuation connector) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFF65)	; ï½¥
+    (katakana-jisx0201	. #xA5)	; &I-KATAKANA-25;
     (<-halfwidth
      ((name		  . "KATAKANA MIDDLE DOT")
       (=ucs		  . #x30FB)	; ・
       ))
-    (=ucs		. #xFF65)	; ï½¥
-    (katakana-jisx0201	. #xA5)	; &I-KATAKANA-25;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER WO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF66)	; ｦ
+    (katakana-jisx0201	. #xA6)	; &I-KATAKANA-26;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER WO")
       (=ucs		  . #x30F2)	; ヲ
       ))
-    (=ucs		. #xFF66)	; ｦ
-    (katakana-jisx0201	. #xA6)	; &I-KATAKANA-26;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER SMALL A")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF67)	; ｧ
+    (katakana-jisx0201	. #xA7)	; &I-KATAKANA-27;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER SMALL A")
       (=ucs		  . #x30A1)	; ァ
       ))
-    (=ucs		. #xFF67)	; ｧ
-    (katakana-jisx0201	. #xA7)	; &I-KATAKANA-27;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER SMALL I")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF68)	; ｨ
+    (katakana-jisx0201	. #xA8)	; &I-KATAKANA-28;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER SMALL I")
       (=ucs		  . #x30A3)	; ィ
       ))
-    (=ucs		. #xFF68)	; ｨ
-    (katakana-jisx0201	. #xA8)	; &I-KATAKANA-28;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER SMALL U")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF69)	; ｩ
+    (katakana-jisx0201	. #xA9)	; &I-KATAKANA-29;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER SMALL U")
       (=ucs		  . #x30A5)	; ゥ
       ))
-    (=ucs		. #xFF69)	; ｩ
-    (katakana-jisx0201	. #xA9)	; &I-KATAKANA-29;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER SMALL E")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF6A)	; ｪ
+    (katakana-jisx0201	. #xAA)	; &I-KATAKANA-2A;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER SMALL E")
       (=ucs		  . #x30A7)	; ェ
       ))
-    (=ucs		. #xFF6A)	; ｪ
-    (katakana-jisx0201	. #xAA)	; &I-KATAKANA-2A;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER SMALL O")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF6B)	; ｫ
+    (katakana-jisx0201	. #xAB)	; &I-KATAKANA-2B;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER SMALL O")
       (=ucs		  . #x30A9)	; ォ
       ))
-    (=ucs		. #xFF6B)	; ｫ
-    (katakana-jisx0201	. #xAB)	; &I-KATAKANA-2B;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER SMALL YA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF6C)	; ｬ
+    (katakana-jisx0201	. #xAC)	; &I-KATAKANA-2C;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER SMALL YA")
       (=ucs		  . #x30E3)	; ャ
       ))
-    (=ucs		. #xFF6C)	; ｬ
-    (katakana-jisx0201	. #xAC)	; &I-KATAKANA-2C;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER SMALL YU")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF6D)	; ï½­
+    (katakana-jisx0201	. #xAD)	; &I-KATAKANA-2D;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER SMALL YU")
       (=ucs		  . #x30E5)	; ュ
       ))
-    (=ucs		. #xFF6D)	; ï½­
-    (katakana-jisx0201	. #xAD)	; &I-KATAKANA-2D;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER SMALL YO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF6E)	; ï½®
+    (katakana-jisx0201	. #xAE)	; &I-KATAKANA-2E;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER SMALL YO")
       (=ucs		  . #x30E7)	; ョ
       ))
-    (=ucs		. #xFF6E)	; ï½®
-    (katakana-jisx0201	. #xAE)	; &I-KATAKANA-2E;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER SMALL TU")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF6F)	; ｯ
+    (katakana-jisx0201	. #xAF)	; &I-KATAKANA-2F;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER SMALL TU")
       (=ucs		  . #x30C3)	; ッ
       ))
-    (=ucs		. #xFF6F)	; ｯ
-    (katakana-jisx0201	. #xAF)	; &I-KATAKANA-2F;
     ))
 (define-char
   '((name . "HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF70)	; ï½°
+    (katakana-jisx0201	. #xB0)	; &I-KATAKANA-30;
     (<-halfwidth
      ((name		  . "KATAKANA-HIRAGANA PROLONGED SOUND MARK")
       (=ucs		  . #x30FC)	; ー
       ))
-    (=ucs		. #xFF70)	; ï½°
-    (katakana-jisx0201	. #xB0)	; &I-KATAKANA-30;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER A")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF71)	; ï½±
+    (katakana-jisx0201	. #xB1)	; &I-KATAKANA-31;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER A")
       (=ucs		  . #x30A2)	; ア
       ))
-    (=ucs		. #xFF71)	; ï½±
-    (katakana-jisx0201	. #xB1)	; &I-KATAKANA-31;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER I")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF72)	; ï½²
+    (katakana-jisx0201	. #xB2)	; &I-KATAKANA-32;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER I")
       (=ucs		  . #x30A4)	; イ
       ))
-    (=ucs		. #xFF72)	; ï½²
-    (katakana-jisx0201	. #xB2)	; &I-KATAKANA-32;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER U")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF73)	; ï½³
+    (katakana-jisx0201	. #xB3)	; &I-KATAKANA-33;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER U")
       (=ucs		  . #x30A6)	; ウ
       ))
-    (=ucs		. #xFF73)	; ï½³
-    (katakana-jisx0201	. #xB3)	; &I-KATAKANA-33;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER E")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF74)	; ï½´
+    (katakana-jisx0201	. #xB4)	; &I-KATAKANA-34;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER E")
       (=ucs		  . #x30A8)	; エ
       ))
-    (=ucs		. #xFF74)	; ï½´
-    (katakana-jisx0201	. #xB4)	; &I-KATAKANA-34;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER O")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF75)	; ï½µ
+    (katakana-jisx0201	. #xB5)	; &I-KATAKANA-35;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER O")
       (=ucs		  . #x30AA)	; オ
       ))
-    (=ucs		. #xFF75)	; ï½µ
-    (katakana-jisx0201	. #xB5)	; &I-KATAKANA-35;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER KA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF76)	; ｶ
+    (katakana-jisx0201	. #xB6)	; &I-KATAKANA-36;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER KA")
       (=ucs		  . #x30AB)	; カ
       ))
-    (=ucs		. #xFF76)	; ｶ
-    (katakana-jisx0201	. #xB6)	; &I-KATAKANA-36;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER KI")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF77)	; ï½·
+    (katakana-jisx0201	. #xB7)	; &I-KATAKANA-37;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER KI")
       (=ucs		  . #x30AD)	; キ
       ))
-    (=ucs		. #xFF77)	; ï½·
-    (katakana-jisx0201	. #xB7)	; &I-KATAKANA-37;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER KU")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF78)	; ｸ
+    (katakana-jisx0201	. #xB8)	; &I-KATAKANA-38;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER KU")
       (=ucs		  . #x30AF)	; ク
       ))
-    (=ucs		. #xFF78)	; ｸ
-    (katakana-jisx0201	. #xB8)	; &I-KATAKANA-38;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER KE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF79)	; ï½¹
+    (katakana-jisx0201	. #xB9)	; &I-KATAKANA-39;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER KE")
       (=ucs		  . #x30B1)	; ケ
       ))
-    (=ucs		. #xFF79)	; ï½¹
-    (katakana-jisx0201	. #xB9)	; &I-KATAKANA-39;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER KO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF7A)	; ｺ
+    (katakana-jisx0201	. #xBA)	; &I-KATAKANA-3A;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER KO")
       (=ucs		  . #x30B3)	; コ
       ))
-    (=ucs		. #xFF7A)	; ｺ
-    (katakana-jisx0201	. #xBA)	; &I-KATAKANA-3A;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER SA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF7B)	; ï½»
+    (katakana-jisx0201	. #xBB)	; &I-KATAKANA-3B;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER SA")
       (=ucs		  . #x30B5)	; サ
       ))
-    (=ucs		. #xFF7B)	; ï½»
-    (katakana-jisx0201	. #xBB)	; &I-KATAKANA-3B;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER SI")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF7C)	; ï½¼
+    (katakana-jisx0201	. #xBC)	; &I-KATAKANA-3C;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER SI")
       (=ucs		  . #x30B7)	; シ
       ))
-    (=ucs		. #xFF7C)	; ï½¼
-    (katakana-jisx0201	. #xBC)	; &I-KATAKANA-3C;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER SU")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF7D)	; ï½½
+    (katakana-jisx0201	. #xBD)	; &I-KATAKANA-3D;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER SU")
       (=ucs		  . #x30B9)	; ス
       ))
-    (=ucs		. #xFF7D)	; ï½½
-    (katakana-jisx0201	. #xBD)	; &I-KATAKANA-3D;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER SE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF7E)	; ï½¾
+    (katakana-jisx0201	. #xBE)	; &I-KATAKANA-3E;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER SE")
       (=ucs		  . #x30BB)	; セ
       ))
-    (=ucs		. #xFF7E)	; ï½¾
-    (katakana-jisx0201	. #xBE)	; &I-KATAKANA-3E;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER SO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF7F)	; ｿ
+    (katakana-jisx0201	. #xBF)	; &I-KATAKANA-3F;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER SO")
       (=ucs		  . #x30BD)	; ソ
       ))
-    (=ucs		. #xFF7F)	; ｿ
-    (katakana-jisx0201	. #xBF)	; &I-KATAKANA-3F;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER TA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF80)	; ﾀ
+    (katakana-jisx0201	. #xC0)	; &I-KATAKANA-40;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER TA")
       (=ucs		  . #x30BF)	; タ
       ))
-    (=ucs		. #xFF80)	; ﾀ
-    (katakana-jisx0201	. #xC0)	; &I-KATAKANA-40;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER TI")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF81)	; ﾁ
+    (katakana-jisx0201	. #xC1)	; &I-KATAKANA-41;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER TI")
       (=ucs		  . #x30C1)	; チ
       ))
-    (=ucs		. #xFF81)	; ﾁ
-    (katakana-jisx0201	. #xC1)	; &I-KATAKANA-41;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER TU")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF82)	; ﾂ
+    (katakana-jisx0201	. #xC2)	; &I-KATAKANA-42;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER TU")
       (=ucs		  . #x30C4)	; ツ
       ))
-    (=ucs		. #xFF82)	; ﾂ
-    (katakana-jisx0201	. #xC2)	; &I-KATAKANA-42;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER TE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF83)	; ﾃ
+    (katakana-jisx0201	. #xC3)	; &I-KATAKANA-43;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER TE")
       (=ucs		  . #x30C6)	; テ
       ))
-    (=ucs		. #xFF83)	; ﾃ
-    (katakana-jisx0201	. #xC3)	; &I-KATAKANA-43;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER TO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF84)	; ﾄ
+    (katakana-jisx0201	. #xC4)	; &I-KATAKANA-44;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER TO")
       (=ucs		  . #x30C8)	; ト
       ))
-    (=ucs		. #xFF84)	; ﾄ
-    (katakana-jisx0201	. #xC4)	; &I-KATAKANA-44;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER NA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF85)	; ﾅ
+    (katakana-jisx0201	. #xC5)	; &I-KATAKANA-45;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER NA")
       (=ucs		  . #x30CA)	; ナ
       ))
-    (=ucs		. #xFF85)	; ﾅ
-    (katakana-jisx0201	. #xC5)	; &I-KATAKANA-45;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER NI")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF86)	; ﾆ
+    (katakana-jisx0201	. #xC6)	; &I-KATAKANA-46;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER NI")
       (=ucs		  . #x30CB)	; ニ
       ))
-    (=ucs		. #xFF86)	; ﾆ
-    (katakana-jisx0201	. #xC6)	; &I-KATAKANA-46;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER NU")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF87)	; ﾇ
+    (katakana-jisx0201	. #xC7)	; &I-KATAKANA-47;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER NU")
       (=ucs		  . #x30CC)	; ヌ
       ))
-    (=ucs		. #xFF87)	; ﾇ
-    (katakana-jisx0201	. #xC7)	; &I-KATAKANA-47;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER NE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF88)	; ﾈ
+    (katakana-jisx0201	. #xC8)	; &I-KATAKANA-48;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER NE")
       (=ucs		  . #x30CD)	; ネ
       ))
-    (=ucs		. #xFF88)	; ﾈ
-    (katakana-jisx0201	. #xC8)	; &I-KATAKANA-48;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER NO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF89)	; ﾉ
+    (katakana-jisx0201	. #xC9)	; &I-KATAKANA-49;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER NO")
       (=ucs		  . #x30CE)	; ノ
       ))
-    (=ucs		. #xFF89)	; ﾉ
-    (katakana-jisx0201	. #xC9)	; &I-KATAKANA-49;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER HA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF8A)	; ﾊ
+    (katakana-jisx0201	. #xCA)	; &I-KATAKANA-4A;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER HA")
       (=ucs		  . #x30CF)	; ハ
       ))
-    (=ucs		. #xFF8A)	; ﾊ
-    (katakana-jisx0201	. #xCA)	; &I-KATAKANA-4A;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER HI")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF8B)	; ﾋ
+    (katakana-jisx0201	. #xCB)	; &I-KATAKANA-4B;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER HI")
       (=ucs		  . #x30D2)	; ヒ
       ))
-    (=ucs		. #xFF8B)	; ﾋ
-    (katakana-jisx0201	. #xCB)	; &I-KATAKANA-4B;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER HU")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF8C)	; ﾌ
+    (katakana-jisx0201	. #xCC)	; &I-KATAKANA-4C;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER HU")
       (=ucs		  . #x30D5)	; フ
       ))
-    (=ucs		. #xFF8C)	; ﾌ
-    (katakana-jisx0201	. #xCC)	; &I-KATAKANA-4C;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER HE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF8D)	; ﾍ
+    (katakana-jisx0201	. #xCD)	; &I-KATAKANA-4D;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER HE")
       (=ucs		  . #x30D8)	; ヘ
       ))
-    (=ucs		. #xFF8D)	; ﾍ
-    (katakana-jisx0201	. #xCD)	; &I-KATAKANA-4D;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER HO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF8E)	; ﾎ
+    (katakana-jisx0201	. #xCE)	; &I-KATAKANA-4E;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER HO")
       (=ucs		  . #x30DB)	; ホ
       ))
-    (=ucs		. #xFF8E)	; ﾎ
-    (katakana-jisx0201	. #xCE)	; &I-KATAKANA-4E;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER MA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF8F)	; ﾏ
+    (katakana-jisx0201	. #xCF)	; &I-KATAKANA-4F;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER MA")
       (=ucs		  . #x30DE)	; マ
       ))
-    (=ucs		. #xFF8F)	; ﾏ
-    (katakana-jisx0201	. #xCF)	; &I-KATAKANA-4F;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER MI")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF90)	; ﾐ
+    (katakana-jisx0201	. #xD0)	; &I-KATAKANA-50;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER MI")
       (=ucs		  . #x30DF)	; ミ
       ))
-    (=ucs		. #xFF90)	; ﾐ
-    (katakana-jisx0201	. #xD0)	; &I-KATAKANA-50;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER MU")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF91)	; ﾑ
+    (katakana-jisx0201	. #xD1)	; &I-KATAKANA-51;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER MU")
       (=ucs		  . #x30E0)	; ム
       ))
-    (=ucs		. #xFF91)	; ﾑ
-    (katakana-jisx0201	. #xD1)	; &I-KATAKANA-51;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER ME")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF92)	; ﾒ
+    (katakana-jisx0201	. #xD2)	; &I-KATAKANA-52;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER ME")
       (=ucs		  . #x30E1)	; メ
       ))
-    (=ucs		. #xFF92)	; ﾒ
-    (katakana-jisx0201	. #xD2)	; &I-KATAKANA-52;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER MO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF93)	; ﾓ
+    (katakana-jisx0201	. #xD3)	; &I-KATAKANA-53;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER MO")
       (=ucs		  . #x30E2)	; モ
       ))
-    (=ucs		. #xFF93)	; ﾓ
-    (katakana-jisx0201	. #xD3)	; &I-KATAKANA-53;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER YA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF94)	; ﾔ
+    (katakana-jisx0201	. #xD4)	; &I-KATAKANA-54;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER YA")
       (=ucs		  . #x30E4)	; ヤ
       ))
-    (=ucs		. #xFF94)	; ﾔ
-    (katakana-jisx0201	. #xD4)	; &I-KATAKANA-54;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER YU")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF95)	; ﾕ
+    (katakana-jisx0201	. #xD5)	; &I-KATAKANA-55;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER YU")
       (=ucs		  . #x30E6)	; ユ
       ))
-    (=ucs		. #xFF95)	; ﾕ
-    (katakana-jisx0201	. #xD5)	; &I-KATAKANA-55;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER YO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF96)	; ﾖ
+    (katakana-jisx0201	. #xD6)	; &I-KATAKANA-56;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER YO")
       (=ucs		  . #x30E8)	; ヨ
       ))
-    (=ucs		. #xFF96)	; ﾖ
-    (katakana-jisx0201	. #xD6)	; &I-KATAKANA-56;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER RA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF97)	; ﾗ
+    (katakana-jisx0201	. #xD7)	; &I-KATAKANA-57;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER RA")
       (=ucs		  . #x30E9)	; ラ
       ))
-    (=ucs		. #xFF97)	; ﾗ
-    (katakana-jisx0201	. #xD7)	; &I-KATAKANA-57;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER RI")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF98)	; ﾘ
+    (katakana-jisx0201	. #xD8)	; &I-KATAKANA-58;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER RI")
       (=ucs		  . #x30EA)	; リ
       ))
-    (=ucs		. #xFF98)	; ﾘ
-    (katakana-jisx0201	. #xD8)	; &I-KATAKANA-58;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER RU")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF99)	; ﾙ
+    (katakana-jisx0201	. #xD9)	; &I-KATAKANA-59;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER RU")
       (=ucs		  . #x30EB)	; ル
       ))
-    (=ucs		. #xFF99)	; ﾙ
-    (katakana-jisx0201	. #xD9)	; &I-KATAKANA-59;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER RE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF9A)	; ﾚ
+    (katakana-jisx0201	. #xDA)	; &I-KATAKANA-5A;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER RE")
       (=ucs		  . #x30EC)	; レ
       ))
-    (=ucs		. #xFF9A)	; ﾚ
-    (katakana-jisx0201	. #xDA)	; &I-KATAKANA-5A;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER RO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF9B)	; ﾛ
+    (katakana-jisx0201	. #xDB)	; &I-KATAKANA-5B;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER RO")
       (=ucs		  . #x30ED)	; ロ
       ))
-    (=ucs		. #xFF9B)	; ﾛ
-    (katakana-jisx0201	. #xDB)	; &I-KATAKANA-5B;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER WA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF9C)	; ﾜ
+    (katakana-jisx0201	. #xDC)	; &I-KATAKANA-5C;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER WA")
       (=ucs		  . #x30EF)	; ワ
       ))
-    (=ucs		. #xFF9C)	; ﾜ
-    (katakana-jisx0201	. #xDC)	; &I-KATAKANA-5C;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA LETTER N")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFF9D)	; ﾝ
+    (katakana-jisx0201	. #xDD)	; &I-KATAKANA-5D;
     (<-halfwidth
      ((name		  . "KATAKANA LETTER N")
       (=ucs		  . #x30F3)	; ン
       ))
-    (=ucs		. #xFF9D)	; ﾝ
-    (katakana-jisx0201	. #xDD)	; &I-KATAKANA-5D;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA VOICED SOUND MARK")
@@ -2501,12 +2501,12 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "halfwidth katakana-hiragana voiced sound mark")
+    (=ucs		. #xFF9E)	; ﾞ
+    (katakana-jisx0201	. #xDE)	; &I-KATAKANA-5E;
     (<-halfwidth
      ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
       (=ucs		  . #x3099)	; ゙
       ))
-    (=ucs		. #xFF9E)	; ﾞ
-    (katakana-jisx0201	. #xDE)	; &I-KATAKANA-5E;
     ))
 (define-char
   '((name		. "HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK")
@@ -2514,764 +2514,764 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "halfwidth katakana-hiragana semi-voiced sound mark")
+    (=ucs		. #xFF9F)	; ﾟ
+    (katakana-jisx0201	. #xDF)	; &I-KATAKANA-5F;
     (<-halfwidth
      ((name . "COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK")
       (=ucs		  . #x309A)	; ゚
       ))
-    (=ucs		. #xFF9F)	; ﾟ
-    (katakana-jisx0201	. #xDF)	; &I-KATAKANA-5F;
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL FILLER")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFA0)	; ï¾ 
     (<-halfwidth
      ((name		  . "HANGUL FILLER")
       (=ucs		  . #x3164)	; ㅤ
       ))
-    (=ucs		. #xFFA0)	; ï¾ 
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER KIYEOK")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFA1)	; ﾡ
     (<-halfwidth
      ((name		  . "HANGUL LETTER KIYEOK")
       (=ucs		  . #x3131)	; ㄱ
       ))
-    (=ucs		. #xFFA1)	; ﾡ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER SSANGKIYEOK")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFA2)	; ï¾¢
     (<-halfwidth
      ((name		  . "HANGUL LETTER SSANGKIYEOK")
       (=ucs		  . #x3132)	; ㄲ
       ))
-    (=ucs		. #xFFA2)	; ï¾¢
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER KIYEOK-SIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFA3)	; ï¾£
     (<-halfwidth
      ((name		  . "HANGUL LETTER KIYEOK-SIOS")
       (=ucs		  . #x3133)	; ㄳ
       ))
-    (=ucs		. #xFFA3)	; ï¾£
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER NIEUN")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFA4)	; ﾤ
     (<-halfwidth
      ((name		  . "HANGUL LETTER NIEUN")
       (=ucs		  . #x3134)	; ㄴ
       ))
-    (=ucs		. #xFFA4)	; ﾤ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER NIEUN-CIEUC")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFA5)	; ï¾¥
     (<-halfwidth
      ((name		  . "HANGUL LETTER NIEUN-CIEUC")
       (=ucs		  . #x3135)	; ㄵ
       ))
-    (=ucs		. #xFFA5)	; ï¾¥
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER NIEUN-HIEUH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFA6)	; ﾦ
     (<-halfwidth
      ((name		  . "HANGUL LETTER NIEUN-HIEUH")
       (=ucs		  . #x3136)	; ㄶ
       ))
-    (=ucs		. #xFFA6)	; ﾦ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER TIKEUT")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFA7)	; ﾧ
     (<-halfwidth
      ((name		  . "HANGUL LETTER TIKEUT")
       (=ucs		  . #x3137)	; ㄷ
       ))
-    (=ucs		. #xFFA7)	; ﾧ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER SSANGTIKEUT")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFA8)	; ﾨ
     (<-halfwidth
      ((name		  . "HANGUL LETTER SSANGTIKEUT")
       (=ucs		  . #x3138)	; ㄸ
       ))
-    (=ucs		. #xFFA8)	; ﾨ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER RIEUL")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFA9)	; ﾩ
     (<-halfwidth
      ((name		  . "HANGUL LETTER RIEUL")
       (=ucs		  . #x3139)	; ㄹ
       ))
-    (=ucs		. #xFFA9)	; ﾩ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER RIEUL-KIYEOK")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFAA)	; ﾪ
     (<-halfwidth
      ((name		  . "HANGUL LETTER RIEUL-KIYEOK")
       (=ucs		  . #x313A)	; ㄺ
       ))
-    (=ucs		. #xFFAA)	; ﾪ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER RIEUL-MIEUM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFAB)	; ﾫ
     (<-halfwidth
      ((name		  . "HANGUL LETTER RIEUL-MIEUM")
       (=ucs		  . #x313B)	; ㄻ
       ))
-    (=ucs		. #xFFAB)	; ﾫ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER RIEUL-PIEUP")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFAC)	; ﾬ
     (<-halfwidth
      ((name		  . "HANGUL LETTER RIEUL-PIEUP")
       (=ucs		  . #x313C)	; ㄼ
       ))
-    (=ucs		. #xFFAC)	; ﾬ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER RIEUL-SIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFAD)	; ï¾­
     (<-halfwidth
      ((name		  . "HANGUL LETTER RIEUL-SIOS")
       (=ucs		  . #x313D)	; ㄽ
       ))
-    (=ucs		. #xFFAD)	; ï¾­
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER RIEUL-THIEUTH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFAE)	; ï¾®
     (<-halfwidth
      ((name		  . "HANGUL LETTER RIEUL-THIEUTH")
       (=ucs		  . #x313E)	; ㄾ
       ))
-    (=ucs		. #xFFAE)	; ï¾®
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER RIEUL-PHIEUPH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFAF)	; ﾯ
     (<-halfwidth
      ((name		  . "HANGUL LETTER RIEUL-PHIEUPH")
       (=ucs		  . #x313F)	; ㄿ
       ))
-    (=ucs		. #xFFAF)	; ﾯ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER RIEUL-HIEUH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFB0)	; ï¾°
     (<-halfwidth
      ((name		  . "HANGUL LETTER RIEUL-HIEUH")
       (=ucs		  . #x3140)	; ㅀ
       ))
-    (=ucs		. #xFFB0)	; ï¾°
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER MIEUM")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFB1)	; ï¾±
     (<-halfwidth
      ((name		  . "HANGUL LETTER MIEUM")
       (=ucs		  . #x3141)	; ㅁ
       ))
-    (=ucs		. #xFFB1)	; ï¾±
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER PIEUP")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFB2)	; ï¾²
     (<-halfwidth
      ((name		  . "HANGUL LETTER PIEUP")
       (=ucs		  . #x3142)	; ㅂ
       ))
-    (=ucs		. #xFFB2)	; ï¾²
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER SSANGPIEUP")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFB3)	; ï¾³
     (<-halfwidth
      ((name		  . "HANGUL LETTER SSANGPIEUP")
       (=ucs		  . #x3143)	; ㅃ
       ))
-    (=ucs		. #xFFB3)	; ï¾³
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER PIEUP-SIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFB4)	; ï¾´
     (<-halfwidth
      ((name		  . "HANGUL LETTER PIEUP-SIOS")
       (=ucs		  . #x3144)	; ㅄ
       ))
-    (=ucs		. #xFFB4)	; ï¾´
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER SIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFB5)	; ï¾µ
     (<-halfwidth
      ((name		  . "HANGUL LETTER SIOS")
       (=ucs		  . #x3145)	; ㅅ
       ))
-    (=ucs		. #xFFB5)	; ï¾µ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER SSANGSIOS")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFB6)	; ﾶ
     (<-halfwidth
      ((name		  . "HANGUL LETTER SSANGSIOS")
       (=ucs		  . #x3146)	; ㅆ
       ))
-    (=ucs		. #xFFB6)	; ﾶ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER IEUNG")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFB7)	; ï¾·
     (<-halfwidth
      ((name		  . "HANGUL LETTER IEUNG")
       (=ucs		  . #x3147)	; ㅇ
       ))
-    (=ucs		. #xFFB7)	; ï¾·
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER CIEUC")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFB8)	; ﾸ
     (<-halfwidth
      ((name		  . "HANGUL LETTER CIEUC")
       (=ucs		  . #x3148)	; ㅈ
       ))
-    (=ucs		. #xFFB8)	; ﾸ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER SSANGCIEUC")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFB9)	; ï¾¹
     (<-halfwidth
      ((name		  . "HANGUL LETTER SSANGCIEUC")
       (=ucs		  . #x3149)	; ㅉ
       ))
-    (=ucs		. #xFFB9)	; ï¾¹
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER CHIEUCH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFBA)	; ﾺ
     (<-halfwidth
      ((name		  . "HANGUL LETTER CHIEUCH")
       (=ucs		  . #x314A)	; ㅊ
       ))
-    (=ucs		. #xFFBA)	; ﾺ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER KHIEUKH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFBB)	; ï¾»
     (<-halfwidth
      ((name		  . "HANGUL LETTER KHIEUKH")
       (=ucs		  . #x314B)	; ㅋ
       ))
-    (=ucs		. #xFFBB)	; ï¾»
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER THIEUTH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFBC)	; ï¾¼
     (<-halfwidth
      ((name		  . "HANGUL LETTER THIEUTH")
       (=ucs		  . #x314C)	; ㅌ
       ))
-    (=ucs		. #xFFBC)	; ï¾¼
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER PHIEUPH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFBD)	; ï¾½
     (<-halfwidth
      ((name		  . "HANGUL LETTER PHIEUPH")
       (=ucs		  . #x314D)	; ㅍ
       ))
-    (=ucs		. #xFFBD)	; ï¾½
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER HIEUH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFBE)	; ï¾¾
     (<-halfwidth
      ((name		  . "HANGUL LETTER HIEUH")
       (=ucs		  . #x314E)	; ㅎ
       ))
-    (=ucs		. #xFFBE)	; ï¾¾
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER A")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFC2)	; ￂ
     (<-halfwidth
      ((name		  . "HANGUL LETTER A")
       (=ucs		  . #x314F)	; ㅏ
       ))
-    (=ucs		. #xFFC2)	; ￂ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER AE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFC3)	; ￃ
     (<-halfwidth
      ((name		  . "HANGUL LETTER AE")
       (=ucs		  . #x3150)	; ㅐ
       ))
-    (=ucs		. #xFFC3)	; ￃ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER YA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFC4)	; ￄ
     (<-halfwidth
      ((name		  . "HANGUL LETTER YA")
       (=ucs		  . #x3151)	; ㅑ
       ))
-    (=ucs		. #xFFC4)	; ￄ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER YAE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFC5)	; ￅ
     (<-halfwidth
      ((name		  . "HANGUL LETTER YAE")
       (=ucs		  . #x3152)	; ㅒ
       ))
-    (=ucs		. #xFFC5)	; ￅ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER EO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFC6)	; ￆ
     (<-halfwidth
      ((name		  . "HANGUL LETTER EO")
       (=ucs		  . #x3153)	; ㅓ
       ))
-    (=ucs		. #xFFC6)	; ￆ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER E")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFC7)	; ￇ
     (<-halfwidth
      ((name		  . "HANGUL LETTER E")
       (=ucs		  . #x3154)	; ㅔ
       ))
-    (=ucs		. #xFFC7)	; ￇ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER YEO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFCA)	; ￊ
     (<-halfwidth
      ((name		  . "HANGUL LETTER YEO")
       (=ucs		  . #x3155)	; ㅕ
       ))
-    (=ucs		. #xFFCA)	; ￊ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER YE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFCB)	; ￋ
     (<-halfwidth
      ((name		  . "HANGUL LETTER YE")
       (=ucs		  . #x3156)	; ㅖ
       ))
-    (=ucs		. #xFFCB)	; ￋ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER O")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFCC)	; ￌ
     (<-halfwidth
      ((name		  . "HANGUL LETTER O")
       (=ucs		  . #x3157)	; ㅗ
       ))
-    (=ucs		. #xFFCC)	; ￌ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER WA")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFCD)	; ￍ
     (<-halfwidth
      ((name		  . "HANGUL LETTER WA")
       (=ucs		  . #x3158)	; ㅘ
       ))
-    (=ucs		. #xFFCD)	; ￍ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER WAE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFCE)	; ￎ
     (<-halfwidth
      ((name		  . "HANGUL LETTER WAE")
       (=ucs		  . #x3159)	; ㅙ
       ))
-    (=ucs		. #xFFCE)	; ￎ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER OE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFCF)	; ￏ
     (<-halfwidth
      ((name		  . "HANGUL LETTER OE")
       (=ucs		  . #x315A)	; ㅚ
       ))
-    (=ucs		. #xFFCF)	; ￏ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER YO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFD2)	; ￒ
     (<-halfwidth
      ((name		  . "HANGUL LETTER YO")
       (=ucs		  . #x315B)	; ㅛ
       ))
-    (=ucs		. #xFFD2)	; ￒ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER U")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFD3)	; ￓ
     (<-halfwidth
      ((name		  . "HANGUL LETTER U")
       (=ucs		  . #x315C)	; ㅜ
       ))
-    (=ucs		. #xFFD3)	; ￓ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER WEO")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFD4)	; ￔ
     (<-halfwidth
      ((name		  . "HANGUL LETTER WEO")
       (=ucs		  . #x315D)	; ㅝ
       ))
-    (=ucs		. #xFFD4)	; ￔ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER WE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFD5)	; ￕ
     (<-halfwidth
      ((name		  . "HANGUL LETTER WE")
       (=ucs		  . #x315E)	; ㅞ
       ))
-    (=ucs		. #xFFD5)	; ￕ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER WI")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFD6)	; ￖ
     (<-halfwidth
      ((name		  . "HANGUL LETTER WI")
       (=ucs		  . #x315F)	; ㅟ
       ))
-    (=ucs		. #xFFD6)	; ￖ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER YU")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFD7)	; ￗ
     (<-halfwidth
      ((name		  . "HANGUL LETTER YU")
       (=ucs		  . #x3160)	; ㅠ
       ))
-    (=ucs		. #xFFD7)	; ￗ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER EU")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFDA)	; ￚ
     (<-halfwidth
      ((name		  . "HANGUL LETTER EU")
       (=ucs		  . #x3161)	; ㅡ
       ))
-    (=ucs		. #xFFDA)	; ￚ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER YI")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFDB)	; ￛ
     (<-halfwidth
      ((name		  . "HANGUL LETTER YI")
       (=ucs		  . #x3162)	; ㅢ
       ))
-    (=ucs		. #xFFDB)	; ￛ
     ))
 (define-char
   '((name		. "HALFWIDTH HANGUL LETTER I")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #xFFDC)	; ￜ
     (<-halfwidth
      ((name		  . "HANGUL LETTER I")
       (=ucs		  . #x3163)	; ㅣ
       ))
-    (=ucs		. #xFFDC)	; ￜ
     ))
 (define-char
   '((name		. "FULLWIDTH CENT SIGN")
     (general-category	symbol currency) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "CENT SIGN")
-      (=ucs		  . #x00A2)	; ¢
-      ))
     (=ucs		. #xFFE0)	; ï¿ 
     (=jis-x0208		. #x2171)	; &I-J90-2171; [01-81]
     (=gb2312		. #x2169)	; &I-G0-2169; [01-73]
     (=ks-x1001		. #x214B)	; &I-K0-214B; [01-43]
     (=cns11643-1	. #x2266)	; &I-C1-2266; [02-70]
     (=big5		. #xA246)	; &I-B-A246;
+    (<-fullwidth
+     ((name		  . "CENT SIGN")
+      (=ucs		  . #x00A2)	; ¢
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH POUND SIGN")
     (general-category	symbol currency) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "POUND SIGN")
-      (=ucs		  . #x00A3)	; £
-      ))
     (=ucs		. #xFFE1)	; ï¿¡
     (=jis-x0208		. #x2172)	; &I-J90-2172; [01-82]
     (=gb2312		. #x216A)	; &I-G0-216A; [01-74]
     (=ks-x1001		. #x214C)	; &I-K0-214C; [01-44]
     (=cns11643-1	. #x2267)	; &I-C1-2267; [02-71]
     (=big5		. #xA247)	; &I-B-A247;
+    (<-fullwidth
+     ((name		  . "POUND SIGN")
+      (=ucs		  . #x00A3)	; £
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH NOT SIGN")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "NOT SIGN")
-      (=ucs		  . #x00AC)	; ¬
-      ))
     (=ucs		. #xFFE2)	; ï¿¢
     (=jis-x0208@1983	. #x224C)	; &I-J83-224C; [02-44]
     (=ks-x1001		. #x217E)	; &I-K0-217E; [01-94]
     (=jis-x0208@1990	. #x224C)	; &I-J90-224C; [02-44]
     (=big5-eten		. #xC8CD)	; &B-C8CD;
+    (<-fullwidth
+     ((name		  . "NOT SIGN")
+      (=ucs		  . #x00AC)	; ¬
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH MACRON")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "MACRON")
-      (=ucs		  . #x00AF)	; ¯
-      ))
     (=ucs		. #xFFE3)	; ï¿£
     (=jis-x0212		. #x2234)	; &I-JSP-2234; [02-20]
     (=cns11643-1	. #x2224)	; &I-C1-2224; [02-04]
     (=jis-x0213-1-2000	. #x292B)	; &I-JX1-292B; [09-11]
     (=big5		. #xA1C3)	; &I-B-A1C3;
     (=jef-china3	. #x81A7)	; &I-JC3-81A7;
+    (<-fullwidth
+     ((name		  . "MACRON")
+      (=ucs		  . #x00AF)	; ¯
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH BROKEN BAR")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "BROKEN BAR")
-      (=ucs		  . #x00A6)	; ¦
-      ))
     (=ucs		. #xFFE4)	; ￤
     (=jis-x0212		. #x2243)	; &I-JSP-2243; [02-35]
     (=jis-x0213-1-2000	. #x2925)	; &I-JX1-2925; [09-05]
     (=big5-eten		. #xC8CE)	; &B-C8CE;
+    (<-fullwidth
+     ((name		  . "BROKEN BAR")
+      (=ucs		  . #x00A6)	; ¦
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH YEN SIGN")
     (general-category	symbol currency) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
-    (<-fullwidth
-     ((name		  . "YEN SIGN")
-      (=ucs		  . #x00A5)	; ¥
-      ))
     (=ucs		. #xFFE5)	; ï¿¥
     (=jis-x0208		. #x216F)	; &I-J90-216F; [01-79]
     (=gb2312		. #x2324)	; &I-G0-2324; [03-04]
     (=ks-x1001		. #x214D)	; &I-K0-214D; [01-45]
     (=cns11643-1	. #x2264)	; &I-C1-2264; [02-68]
     (=big5		. #xA244)	; &I-B-A244;
+    (<-fullwidth
+     ((name		  . "YEN SIGN")
+      (=ucs		  . #x00A5)	; ¥
+      ))
     ))
 (define-char
   '((name		. "FULLWIDTH WON SIGN")
     (general-category	symbol currency) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
+    (=ucs		. #xFFE6)	; ￦
+    (=ks-x1001		. #x235C)	; &I-K0-235C; [03-60]
     (<-fullwidth
      ((name		  . "WON SIGN")
       (=ucs		  . #x20A9)	; ₩
       ))
-    (=ucs		. #xFFE6)	; ￦
-    (=ks-x1001		. #x235C)	; &I-K0-235C; [03-60]
     ))
 (define-char
   '((name		. "HALFWIDTH FORMS LIGHT VERTICAL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFFE8)	; ￨
     (<-halfwidth
      ((name		  . "BOX DRAWINGS LIGHT VERTICAL")
       (=ucs		  . #x2502)	; │
       ))
-    (=ucs		. #xFFE8)	; ￨
     ))
 (define-char
   '((name		. "HALFWIDTH LEFTWARDS ARROW")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFFE9)	; ï¿©
     (<-halfwidth
      ((name		  . "LEFTWARDS ARROW")
       (=ucs		  . #x2190)	; ←
       ))
-    (=ucs		. #xFFE9)	; ï¿©
     ))
 (define-char
   '((name		. "HALFWIDTH UPWARDS ARROW")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFFEA)	; ￪
     (<-halfwidth
      ((name		  . "UPWARDS ARROW")
       (=ucs		  . #x2191)	; ↑
       ))
-    (=ucs		. #xFFEA)	; ￪
     ))
 (define-char
   '((name		. "HALFWIDTH RIGHTWARDS ARROW")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFFEB)	; ï¿«
     (<-halfwidth
      ((name		  . "RIGHTWARDS ARROW")
       (=ucs		  . #x2192)	; →
       ))
-    (=ucs		. #xFFEB)	; ï¿«
     ))
 (define-char
   '((name		. "HALFWIDTH DOWNWARDS ARROW")
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFFEC)	; ￬
     (<-halfwidth
      ((name		  . "DOWNWARDS ARROW")
       (=ucs		  . #x2193)	; ↓
       ))
-    (=ucs		. #xFFEC)	; ￬
     ))
 (define-char
   '((name		. "HALFWIDTH BLACK SQUARE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFFED)	; ï¿­
     (<-halfwidth
      ((name		  . "BLACK SQUARE")
       (=ucs		  . #x25A0)	; ■
       ))
-    (=ucs		. #xFFED)	; ï¿­
     ))
 (define-char
   '((name		. "HALFWIDTH WHITE CIRCLE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (=ucs		. #xFFEE)	; ï¿®
     (<-halfwidth
      ((name		  . "WHITE CIRCLE")
       (=ucs		  . #x25CB)	; ○
       ))
-    (=ucs		. #xFFEE)	; ï¿®
     ))
diff --git a/src/ChangeLog b/src/ChangeLog
index 884277d..1481e06 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2005-12-27  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* concord.c: New file.
+
+2005-12-02  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* lrecord.h (enum lrecord_type): Add `lrecord_type_concord_ds' and
+	`lrecord_type_concord_object'.
+
+2005-09-21  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* symsinit.h (syms_of_concord): New prototype.
+	(vars_of_concord): New prototype.
+
+	* emacs.c (main_1): Setup symbols and variable about concord if
+	HAVE_CONCORD is defined.
+
+	* config.h.in (HAVE_CONCORD): New macro.
+
 2005-09-08  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* chartab.c (Fput_char_attribute): For each character relation
diff --git a/src/concord.c b/src/concord.c
new file mode 100644
index 0000000..47bf866
--- /dev/null
+++ b/src/concord.c
@@ -0,0 +1,708 @@
+/* XEmacs routines to deal with CONCORD.
+   Copyright (C) 2005 MORIOKA Tomohiko
+
+This file is part of XEmacs.
+
+XEmacs is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+/* Synched up with: Not in FSF. */
+
+/* Written by MORIOKA Tomohiko */
+
+#include <config.h>
+#include "lisp.h"
+#include "sysfile.h"
+#include "buffer.h"
+#include <errno.h>
+#include <concord.h>
+
+
+EXFUN (Fread_from_string, 3);
+
+
+Lisp_Object Qconcord;
+
+
+typedef struct Lisp_CONCORD_DS Lisp_CONCORD_DS;
+DECLARE_LRECORD (concord_ds, Lisp_CONCORD_DS);
+
+Lisp_Object Qconcord_dsp;
+
+struct Lisp_CONCORD_DS
+{
+  struct lcrecord_header header;
+  CONCORD_DS ds;
+};
+
+#define XCONCORD_DS(x) XRECORD (x, concord_ds, Lisp_CONCORD_DS)
+#define XSET_CONCORD_DS(x, p) XSETRECORD (x, p, concord_ds)
+#define CONCORD_DS_P(x) RECORDP (x, concord_ds)
+#define CHECK_CONCORD_DS(x) CHECK_RECORD (x, concord_ds)
+#define CONCHECK_CONCORD_DS(x) CONCHECK_RECORD (x, concord_ds)
+
+static Lisp_CONCORD_DS*
+allocate_concord_ds (void)
+{
+  Lisp_CONCORD_DS* lds
+    = alloc_lcrecord_type (Lisp_CONCORD_DS, &lrecord_concord_ds);
+
+  lds->ds = NULL;
+  return lds;
+}
+
+static Lisp_Object
+mark_concord_ds (Lisp_Object object)
+{
+  return Qnil;
+}
+
+static void
+print_concord_ds (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
+{
+  Lisp_CONCORD_DS* lds = XCONCORD_DS (obj);
+
+  if (print_readably)
+    error ("printing unreadable object #<concord_ds 0x%x>", lds->header.uid);
+
+  write_c_string ("#<concord_ds \"", printcharfun);
+  write_c_string (concord_ds_location (lds->ds), printcharfun);
+  write_c_string ("\">", printcharfun);
+}
+
+static void
+finalize_concord_ds (void *header, int for_disksave)
+{
+  Lisp_CONCORD_DS *lds = (Lisp_CONCORD_DS *) header;
+
+  if (for_disksave)
+    {
+      Lisp_Object object;
+      XSET_CONCORD_DS (object, lds);
+
+      signal_simple_error
+	("Can't dump an emacs containing concord_ds objects", object);
+    }
+  if ( lds->ds != NULL)
+    concord_close_ds (lds->ds);
+}
+
+DEFINE_LRECORD_IMPLEMENTATION ("concord_ds", concord_ds,
+                               mark_concord_ds, print_concord_ds,
+			       finalize_concord_ds, 0, 0, 0,
+			       Lisp_CONCORD_DS);
+
+DEFUN ("concord-close-ds", Fconcord_close_ds, 1, 1, 0, /*
+Close concord-ds CONCORD-DS.
+*/
+       (concord_ds))
+{
+  Lisp_CONCORD_DS* lds;
+  lds = XCONCORD_DS (concord_ds);
+  if ( lds->ds != NULL)
+    concord_close_ds (lds->ds);
+  lds->ds = NULL;
+  return Qnil;
+}
+
+DEFUN ("concord-ds-p", Fconcord_ds_p, 1, 1, 0, /*
+Return t if OBJECT is a concord-ds.
+*/
+       (object))
+{
+  return CONCORD_DS_P (object) ? Qt : Qnil;
+}
+
+DEFUN ("concord-open-ds", Fconcord_open_ds, 1, 4, 0, /*
+Return a new concord_ds object opened on PATH.
+Optional arguments TYPE and SUBTYPE specify the concord_ds type.
+Optional argument MODE gives the permissions to use when opening PATH,
+and defaults to 0755.
+*/
+       (path, type, subtype, mode))
+{
+  Lisp_Object retval;
+  Lisp_CONCORD_DS* lds = NULL;
+  CONCORD_DS ds;
+  int modemask;
+  char *pathname;
+  struct gcpro gcpro1;
+
+  CHECK_STRING (path);
+  GCPRO1 (path);
+  path = Fexpand_file_name (path, Qnil);
+  UNGCPRO;
+
+  TO_EXTERNAL_FORMAT (LISP_STRING, path,
+		      C_STRING_ALLOCA, pathname,
+		      Qfile_name);
+
+  if (NILP (mode))
+    {
+      modemask = 0755;		/* rwxr-xr-x */
+    }
+  else
+    {
+      CHECK_INT (mode);
+      modemask = XINT (mode);
+    }
+
+  ds = concord_open_ds (CONCORD_Backend_Berkeley_DB,
+			pathname, 0, modemask);
+  if ( ds == NULL )
+    return Qnil;
+
+  lds = allocate_concord_ds ();
+  lds->ds = ds;
+  XSET_CONCORD_DS (retval, lds);
+  return retval;
+}
+
+
+struct closure_to_list_feature
+{
+  Lisp_Object feature_list;
+} *concord_feature_list_closure;
+
+static int
+add_feature_to_list_mapper (CONCORD_Genre genre, unsigned char* name)
+{
+  /* This function can GC */
+  concord_feature_list_closure->feature_list
+    = Fcons (intern (name), concord_feature_list_closure->feature_list);
+  return 0;
+}
+
+DEFUN ("concord-feature-list", Fconcord_feature_list, 1, 2, 0, /*
+Return the list of all existing features in GENRE.
+*/
+       (genre, ds))
+{
+  Lisp_CONCORD_DS* lds;
+  unsigned char* genre_name;
+  CONCORD_Genre c_genre;
+  struct gcpro gcpro1;
+
+  if ( !STRINGP(genre) )
+    genre = Fsymbol_name (genre);
+  CHECK_CONCORD_DS (ds);
+  lds = XCONCORD_DS (ds);
+  if (lds->ds == NULL)
+    return Qnil;
+  TO_EXTERNAL_FORMAT (LISP_STRING, genre,
+		      C_STRING_ALLOCA, genre_name,
+		      Qfile_name);
+  c_genre = concord_ds_get_genre (lds->ds, genre_name);
+  if (c_genre == NULL)
+    return Qnil;
+  concord_feature_list_closure
+    = alloca (sizeof (struct closure_to_list_feature));
+  concord_feature_list_closure->feature_list = Qnil;
+  GCPRO1 (concord_feature_list_closure->feature_list);
+  concord_genre_foreach_feature_name (c_genre,
+				      add_feature_to_list_mapper);
+  UNGCPRO;
+  return concord_feature_list_closure->feature_list;
+}
+
+
+typedef struct Lisp_CONCORD_Object Lisp_CONCORD_Object;
+DECLARE_LRECORD (concord_object, Lisp_CONCORD_Object);
+
+Lisp_Object Qconcord_objectp;
+
+struct Lisp_CONCORD_Object
+{
+  struct lcrecord_header header;
+  CONCORD_Genre genre;
+  Lisp_Object id;
+};
+
+#define XCONCORD_OBJECT(x) XRECORD (x, concord_object, Lisp_CONCORD_Object)
+#define XSET_CONCORD_OBJECT(x, p) XSETRECORD (x, p, concord_object)
+#define CONCORD_OBJECT_P(x) RECORDP (x, concord_object)
+#define CHECK_CONCORD_OBJECT(x) CHECK_RECORD (x, concord_object)
+#define CONCHECK_CONCORD_OBJECT(x) CONCHECK_RECORD (x, concord_object)
+#define CONCORD_OBJECT_GENRE(x)	((x)->genre)
+#define CONCORD_OBJECT_ID(x)	((x)->id)
+#define XCONCORD_OBJECT_ID(x)	CONCORD_OBJECT_ID (XCONCORD_OBJECT(x))
+#define XCONCORD_OBJECT_GENRE(x) CONCORD_OBJECT_GENRE (XCONCORD_OBJECT(x))
+
+static Lisp_CONCORD_Object*
+allocate_concord_object (void)
+{
+  Lisp_CONCORD_Object* lcobj
+    = alloc_lcrecord_type (Lisp_CONCORD_Object, &lrecord_concord_object);
+
+  lcobj->genre = NULL;
+  lcobj->id = Qunbound;
+  return lcobj;
+}
+
+static Lisp_Object
+mark_concord_object (Lisp_Object object)
+{
+  mark_object (XCONCORD_OBJECT_ID(object));
+  return Qnil;
+}
+
+static void
+print_concord_object (Lisp_Object obj,
+		      Lisp_Object printcharfun, int escapeflag)
+{
+  Lisp_CONCORD_Object* lcobj = XCONCORD_OBJECT (obj);
+  struct gcpro gcpro1, gcpro2;
+
+  if (print_readably)
+    error ("printing unreadable object #<concord_object 0x%x>",
+	   lcobj->header.uid);
+
+  write_c_string ("#<concord_object \"", printcharfun);
+  write_c_string (concord_ds_location
+		  (concord_genre_get_data_source (lcobj->genre)),
+		  printcharfun);
+  write_c_string (":", printcharfun);
+  write_c_string (concord_genre_get_name (lcobj->genre), printcharfun);
+  write_c_string (";", printcharfun);
+  GCPRO2 (obj, printcharfun);
+  print_internal (lcobj->id, printcharfun, escapeflag);
+  UNGCPRO;
+  write_c_string ("\">", printcharfun);
+}
+
+static void
+finalize_concord_object (void *header, int for_disksave)
+{
+  Lisp_CONCORD_Object* lcobj = (Lisp_CONCORD_Object *) header;
+
+  if (for_disksave)
+    {
+      Lisp_Object object;
+      XSET_CONCORD_OBJECT (object, lcobj);
+
+      signal_simple_error
+	("Can't dump an emacs containing concord_object objects", object);
+    }
+}
+
+static const struct lrecord_description concord_object_description[] = {
+  { XD_LISP_OBJECT, offsetof (Lisp_CONCORD_Object, id) },
+  { XD_END }
+};
+
+DEFINE_LRECORD_IMPLEMENTATION ("concord_object", concord_object,
+                               mark_concord_object, print_concord_object,
+			       finalize_concord_object, 0, 0,
+			       concord_object_description,
+			       Lisp_CONCORD_Object);
+
+DEFUN ("concord-make-object",
+       Fconcord_make_object, 1, 3, 0, /*
+Make and return a Concord-object from ID and GENRE.
+Optional argument DS specifies the data-source of the GENRE.
+*/
+       (id, genre, ds))
+{
+  Lisp_CONCORD_DS* lds;
+  unsigned char* genre_name;
+  CONCORD_Genre c_genre;
+  Lisp_CONCORD_Object* lcobj;
+  Lisp_Object retval;
+
+  if ( !STRINGP(genre) )
+    genre = Fsymbol_name (genre);
+  CHECK_CONCORD_DS (ds);
+  lds = XCONCORD_DS (ds);
+  if (lds->ds == NULL)
+    return Qnil;
+  TO_EXTERNAL_FORMAT (LISP_STRING, genre,
+		      C_STRING_ALLOCA, genre_name,
+		      Qfile_name);
+  c_genre = concord_ds_get_genre (lds->ds, genre_name);
+  if (c_genre == NULL)
+    return Qnil;
+  lcobj = allocate_concord_object ();
+  lcobj->genre = c_genre;
+  lcobj->id = id;
+  XSET_CONCORD_OBJECT (retval, lcobj);
+  return retval;
+}
+
+DEFUN ("concord-object-p",
+       Fconcord_object_p, 1, 1, 0, /*
+Return t if OBJECT is a concord-object.
+*/
+       (object))
+{
+  return CONCORD_OBJECT_P (object) ? Qt : Qnil;
+}
+
+DEFUN ("concord-object-id",
+       Fconcord_object_id, 1, 1, 0, /*
+Return an id of Concord-object OBJECT.
+*/
+       (object))
+{
+  CHECK_CONCORD_OBJECT (object);
+  return XCONCORD_OBJECT_ID (object);
+}
+
+DEFUN ("concord-decode-object",
+       Fconcord_decode_object, 2, 4, 0, /*
+Make and return a Concord-object from FEATURE and VALUE.
+Optional argument GENRE specifies the GENRE of the object.
+Optional argument DS specifies the data-source of the GENRE.
+*/
+       (feature, value, genre, ds))
+{
+  Lisp_CONCORD_DS* lds;
+  unsigned char* genre_name;
+  CONCORD_Genre c_genre;
+  unsigned char* feature_name;
+  CONCORD_INDEX c_index;
+  Lisp_Object value_string;
+  unsigned char* strid;
+  CONCORD_String_Tank st_id;
+  int status;
+  Lisp_Object obj;
+  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
+
+  if ( !STRINGP(feature) )
+    feature = Fsymbol_name (feature);
+  if ( !STRINGP(genre) )
+    genre = Fsymbol_name (genre);
+  CHECK_CONCORD_DS (ds);
+  lds = XCONCORD_DS (ds);
+  if (lds->ds == NULL)
+    return Qnil;
+
+  TO_EXTERNAL_FORMAT (LISP_STRING, genre,
+		      C_STRING_ALLOCA, genre_name,
+		      Qfile_name);
+  c_genre = concord_ds_get_genre (lds->ds, genre_name);
+  if (c_genre == NULL)
+    {
+      return Qnil;
+    }
+
+  TO_EXTERNAL_FORMAT (LISP_STRING, feature,
+		      C_STRING_ALLOCA, feature_name,
+		      Qfile_name);
+  c_index = concord_genre_get_index (c_genre, feature_name);
+  if (c_index == NULL)
+    {
+      return Qnil;
+    }
+
+  GCPRO5 (feature, value, genre, ds, value_string);
+  value_string = Fprin1_to_string (value, Qnil);
+  UNGCPRO;
+  TO_EXTERNAL_FORMAT (LISP_STRING,
+		      value_string, C_STRING_ALLOCA, strid,
+		      Qfile_name);
+  status = concord_index_strid_get_obj_string (c_index, strid, &st_id);
+  if (!status)
+    {
+      GCPRO3 (genre, ds, obj);
+#if 0
+      obj = read_from_c_string (CONCORD_String_data (&st_id),
+				CONCORD_String_size (&st_id) );
+#else
+      obj = Fcar (Fread_from_string (make_ext_string
+				     (CONCORD_String_data (&st_id),
+				      CONCORD_String_size (&st_id),
+				      Qfile_name),
+				     Qnil, Qnil));
+#endif
+      UNGCPRO;
+      return Fconcord_make_object (obj, genre, ds);
+    }
+  return Qnil;
+}
+
+DEFUN ("concord-object-get",
+       Fconcord_object_get, 2, 2, 0, /*
+Return the value of OBJECT's FEATURE.
+*/
+       (object, feature))
+{
+  struct gcpro gcpro1, gcpro2;
+  Lisp_Object obj_string;
+  unsigned char* c_obj;
+  CONCORD_Genre c_genre;
+  unsigned char* feature_name;
+  CONCORD_Feature c_feature;
+  int status;
+  CONCORD_String_Tank st_value;
+
+  CHECK_CONCORD_OBJECT (object);
+  if ( !STRINGP(feature) )
+    feature = Fsymbol_name (feature);
+  GCPRO2 (object, feature);
+  obj_string = Fprin1_to_string (XCONCORD_OBJECT_ID(object), Qnil);
+  UNGCPRO;
+  TO_EXTERNAL_FORMAT (LISP_STRING, obj_string,
+		      C_STRING_ALLOCA, c_obj, Qfile_name);
+  c_genre = XCONCORD_OBJECT_GENRE(object);
+  TO_EXTERNAL_FORMAT (LISP_STRING, feature,
+		      C_STRING_ALLOCA, feature_name,
+		      Qfile_name);
+  c_feature = concord_genre_get_feature (c_genre, feature_name);
+  if (c_feature == NULL)
+    {
+      return Qnil;
+    }
+  status = concord_obj_get_feature_value_string (c_obj, c_feature,
+						 &st_value);
+  if (!status)
+    {
+      return
+	Fcar (Fread_from_string (make_ext_string
+				 (CONCORD_String_data (&st_value),
+				  CONCORD_String_size (&st_value),
+				  Qfile_name),
+				 Qnil, Qnil));
+    }
+  return Qnil;
+}
+
+DEFUN ("concord-object-put",
+       Fconcord_object_put, 3, 3, 0, /*
+Store a VALUE of OBJECT's FEATURE.
+*/
+       (object, feature, value))
+{
+  struct gcpro gcpro1, gcpro2, gcpro3;
+  Lisp_Object obj_string;
+  unsigned char* c_obj;
+  CONCORD_Genre c_genre;
+  unsigned char* feature_name;
+  CONCORD_Feature c_feature;
+  int status;
+  Lisp_Object value_string;
+  unsigned char* c_value;
+
+  CHECK_CONCORD_OBJECT (object);
+  if ( !STRINGP(feature) )
+    feature = Fsymbol_name (feature);
+  GCPRO3 (object, feature, value);
+  obj_string = Fprin1_to_string (XCONCORD_OBJECT_ID(object), Qnil);
+  UNGCPRO;
+  TO_EXTERNAL_FORMAT (LISP_STRING, obj_string,
+		      C_STRING_ALLOCA, c_obj, Qfile_name);
+  c_genre = XCONCORD_OBJECT_GENRE(object);
+  TO_EXTERNAL_FORMAT (LISP_STRING, feature,
+		      C_STRING_ALLOCA, feature_name,
+		      Qfile_name);
+  c_feature = concord_genre_get_feature (c_genre, feature_name);
+  if (c_feature == NULL)
+    {
+      return Qnil;
+    }
+  GCPRO3 (object, feature, value);
+  value_string = Fprin1_to_string (value, Qnil);
+  UNGCPRO;
+  TO_EXTERNAL_FORMAT (LISP_STRING, value_string,
+		      C_STRING_ALLOCA, c_value,
+		      Qfile_name);
+  status = concord_obj_put_feature_value_str (c_obj, c_feature, c_value);
+  if (status)
+    return Qnil;
+  status = chise_feature_sync (c_feature);
+  if (status)
+    return Qnil;
+  return Qt;
+}
+
+struct closure_for_object_spec
+{
+  unsigned char* object_id;
+  Lisp_Object spec;
+} *concord_object_spec_closure;
+
+static int
+add_feature_to_spec_mapper (CONCORD_Genre genre, unsigned char* name)
+{
+  /* This function can GC */
+  CONCORD_String_Tank st_value;
+  CONCORD_Feature c_feature;
+  int status;
+
+  c_feature = concord_genre_get_feature (genre, name);
+  if (c_feature == NULL)
+    return 0;
+
+  status =
+    concord_obj_get_feature_value_string
+    (concord_object_spec_closure->object_id, c_feature, &st_value);
+  if (!status)
+    {
+      concord_object_spec_closure->spec
+	= Fcons (Fcons (intern (name),
+			Fcar (Fread_from_string
+			      (make_ext_string
+			       (CONCORD_String_data (&st_value),
+				CONCORD_String_size (&st_value),
+				Qfile_name),
+			       Qnil, Qnil))),
+		 concord_object_spec_closure->spec);
+    }
+  return 0;
+}
+
+DEFUN ("concord-object-spec", Fconcord_object_spec, 1, 1, 0, /*
+Return the spec of OBJECT.
+*/
+       (object))
+{
+  Lisp_Object obj_string;
+  unsigned char* c_obj;
+  CONCORD_Genre c_genre;
+  struct gcpro gcpro1, gcpro2;
+
+  CHECK_CONCORD_OBJECT (object);
+  GCPRO1 (object);
+  obj_string = Fprin1_to_string (XCONCORD_OBJECT_ID(object), Qnil);
+  UNGCPRO;
+  TO_EXTERNAL_FORMAT (LISP_STRING, obj_string,
+		      C_STRING_ALLOCA, c_obj, Qfile_name);
+  c_genre = XCONCORD_OBJECT_GENRE(object);
+  concord_object_spec_closure
+    = alloca (sizeof (struct closure_for_object_spec));
+  concord_object_spec_closure->object_id = c_obj;
+  concord_object_spec_closure->spec = Qnil;
+  GCPRO2 (object, concord_object_spec_closure->spec);
+  concord_genre_foreach_feature_name (c_genre,
+				      add_feature_to_spec_mapper);
+  UNGCPRO;
+  return concord_object_spec_closure->spec;
+}
+
+struct closure_for_each_object
+{
+  Lisp_Object function;
+  Lisp_Object genre;
+  Lisp_Object ds;
+} *for_each_object_closure;
+
+static int
+func_for_each_object (CONCORD_String object_id,
+		      CONCORD_Feature feature,
+		      CONCORD_String value)
+{
+  Lisp_Object obj, val, ret;
+
+#if 0
+  obj = read_from_c_string (CONCORD_String_data (object_id),
+			    CONCORD_String_size (object_id) );
+#else
+  obj = Fcar (Fread_from_string (make_ext_string
+				 (CONCORD_String_data (object_id),
+				  CONCORD_String_size (object_id),
+				  Qfile_name),
+				 Qnil, Qnil));
+#endif
+  obj = Fconcord_make_object (obj,
+			      for_each_object_closure->genre,
+			      for_each_object_closure->ds);
+#if 0
+  val = read_from_c_string (CONCORD_String_data (value),
+			    CONCORD_String_size (value) );
+#else
+  val = Fcar (Fread_from_string (make_ext_string
+				 (CONCORD_String_data (value),
+				  CONCORD_String_size (value),
+				  Qfile_name),
+				 Qnil, Qnil));
+#endif
+  ret = call2 (for_each_object_closure->function, obj, val);
+  return !NILP (ret);
+}
+
+DEFUN ("concord-for-each-object-in-feature",
+       Fconcord_foreach_object_in_feature, 2, 4, 0, /*
+Do FUNCTION over objects in FEATURE, calling it with two args,
+each key and value in the FEATURE table.
+Optional argument GENRE specifies the genre of the FEATURE.
+When the FUNCTION returns non-nil, it breaks the repeat.
+*/
+       (function, feature, genre, ds))
+{
+  Lisp_CONCORD_DS* lds;
+  unsigned char* genre_name;
+  CONCORD_Genre c_genre;
+  unsigned char* feature_name;
+  CONCORD_Feature c_feature;
+
+  if ( !STRINGP(feature) )
+    feature = Fsymbol_name (feature);
+  if ( !STRINGP(genre) )
+    genre = Fsymbol_name (genre);
+  CHECK_CONCORD_DS (ds);
+  lds = XCONCORD_DS (ds);
+  if (lds->ds == NULL)
+    return Qnil;
+  TO_EXTERNAL_FORMAT (LISP_STRING, genre,
+		      C_STRING_ALLOCA, genre_name,
+		      Qfile_name);
+  c_genre = concord_ds_get_genre (lds->ds, genre_name);
+  if (c_genre == NULL)
+    return Qnil;
+
+  CHECK_STRING (feature);
+  TO_EXTERNAL_FORMAT (LISP_STRING, feature,
+		      C_STRING_ALLOCA, feature_name,
+		      Qfile_name);
+  c_feature = concord_genre_get_feature (c_genre, feature_name);
+  if (c_feature == NULL)
+    return Qnil;
+  for_each_object_closure
+    = alloca (sizeof (struct closure_for_each_object));
+  for_each_object_closure->function = function;
+  for_each_object_closure->genre = genre;
+  for_each_object_closure->ds = ds;
+  concord_feature_foreach_obj_string (c_feature, func_for_each_object);
+  return Qt;
+}
+
+void
+syms_of_concord (void)
+{
+  INIT_LRECORD_IMPLEMENTATION (concord_ds);
+  INIT_LRECORD_IMPLEMENTATION (concord_object);
+
+  defsymbol (&Qconcord, "concord");
+  defsymbol (&Qconcord_dsp, "concord-dsp");
+  defsymbol (&Qconcord_objectp, "concord-objectp");
+
+  DEFSUBR (Fconcord_open_ds);
+  DEFSUBR (Fconcord_ds_p);
+  DEFSUBR (Fconcord_close_ds);
+  DEFSUBR (Fconcord_feature_list);
+  DEFSUBR (Fconcord_make_object);
+  DEFSUBR (Fconcord_object_p);
+  DEFSUBR (Fconcord_object_id);
+  DEFSUBR (Fconcord_decode_object);
+  DEFSUBR (Fconcord_object_get);
+  DEFSUBR (Fconcord_object_put);
+  DEFSUBR (Fconcord_object_spec);
+  DEFSUBR (Fconcord_foreach_object_in_feature);
+}
+
+void
+vars_of_concord (void)
+{
+  Fprovide (Qconcord);
+}
diff --git a/src/emacs.c b/src/emacs.c
index 2331bb9..87c77c4 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1589,6 +1589,10 @@ main_1 (int argc, char **argv, char **envp, int restart)
       syms_of_postgresql ();
 #endif
 
+#ifdef HAVE_CONCORD
+      syms_of_concord ();
+#endif
+
       /* Now create the subtypes for the types that have them.
 	 We do this before the vars_*() because more symbols
 	 may get initialized here. */
@@ -2044,6 +2048,10 @@ main_1 (int argc, char **argv, char **envp, int restart)
       vars_of_postgresql();
 #endif
 
+#ifdef HAVE_CONCORD
+      vars_of_concord ();
+#endif
+
 #ifdef HAVE_GPM
       vars_of_gpmevent ();
 #endif
diff --git a/src/lrecord.h b/src/lrecord.h
index dd018e4..08d6269 100644
--- a/src/lrecord.h
+++ b/src/lrecord.h
@@ -187,6 +187,8 @@ enum lrecord_type
   lrecord_type_tooltalk_message,
   lrecord_type_tooltalk_pattern,
   lrecord_type_ldap,
+  lrecord_type_concord_ds,
+  lrecord_type_concord_object,
   lrecord_type_pgconn,
   lrecord_type_pgresult,
   lrecord_type_devmode,
diff --git a/src/symsinit.h b/src/symsinit.h
index e48f8d7..b466b39 100644
--- a/src/symsinit.h
+++ b/src/symsinit.h
@@ -155,6 +155,7 @@ void syms_of_window (void);
 void syms_of_select_x (void);
 void syms_of_eldap (void);
 void syms_of_postgresql (void);
+void syms_of_concord (void);
 void syms_of_gpmevent (void);
 void syms_of_win32 (void);
 
@@ -383,6 +384,7 @@ void vars_of_select_x (void);
 void reinit_vars_of_select_x (void);
 void vars_of_eldap (void);
 void vars_of_postgresql (void);
+void vars_of_concord (void);
 void vars_of_gpmevent (void);
 
 /* Initialize specifier variables (dump-time only). */