From: tomo <tomo>
Date: Sun, 1 Sep 2002 11:20:39 +0000 (+0000)
Subject: Sync with r21-4-3-utf-2000-0_19-new-case-b5c2.
X-Git-Tag: r21-4-3-utf-2000-0_19-3~1
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=69bf015d5ff3785b24464557bd1ee72980fd9576;p=chise%2Fxemacs-chise.git.1

Sync with r21-4-3-utf-2000-0_19-new-case-b5c2.
---

diff --git a/ChangeLog b/ChangeLog
index ad142aa..827ea06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,23 @@
 	* configure.in: Add new option `--with-utf-2000'; define `UTF2000'
 	if it is specified.
 
+2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.3 "Academic Rigor" is released.
+
+2001-05-10  Paul Stodghill  <stodghil@cs.cornell.edu>
+
+	* configure.in: Reverse the order of Windows and Linux sound tests
+	so that	Cygwin will find Windows first.
+
+2001-05-15  Steve Youngs  <youngs@xemacs.org>
+
+	* etc/photos/{youngs,youngsm}.png:  New photos.
+
+2001-05-15  Steve Youngs  <youngs@xemacs.org>
+
+	* etc/PACKAGES: Update to reflect new package dir tree.
+
 2001-05-10  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.2 "Developer-Friendly Unix APIs" is released.
diff --git a/configure b/configure
index 6fdb571..78896c0 100755
--- a/configure
+++ b/configure
@@ -1505,7 +1505,8 @@ EOF
 esac
 
 test -z "$machine" && machine=`echo $canonical | sed 's/-.*$//'`
-test -z "$opsys"   && opsys=`echo $canonical | sed 's/^^-*-^-*-//'`
+
+test -z "$opsys"   && opsys=`uname -s | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 
 if test -r "${srcdir}/src/m/${machine}.h"; then
   machfile="m/${machine}.h"
@@ -1624,7 +1625,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:1628: checking for $ac_word" >&5
+echo "configure:1629: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1651,7 +1652,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:1655: checking for $ac_word" >&5
+echo "configure:1656: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1699,7 +1700,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:1703: checking for $ac_word" >&5
+echo "configure:1704: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1728,7 +1729,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1732: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1733: 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'
@@ -1741,12 +1742,12 @@ cross_compiling=no
 
 cat > conftest.$ac_ext << EOF
 
-#line 1745 "configure"
+#line 1746 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1751: \"$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
@@ -1774,19 +1775,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:1778: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1779: 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:1783: checking whether we are using GNU C" >&5
+echo "configure:1784: 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:1790: \"$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:1791: \"$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
@@ -1804,7 +1805,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:1808: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1809: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1837,7 +1838,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:1841: checking for $ac_word" >&5
+echo "configure:1842: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1864,7 +1865,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:1868: checking for $ac_word" >&5
+echo "configure:1869: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1912,7 +1913,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:1916: checking for $ac_word" >&5
+echo "configure:1917: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1941,7 +1942,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1945: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1946: 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'
@@ -1954,12 +1955,12 @@ cross_compiling=no
 
 cat > conftest.$ac_ext << EOF
 
-#line 1958 "configure"
+#line 1959 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1964: \"$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
@@ -1987,19 +1988,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:1991: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1992: 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:1996: checking whether we are using GNU C" >&5
+echo "configure:1997: 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:2003: \"$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:2004: \"$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
@@ -2017,7 +2018,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:2021: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2022: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2050,7 +2051,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:2054: checking for $ac_word" >&5
+echo "configure:2055: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2077,7 +2078,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:2081: checking for $ac_word" >&5
+echo "configure:2082: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2125,7 +2126,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:2129: checking for $ac_word" >&5
+echo "configure:2130: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2154,7 +2155,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2158: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2159: 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'
@@ -2167,12 +2168,12 @@ cross_compiling=no
 
 cat > conftest.$ac_ext << EOF
 
-#line 2171 "configure"
+#line 2172 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2177: \"$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
@@ -2200,19 +2201,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:2204: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2205: 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:2209: checking whether we are using GNU C" >&5
+echo "configure:2210: 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:2216: \"$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:2217: \"$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
@@ -2230,7 +2231,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:2234: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2235: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2267,7 +2268,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:2271: checking how to run the C preprocessor" >&5
+echo "configure:2272: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2280,13 +2281,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 2284 "configure"
+#line 2285 "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:2290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2291: \"$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
   :
@@ -2297,13 +2298,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2301 "configure"
+#line 2302 "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:2307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2308: \"$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
   :
@@ -2314,13 +2315,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2318 "configure"
+#line 2319 "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:2324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2325: \"$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
   :
@@ -2346,9 +2347,9 @@ echo "$ac_t""$CPP" 1>&6
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2350: checking for AIX" >&5
+echo "configure:2351: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2352 "configure"
+#line 2353 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2375,9 +2376,9 @@ rm -f conftest*
  
 
 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2379: checking for GNU libc" >&5
+echo "configure:2380: checking for GNU libc" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2381 "configure"
+#line 2382 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -2389,7 +2390,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_glibc=yes
 else
@@ -2466,7 +2467,7 @@ EOF
 esac
 
 cat > conftest.$ac_ext <<EOF
-#line 2470 "configure"
+#line 2471 "configure"
 #include "confdefs.h"
 int main () {
 #if defined __SUNPRO_C
@@ -2480,7 +2481,7 @@ return 0;
 #endif
 }
 EOF
-if { (eval echo configure:2484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -2714,17 +2715,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:2718: checking for whether the -Kalloca compiler flag is needed" >&5
+echo "configure:2719: checking for whether the -Kalloca compiler flag is needed" >&5
   need_kalloca=no
   cat > conftest.$ac_ext <<EOF
-#line 2721 "configure"
+#line 2722 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   :
 else
@@ -2735,14 +2736,14 @@ else
     xe_save_c_switch_system="$c_switch_system"
     c_switch_system="$c_switch_system -Kalloca"
     cat > conftest.$ac_ext <<EOF
-#line 2739 "configure"
+#line 2740 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    need_kalloca=yes 
 else
@@ -2777,7 +2778,7 @@ fi
 
 if test "$GCC" = "yes"; then
 echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
-echo "configure:2781: checking for buggy gcc versions" >&5
+echo "configure:2782: 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.*)
@@ -2900,7 +2901,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:2904: checking for dynodump" >&5
+echo "configure:2905: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
@@ -2938,12 +2939,12 @@ if test "$unexec" = "unexaix.o"; then
   done
   
 echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:2942: checking for terminateAndUnload in -lC" >&5
+echo "configure:2943: 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 2947 "configure"
+#line 2948 "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
@@ -2954,7 +2955,7 @@ int main() {
 terminateAndUnload()
 ; return 0; }
 EOF
-if { (eval echo configure:2958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2959: \"$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
@@ -3062,7 +3063,7 @@ fi
 
 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:3066: checking "for runtime libraries flag"" >&5
+echo "configure:3067: checking "for runtime libraries flag"" >&5
   case "$opsys" in
     sol2 ) dash_r="-R" ;;
     decosf* | linux* | irix*) dash_r="-rpath " ;;
@@ -3084,14 +3085,14 @@ if test "$GCC" = "yes"; then
   done
 fi
         cat > conftest.$ac_ext <<EOF
-#line 3088 "configure"
+#line 3089 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -3192,10 +3193,10 @@ else
 fi
 after_morecore_hook_exists=yes
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3196: checking for malloc_set_state" >&5
+echo "configure:3197: checking for malloc_set_state" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3199 "configure"
+#line 3200 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -3218,7 +3219,7 @@ malloc_set_state();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3223: \"$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
@@ -3238,16 +3239,16 @@ doug_lea_malloc=no
 fi
 
 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3242: checking whether __after_morecore_hook exists" >&5
+echo "configure:3243: checking whether __after_morecore_hook exists" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3244 "configure"
+#line 3245 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:3251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3252: \"$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
@@ -3303,7 +3304,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:3307: checking for $ac_word" >&5
+echo "configure:3308: checking for $ac_word" >&5
 
 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3358,7 +3359,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:3362: checking for a BSD compatible install" >&5
+echo "configure:3363: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 
   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -3412,7 +3413,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:3416: checking for $ac_word" >&5
+echo "configure:3417: checking for $ac_word" >&5
 
 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3444,15 +3445,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:3448: checking for $ac_hdr" >&5
+echo "configure:3449: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3451 "configure"
+#line 3452 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3457: \"$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*
@@ -3482,10 +3483,10 @@ fi
 done
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3486: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3487: checking for sys/wait.h that is POSIX.1 compatible" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3489 "configure"
+#line 3490 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3501,7 +3502,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3525,10 +3526,10 @@ EOF
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3529: checking for ANSI C header files" >&5
+echo "configure:3530: checking for ANSI C header files" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3532 "configure"
+#line 3533 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3536,7 +3537,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:3540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3541: \"$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*
@@ -3553,7 +3554,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 3557 "configure"
+#line 3558 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3571,7 +3572,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 3575 "configure"
+#line 3576 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3589,7 +3590,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 3593 "configure"
+#line 3594 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3600,7 +3601,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:3604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -3626,10 +3627,10 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3630: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3631: checking whether time.h and sys/time.h may both be included" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3633 "configure"
+#line 3634 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3638,7 +3639,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3662,10 +3663,10 @@ EOF
 fi
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3666: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:3667: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3669 "configure"
+#line 3670 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3677,7 +3678,7 @@ int main() {
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -3703,9 +3704,9 @@ fi
 
 
 echo $ac_n "checking for utime""... $ac_c" 1>&6
-echo "configure:3707: checking for utime" >&5
+echo "configure:3708: checking for utime" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3709 "configure"
+#line 3710 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <utime.h>
@@ -3713,7 +3714,7 @@ int main() {
 struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
 ; return 0; }
 EOF
-if { (eval echo configure:3717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3718: \"$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
@@ -3732,10 +3733,10 @@ else
       for ac_func in utimes
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3736: checking for $ac_func" >&5
+echo "configure:3737: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3739 "configure"
+#line 3740 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3758,7 +3759,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3763: \"$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
@@ -3790,10 +3791,10 @@ rm -f conftest*
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3794: checking return type of signal handlers" >&5
+echo "configure:3795: checking return type of signal handlers" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3797 "configure"
+#line 3798 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3810,7 +3811,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3832,10 +3833,10 @@ EOF
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3836: checking for size_t" >&5
+echo "configure:3837: checking for size_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3839 "configure"
+#line 3840 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3866,10 +3867,10 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3870: checking for pid_t" >&5
+echo "configure:3871: checking for pid_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3873 "configure"
+#line 3874 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3900,10 +3901,10 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3904: checking for uid_t in sys/types.h" >&5
+echo "configure:3905: checking for uid_t in sys/types.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3907 "configure"
+#line 3908 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -3939,10 +3940,10 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3943: checking for mode_t" >&5
+echo "configure:3944: checking for mode_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3946 "configure"
+#line 3947 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3973,10 +3974,10 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3977: checking for off_t" >&5
+echo "configure:3978: checking for off_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3980 "configure"
+#line 3981 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4007,10 +4008,10 @@ EOF
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4011: checking for ssize_t" >&5
+echo "configure:4012: checking for ssize_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4014 "configure"
+#line 4015 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4042,9 +4043,9 @@ fi
 
 
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:4046: checking for socklen_t" >&5
+echo "configure:4047: checking for socklen_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4048 "configure"
+#line 4049 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 socklen_t x;
@@ -4053,7 +4054,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -4062,7 +4063,7 @@ else
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 4066 "configure"
+#line 4067 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int accept (int, struct sockaddr *, size_t *);
@@ -4071,7 +4072,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 echo "$ac_t""size_t" 1>&6
@@ -4103,9 +4104,9 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:4107: checking for struct timeval" >&5
+echo "configure:4108: checking for struct timeval" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4109 "configure"
+#line 4110 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4121,7 +4122,7 @@ int main() {
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:4125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -4143,10 +4144,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:4147: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4148: checking whether struct tm is in sys/time.h or time.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4150 "configure"
+#line 4151 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4154,7 +4155,7 @@ int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:4158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -4178,10 +4179,10 @@ EOF
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4182: checking for tm_zone in struct tm" >&5
+echo "configure:4183: checking for tm_zone in struct tm" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4185 "configure"
+#line 4186 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -4189,7 +4190,7 @@ int main() {
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:4193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -4212,10 +4213,10 @@ EOF
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4216: checking for tzname" >&5
+echo "configure:4217: checking for tzname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4219 "configure"
+#line 4220 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -4225,7 +4226,7 @@ int main() {
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:4229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -4251,10 +4252,10 @@ fi
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4255: checking for working const" >&5
+echo "configure:4256: checking for working const" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4258 "configure"
+#line 4259 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4303,7 +4304,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:4307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4328,7 +4329,7 @@ fi
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4332: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4333: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 
 cat > conftestmake <<\EOF
@@ -4353,12 +4354,12 @@ fi
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4357: checking whether byte ordering is bigendian" >&5
+echo "configure:4358: 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 4362 "configure"
+#line 4363 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4369,11 +4370,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4374: \"$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 4377 "configure"
+#line 4378 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4384,7 +4385,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -4401,7 +4402,7 @@ fi
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 4405 "configure"
+#line 4406 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -4414,7 +4415,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:4418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -4441,10 +4442,10 @@ fi
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4445: checking size of short" >&5
+echo "configure:4446: checking size of short" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4448 "configure"
+#line 4449 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4456,7 +4457,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -4484,10 +4485,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:4488: checking size of int" >&5
+echo "configure:4489: checking size of int" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4491 "configure"
+#line 4492 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4499,7 +4500,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4521,10 +4522,10 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4525: checking size of long" >&5
+echo "configure:4526: checking size of long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4528 "configure"
+#line 4529 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4536,7 +4537,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4558,10 +4559,10 @@ EOF
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4562: checking size of long long" >&5
+echo "configure:4563: checking size of long long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4565 "configure"
+#line 4566 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4573,7 +4574,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4578: \"$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
@@ -4595,10 +4596,10 @@ EOF
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4599: checking size of void *" >&5
+echo "configure:4600: checking size of void *" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4602 "configure"
+#line 4603 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4610,7 +4611,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4615: \"$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
@@ -4633,7 +4634,7 @@ EOF
 
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4637: checking for long file names" >&5
+echo "configure:4638: 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:
@@ -4679,10 +4680,10 @@ fi
 
 
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4683: checking for sin" >&5
+echo "configure:4684: checking for sin" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4686 "configure"
+#line 4687 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4705,7 +4706,7 @@ sin();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4710: \"$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
@@ -4723,12 +4724,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4727: checking for sin in -lm" >&5
+echo "configure:4728: 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 4732 "configure"
+#line 4733 "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
@@ -4739,7 +4740,7 @@ int main() {
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4744: \"$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
@@ -4783,14 +4784,14 @@ EOF
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4787 "configure"
+#line 4788 "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:4794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4795: \"$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
@@ -4807,14 +4808,14 @@ fi
 rm -f conftest*
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:4811: checking type of mail spool file locking" >&5
+echo "configure:4812: 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:4815: checking for $ac_func" >&5
+echo "configure:4816: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4818 "configure"
+#line 4819 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4837,7 +4838,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4842: \"$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
@@ -4919,12 +4920,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:4923: checking for cma_open in -lpthreads" >&5
+echo "configure:4924: 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 4928 "configure"
+#line 4929 "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
@@ -4935,7 +4936,7 @@ int main() {
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:4939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4940: \"$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
@@ -4971,7 +4972,7 @@ fi
 esac
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:4975: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:4976: 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;
@@ -4983,7 +4984,7 @@ fi
 if test "$opsys" = "sol2"; then
   if test "$os_release" -ge 56; then
     echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:4987: checking for \"-z ignore\" linker flag" >&5
+echo "configure:4988: 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 ;;
@@ -4994,7 +4995,7 @@ fi
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:4998: checking "for specified window system"" >&5
+echo "configure:4999: checking "for specified window system"" >&5
 
 
 GNOME_CONFIG=no
@@ -5002,7 +5003,7 @@ GTK_CONFIG=no
 
 if test "$with_gnome" != "no"; then
    echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5006: checking for GNOME configuration script" >&5
+echo "configure:5007: checking for GNOME configuration script" >&5
    for possible in gnome-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5033,7 +5034,7 @@ fi
 
 if test "$with_gtk" != "no";then
    echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5037: checking for GTK configuration script" >&5
+echo "configure:5038: checking for GTK configuration script" >&5
    for possible in gtk12-config gtk14-config gtk-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5055,37 +5056,37 @@ fi
 
 if test "${GTK_CONFIG}" != "no"; then
       echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5059: checking gtk version" >&5
+echo "configure:5060: 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:5064: checking gtk libs" >&5
+echo "configure:5065: 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:5070: checking gtk cflags" >&5
+echo "configure:5071: checking gtk cflags" >&5
       GTK_CFLAGS=`${GTK_CONFIG} --cflags`
       c_switch_gtk="$c_switch_gtk ${GTK_CFLAGS}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"${GTK_CFLAGS}\" to \$c_switch_gtk"; fi
       echo "$ac_t""${GTK_CFLAGS}" 1>&6
 
       
 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5077: checking for main in -lgdk_imlib" >&5
+echo "configure:5078: 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 5082 "configure"
+#line 5083 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5090: \"$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
@@ -5107,12 +5108,12 @@ fi
 
       
 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5111: checking for Imlib_init in -lImlib" >&5
+echo "configure:5112: 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 5116 "configure"
+#line 5117 "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
@@ -5123,7 +5124,7 @@ int main() {
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5128: \"$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
@@ -5146,10 +5147,10 @@ fi
       for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5150: checking for $ac_func" >&5
+echo "configure:5151: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5153 "configure"
+#line 5154 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5172,7 +5173,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5177: \"$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
@@ -5249,15 +5250,15 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5253: checking for $ac_hdr" >&5
+echo "configure:5254: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5256 "configure"
+#line 5257 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5262: \"$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*
@@ -5288,19 +5289,19 @@ done
 
       
 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5292: checking for main in -lxml" >&5
+echo "configure:5293: 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 5297 "configure"
+#line 5298 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5305: \"$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
@@ -5322,19 +5323,19 @@ fi
 
       
 echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5326: checking for main in -lglade" >&5
+echo "configure:5327: 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 5331 "configure"
+#line 5332 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5339: \"$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
@@ -5356,19 +5357,19 @@ fi
 
       
 echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5360: checking for main in -lglade-gnome" >&5
+echo "configure:5361: 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 5365 "configure"
+#line 5366 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5373: \"$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
@@ -5389,7 +5390,7 @@ fi
 
 
       cat > conftest.$ac_ext <<EOF
-#line 5393 "configure"
+#line 5394 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
@@ -5447,7 +5448,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:5451: checking for X" >&5
+echo "configure:5452: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5507,12 +5508,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5511 "configure"
+#line 5512 "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:5516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5517: \"$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*
@@ -5581,14 +5582,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 5585 "configure"
+#line 5586 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5593: \"$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.
@@ -5697,17 +5698,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:5701: checking whether -R must be followed by a space" >&5
+echo "configure:5702: 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 5704 "configure"
+#line 5705 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5723,14 +5724,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5727 "configure"
+#line 5728 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5766,12 +5767,12 @@ ac_cv_lib_dnet_dnet_ntoa=no
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5770: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5771: 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 5775 "configure"
+#line 5776 "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
@@ -5782,7 +5783,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5787: \"$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
@@ -5806,12 +5807,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:5810: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5811: 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 5815 "configure"
+#line 5816 "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
@@ -5822,7 +5823,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5827: \"$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
@@ -5851,10 +5852,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:5855: checking for gethostbyname" >&5
+echo "configure:5856: checking for gethostbyname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5858 "configure"
+#line 5859 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -5877,7 +5878,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5882: \"$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
@@ -5898,12 +5899,12 @@ fi
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5902: checking for gethostbyname in -lnsl" >&5
+echo "configure:5903: 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 5907 "configure"
+#line 5908 "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
@@ -5914,7 +5915,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:5918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5919: \"$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
@@ -5944,10 +5945,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:5948: checking for connect" >&5
+echo "configure:5949: checking for connect" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5951 "configure"
+#line 5952 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -5970,7 +5971,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5975: \"$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
@@ -5993,12 +5994,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:5997: checking "$xe_msg_checking"" >&5
+echo "configure:5998: 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 6002 "configure"
+#line 6003 "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
@@ -6009,7 +6010,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:6013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6014: \"$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
@@ -6033,10 +6034,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:6037: checking for remove" >&5
+echo "configure:6038: checking for remove" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6040 "configure"
+#line 6041 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -6059,7 +6060,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6064: \"$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
@@ -6080,12 +6081,12 @@ fi
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6084: checking for remove in -lposix" >&5
+echo "configure:6085: 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 6089 "configure"
+#line 6090 "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
@@ -6096,7 +6097,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:6100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6101: \"$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
@@ -6120,10 +6121,10 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6124: checking for shmat" >&5
+echo "configure:6125: checking for shmat" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6127 "configure"
+#line 6128 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -6146,7 +6147,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6151: \"$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
@@ -6167,12 +6168,12 @@ fi
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6171: checking for shmat in -lipc" >&5
+echo "configure:6172: 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 6176 "configure"
+#line 6177 "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
@@ -6183,7 +6184,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:6187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6188: \"$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
@@ -6219,12 +6220,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:6223: checking "$xe_msg_checking"" >&5
+echo "configure:6224: 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 6228 "configure"
+#line 6229 "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
@@ -6235,7 +6236,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:6239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6240: \"$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
@@ -6402,7 +6403,7 @@ EOF
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6406: checking for X defines extracted by xmkmf" >&5
+echo "configure:6407: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -6451,15 +6452,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:6455: checking for X11/Intrinsic.h" >&5
+echo "configure:6456: checking for X11/Intrinsic.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6458 "configure"
+#line 6459 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6464: \"$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*
@@ -6483,12 +6484,12 @@ fi
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6487: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6488: 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 6492 "configure"
+#line 6493 "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
@@ -6499,7 +6500,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6504: \"$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
@@ -6524,12 +6525,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:6528: checking "$xe_msg_checking"" >&5
+echo "configure:6529: 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 6533 "configure"
+#line 6534 "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
@@ -6540,7 +6541,7 @@ int main() {
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6545: \"$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
@@ -6567,12 +6568,12 @@ fi
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6571: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6572: 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 6576 "configure"
+#line 6577 "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
@@ -6583,7 +6584,7 @@ int main() {
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6588: \"$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
@@ -6606,12 +6607,12 @@ fi
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6610: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6611: 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 6615 "configure"
+#line 6616 "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
@@ -6622,7 +6623,7 @@ int main() {
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6627: \"$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
@@ -6645,14 +6646,14 @@ fi
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6649: checking the version of X11 being used" >&5
+echo "configure:6650: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6651 "configure"
+#line 6652 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6683,10 +6684,10 @@ EOF
   for ac_func in XConvertCase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6687: checking for $ac_func" >&5
+echo "configure:6688: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6690 "configure"
+#line 6691 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6709,7 +6710,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6741,15 +6742,15 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6745: checking for $ac_hdr" >&5
+echo "configure:6746: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6748 "configure"
+#line 6749 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6754: \"$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*
@@ -6782,10 +6783,10 @@ done
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6786: checking for $ac_func" >&5
+echo "configure:6787: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6789 "configure"
+#line 6790 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6808,7 +6809,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6813: \"$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
@@ -6836,9 +6837,9 @@ fi
 done
 
   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:6840: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:6841: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6842 "configure"
+#line 6843 "configure"
 #include "confdefs.h"
 
 #define NeedFunctionPrototypes 1
@@ -6850,7 +6851,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:6854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -6871,12 +6872,12 @@ rm -f conftest*
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:6875: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:6876: 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 6880 "configure"
+#line 6881 "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
@@ -6887,7 +6888,7 @@ int main() {
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:6891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6892: \"$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
@@ -6926,19 +6927,19 @@ EOF
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:6930: checking for main in -lXbsd" >&5
+echo "configure:6931: 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 6935 "configure"
+#line 6936 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6943: \"$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
@@ -6975,22 +6976,22 @@ fi
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:6979: checking for MS-Windows" >&5
+echo "configure:6980: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:6982: checking for main in -lgdi32" >&5
+echo "configure:6983: 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 6987 "configure"
+#line 6988 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6995: \"$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
@@ -7063,12 +7064,12 @@ EOF
  fi
     fi
         cat > conftest.$ac_ext <<EOF
-#line 7067 "configure"
+#line 7068 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MSG_SELECT
@@ -7132,15 +7133,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:7136: checking for X11/extensions/shape.h" >&5
+echo "configure:7137: checking for X11/extensions/shape.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7139 "configure"
+#line 7140 "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:7144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7145: \"$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*
@@ -7192,7 +7193,7 @@ case "$x_libraries" in *X11R4* )
 esac
 
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7196: checking for WM_COMMAND option" >&5;
+echo "configure:7197: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -7207,15 +7208,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:7211: checking for X11/Xauth.h" >&5
+echo "configure:7212: checking for X11/Xauth.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7214 "configure"
+#line 7215 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7220: \"$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*
@@ -7238,12 +7239,12 @@ fi
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7242: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7243: 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 7247 "configure"
+#line 7248 "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
@@ -7254,7 +7255,7 @@ int main() {
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:7258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7259: \"$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
@@ -7299,15 +7300,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:7303: checking for ${dir}tt_c.h" >&5
+echo "configure:7304: checking for ${dir}tt_c.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7306 "configure"
+#line 7307 "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:7311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7312: \"$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*
@@ -7343,12 +7344,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:7347: checking "$xe_msg_checking"" >&5
+echo "configure:7348: 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 7352 "configure"
+#line 7353 "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
@@ -7359,7 +7360,7 @@ int main() {
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:7363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7364: \"$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
@@ -7416,15 +7417,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:7420: checking for Dt/Dt.h" >&5
+echo "configure:7421: checking for Dt/Dt.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7423 "configure"
+#line 7424 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7429: \"$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*
@@ -7447,12 +7448,12 @@ fi
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:7451: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:7452: 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 7456 "configure"
+#line 7457 "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
@@ -7463,7 +7464,7 @@ int main() {
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7468: \"$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
@@ -7536,7 +7537,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:7540: checking if drag and drop API is needed" >&5
+echo "configure:7541: 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
@@ -7556,18 +7557,18 @@ EOF
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:7560: checking for LDAP" >&5
+echo "configure:7561: 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:7563: checking for ldap.h" >&5
+echo "configure:7564: checking for ldap.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7566 "configure"
+#line 7567 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7572: \"$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*
@@ -7590,15 +7591,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:7594: checking for lber.h" >&5
+echo "configure:7595: checking for lber.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7597 "configure"
+#line 7598 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7603: \"$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*
@@ -7622,12 +7623,12 @@ fi
 if test "$with_ldap" != "no"; then
   
 echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:7626: checking for ldap_search in -lldap" >&5
+echo "configure:7627: 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 7631 "configure"
+#line 7632 "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
@@ -7638,7 +7639,7 @@ int main() {
 ldap_search()
 ; return 0; }
 EOF
-if { (eval echo configure:7642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7643: \"$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
@@ -7663,12 +7664,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:7667: checking "$xe_msg_checking"" >&5
+echo "configure:7668: 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 7672 "configure"
+#line 7673 "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
@@ -7679,7 +7680,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7684: \"$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
@@ -7704,12 +7705,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:7708: checking "$xe_msg_checking"" >&5
+echo "configure:7709: 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 7713 "configure"
+#line 7714 "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
@@ -7720,7 +7721,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7725: \"$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
@@ -7745,12 +7746,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:7749: checking "$xe_msg_checking"" >&5
+echo "configure:7750: 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 7754 "configure"
+#line 7755 "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
@@ -7761,7 +7762,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7766: \"$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
@@ -7812,10 +7813,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:7816: checking for $ac_func" >&5
+echo "configure:7817: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7819 "configure"
+#line 7820 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7838,7 +7839,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7843: \"$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
@@ -7869,20 +7870,20 @@ fi
 
 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:7873: checking for PostgreSQL" >&5
+echo "configure:7874: 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:7878: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:7879: checking for ${header_dir}libpq-fe.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7881 "configure"
+#line 7882 "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:7886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7887: \"$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*
@@ -7906,12 +7907,12 @@ fi
 
   test -n "$libpq_fe_h_file" && { 
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:7910: checking for PQconnectdb in -lpq" >&5
+echo "configure:7911: 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 7915 "configure"
+#line 7916 "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
@@ -7922,7 +7923,7 @@ int main() {
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:7926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7927: \"$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
@@ -7955,12 +7956,12 @@ EOF
 
     
 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:7959: checking for PQconnectStart in -lpq" >&5
+echo "configure:7960: 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 7964 "configure"
+#line 7965 "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
@@ -7971,7 +7972,7 @@ int main() {
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7976: \"$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
@@ -8019,15 +8020,15 @@ fi
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:8023: checking for graphics libraries" >&5
+echo "configure:8024: checking for graphics libraries" >&5
 
     xpm_problem=""
   if test -z "$with_xpm"; then
     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:8028: checking for Xpm - no older than 3.4f" >&5
+echo "configure:8029: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8031 "configure"
+#line 8032 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -8036,7 +8037,7 @@ echo "configure:8028: checking for Xpm - no older than 3.4f" >&5
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8041: \"$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
@@ -8078,17 +8079,17 @@ EOF
 
     libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
     echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:8082: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:8083: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8085 "configure"
+#line 8086 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:8092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -8114,15 +8115,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:8118: checking for compface.h" >&5
+echo "configure:8119: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8121 "configure"
+#line 8122 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8127: \"$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*
@@ -8145,12 +8146,12 @@ fi
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8149: checking for UnGenFace in -lcompface" >&5
+echo "configure:8150: 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 8154 "configure"
+#line 8155 "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
@@ -8161,7 +8162,7 @@ int main() {
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8166: \"$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
@@ -8213,12 +8214,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:8217: checking for inflate in -lc" >&5
+echo "configure:8218: 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 8222 "configure"
+#line 8223 "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
@@ -8229,7 +8230,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8234: \"$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
@@ -8248,12 +8249,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:8252: checking for inflate in -lz" >&5
+echo "configure:8253: 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 8257 "configure"
+#line 8258 "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
@@ -8264,7 +8265,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8269: \"$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
@@ -8283,12 +8284,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:8287: checking for inflate in -lgz" >&5
+echo "configure:8288: 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 8292 "configure"
+#line 8293 "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
@@ -8299,7 +8300,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8304: \"$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
@@ -8329,15 +8330,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:8333: checking for jpeglib.h" >&5
+echo "configure:8334: checking for jpeglib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8336 "configure"
+#line 8337 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8342: \"$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*
@@ -8360,12 +8361,12 @@ fi
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:8364: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:8365: 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 8369 "configure"
+#line 8370 "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
@@ -8376,7 +8377,7 @@ int main() {
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:8380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8381: \"$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
@@ -8412,10 +8413,10 @@ EOF
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:8416: checking for pow" >&5
+echo "configure:8417: checking for pow" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8419 "configure"
+#line 8420 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -8438,7 +8439,7 @@ pow();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8443: \"$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
@@ -8459,15 +8460,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:8463: checking for png.h" >&5
+echo "configure:8464: checking for png.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8466 "configure"
+#line 8467 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8472: \"$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*
@@ -8490,12 +8491,12 @@ fi
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8494: checking for png_read_image in -lpng" >&5
+echo "configure:8495: 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 8499 "configure"
+#line 8500 "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
@@ -8506,7 +8507,7 @@ int main() {
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:8510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8511: \"$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
@@ -8529,10 +8530,10 @@ fi
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8533: checking for workable png version information" >&5
+echo "configure:8534: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 8536 "configure"
+#line 8537 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -8540,7 +8541,7 @@ echo "configure:8533: 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:8544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8545: \"$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
@@ -8583,15 +8584,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:8587: checking for tiffio.h" >&5
+echo "configure:8588: checking for tiffio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8590 "configure"
+#line 8591 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8596: \"$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*
@@ -8614,12 +8615,12 @@ fi
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8618: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:8619: 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 8623 "configure"
+#line 8624 "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
@@ -8630,7 +8631,7 @@ int main() {
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8635: \"$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
@@ -8669,15 +8670,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:8673: checking for compface.h" >&5
+echo "configure:8674: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8676 "configure"
+#line 8677 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8682: \"$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*
@@ -8700,12 +8701,12 @@ fi
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8704: checking for UnGenFace in -lcompface" >&5
+echo "configure:8705: 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 8709 "configure"
+#line 8710 "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
@@ -8716,7 +8717,7 @@ int main() {
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8721: \"$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
@@ -8756,10 +8757,10 @@ fi
 if test "$with_x11" = "yes"; then
 
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:8760: checking for X11 graphics libraries" >&5
+echo "configure:8761: checking for X11 graphics libraries" >&5
 
   echo "checking for the Athena widgets" 1>&6
-echo "configure:8763: checking for the Athena widgets" >&5
+echo "configure:8764: checking for the Athena widgets" >&5
 
     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -8773,12 +8774,12 @@ echo "configure:8763: 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:8777: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:8778: 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 8782 "configure"
+#line 8783 "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
@@ -8789,7 +8790,7 @@ int main() {
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:8793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8794: \"$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
@@ -8805,12 +8806,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
   echo "$ac_t""yes" 1>&6
           
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8809: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8810: checking for threeDClassRec in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8814 "configure"
+#line 8815 "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
@@ -8821,7 +8822,7 @@ int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8852,12 +8853,12 @@ fi
   else
         
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8856: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8857: checking for threeDClassRec in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8861 "configure"
+#line 8862 "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
@@ -8868,7 +8869,7 @@ int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8873: \"$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
@@ -8886,12 +8887,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 threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:8890: checking for threeDClassRec in -lXaw" >&5
+echo "configure:8891: checking for threeDClassRec in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 8895 "configure"
+#line 8896 "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
@@ -8902,7 +8903,7 @@ int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8907: \"$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
@@ -8933,15 +8934,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:8937: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:8938: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8940 "configure"
+#line 8941 "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:8945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8946: \"$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*
@@ -8961,15 +8962,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:8965: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:8966: checking for X11/Xaw/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8968 "configure"
+#line 8969 "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:8973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8974: \"$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*
@@ -8995,15 +8996,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:8999: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:9000: checking for X11/$athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9002 "configure"
+#line 9003 "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:9007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9008: \"$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*
@@ -9020,15 +9021,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:9024: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:9025: checking for X11/$athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9027 "configure"
+#line 9028 "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:9032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9033: \"$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*
@@ -9056,15 +9057,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:9060: checking for $athena_variant/XawInit.h" >&5
+echo "configure:9061: checking for $athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9063 "configure"
+#line 9064 "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:9068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9069: \"$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*
@@ -9081,15 +9082,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:9085: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:9086: checking for $athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9088 "configure"
+#line 9089 "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:9093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9094: \"$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*
@@ -9118,15 +9119,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:9122: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:9123: checking for X11/Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9125 "configure"
+#line 9126 "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:9130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9131: \"$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*
@@ -9143,15 +9144,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:9147: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:9148: checking for X11/Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9150 "configure"
+#line 9151 "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:9155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9156: \"$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*
@@ -9183,15 +9184,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:9187: checking for Xaw3d/XawInit.h" >&5
+echo "configure:9188: checking for Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9190 "configure"
+#line 9191 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9196: \"$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*
@@ -9208,15 +9209,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:9212: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:9213: checking for Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9215 "configure"
+#line 9216 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9221: \"$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*
@@ -9248,15 +9249,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:9252: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9253: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9255 "configure"
+#line 9256 "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:9260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9261: \"$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*
@@ -9291,15 +9292,15 @@ fi
 
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:9295: checking for Xm/Xm.h" >&5
+echo "configure:9296: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9298 "configure"
+#line 9299 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9304: \"$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*
@@ -9316,12 +9317,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:9320: checking for XmStringFree in -lXm" >&5
+echo "configure:9321: 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 9325 "configure"
+#line 9326 "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
@@ -9332,7 +9333,7 @@ int main() {
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:9336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9337: \"$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
@@ -9361,9 +9362,9 @@ fi
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:9365: checking for Lesstif" >&5
+echo "configure:9366: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 9367 "configure"
+#line 9368 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -9787,7 +9788,7 @@ fi
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:9791: checking for Mule-related features" >&5
+echo "configure:9792: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -9828,15 +9829,15 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9832: checking for $ac_hdr" >&5
+echo "configure:9833: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9835 "configure"
+#line 9836 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9841: \"$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*
@@ -9867,12 +9868,12 @@ done
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:9871: checking for strerror in -lintl" >&5
+echo "configure:9872: 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 9876 "configure"
+#line 9877 "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
@@ -9883,7 +9884,7 @@ int main() {
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:9887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9888: \"$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
@@ -9935,18 +9936,18 @@ EOF
   fi
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:9939: checking for Mule input methods" >&5
+echo "configure:9940: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:9942: checking for XIM" >&5
+echo "configure:9943: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:9945: checking for XOpenIM in -lX11" >&5
+echo "configure:9946: 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 9950 "configure"
+#line 9951 "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
@@ -9957,7 +9958,7 @@ int main() {
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:9961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9962: \"$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
@@ -9981,12 +9982,12 @@ fi
         if test "$have_motif $have_lesstif" = "yes no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:9985: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:9986: 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 9990 "configure"
+#line 9991 "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
@@ -9997,7 +9998,7 @@ int main() {
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10002: \"$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
@@ -10062,15 +10063,15 @@ EOF
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:10066: checking for XFontSet" >&5
+echo "configure:10067: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:10069: checking for XmbDrawString in -lX11" >&5
+echo "configure:10070: 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 10074 "configure"
+#line 10075 "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
@@ -10081,7 +10082,7 @@ int main() {
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:10085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10086: \"$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
@@ -10121,15 +10122,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:10125: checking for wnn/jllib.h" >&5
+echo "configure:10126: checking for wnn/jllib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10128 "configure"
+#line 10129 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (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*
@@ -10152,15 +10153,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:10156: checking for wnn/commonhd.h" >&5
+echo "configure:10157: checking for wnn/commonhd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10159 "configure"
+#line 10160 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10165: \"$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*
@@ -10185,10 +10186,10 @@ fi
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10189: checking for $ac_func" >&5
+echo "configure:10190: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10192 "configure"
+#line 10193 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10211,7 +10212,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10216: \"$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
@@ -10240,12 +10241,12 @@ done
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:10244: checking for crypt in -lcrypt" >&5
+echo "configure:10245: 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 10249 "configure"
+#line 10250 "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
@@ -10256,7 +10257,7 @@ int main() {
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:10260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10261: \"$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
@@ -10291,12 +10292,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:10295: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:10296: 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 10300 "configure"
+#line 10301 "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
@@ -10307,7 +10308,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10312: \"$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
@@ -10325,12 +10326,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:10329: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:10330: 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 10334 "configure"
+#line 10335 "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
@@ -10341,7 +10342,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10346: \"$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
@@ -10359,12 +10360,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:10363: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:10364: 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 10368 "configure"
+#line 10369 "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
@@ -10375,7 +10376,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10380: \"$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
@@ -10393,12 +10394,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:10397: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:10398: 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 10402 "configure"
+#line 10403 "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
@@ -10409,7 +10410,7 @@ int main() {
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10414: \"$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
@@ -10457,12 +10458,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:10461: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:10462: 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 10466 "configure"
+#line 10467 "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
@@ -10473,7 +10474,7 @@ int main() {
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:10477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10478: \"$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
@@ -10508,15 +10509,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:10512: checking for canna/jrkanji.h" >&5
+echo "configure:10513: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10515 "configure"
+#line 10516 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10521: \"$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*
@@ -10543,15 +10544,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:10547: checking for canna/jrkanji.h" >&5
+echo "configure:10548: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10550 "configure"
+#line 10551 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10556: \"$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*
@@ -10579,15 +10580,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:10583: checking for canna/RK.h" >&5
+echo "configure:10584: checking for canna/RK.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10586 "configure"
+#line 10587 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10592: \"$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*
@@ -10610,12 +10611,12 @@ fi
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:10614: checking for RkBgnBun in -lRKC" >&5
+echo "configure:10615: 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 10619 "configure"
+#line 10620 "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
@@ -10626,7 +10627,7 @@ int main() {
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:10630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10631: \"$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
@@ -10649,12 +10650,12 @@ fi
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:10653: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:10654: 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 10658 "configure"
+#line 10659 "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
@@ -10665,7 +10666,7 @@ int main() {
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:10669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10670: \"$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
@@ -10714,12 +10715,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:10718: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:10719: 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 10723 "configure"
+#line 10724 "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
@@ -10730,7 +10731,7 @@ int main() {
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:10734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10735: \"$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
@@ -10816,10 +10817,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:10820: checking for $ac_func" >&5
+echo "configure:10821: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10823 "configure"
+#line 10824 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10842,7 +10843,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10847: \"$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
@@ -10874,10 +10875,10 @@ done
 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:10878: checking for $ac_func" >&5
+echo "configure:10879: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10881 "configure"
+#line 10882 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10900,7 +10901,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10905: \"$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
@@ -10929,10 +10930,10 @@ done
 
 
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:10933: checking for openpty" >&5
+echo "configure:10934: checking for openpty" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10936 "configure"
+#line 10937 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -10955,7 +10956,7 @@ openpty();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10960: \"$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
@@ -10974,12 +10975,12 @@ else
 
   
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:10978: checking for openpty in -lutil" >&5
+echo "configure:10979: 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 10983 "configure"
+#line 10984 "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
@@ -10990,7 +10991,7 @@ int main() {
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:10994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10995: \"$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
@@ -11025,15 +11026,15 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11029: checking for $ac_hdr" >&5
+echo "configure:11030: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11032 "configure"
+#line 11033 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11038: \"$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*
@@ -11069,15 +11070,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:11073: checking for $ac_hdr" >&5
+echo "configure:11074: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11076 "configure"
+#line 11077 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11082: \"$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*
@@ -11110,10 +11111,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:11114: checking for $ac_func" >&5
+echo "configure:11115: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11117 "configure"
+#line 11118 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11136,7 +11137,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11141: \"$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
@@ -11167,15 +11168,15 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11171: checking for $ac_hdr" >&5
+echo "configure:11172: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11174 "configure"
+#line 11175 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11180: \"$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*
@@ -11212,10 +11213,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:11216: checking for $ac_func" >&5
+echo "configure:11217: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11219 "configure"
+#line 11220 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11238,7 +11239,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11243: \"$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
@@ -11271,15 +11272,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:11275: checking for $ac_hdr" >&5
+echo "configure:11276: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11278 "configure"
+#line 11279 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11284: \"$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*
@@ -11315,12 +11316,12 @@ else
 
     
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:11319: checking for kstat_open in -lkstat" >&5
+echo "configure:11320: 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 11324 "configure"
+#line 11325 "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
@@ -11331,7 +11332,7 @@ int main() {
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:11335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11336: \"$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
@@ -11366,15 +11367,15 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11370: checking for $ac_hdr" >&5
+echo "configure:11371: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11373 "configure"
+#line 11374 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11379: \"$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*
@@ -11406,12 +11407,12 @@ done
 
     
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:11410: checking for kvm_read in -lkvm" >&5
+echo "configure:11411: 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 11415 "configure"
+#line 11416 "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
@@ -11422,7 +11423,7 @@ int main() {
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:11426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11427: \"$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
@@ -11456,16 +11457,16 @@ fi
 fi
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:11460: checking whether netdb declares h_errno" >&5
+echo "configure:11461: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11462 "configure"
+#line 11463 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:11469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11470: \"$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
@@ -11485,16 +11486,16 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:11489: checking for sigsetjmp" >&5
+echo "configure:11490: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11491 "configure"
+#line 11492 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:11498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11499: \"$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
@@ -11514,11 +11515,11 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:11518: checking whether localtime caches TZ" >&5
+echo "configure:11519: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 11522 "configure"
+#line 11523 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -11553,7 +11554,7 @@ main()
   exit (0);
 }
 EOF
-if { (eval echo configure:11557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -11583,9 +11584,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:11587: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:11588: checking whether gettimeofday accepts one or two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11589 "configure"
+#line 11590 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -11606,7 +11607,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:11610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""two" 1>&6
 else
@@ -11628,19 +11629,19 @@ fi
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:11632: checking for inline" >&5
+echo "configure:11633: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 11637 "configure"
+#line 11638 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:11644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -11681,17 +11682,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:11685: checking for working alloca.h" >&5
+echo "configure:11686: checking for working alloca.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11688 "configure"
+#line 11689 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:11695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11696: \"$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
@@ -11715,10 +11716,10 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:11719: checking for alloca" >&5
+echo "configure:11720: checking for alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11722 "configure"
+#line 11723 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -11746,7 +11747,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:11750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11751: \"$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
@@ -11785,10 +11786,10 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:11789: checking whether alloca needs Cray hooks" >&5
+echo "configure:11790: checking whether alloca needs Cray hooks" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11792 "configure"
+#line 11793 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -11812,10 +11813,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:11816: checking for $ac_func" >&5
+echo "configure:11817: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11819 "configure"
+#line 11820 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11838,7 +11839,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11843: \"$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
@@ -11868,10 +11869,10 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:11872: checking stack direction for C alloca" >&5
+echo "configure:11873: checking stack direction for C alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11875 "configure"
+#line 11876 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -11890,7 +11891,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:11894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -11920,15 +11921,15 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:11924: checking for vfork.h" >&5
+echo "configure:11925: checking for vfork.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11927 "configure"
+#line 11928 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11933: \"$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*
@@ -11956,10 +11957,10 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:11960: checking for working vfork" >&5
+echo "configure:11961: checking for working vfork" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11963 "configure"
+#line 11964 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -12054,7 +12055,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:12058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -12080,10 +12081,10 @@ fi
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:12084: checking for working strcoll" >&5
+echo "configure:12085: checking for working strcoll" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12087 "configure"
+#line 12088 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -12093,7 +12094,7 @@ main ()
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:12097: \"$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
   ac_cv_func_strcoll_works=yes
 else
@@ -12121,10 +12122,10 @@ fi
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12125: checking for $ac_func" >&5
+echo "configure:12126: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12128 "configure"
+#line 12129 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12147,7 +12148,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12152: \"$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
@@ -12175,10 +12176,10 @@ fi
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:12179: checking whether getpgrp takes no argument" >&5
+echo "configure:12180: checking whether getpgrp takes no argument" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12182 "configure"
+#line 12183 "configure"
 #include "confdefs.h"
 
 /*
@@ -12233,7 +12234,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:12237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -12260,10 +12261,10 @@ fi
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:12264: checking for working mmap" >&5
+echo "configure:12265: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 12267 "configure"
+#line 12268 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -12296,7 +12297,7 @@ int main (int argc, char *argv[])
   return 1;
 }
 EOF
-if { (eval echo configure:12300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -12325,9 +12326,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:12329: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:12330: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 12331 "configure"
+#line 12332 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -12339,7 +12340,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:12343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -12364,15 +12365,15 @@ EOF
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:12368: checking for termios.h" >&5
+echo "configure:12369: checking for termios.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12371 "configure"
+#line 12372 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12377: \"$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*
@@ -12415,15 +12416,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:12419: checking for termio.h" >&5
+echo "configure:12420: checking for termio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12422 "configure"
+#line 12423 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12428: \"$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*
@@ -12455,10 +12456,10 @@ fi
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:12459: checking for socket" >&5
+echo "configure:12460: checking for socket" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12462 "configure"
+#line 12463 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -12481,7 +12482,7 @@ socket();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12486: \"$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
@@ -12496,15 +12497,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:12500: checking for netinet/in.h" >&5
+echo "configure:12501: checking for netinet/in.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12503 "configure"
+#line 12504 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12509: \"$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*
@@ -12521,15 +12522,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:12525: checking for arpa/inet.h" >&5
+echo "configure:12526: checking for arpa/inet.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12528 "configure"
+#line 12529 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12534: \"$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*
@@ -12554,9 +12555,9 @@ EOF
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:12558: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:12559: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12560 "configure"
+#line 12561 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12567,7 +12568,7 @@ int main() {
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:12571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12572: \"$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
@@ -12585,9 +12586,9 @@ else
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:12589: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:12590: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12591 "configure"
+#line 12592 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12597,7 +12598,7 @@ int main() {
 static struct ip_mreq x;
 ; 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:12602: \"$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
@@ -12628,10 +12629,10 @@ fi
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:12632: checking for msgget" >&5
+echo "configure:12633: checking for msgget" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12635 "configure"
+#line 12636 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -12654,7 +12655,7 @@ msgget();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12659: \"$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
@@ -12669,15 +12670,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:12673: checking for sys/ipc.h" >&5
+echo "configure:12674: checking for sys/ipc.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12676 "configure"
+#line 12677 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12682: \"$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*
@@ -12694,15 +12695,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:12698: checking for sys/msg.h" >&5
+echo "configure:12699: checking for sys/msg.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12701 "configure"
+#line 12702 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12707: \"$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*
@@ -12740,15 +12741,15 @@ fi
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:12744: checking for dirent.h" >&5
+echo "configure:12745: checking for dirent.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12747 "configure"
+#line 12748 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12753: \"$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*
@@ -12775,15 +12776,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:12779: checking for sys/dir.h" >&5
+echo "configure:12780: checking for sys/dir.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12782 "configure"
+#line 12783 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12788: \"$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*
@@ -12816,15 +12817,15 @@ fi
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:12820: checking for nlist.h" >&5
+echo "configure:12821: checking for nlist.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12823 "configure"
+#line 12824 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12829: \"$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*
@@ -12854,22 +12855,22 @@ fi
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:12858: checking "for sound support"" >&5
+echo "configure:12859: 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:12865: checking for multimedia/audio_device.h" >&5
+echo "configure:12866: checking for multimedia/audio_device.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12868 "configure"
+#line 12869 "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:12873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12874: \"$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*
@@ -12917,12 +12918,12 @@ fi
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:12921: checking for ALopenport in -laudio" >&5
+echo "configure:12922: 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 12926 "configure"
+#line 12927 "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
@@ -12933,7 +12934,7 @@ int main() {
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:12937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12938: \"$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
@@ -12964,12 +12965,12 @@ fi
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:12968: checking for AOpenAudio in -lAlib" >&5
+echo "configure:12969: 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 12973 "configure"
+#line 12974 "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
@@ -12980,7 +12981,7 @@ int main() {
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:12984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12985: \"$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
@@ -13015,18 +13016,25 @@ fi
   fi
 
     if test -z "$sound_found"; then
+    if test "$with_msw" = "yes"; then
+    sound_found=yes
+    native_sound_lib=
+    fi
+  fi
+
+    if test -z "$sound_found"; then
     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:13022: checking for ${dir}/soundcard.h" >&5
+echo "configure:13030: checking for ${dir}/soundcard.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13025 "configure"
+#line 13033 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13038: \"$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*
@@ -13062,13 +13070,6 @@ fi
     done
   fi
 
-    if test -z "$sound_found"; then
-    if test "$with_msw" = "yes"; then
-    sound_found=yes
-    native_sound_lib=
-    fi
-  fi
-
   test "$sound_found" = "yes" && with_native_sound=yes
 fi
 
@@ -13087,15 +13088,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:13091: checking for audio/audiolib.h" >&5
+echo "configure:13092: checking for audio/audiolib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13094 "configure"
+#line 13095 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13100: \"$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*
@@ -13113,12 +13114,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:13117: checking for AuOpenServer in -laudio" >&5
+echo "configure:13118: 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 13122 "configure"
+#line 13123 "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
@@ -13129,7 +13130,7 @@ int main() {
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:13133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13134: \"$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
@@ -13168,7 +13169,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 13172 "configure"
+#line 13173 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -13199,7 +13200,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:13203: checking for $ac_word" >&5
+echo "configure:13204: 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.
@@ -13228,10 +13229,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:13232: checking for esd_play_stream" >&5
+echo "configure:13233: checking for esd_play_stream" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13235 "configure"
+#line 13236 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -13254,7 +13255,7 @@ esd_play_stream();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13259: \"$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
@@ -13305,7 +13306,7 @@ test -z "$with_tty" && with_tty=yes
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:13309: checking for TTY-related features" >&5
+echo "configure:13310: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -13321,12 +13322,12 @@ EOF
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:13325: checking for tgetent in -lncurses" >&5
+echo "configure:13326: 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 13330 "configure"
+#line 13331 "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
@@ -13337,7 +13338,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13342: \"$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
@@ -13370,15 +13371,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:13374: checking for ncurses/curses.h" >&5
+echo "configure:13375: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13377 "configure"
+#line 13378 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13383: \"$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*
@@ -13400,15 +13401,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:13404: checking for ncurses/term.h" >&5
+echo "configure:13405: checking for ncurses/term.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13407 "configure"
+#line 13408 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13438,15 +13439,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:13442: checking for ncurses/curses.h" >&5
+echo "configure:13443: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13445 "configure"
+#line 13446 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13451: \"$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*
@@ -13481,12 +13482,12 @@ fi
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:13485: checking for tgetent in -l$lib" >&5
+echo "configure:13486: 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 13490 "configure"
+#line 13491 "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
@@ -13497,7 +13498,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13502: \"$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
@@ -13528,12 +13529,12 @@ fi
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:13532: checking for tgetent in -lcurses" >&5
+echo "configure:13533: 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 13537 "configure"
+#line 13538 "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
@@ -13544,7 +13545,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13549: \"$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
@@ -13562,12 +13563,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:13566: checking for tgetent in -ltermcap" >&5
+echo "configure:13567: 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 13571 "configure"
+#line 13572 "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
@@ -13578,7 +13579,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13583: \"$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,15 +13627,15 @@ EOF
 
     test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:13630: checking for gpm.h" >&5
+echo "configure:13631: checking for gpm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13633 "configure"
+#line 13634 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13639: \"$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*
@@ -13657,12 +13658,12 @@ fi
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:13661: checking for Gpm_Open in -lgpm" >&5
+echo "configure:13662: 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 13666 "configure"
+#line 13667 "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
@@ -13673,7 +13674,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:13677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13678: \"$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
@@ -13723,20 +13724,20 @@ test "$with_x11" = "yes" -o "$with_tty" = "yes" && extra_objs="$extra_objs event
 
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
   != "no no no" && echo "checking for database support" 1>&6
-echo "configure:13727: checking for database support" >&5
+echo "configure:13728: 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:13732: checking for ndbm.h" >&5
+echo "configure:13733: checking for ndbm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13735 "configure"
+#line 13736 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13741: \"$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*
@@ -13766,12 +13767,12 @@ fi
 if test "$with_database_gdbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:13770: checking for dbm_open in -lgdbm" >&5
+echo "configure:13771: 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 13775 "configure"
+#line 13776 "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
@@ -13782,7 +13783,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13787: \"$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
@@ -13810,10 +13811,10 @@ fi
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:13814: checking for dbm_open" >&5
+echo "configure:13815: checking for dbm_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13817 "configure"
+#line 13818 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -13836,7 +13837,7 @@ dbm_open();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13841: \"$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
@@ -13855,12 +13856,12 @@ else
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:13859: checking for dbm_open in -ldbm" >&5
+echo "configure:13860: 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 13864 "configure"
+#line 13865 "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
@@ -13871,7 +13872,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13876: \"$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
@@ -13912,10 +13913,10 @@ EOF
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:13916: checking for Berkeley db.h" >&5
+echo "configure:13917: checking for Berkeley db.h" >&5
   for header in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF
-#line 13919 "configure"
+#line 13920 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13937,7 +13938,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:13941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -13953,9 +13954,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:13957: checking for Berkeley DB version" >&5
+echo "configure:13958: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 13959 "configure"
+#line 13960 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -13967,7 +13968,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 13971 "configure"
+#line 13972 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -13994,10 +13995,10 @@ fi
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:13998: checking for $dbfunc" >&5
+echo "configure:13999: checking for $dbfunc" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14001 "configure"
+#line 14002 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -14020,7 +14021,7 @@ $dbfunc();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14025: \"$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
@@ -14039,12 +14040,12 @@ else
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:14043: checking for $dbfunc in -ldb" >&5
+echo "configure:14044: 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 14048 "configure"
+#line 14049 "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
@@ -14055,7 +14056,7 @@ int main() {
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:14059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14060: \"$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
@@ -14129,12 +14130,12 @@ fi
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:14133: checking for SOCKSinit in -lsocks" >&5
+echo "configure:14134: 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 14138 "configure"
+#line 14139 "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
@@ -14145,7 +14146,7 @@ int main() {
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:14149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14150: \"$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
@@ -14200,22 +14201,22 @@ fi
 
 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:14204: checking for module support" >&5
+echo "configure:14205: checking for module support" >&5
 
     if test "$with_msw" = "yes"; then
     have_dl=yes;
   else
         ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:14211: checking for dlfcn.h" >&5
+echo "configure:14212: checking for dlfcn.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14214 "configure"
+#line 14215 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14220: \"$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*
@@ -14232,16 +14233,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:14236: checking for dlopen in -lc" >&5
+echo "configure:14237: checking for dlopen in -lc" >&5
       cat > conftest.$ac_ext <<EOF
-#line 14238 "configure"
+#line 14239 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14250,18 +14251,18 @@ else
   rm -rf conftest*
   
       echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:14254: checking for dlopen in -ldl" >&5
+echo "configure:14255: checking for dlopen in -ldl" >&5
       ac_save_LIBS="$LIBS"
       LIBS="-ldl $LIBS"
       cat > conftest.$ac_ext <<EOF
-#line 14258 "configure"
+#line 14259 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14290,12 +14291,12 @@ EOF
     else
       
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:14294: checking for shl_load in -ldld" >&5
+echo "configure:14295: 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 14299 "configure"
+#line 14300 "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
@@ -14306,7 +14307,7 @@ int main() {
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:14310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14311: \"$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
@@ -14333,12 +14334,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:14337: checking for dld_init in -ldld" >&5
+echo "configure:14338: 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 14342 "configure"
+#line 14343 "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
@@ -14349,7 +14350,7 @@ int main() {
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:14353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14354: \"$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
@@ -14394,7 +14395,7 @@ xehost=$canonical
 xealias=$internal_configuration
 
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:14398: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:14399: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -14422,9 +14423,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:14426: checking checking whether we are using GNU C" >&5
+echo "configure:14427: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 14428 "configure"
+#line 14429 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -14446,7 +14447,7 @@ rm -f conftest*
 fi
 
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:14450: checking how to produce PIC code" >&5
+echo "configure:14451: checking how to produce PIC code" >&5
 wl=
 
 can_build_shared=yes
@@ -14547,18 +14548,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:14551: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:14552: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 14555 "configure"
+#line 14556 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14563: \"$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
@@ -14589,7 +14590,7 @@ cc_produces_so=no
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:14593: checking if C compiler can produce shared libraries" >&5
+echo "configure:14594: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes; then
   xcldf="-shared"
   xldf="-shared"
@@ -14640,14 +14641,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 14644 "configure"
+#line 14645 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -14672,7 +14673,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:14676: checking for ld used by GCC" >&5
+echo "configure:14677: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
@@ -14697,7 +14698,7 @@ echo "configure:14676: checking for ld used by GCC" >&5
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:14701: checking for GNU ld" >&5
+echo "configure:14702: checking for GNU ld" >&5
   fi
 
   if test -z "$LTLD"; then
@@ -14735,7 +14736,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:14739: checking if the linker is GNU ld" >&5
+echo "configure:14740: 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
@@ -14763,7 +14764,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:14767: checking whether the linker supports shared libraries" >&5
+echo "configure:14768: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -14974,10 +14975,10 @@ EOF
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14978: checking for $ac_func" >&5
+echo "configure:14979: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14981 "configure"
+#line 14982 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -15000,7 +15001,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15005: \"$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
@@ -15039,11 +15040,11 @@ done
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 15043 "configure"
+#line 15044 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:15047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:15048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
diff --git a/configure.in b/configure.in
index 60c8a71..fc5e3c6 100644
--- a/configure.in
+++ b/configure.in
@@ -4052,6 +4052,14 @@ if test "$with_native_sound" != "no"; then
     esac
   fi
 
+  dnl Win32 Native uses native sound
+  if test -z "$sound_found"; then
+    if test "$with_msw" = "yes"; then
+    sound_found=yes
+    native_sound_lib=
+    fi
+  fi
+
   dnl Check for Linux/BSD native sound
   if test -z "$sound_found"; then
     for dir in "machine" "sys" "linux"; do
@@ -4064,14 +4072,6 @@ if test "$with_native_sound" != "no"; then
     done
   fi
 
-  dnl Win32 Native uses native sound
-  if test -z "$sound_found"; then
-    if test "$with_msw" = "yes"; then
-    sound_found=yes
-    native_sound_lib=
-    fi
-  fi
-
   test "$sound_found" = "yes" && with_native_sound=yes
 fi
 
diff --git a/etc/PACKAGES b/etc/PACKAGES
index f958692..cb6a7ae 100644
--- a/etc/PACKAGES
+++ b/etc/PACKAGES
@@ -7,123 +7,145 @@ To collapse a heading:  Press C-c C-d
 
 For general XEmacs navigation tips: Press C-h t
 
-Description of available packages by category
-=============================================
-This data is up-to-date as of January 17, 2001.
+Description of available packages
+=================================
+Up-to-date as of May 15, 2001.
 
-** Library Packages (libs)
-==========================
-These packages are required to build and support most of the rest of
-XEmacs.  By design, xemacs-base is a `regular' package.  Use restraint 
-when adding new files there as it is required by almost everything.
+** Normal Packages
+==================
+A very broad collection of elisp packages.
 
 *** Sun
 Support for Sparcworks.
 
+*** ada
+Ada language support.
+
 *** apel
 A Portable Emacs Library.  Used by XEmacs MIME support.
 
-*** dired
-The DIRectory EDitor is for manipulating, and running commands on
-files in a directory.
+*** auctex
+Basic TeX/LaTeX support.
 
-*** edebug
-A Lisp debugger.
+*** bbdb
+The Big Brother Data Base
 
-*** efs
-Treat files on remote systems the same as local files.
+*** build
+Build XEmacs using custom widgets.
 
-*** elib
-Portable Emacs Lisp utilities library.
+*** c-support
+Basic single-file add-ons for editing C code.
 
-*** fsf-compat
-FSF Emacs compatibility files.
+*** calc
+Emacs calculator.
 
-*** mail-lib
-Fundamental lisp files for providing email support.
+*** calendar
+Calendar and diary support.
 
-*** sounds-au
-XEmacs Sun sound files.
+*** cc-mode
+C, C++ and Java language support.
 
-*** sounds-wav
-XEmacs Microsoft sound files.
+*** cookie
+Spook and Yow (Zippy quotes).
 
-*** tooltalk
-Support for building with Tooltalk.
+*** crisp
+Crisp/Brief emulation.
 
-*** xemacs-base
-Fundamental XEmacs support.  Install this unless you wish a totally
-naked XEmacs.
+*** debug
+GUD, gdb, dbx debugging support.
 
-*** xemacs-devel
-XEmacs Lisp developer support.  This package contains utilities for
-supporting Lisp development.  It is a single-file package so it may be 
-tailored.
+*** dired
+The DIRectory EDitor is for manipulating, and running commands on
+files in a directory.
 
-** Communications Packages (comm)
-=================================
-These packages provide support for various communications, primarily
-email and usenet.
+*** edebug
+A Lisp debugger.
 
-*** bbdb
-The Big Brother Data Base
+*** ediff
+Interface over patch.
+
+*** edit-utils
+Single file lisp packages for various XEmacs goodies.  Load this and
+weed out the junk you don't want.
+
+*** edt
+DEC EDIT/EDT emulation.
+
+*** efs
+Treat files on remote systems the same as local files.
 
 *** eicq
 ICQ Client developed and tested on Linux x86; 
 only supported on that platform
 
+*** eieio
+Enhanced Implementation of Emacs Interpreted Objects
+
+*** elib
+Portable Emacs Lisp utilities library.
+
+*** emerge
+Another interface over patch.
+
+*** eshell
+Command shell implemented entirely in Emacs Lisp.
+
+*** eterm
+Terminal emulator.
+
 *** eudc
 Emacs Unified Directory Client (LDAP, PH).
 
 *** footnote
 Footnoting in mail message editing modes.
 
+*** forms
+Forms editing support (obsolete, use the built-in Widget instead).
+
+*** frame-icon
+Provide a WM icon based on major mode.
+
+*** fsf-compat
+FSF Emacs compatibility files.
+
+*** games
+Tetris, Sokoban, and Snake.
+
 *** gnats
 XEmacs bug reports.
 
 *** gnus
 The Gnus Newsreader and Mailreader.
 
-*** mailcrypt
-Support for messaging encryption with PGP.
-
-*** mew
-Messaging in an Emacs World.
-
-*** mh-e
-Front end support for MH.
-
-*** net-utils
-Miscellaneous Networking Utilities.  This is a single-file package and 
-files may be deleted at will.
+*** hm--html-menus
+HTML editing.
 
-*** rmail
-An obsolete Emacs mailer.  If you do not already use it don't start.
+*** idlwave
+Editing and Shell mode for the Interactive Data Language.
 
-*** supercite
-An Emacs citation tool.  Useful with all Emacs Mailers and Newsreaders.
+*** igrep
+Enhanced front-end for Grep.
 
-*** tm
-Emacs MIME support. Not needed for Gnus >= 5.8.0
+*** ilisp
+Front-end for Inferior Lisp.
 
-*** vm
-An Emacs mailer.
+*** ispell
+Spell-checking with ispell.
 
-*** w3
-A Web browser.
+*** jde
+Java language and development support.
 
-*** zenirc
-ZENIRC IRC Client.
+*** mail-lib
+Fundamental lisp files for providing email support.
 
-** Games and Amusements (games)
-===============================
-All work and no play...
+*** mailcrypt
+Support for messaging encryption with PGP.
 
-*** cookie
-Spook and Yow (Zippy quotes).
+*** mew
+Messaging in an Emacs World.
 
-*** games
-Tetris, Sokoban, and Snake.
+*** mh-e
+Front end support for MH.
 
 *** mine
 Minehunt.
@@ -131,194 +153,156 @@ Minehunt.
 *** misc-games
 Other amusements and diversions.
 
-** Mule Support (mule)
-======================
-MULti-lingual Enhancement.  Support for world scripts such as
-Latin, Arabic, Cyrillic, Chinese, Japanese, Greek, Hebrew etc.
-To use these packages your XEmacs must be compiled with Mule
-support.
-
-*** edict
-Lisp Interface to EDICT, Kanji Dictionary.
-
-*** egg-its
-Wnn (4.2 and 6) support.  SJ3 support.  Must be installed prior to
-XEmacs build.
-
-*** leim
-Quail.  Used for everything other than English and Japanese.
-
-*** locale
-Used for localized menubars (French and Japanese) and localized splash
-screens (Japanese).
-
-*** lookup
-Dictionary support
-
-*** mule-base
-Basic Mule support.  Must be installed prior to building with Mule.
+*** net-utils
+Miscellaneous Networking Utilities.  This is a single-file package and 
+files may be deleted at will.
 
-*** skk
-Another Japanese Language Input Method.  Can be used without a
-separate process running as a dictionary server.
+*** os-utils
+Miscellaneous single-file O/S utilities, for printing, archiving,
+compression, remote shells, etc.
 
-** Productivity Packages (oa)
-=============================
-Things to make life a little easier.
+*** pc
+PC style interface emulation.
 
-*** calc
-Emacs calculator.
+*** pcl-cvs
+CVS frontend.
 
-*** calendar
-Calendar and diary support.
+*** pcomplete
+Provides programmatic completion.
 
-*** edit-utils
-Single file lisp packages for various XEmacs goodies.  Load this and
-weed out the junk you don't want.
+*** prog-modes
+Miscellaneous single-file lisp files for various programming languages.
 
-*** forms
-Forms editing support (obsolete, use the built-in Widget instead).
+*** ps-print-nomule
+Old, but no-Mule safe ps-print.
 
-*** frame-icon
-Provide a WM icon based on major mode.
+*** psgml
+Validated HTML/SGML editing.
 
-*** hm--html-menus
-HTML editing.
+*** reftex
+Emacs support for LaTeX cross-references, citations.
 
-*** ispell
-Spell-checking with ispell.
+*** rmail
+An obsolete Emacs mailer.  If you do not already use it don't start.
 
-*** pc
-PC style interface emulation.
+*** scheme
+Front-end support for Inferior Scheme.
 
-*** psgml
-Validated HTML/SGML editing.
+*** semantic
+Semantic bovinator.
 
 *** sgml
 SGML/Linuxdoc-SGML editing.
 
+*** sh-script
+Support for editing shell scripts.
+
 *** slider
 User interface tool.
 
+*** sounds-au
+XEmacs Sun sound files.
+
+*** sounds-wav
+XEmacs Microsoft sound files.
+
 *** speedbar
 Provides a separate frame with convenient references.
 
 *** strokes
 Mouse enhancement utility.
 
+*** supercite
+An Emacs citation tool.  Useful with all Emacs Mailers and Newsreaders.
+
+*** texinfo
+XEmacs TeXinfo support.
+
 *** text-modes
 Various single file lisp packages for editing text files.
 
+*** textools
+Single-file TeX support.
+
 *** time
 Display time & date on the modeline.
 
-** Operating System Utilities (os)
-==================================
-Tools for working with the operating system.
-
-*** eshell
-Command shell implemented entirely in Emacs Lisp.
-
-*** eterm
-Terminal emulator.
+*** tm
+Emacs MIME support. Not needed for Gnus >= 5.8.0
 
-*** igrep
-Enhanced front-end for Grep.
+*** tooltalk
+Support for building with Tooltalk.
 
-*** ilisp
-Front-end for Inferior Lisp.
+*** tpu
+DEC EDIT/TPU support.
 
-*** os-utils
-Miscellaneous single-file O/S utilities, for printing, archiving,
-compression, remote shells, etc.
+*** vc
+Version Control for Free systems.
 
-*** pcomplete
-Provides programmatic completion.
+*** vc-cc
+Version Control for ClearCase.  This package will shortly be
+replaced with clearcase.el
 
-*** ps-print-nomule
-Old, but no-Mule safe ps-print.
+*** vhdl
+Support for VHDL.
 
 *** view-process
 A Unix process browsing tool.
 
-** Program Editing Support (prog)
-=================================
-XEmacs supports a multitude of programming languages.  These
-packages will help your coding.
-
-*** ada
-Ada language support.
-
-*** c-support
-Basic single-file add-ons for editing C code.
-
-*** cc-mode
-C, C++ and Java language support.
-
-*** debug
-GUD, gdb, dbx debugging support.
-
-*** ediff
-Interface over patch.
-
-*** emerge
-Another interface over patch.
-
-*** idlwave
-Editing and Shell mode for the Interactive Data Language.
-
-*** jde
-Java language and development support.
+*** viper
+VI emulation support.
 
-*** pcl-cvs
-CVS frontend.
 
-*** prog-modes
-Miscellaneous single-file lisp files for various programming languages.
-
-*** scheme
-Front-end support for Inferior Scheme.
+*** vm
+An Emacs mailer.
 
-*** semantic
-Semantic bovinator.
+*** w3
+A Web browser.
 
-*** sh-script
-Support for editing shell scripts.
+*** xemacs-base
+Fundamental XEmacs support.  Install this unless you wish a totally
+naked XEmacs.
 
-*** vc
-Version Control for Free systems.
+*** xemacs-devel
+XEmacs Lisp developer support.  This package contains utilities for
+supporting Lisp development.  It is a single-file package so it may be 
+tailored.
 
-*** vc-cc
-Version Control for ClearCase.  This package will shortly be
-replaced with clearcase.el
+*** xslt-process
+A minor mode for (X)Emacs which allows running an XSLT processor on a
+buffer.
 
-*** vhdl
-Support for VHDL.
+*** zenirc
+ZENIRC IRC Client.
 
-** Word Processing (wp)
-=======================
-Working with text.
+** Mule Support (mule)
+======================
+MULti-lingual Enhancement.  Support for world scripts such as
+Latin, Arabic, Cyrillic, Chinese, Japanese, Greek, Hebrew etc.
+To use these packages your XEmacs must be compiled with Mule
+support.
 
-*** auctex
-Basic TeX/LaTeX support.
+*** edict
+Lisp Interface to EDICT, Kanji Dictionary.
 
-*** crisp
-Crisp/Brief emulation.
+*** egg-its
+Wnn (4.2 and 6) support.  SJ3 support.  Must be installed prior to
+XEmacs build.
 
-*** edt
-DEC EDIT/EDT emulation.
+*** leim
+Quail.  Used for everything other than English and Japanese.
 
-*** reftex
-Emacs support for LaTeX cross-references, citations.
+*** locale
+Used for localized menubars (French and Japanese) and localized splash
+screens (Japanese).
 
-*** texinfo
-XEmacs TeXinfo support.
+*** lookup
+Dictionary support
 
-*** textools
-Single-file TeX support.
+*** mule-base
+Basic Mule support.  Must be installed prior to building with Mule.
 
-*** tpu
-DEC EDIT/TPU support.
+*** skk
+Another Japanese Language Input Method.  Can be used without a
+separate process running as a dictionary server.
 
-*** viper
-VI emulation support.
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 5b6c1e0..6f18a15 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.3 "Academic Rigor" is released.
+
 2001-05-10  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.2 "Developer-Friendly Unix APIs" is released.
diff --git a/lib-src/config.values.sh b/lib-src/config.values.sh
index f723043..0282c52 100644
--- a/lib-src/config.values.sh
+++ b/lib-src/config.values.sh
@@ -31,7 +31,7 @@ eval 'exec perl -w -S $0 ${1+"$@"}' # Portability kludge
 ## to make them available to elisp later (see util/config.el)
 ## Primarily useful for creating ridiculously verbose bug reports.
 ##
-## See lisp/utils/config.el, ../configure.in,
+## See lisp/config.el, ../configure.in,
 ## and the Autoconf documentation on AC_OUTPUT, for more details.
 ##
 ## This script needs only to be run occasionally (before a Net release)
@@ -62,14 +62,14 @@ my $new_cvi_contents =
 ;;; This file was automatically generated, by the config.values.sh script,
 ;;; from configure, which was itself automatically generated from configure.in.
 ;;;
-;;; See lisp/util/config.el for details on how this file is used.
+;;; See lisp/config.el for details on how this file is used.
 ;;;
 ;;; You are trapped in a twisty maze of strange-looking files, all autogenerated...
 
 ;;; configure        is created, from configure.in,     by autoconf
 ;;; config.values.in is created, from configure,        by config.values.sh
 ;;; config.values    is created, from config.values.in, by configure
-;;; config.values    is read by lisp/utils/config.el,
+;;; config.values    is read by lisp/config.el,
 ;;;                  to create the (Lisp object) config-value-hash-table
 
 ;;; Variables defined in configure by AC_SUBST follow:
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 599f6ba..f648cd7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -707,6 +707,14 @@
 	* files.el (insert-file-contents-literally): Treat file as binary;
 	call file-name-handlers. [sync with Emacs 20.3.10]
 
+2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.3 "Academic Rigor" is released.
+
+2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* config.values.sh:  lisp/utils?/config.el -> lisp/config.el.
+
 2001-05-10  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.2 "Developer-Friendly Unix APIs" is released.
diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index cf6ad87..127b107 100644
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-30  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R083-Clan.el, Ideograph-R084-Steam.el,
+	Ideograph-R085-Water.el, Ideograph-R078-Death.el,
+	Ideograph-R079-Weapon.el, Ideograph-R080-Do-Not.el,
+	Ideograph-R081-Compare.el, Ideograph-R082-Fur.el,
+	Ideograph-R072-Sun.el: Add some missing mappings for Big5 code
+	points or fix some definitions.
+
 2002-08-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* Ideograph-R211-Tooth.el, Ideograph-R213-Turtle.el,
diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el
index 9b54057..3eb8e15 100644
--- a/lisp/utf-2000/Ideograph-R072-Sun.el
+++ b/lisp/utf-2000/Ideograph-R072-Sun.el
@@ -3174,6 +3174,7 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3C47)	; ø»“´°
+    (chinese-big5	. #xD9A4)	; ý¢€¦¤
     (ucs		. #x6680)	; 暀
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R078-Death.el b/lisp/utf-2000/Ideograph-R078-Death.el
index 7d8010b..751a69b 100644
--- a/lisp/utf-2000/Ideograph-R078-Death.el
+++ b/lisp/utf-2000/Ideograph-R078-Death.el
@@ -8,6 +8,7 @@
     (chinese-isoir165		. #x3475)	; ø»‹¢
     (chinese-cns11643-1		. #x4550)	; ø»‘¸ƒ
     (japanese-jisx0208-1990	. #x5D46)	; ø½‹Ž©
+    (chinese-big5		. #xA4EF)	; ý¢€Š“¯
     (ideograph-daikanwa		. 16359)	; ø¸ƒ¿§
     (ucs			. #x6B79)	; æ­¹
     ))
@@ -84,6 +85,7 @@
     (korean-ksc5601		. #x5E5D)	; ø»‰´®
     (chinese-isoir165		. #x4B40)	; ø»¬Ÿ
     (japanese-jisx0208-1990	. #x3B60)	; ø½Š‡
+    (chinese-big5		. #xA6BA)	; ý¢€Ššº
     (ideograph-daikanwa		. 16365)	; ø¸ƒ¿­
     (ucs			. #x6B7B)	; æ­»
     ))
@@ -323,6 +325,7 @@
     (total-strokes	 . 8)
     (japanese-jisx0212	. #x4621)	; ø»‹š¦
     (chinese-cns11643-2 . #x274C)	; ø»“•¿
+    (chinese-big5	. #xCCEB)	; ý¢€Œ³«
     (ideograph-daikanwa . 16384)	; ø¸„€€
     (ucs		. #x6B7E)	; æ­¾
     ))
@@ -336,6 +339,7 @@
     (korean-ksc5601		. #x5951)	; ø»‰­Œ
     (chinese-cns11643-1		. #x4E3F)	; ø»’…€
     (japanese-jisx0208-1990	. #x5D47)	; ø½‹Žª
+    (chinese-big5		. #xAA5C)	; ý¢€Š©œ
     (ideograph-daikanwa		. 16385)	; ø¸„€
     (ucs			. #x6B7F)	; æ­¿
     ))
@@ -396,6 +400,7 @@
     (japanese-jisx0208		. #x5D48)	; ø»‡¨·
     (chinese-cns11643-2		. #x274B)	; ø»“•¾
     (japanese-jisx0208-1990	. #x5D48)	; ø½‹Ž«
+    (chinese-big5		. #xCCEA)	; ý¢€Œ³ª
     (ideograph-daikanwa		. 16390)	; ø¸„€†
     (ucs			. #x6B80)	; 殀
     ))
@@ -581,6 +586,7 @@
     (chinese-isoir165		. #x6963)	; ø»Ž™†
     (chinese-cns11643-2		. #x2B47)	; ø»“›²
     (japanese-jisx0213-1	. #x7646)	; ø»¤—
+    (chinese-big5		. #xCF65)	; ý¢€Œ½¥
     (ideograph-daikanwa		. 16408)	; ø¸„€˜
     (china3-jef			. #x54E5)	; øº…“¥
     (ucs			. #x6B82)	; 殂
@@ -606,6 +612,7 @@
     (korean-ksc5601		. #x646A)	; ø»‰½¯
     (chinese-isoir165		. #x516A)	; ø»µ½
     (japanese-jisx0208-1990	. #x5D4A)	; ø½‹Ž­
+    (chinese-big5		. #xAC6F)	; ý¢€Š±¯
     (ideograph-daikanwa		. 16410)	; ø¸„€š
     (ucs			. #x6B83)	; 殃
     ))
@@ -649,6 +656,7 @@
     (chinese-isoir165		. #x6965)	; ø»Ž™ˆ
     (chinese-cns11643-2		. #x2B48)	; ø»“›³
     (japanese-jisx0208-1990	. #x5D49)	; ø½‹Ž¬
+    (chinese-big5		. #xCF66)	; ý¢€Œ½¦
     (ideograph-daikanwa		. 16413)	; ø¸„€
     (ucs			. #x6B84)	; 殄
     ))
@@ -835,6 +843,7 @@
     (chinese-isoir165		. #x3479)	; ø»‹¦
     (chinese-cns11643-1		. #x5173)	; ø»’ŠŽ
     (japanese-jisx0208-1990	. #x4B58)	; ø½Š´Ÿ
+    (chinese-big5		. #xAC70)	; ý¢€Š±°
     (ideograph-daikanwa		. 16430)	; ø¸„€®
     (ucs			. #x6B86)	; 殆
     ))
@@ -943,6 +952,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (chinese-cns11643-2 . #x2F7E)	; ø»“¢¡
+    (chinese-big5	. #xD1FC)	; ý¢€‡¼
     (ideograph-daikanwa . 16438)	; ø¸„€¶
     (ucs		. #x6B88)	; 殈
     ))
@@ -1067,6 +1077,7 @@
     (chinese-isoir165		. #x5133)	; ø»µ†
     (chinese-cns11643-1		. #x5632)	; ø»’£
     (japanese-jisx0208-1990	. #x3D5E)	; ø½Š 
+    (chinese-big5		. #xAEEE)	; ý¢€Š»®
     (ideograph-daikanwa		. 16448)	; ø¸„€
     (ucs			. #x6B89)	; 殉
     ))
@@ -1102,6 +1113,7 @@
     (chinese-isoir165		. #x4A62)	; ø»«£
     (chinese-cns11643-1		. #x5631)	; ø»’¢
     (japanese-jisx0208-1990	. #x3C6C)	; ø½Šž±
+    (chinese-big5		. #xAEED)	; ý¢€Š»­
     (ideograph-daikanwa		. 16451)	; ø¸„ƒ
     (ucs			. #x6B8A)	; 殊
     ))
@@ -1218,6 +1230,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (chinese-cns11643-2 . #x3642)	; ø»“«·
+    (chinese-big5	. #xD5DE)	; ý¢€—ž
     (ideograph-daikanwa . 16462)	; ø¸„Ž
     (ucs		. #x6B8C)	; 殌
     ))
@@ -1240,6 +1253,7 @@
     (japanese-jisx0208-1978	. #x5D4B)	; ø»ƒ”²
     (japanese-jisx0208		. #x5D4B)	; ø»‡¨º
     (japanese-jisx0208-1990	. #x5D4B)	; ø½‹Ž®
+    (chinese-big5		. #xD5DC)	; ý¢€—œ
     (ideograph-daikanwa		. 16464)	; ø¸„
     (ucs-jis			. #x6B8D)	; ø»ƒ”²
     ))
@@ -1344,6 +1358,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (chinese-cns11643-2 . #x3641)	; ø»“«¶
+    (chinese-big5	. #xD5DD)	; ý¢€—
     (ideograph-daikanwa . 16471)	; ø¸„—
     (ucs		. #x6B8E)	; 殎
     ))
@@ -1352,6 +1367,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (chinese-cns11643-2 . #x363F)	; ø»“«´
+    (chinese-big5	. #xD5DB)	; ý¢€—›
     (ideograph-daikanwa . 16472)	; ø¸„˜
     (ucs		. #x6B8F)	; 殏
     ))
@@ -1393,6 +1409,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (chinese-cns11643-2 . #x363E)	; ø»“«³
+    (chinese-big5	. #xD5DA)	; ý¢€—š
     (ideograph-daikanwa . 16476)	; ø¸„œ
     (ucs		. #x6B91)	; 殑
     ))
@@ -1555,6 +1572,7 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D23)	; ø»“µª
+    (chinese-big5	. #xD9DE)	; ý¢€§ž
     (ideograph-daikanwa . 16489)	; ø¸„©
     (ucs		. #x6B94)	; 殔
     ))
@@ -1667,6 +1685,7 @@
     (japanese-jisx0208-1978	. #x5D4D)	; ø»ƒ”´
     (japanese-jisx0208		. #x5D4D)	; ø»‡¨¼
     (japanese-jisx0208-1990	. #x5D4D)	; ø½‹Ž°
+    (chinese-big5		. #xD9E1)	; ý¢€§¡
     (ideograph-daikanwa		. 16498)	; ø¸„²
     (ucs-jis			. #x6B95)	; ø»ƒ”´
     ))
@@ -1732,6 +1751,7 @@
     (japanese-jisx0208		. #x3F23)	; ø»†¼Ž
     (korean-ksc5601		. #x6356)	; ø»‰»½
     (japanese-jisx0208-1990	. #x3F23)	; ø½Š¢‚
+    (chinese-big5		. #xB4DE)	; ý¢€‹“ž
     (ideograph-daikanwa		. 16502)	; ø¸„¶
     (ucs-jis			. #x6B96)	; ø»‚¨†
     ))
@@ -1778,20 +1798,21 @@
     (ucs		. #x3C66)	; 㱦
     ))
 (define-char
-  '((=>ucs		. #x6B97)	; 殗
-    (ideographic-radical . 78)	; ⽍
+  '((ideographic-radical . 78)	; ⽍
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (japanese-jisx0212	. #x4624)	; ø»‹š©
+    (chinese-big5	. #xD9DF)	; ý¢€§Ÿ
     (ideograph-daikanwa . 16505)	; ø¸„¹
+    (ucs		. #x6B97)	; 殗
     ))
 (define-char
-  '((morohashi-daikanwa	16505 0 1)
+  '((=>ucs		. #x6B97)	; 殗
+    (morohashi-daikanwa	16505 0 1)
     (ideographic-radical . 78)	; ⽍
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D24)	; ø»“µ«
-    (ucs		. #x6B97)	; 殗
     ))
 (define-char
   '((ideographic-radical . 78)	; ⽍
@@ -1804,6 +1825,7 @@
     (chinese-cns11643-1		. #x6024)	; ø»’Ÿ
     (japanese-jisx0208-1990	. #x5D4C)	; ø½‹Ž¯
     (chinese-gb12345		. #x3250)	; 殘
+    (chinese-big5		. #xB4DD)	; ý¢€‹“
     (ideograph-daikanwa		. 16506)	; ø¸„º
     (ucs			. #x6B98)	; 殘
     ))
@@ -1812,6 +1834,7 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D25)	; ø»“µ¬
+    (chinese-big5	. #xD9E0)	; ý¢€§ 
     (ideograph-daikanwa . 16507)	; ø¸„»
     (ucs		. #x6B99)	; 殙
     ))
@@ -1921,18 +1944,26 @@
     (ucs			. #x23A31)	; 𣨱
     ))
 (define-char
-  '((ideographic-radical . 78)	; ⽍
+  '((=>ucs		. #x6B9B)	; 殛
+    (ideographic-radical . 78)	; ⽍
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (shinjigen-1	. 3978)
-    (chinese-gb2312		. #x696A)	; ø»…°½
     (japanese-jisx0212		. #x4625)	; ø»‹šª
-    (chinese-isoir165		. #x696A)	; ø»Ž™
     (chinese-cns11643-2		. #x4423)	; ø»“¿¼
     (japanese-jisx0213-2	. #x6E21)	; ø»¦Ž†
+    (chinese-big5		. #xDDFB)	; ý¢€·»
     (ideograph-daikanwa		. 16517)	; ø¸„‚…
     (china3-jef			. #x54E7)	; øº…“§
-    (ucs			. #x6B9B)	; 殛
+    ))
+(define-char
+  '((morohashi-daikanwa	16517 0 2)
+    (ideographic-radical . 78)	; ⽍
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (chinese-gb2312	. #x696A)	; ø»…°½
+    (chinese-isoir165	. #x696A)	; ø»Ž™
+    (ucs		. #x6B9B)	; 殛
     ))
 (define-char
   '((=>ucs		. #x23A32)	; 𣨲
@@ -2185,6 +2216,7 @@
     (chinese-cns11643-2		. #x4B2E)	; ø»”Š™
     (japanese-jisx0208-1990	. #x5D4E)	; ø½‹Ž±
     (chinese-gb12345		. #x6966)	; 殞
+    (chinese-big5		. #xE266)	; ý¢€Ž‰¦
     (ideograph-daikanwa		. 16535)	; ø¸„‚—
     (ucs			. #x6B9E)	; 殞
     ))
@@ -2194,6 +2226,7 @@
     (total-strokes	 . 14)
     (japanese-jisx0212	. #x4626)	; ø»‹š«
     (chinese-cns11643-2 . #x4B2F)	; ø»”Šš
+    (chinese-big5	. #xE267)	; ý¢€Ž‰§
     (ideograph-daikanwa . 16536)	; ø¸„‚˜
     (ucs		. #x6B9F)	; 殟
     ))
@@ -2252,11 +2285,19 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (japanese-jisx0212	. #x4627)	; ø»‹š¬
-    (chinese-cns11643-2 . #x4B30)	; ø»”Š›
+    (chinese-big5	. #xE268)	; ý¢€Ž‰¨
     (ideograph-daikanwa . 16541)	; ø¸„‚
     (ucs		. #x6BA0)	; æ® 
     ))
 (define-char
+  '((=>ucs		. #x6BA0)	; æ® 
+    (morohashi-daikanwa	16541 0 0)
+    (ideographic-radical . 78)	; ⽍
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (chinese-cns11643-2 . #x4B30)	; ø»”Š›
+    ))
+(define-char
   '((=>ucs		. #x3C72)	; ã±²
     (ideographic-radical . 78)	; ⽍
     (ideographic-strokes . 10)
@@ -2387,6 +2428,7 @@
     (total-strokes	 . 15)
     (japanese-jisx0212	. #x4628)	; ø»‹š­
     (chinese-cns11643-2 . #x513C)	; ø»”“›
+    (chinese-big5	. #xE5F3)	; ý¢€Ž—³
     (ideograph-daikanwa . 16550)	; ø¸„‚¦
     (ucs		. #x6BA2)	; 殢
     ))
@@ -2397,6 +2439,7 @@
     (japanese-jisx0212	. #x4629)	; ø»‹š®
     (chinese-isoir165	. #x2C52)	; ø»Œ¿
     (chinese-cns11643-2 . #x513B)	; ø»”“š
+    (chinese-big5	. #xE5F2)	; ý¢€Ž—²
     (ideograph-daikanwa . 16551)	; ø¸„‚§
     (ucs		. #x6BA3)	; 殣
     ))
@@ -2410,6 +2453,7 @@
     (chinese-cns11643-1		. #x6D46)	; ø»’²©
     (japanese-jisx0208-1990	. #x5D4F)	; ø½‹Ž²
     (chinese-gb12345		. #x6964)	; 殤
+    (chinese-big5		. #xBCDC)	; ý¢€‹³œ
     (ideograph-daikanwa		. 16557)	; ø¸„‚­
     (ucs			. #x6BA4)	; 殤
     ))
@@ -2418,6 +2462,7 @@
     (ideographic-radical . 78)	; ⽍
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (chinese-big5	. #xE5F1)	; ý¢€Ž—±
     (ideograph-daikanwa . 16565)	; ø¸„‚µ
     ))
 (define-char
@@ -2439,6 +2484,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (chinese-cns11643-2 . #x513D)	; ø»”“œ
+    (chinese-big5	. #xE5F4)	; ý¢€Ž—´
     (ideograph-daikanwa . 16567)	; ø¸„‚·
     (ucs		. #x6BA6)	; 殦
     ))
@@ -2558,6 +2604,7 @@
     (ideographic-radical . 78)	; ⽍
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (chinese-big5	. #xE9E1)	; ý¢€Ž§¡
     (ideograph-daikanwa . 16568)	; ø¸„‚¸
     ))
 (define-char
@@ -2680,6 +2727,7 @@
     (chinese-isoir165		. #x696C)	; ø»Ž™
     (chinese-cns11643-2		. #x576D)	; ø»”€
     (japanese-jisx0208-1990	. #x5D50)	; ø½‹Ž³
+    (chinese-big5		. #xE9E2)	; ý¢€Ž§¢
     (ideograph-daikanwa		. 16578)	; ø¸„ƒ‚
     (ucs			. #x6BAA)	; 殪
     ))
@@ -2725,6 +2773,7 @@
     (chinese-cns11643-2		. #x576E)	; ø»”
     (japanese-jisx0208-1990	. #x5D51)	; ø½‹Ž´
     (chinese-gb12345		. #x6969)	; 殫
+    (chinese-big5		. #xE9E3)	; ý¢€Ž§£
     (ideograph-daikanwa		. 16581)	; ø¸„ƒ…
     (ucs			. #x6BAB)	; 殫
     ))
@@ -2827,6 +2876,7 @@
     (japanese-jisx0212		. #x462D)	; ø»‹š²
     (chinese-cns11643-2		. #x5D38)	; ø»”¤¿
     (japanese-jisx0213-1	. #x7648)	; ø»¤™
+    (chinese-big5		. #xED4C)	; ý¢€ŽµŒ
     (ideograph-daikanwa		. 16588)	; ø¸„ƒŒ
     (ucs			. #x6BAD)	; æ®­
     ))
@@ -2856,6 +2906,7 @@
     (chinese-cns11643-1		. #x737D)	; ø»’¼”
     (japanese-jisx0213-2	. #x6E22)	; ø»¦Ž‡
     (chinese-gb12345		. #x6967)	; æ®®
+    (chinese-big5		. #xC0D4)	; ý¢€Œƒ”
     (ideograph-daikanwa		. 16590)	; ø¸„ƒŽ
     (china3-jef			. #x54E8)	; øº…“¨
     (ucs			. #x6BAE)	; æ®®
@@ -2934,17 +2985,26 @@
     (ucs			. #x23A71)	; 𣩱
     ))
 (define-char
-  '((ideographic-radical . 78)	; ⽍
+  '((=>ucs		. #x6BAF)	; 殯
+    (ideographic-radical . 78)	; ⽍
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
     (shinjigen-2	. 3988)
     (japanese-jisx0208-1978	. #x5D52)	; ø»ƒ”¹
     (japanese-jisx0208		. #x5D52)	; ø»‡©
-    (chinese-cns11643-1		. #x7658)	; ø»“€‰
     (japanese-jisx0208-1990	. #x5D52)	; ø½‹Žµ
-    (chinese-gb12345		. #x696B)	; 殯
+    (chinese-big5		. #xC26C)	; ý¢€Œ‰¬
     (ideograph-daikanwa		. 16596)	; ø¸„ƒ”
-    (ucs			. #x6BAF)	; 殯
+    (ucs-jis			. #x6BAF)	; ø»ƒ”¹
+    ))
+(define-char
+  '((morohashi-daikanwa	16596 0 0)
+    (ideographic-radical . 78)	; ⽍
+    (ideographic-strokes . 14)
+    (total-strokes	 . 18)
+    (chinese-cns11643-1 . #x7658)	; ø»“€‰
+    (chinese-gb12345	. #x696B)	; 殯
+    (ucs		. #x6BAF)	; 殯
     ))
 (define-char
   '((=>ucs		. #x6BAF)	; 殯
@@ -2981,12 +3041,20 @@
     (ucs			. #x23A76)	; 𣩶
     ))
 (define-char
-  '((ideographic-radical . 78)	; ⽍
+  '((=>ucs		. #x6BB0)	; æ®°
+    (ideographic-radical . 78)	; ⽍
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
     (japanese-jisx0212	. #x462F)	; ø»‹š´
-    (chinese-cns11643-2 . #x6565)	; ø»”±œ
+    (chinese-big5	. #xF25A)	; ý¢€‰š
     (ideograph-daikanwa . 16601)	; ø¸„ƒ™
+    ))
+(define-char
+  '((morohashi-daikanwa	16601 0 0)
+    (ideographic-radical . 78)	; ⽍
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (chinese-cns11643-2 . #x6565)	; ø»”±œ
     (ucs		. #x6BB0)	; æ®°
     ))
 (define-char
@@ -3087,6 +3155,7 @@
     (chinese-cns11643-1		. #x7A73)	; ø»“†œ
     (japanese-jisx0208-1990	. #x5D53)	; ø½‹Ž¶
     (chinese-gb12345		. #x3C5F)	; 殲
+    (chinese-big5		. #xC4E8)	; ý¢€Œ“¨
     (ideograph-daikanwa		. 16608)	; ø¸„ƒ 
     (ucs			. #x6BB2)	; 殲
     ))
diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el
index 8d80525..1a28ae2 100644
--- a/lisp/utf-2000/Ideograph-R079-Weapon.el
+++ b/lisp/utf-2000/Ideograph-R079-Weapon.el
@@ -3,21 +3,23 @@
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (ideograph-daikanwa . 16613)	; ø¸„ƒ¥
+    (shinjigen-2	. 3991)
+    (japanese-jisx0208-1978	. #x5D55)	; ø»ƒ”¼
+    (japanese-jisx0208		. #x5D55)	; ø»‡©„
+    (japanese-jisx0208-1990	. #x5D55)	; ø½‹Ž¸
+    (chinese-big5		. #xC95F)	; ý¢€Œ¥Ÿ
+    (ideograph-daikanwa		. 16613)	; ø¸„ƒ¥
+    (ucs-jis			. #x6BB3)	; ø»ƒ”¼
     ))
 (define-char
   '((morohashi-daikanwa	16613 0 0)
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (shinjigen-2	. 3991)
-    (japanese-jisx0208-1978	. #x5D55)	; ø»ƒ”¼
-    (chinese-gb2312		. #x6C2F)	; ø»…´œ
-    (japanese-jisx0208		. #x5D55)	; ø»‡©„
-    (chinese-isoir165		. #x6C2F)	; ø»Žœ¬
-    (chinese-cns11643-2		. #x213F)	; ø»“Œ¾
-    (japanese-jisx0208-1990	. #x5D55)	; ø½‹Ž¸
-    (ucs			. #x6BB3)	; 殳
+    (chinese-gb2312	. #x6C2F)	; ø»…´œ
+    (chinese-isoir165	. #x6C2F)	; ø»Žœ¬
+    (chinese-cns11643-2 . #x213F)	; ø»“Œ¾
+    (ucs		. #x6BB3)	; 殳
     ))
 (define-char
   '((=>ucs		. #x3C7C)	; ã±¼
@@ -108,6 +110,7 @@
     (japanese-jisx0208		. #x434A)	; ø»‡‚­
     (korean-ksc5601		. #x532B)	; ø»‰£²
     (japanese-jisx0208-1990	. #x434A)	; ø½Š¨¡
+    (chinese-big5		. #xAC71)	; ý¢€Š±±
     (ideograph-daikanwa		. 16619)	; ø¸„ƒ«
     (ucs-jis			. #x6BB5)	; ø»‚®¥
     ))
@@ -150,6 +153,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B49)	; ø»“›´
+    (chinese-big5	. #xCF67)	; ý¢€Œ½§
     (ucs		. #x6BB6)	; 殶
     ))
 (define-char
@@ -212,6 +216,7 @@
     (japanese-jisx0208		. #x5D56)	; ø»‡©…
     (korean-ksc5601		. #x6B5C)	; ø»Š‡³
     (japanese-jisx0208-1990	. #x5D56)	; ø½‹Ž¹
+    (chinese-big5		. #xAEEF)	; ý¢€Š»¯
     (ideograph-daikanwa		. 16627)	; ø¸„ƒ³
     (ucs-jis			. #x6BB7)	; ø»ƒ”½
     ))
@@ -246,6 +251,7 @@
     (japanese-jisx0208-1978	. #x3B26)	; ø»‚¢‘
     (japanese-jisx0208		. #x3B26)	; ø»†¶™
     (japanese-jisx0208-1990	. #x3B26)	; ø½Šœ
+    (chinese-big5		. #xB1FE)	; ý¢€‹‡¾
     (ideograph-daikanwa		. 16629)	; ø¸„ƒµ
     (ucs-jis			. #x6BBA)	; ø»‚¢‘
     ))
@@ -499,6 +505,7 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (chinese-cns11643-1 . #x6026)	; ø»’Ÿƒ
+    (chinese-big5	. #xB4DF)	; ý¢€‹“Ÿ
     (ucs		. #x6BBC)	; 殼
     ))
 (define-char
@@ -535,6 +542,7 @@
     (total-strokes	 . 12)
     (japanese-jisx0212		. #x4632)	; ø»‹š·
     (japanese-jisx0213-2	. #x6E24)	; ø»¦Ž‰
+    (chinese-big5		. #xD9E2)	; ý¢€§¢
     (ideograph-daikanwa		. 16647)	; ø¸„„‡
     (china3-jef			. #x54EE)	; øº…“®
     (ucs			. #x6BBD)	; 殽
@@ -615,6 +623,7 @@
     (chinese-gb2312	. #x356E)	; ø»„¤©
     (chinese-isoir165	. #x356E)	; ø»Œ¹
     (chinese-cns11643-1 . #x645B)	; ø»’¥°
+    (chinese-big5	. #xB7B5)	; ý¢€‹žµ
     (ucs		. #x6BBF)	; 殿
     ))
 (define-char
@@ -648,6 +657,7 @@
     (japanese-jisx0208		. #x544C)	; ø»‡›­
     (chinese-cns11643-1		. #x645A)	; ø»’¥¯
     (japanese-jisx0208-1990	. #x544C)	; ø½‹¡
+    (chinese-big5		. #xB7B4)	; ý¢€‹ž´
     (ideograph-daikanwa		. 16654)	; ø¸„„Ž
     (ucs			. #x6BC0)	; 毀
     ))
@@ -802,6 +812,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (japanese-jisx0212	. #x4634)	; ø»‹š¹
+    (chinese-big5	. #xE269)	; ý¢€Ž‰©
     (ideograph-daikanwa . 16665)	; ø¸„„™
     ))
 (define-char
@@ -841,6 +852,7 @@
     (total-strokes	 . 14)
     (japanese-jisx0212	. #x4635)	; ø»‹šº
     (chinese-cns11643-2 . #x4B32)	; ø»”Š
+    (chinese-big5	. #xE26A)	; ý¢€Ž‰ª
     (ideograph-daikanwa . 16668)	; ø¸„„œ
     (ucs		. #x6BC4)	; 毄
     ))
@@ -886,6 +898,7 @@
     (japanese-jisx0208		. #x3523)	; ø»†­¢
     (korean-ksc5601		. #x6B76)	; ø»Šˆ
     (japanese-jisx0208-1990	. #x3523)	; ø½Š“–
+    (chinese-big5		. #xBCDD)	; ý¢€‹³
     (ideograph-daikanwa		. 16673)	; ø¸„„¡
     (ucs-jis			. #x6BC5)	; ø»‚™š
     ))
@@ -909,6 +922,7 @@
     (japanese-jisx0208		. #x5D58)	; ø»‡©‡
     (korean-ksc5601		. #x4F32)	; ø»‰ž
     (japanese-jisx0208-1990	. #x5D58)	; ø½‹Ž»
+    (chinese-big5		. #xBCDE)	; ý¢€‹³ž
     (ideograph-daikanwa		. 16674)	; ø¸„„¢
     (ucs-jis			. #x6BC6)	; ø»ƒ”¿
     ))
@@ -972,6 +986,7 @@
     (total-strokes	 . 16)
     (chinese-cns11643-2		. #x5770)	; ø»”ƒ
     (japanese-jisx0213-2	. #x6E26)	; ø»¦Ž‹
+    (chinese-big5		. #xE9E5)	; ý¢€Ž§¥
     (ucs			. #x6BC7)	; 毇
     ))
 (define-char
@@ -987,16 +1002,17 @@
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (ideograph-daikanwa . 16681)	; ø¸„„©
+    (japanese-jisx0213-2	. #x6E27)	; ø»¦ŽŒ
+    (chinese-big5		. #xE9E4)	; ý¢€Ž§¤
+    (ideograph-daikanwa		. 16681)	; ø¸„„©
     ))
 (define-char
   '((morohashi-daikanwa	16681 0 0)
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (chinese-cns11643-2		. #x576F)	; ø»”‚
-    (japanese-jisx0213-2	. #x6E27)	; ø»¦ŽŒ
-    (ucs			. #x6BC8)	; 毈
+    (chinese-cns11643-2 . #x576F)	; ø»”‚
+    (ucs		. #x6BC8)	; 毈
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎
@@ -1237,6 +1253,7 @@
     (unicode-strokes	. 15)
     (japanese-jisx0212		. #x4636)	; ø»‹š»
     (japanese-jisx0213-2	. #x6E28)	; ø»¦Ž
+    (chinese-big5		. #xEFE9)	; ý¢€Ž¿©
     (china3-jef			. #x54EC)	; øº…“¬
     (ucs			. #x6BC9)	; 毉
     ))
@@ -1347,6 +1364,7 @@
   '((=>ucs		. #x6BCA)	; 毊
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 19)
+    (chinese-big5	. #xF7E3)	; ý¢€Ÿ£
     (ideograph-daikanwa . 16711)	; ø¸„…‡
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R080-Do-Not.el b/lisp/utf-2000/Ideograph-R080-Do-Not.el
index 0051c95..26702a5 100644
--- a/lisp/utf-2000/Ideograph-R080-Do-Not.el
+++ b/lisp/utf-2000/Ideograph-R080-Do-Not.el
@@ -19,6 +19,7 @@
     (chinese-gb2312	. #x4E63)	; ø»…‰Œ
     (chinese-isoir165	. #x4E63)	; ø»±œ
     (chinese-cns11643-1 . #x4551)	; ø»‘¸„
+    (chinese-big5	. #xA4F0)	; ý¢€Š“°
     (ucs		. #x6BCB)	; 毋
     ))
 (define-char
@@ -27,6 +28,7 @@
     (total-strokes	 . 4)
     (japanese-jisx0212	. #x4637)	; ø»‹š¼
     (chinese-cns11643-2 . #x2140)	; ø»“Œ¿
+    (chinese-big5	. #xC960)	; ý¢€Œ¥ 
     (ideograph-daikanwa . 16722)	; ø¸„…’
     (ucs		. #x6BCC)	; 毌
     ))
@@ -42,6 +44,7 @@
     (chinese-isoir165		. #x4438)	; ø»¢…
     (chinese-cns11643-1		. #x4660)	; ø»‘¹±
     (japanese-jisx0208-1990	. #x4A6C)	; ø½Š³•
+    (chinese-big5		. #xA5C0)	; ý¢€Š—€
     (ideograph-daikanwa		. 16723)	; ø¸„…“
     (ucs			. #x6BCD)	; 母
     ))
@@ -73,6 +76,7 @@
     (chinese-isoir165		. #x433F)	; ø» ®
     (chinese-cns11643-1		. #x4A64)	; ø»‘¿­
     (japanese-jisx0213-1	. #x764A)	; ø»¤›
+    (chinese-big5		. #xA843)	; ý¢€Š¡ƒ
     (ideograph-daikanwa		. 16725)	; ø¸„…•
     (china3-jef			. #x54F4)	; øº…“´
     (ucs			. #x6BCF)	; 每
@@ -93,11 +97,19 @@
     (ucs		. #x23AED)	; 𣫭
     ))
 (define-char
-  '((ideographic-radical . 80)	; ⽏
+  '((=>ucs		. #x6BD0)	; 毐
+    (ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (chinese-cns11643-2 . #x2448)	; ø»“‘¡
+    (chinese-big5	. #xCB48)	; ý¢€Œ­ˆ
     (ideograph-daikanwa . 16727)	; ø¸„…—
+    ))
+(define-char
+  '((morohashi-daikanwa	16727 0 2)
+    (ideographic-radical . 80)	; ⽏
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
     (ucs		. #x6BD0)	; 毐
     ))
 (define-char
@@ -137,6 +149,7 @@
     (japanese-jisx0208-1978	. #x4647)	; ø»‚²¼
     (japanese-jisx0208		. #x4647)	; ø»‡‡„
     (japanese-jisx0208-1990	. #x4647)	; ø½Š¬¸
+    (chinese-big5		. #xAC72)	; ý¢€Š±²
     (ideograph-daikanwa		. 16730)	; ø¸„…š
     (ucs-jis			. #x6BD2)	; ø»‚²¼
     ))
@@ -231,6 +244,7 @@
     (japanese-jisx0208		. #x5D5A)	; ø»‡©‰
     (korean-ksc5601		. #x6B3E)	; ø»Š‡•
     (japanese-jisx0208-1990	. #x5D5A)	; ø½‹Ž½
+    (chinese-big5		. #xB7B6)	; ý¢€‹ž¶
     (ideograph-daikanwa		. 16740)	; ø¸„…¤
     (ucs-jis			. #x6BD3)	; ø»ƒ•
     ))
diff --git a/lisp/utf-2000/Ideograph-R081-Compare.el b/lisp/utf-2000/Ideograph-R081-Compare.el
index e5293e7..c345595 100644
--- a/lisp/utf-2000/Ideograph-R081-Compare.el
+++ b/lisp/utf-2000/Ideograph-R081-Compare.el
@@ -19,6 +19,7 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
     (chinese-cns11643-1 . #x4552)	; ø»‘¸…
+    (chinese-big5	. #xA4F1)	; ý¢€Š“±
     ))
 (define-char
   '((ideographic-radical . 81)	; ⽐
@@ -131,6 +132,7 @@
     (japanese-jisx0212		. #x4638)	; ø»‹š½
     (chinese-isoir165		. #x3151)	; ø»†¤
     (japanese-jisx0213-1	. #x764B)	; ø»¤œ
+    (chinese-big5		. #xCF68)	; ý¢€Œ½¨
     (ideograph-daikanwa		. 16750)	; ø¸„…®
     (china3-jef			. #x54F8)	; øº…“¸
     (ucs			. #x6BD6)	; 毖
@@ -177,6 +179,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (chinese-cns11643-1 . #x5176)	; ø»’Š‘
+    (chinese-big5	. #xAC73)	; ý¢€Š±³
     ))
 (define-char
   '((ideographic-radical . 81)	; ⽐
@@ -187,6 +190,7 @@
     (japanese-jisx0208		. #x487B)	; ø»‡Š´
     (korean-ksc5601		. #x5D72)	; ø»‰³¥
     (japanese-jisx0208-1990	. #x487B)	; ø½Š°¨
+    (chinese-big5		. #xCF69)	; ý¢€Œ½©
     (ideograph-daikanwa		. 16753)	; ø¸„…±
     (ucs			. #x6BD8)	; 毘
     ))
@@ -413,12 +417,20 @@
     (total-strokes	 . 17)
     (japanese-jisx0212		. #x4639)	; ø»‹š¾
     (chinese-isoir165		. #x7A3B)	; ø»Ž±œ
-    (chinese-cns11643-1		. #x737E)	; ø»’¼•
     (japanese-jisx0213-2	. #x6E29)	; ø»¦ŽŽ
+    (chinese-big5		. #xC0D5)	; ý¢€Œƒ•
     (ideograph-daikanwa		. 16767)	; ø¸„…¿
     (ucs			. #x6BDA)	; 毚
     ))
 (define-char
+  '((=>ucs		. #x6BDA)	; 毚
+    (morohashi-daikanwa	16767 0 1)
+    (ideographic-radical . 81)	; ⽐
+    (ideographic-strokes . 13)
+    (total-strokes	 . 17)
+    (chinese-cns11643-1 . #x737E)	; ø»’¼•
+    ))
+(define-char
   '((ideographic-radical . 81)	; ⽐
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
diff --git a/lisp/utf-2000/Ideograph-R082-Fur.el b/lisp/utf-2000/Ideograph-R082-Fur.el
index ad41c7c..6e20165 100644
--- a/lisp/utf-2000/Ideograph-R082-Fur.el
+++ b/lisp/utf-2000/Ideograph-R082-Fur.el
@@ -10,6 +10,7 @@
     (chinese-isoir165		. #x432B)	; ø» š
     (chinese-cns11643-1		. #x4553)	; ø»‘¸†
     (japanese-jisx0208-1990	. #x4C53)	; ø½Šµ¸
+    (chinese-big5		. #xA4F2)	; ý¢€Š“²
     (ideograph-daikanwa		. 16772)	; ø¸„†„
     (ucs			. #x6BDB)	; 毛
     ))
@@ -154,11 +155,19 @@
   '((ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (chinese-cns11643-2 . #x274D)	; ø»“–€
+    (chinese-big5	. #xCCEC)	; ý¢€Œ³¬
     (ideograph-daikanwa . 16781)	; ø¸„†
     (ucs		. #x6BDE)	; 毞
     ))
 (define-char
+  '((=>ucs		. #x6BDE)	; 毞
+    (morohashi-daikanwa	16781 0 0)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 4)
+    (total-strokes	 . 8)
+    (chinese-cns11643-2 . #x274D)	; ø»“–€
+    ))
+(define-char
   '((ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
@@ -373,6 +382,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B4C)	; ø»“›·
+    (chinese-big5	. #xCF6A)	; ý¢€Œ½ª
     (ideograph-daikanwa . 16795)	; ø¸„†›
     (ucs		. #x6BE0)	; 毠
     ))
@@ -571,6 +581,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (chinese-cns11643-2 . #x3025)	; ø»“¢¦
+    (chinese-big5	. #xD242)	; ý¢€‰‚
     (ideograph-daikanwa . 16812)	; ø¸„†¬
     (ucs		. #x6BE2)	; 毢
     ))
@@ -580,6 +591,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (japanese-jisx0212	. #x463B)	; ø»‹›€
+    (chinese-big5	. #xD241)	; ý¢€‰
     (ideograph-daikanwa . 16813)	; ø¸„†­
     ))
 (define-char
@@ -628,11 +640,19 @@
     (chinese-cns11643-5 . #x2E41)	; ø»™¾’
     ))
 (define-char
-  '((ideographic-radical . 82)	; ⽑
+  '((=>ucs		. #x6BE4)	; 毤
+    (ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (chinese-cns11643-2 . #x3022)	; ø»“¢£
+    (chinese-big5	. #xD1FE)	; ý¢€‡¾
     (ideograph-daikanwa . 16816)	; ø¸„†°
+    ))
+(define-char
+  '((morohashi-daikanwa	16816 0 1)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (chinese-cns11643-2 . #x3022)	; ø»“¢£
     (ucs		. #x6BE4)	; 毤
     ))
 (define-char
@@ -644,14 +664,22 @@
     (ucs		. #x6BE5)	; 毥
     ))
 (define-char
-  '((ideographic-radical . 82)	; ⽑
+  '((=>ucs		. #x6BE6)	; 毦
+    (ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (japanese-jisx0212		. #x463C)	; ø»‹›
     (chinese-cns11643-2		. #x3021)	; ø»“¢¢
     (japanese-jisx0213-2	. #x6E2A)	; ø»¦Ž
+    (chinese-big5		. #xD1FD)	; ý¢€‡½
     (ideograph-daikanwa		. 16818)	; ø¸„†²
-    (ucs			. #x6BE6)	; 毦
+    ))
+(define-char
+  '((morohashi-daikanwa	16818 0 0)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (ucs		. #x6BE6)	; 毦
     ))
 (define-char
   '((ideographic-radical . 82)	; ⽑
@@ -660,6 +688,7 @@
     (japanese-jisx0212		. #x463D)	; ø»‹›‚
     (chinese-cns11643-2		. #x3026)	; ø»“¢§
     (japanese-jisx0213-2	. #x6E2B)	; ø»¦Ž
+    (chinese-big5		. #xD243)	; ý¢€‰ƒ
     (ideograph-daikanwa		. 16819)	; ø¸„†³
     (ucs			. #x6BE7)	; 毧
     ))
@@ -690,6 +719,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (chinese-cns11643-2 . #x3023)	; ø»“¢¤
+    (chinese-big5	. #xD240)	; ý¢€‰€
     (ideograph-daikanwa . 16821)	; ø¸„†µ
     (ucs		. #x6BE8)	; 毨
     ))
@@ -859,19 +889,28 @@
     (ucs		. #x6BEA)	; 毪
     ))
 (define-char
-  '((ideographic-radical . 82)	; ⽑
+  '((=>ucs		. #x6BEB)	; 毫
+    (ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (shinjigen-2	. 4023)
     (japanese-jisx0208-1978	. #x5D5D)	; ø»ƒ•„
-    (chinese-gb2312		. #x3A41)	; ø»„«’
     (japanese-jisx0208		. #x5D5D)	; ø»‡©Œ
     (korean-ksc5601		. #x7B46)	; ø»Šž½
-    (chinese-isoir165		. #x3A41)	; ø»“¢
-    (chinese-cns11643-1		. #x5B45)	; ø»’˜Œ
     (japanese-jisx0208-1990	. #x5D5D)	; ø½‹€
+    (chinese-big5		. #xB240)	; ý¢€‹‰€
     (ideograph-daikanwa		. 16831)	; ø¸„†¿
-    (ucs			. #x6BEB)	; 毫
+    (ucs-jis			. #x6BEB)	; ø»ƒ•„
+    ))
+(define-char
+  '((morohashi-daikanwa	16831 0 0)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (chinese-gb2312	. #x3A41)	; ø»„«’
+    (chinese-isoir165	. #x3A41)	; ø»“¢
+    (chinese-cns11643-1 . #x5B45)	; ø»’˜Œ
+    (ucs		. #x6BEB)	; 毫
     ))
 (define-char
   '((ideographic-radical . 82)	; ⽑
@@ -883,6 +922,7 @@
     (korean-ksc5601		. #x4F33)	; ø»‰ž‚
     (chinese-cns11643-1		. #x5B46)	; ø»’˜
     (japanese-jisx0208-1990	. #x5D5C)	; ø½‹Ž¿
+    (chinese-big5		. #xB241)	; ý¢€‹‰
     (ideograph-daikanwa		. 16837)	; ø¸„‡…
     (ucs			. #x6BEC)	; 毬
     ))
@@ -1045,17 +1085,33 @@
     (chinese-gb2312		. #x4C3A)	; ø»……§
     (japanese-jisx0208		. #x5D5F)	; ø»‡©Ž
     (chinese-isoir165		. #x4C3A)	; ø»­·
-    (chinese-cns11643-1		. #x6027)	; ø»’Ÿ„
     (japanese-jisx0208-1990	. #x5D5F)	; ø½‹‚
+    (chinese-big5		. #xB4E0)	; ý¢€‹“ 
     (ideograph-daikanwa		. 16858)	; ø¸„‡š
     (ucs			. #x6BEF)	; 毯
     ))
 (define-char
-  '((ideographic-radical . 82)	; ⽑
+  '((=>ucs		. #x6BEF)	; 毯
+    (morohashi-daikanwa	16858 0 0)
+    (ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (chinese-cns11643-2 . #x3D28)	; ø»“µ¯
+    (chinese-cns11643-1 . #x6027)	; ø»’Ÿ„
+    ))
+(define-char
+  '((=>ucs		. #x6BF0)	; 毰
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (chinese-big5	. #xD9E3)	; ý¢€§£
     (ideograph-daikanwa . 16864)	; ø¸„‡ 
+    ))
+(define-char
+  '((morohashi-daikanwa	16864 0 0)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (chinese-cns11643-2 . #x3D28)	; ø»“µ¯
     (ucs		. #x6BF0)	; 毰
     ))
 (define-char
@@ -1074,22 +1130,32 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D29)	; ø»“µ°
+    (chinese-big5	. #xD9E4)	; ý¢€§¤
     (ideograph-daikanwa . 16870)	; ø¸„‡¦
     (ucs		. #x6BF2)	; 毲
     ))
 (define-char
-  '((ideographic-radical . 82)	; ⽑
+  '((=>ucs		. #x6BF3)	; 毳
+    (ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (shinjigen-2	. 4024)
     (japanese-jisx0208-1978	. #x5D5E)	; ø»ƒ•…
-    (chinese-gb2312		. #x6B25)	; ø»…²´
     (japanese-jisx0208		. #x5D5E)	; ø»‡©
-    (chinese-isoir165		. #x6B25)	; ø»Ž›„
     (chinese-cns11643-2		. #x3D2A)	; ø»“µ±
     (japanese-jisx0208-1990	. #x5D5E)	; ø½‹
+    (chinese-big5		. #xD9E5)	; ý¢€§¥
     (ideograph-daikanwa		. 16872)	; ø¸„‡¨
-    (ucs			. #x6BF3)	; 毳
+    (ucs-jis			. #x6BF3)	; ø»ƒ•…
+    ))
+(define-char
+  '((morohashi-daikanwa	16872 0 0)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (chinese-gb2312	. #x6B25)	; ø»…²´
+    (chinese-isoir165	. #x6B25)	; ø»Ž›„
+    (ucs		. #x6BF3)	; 毳
     ))
 (define-char
   '((ideographic-radical . 82)	; ⽑
@@ -1257,6 +1323,7 @@
     (total-strokes	 . 13)
     (japanese-jisx0212	. #x4640)	; ø»‹›…
     (chinese-cns11643-2 . #x4427)	; ø»”€€
+    (chinese-big5	. #xDE41)	; ý¢€¹
     (ideograph-daikanwa . 16890)	; ø¸„‡º
     (ucs		. #x6BF7)	; 毷
     ))
@@ -1265,6 +1332,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (chinese-cns11643-2 . #x4428)	; ø»”€
+    (chinese-big5	. #xDE42)	; ý¢€¹‚
     (ideograph-daikanwa . 16895)	; ø¸„‡¿
     (ucs		. #x6BF8)	; 毸
     ))
@@ -1277,6 +1345,14 @@
     (ideograph-daikanwa . 16896)	; ø¸„ˆ€
     ))
 (define-char
+  '((=>ucs		. #x6BF9)	; 毹
+    (morohashi-daikanwa	16896 0 1)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (chinese-big5	. #xDE40)	; ý¢€¹€
+    ))
+(define-char
   '((morohashi-daikanwa	16896 0 2)
     (ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 9)
@@ -1321,26 +1397,43 @@
   '((ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (chinese-cns11643-2 . #x4424)	; ø»“¿½
+    (chinese-big5	. #xDDFD)	; ý¢€·½
     (ideograph-daikanwa . 16899)	; ø¸„ˆƒ
     (ucs		. #x6BFB)	; 毻
     ))
 (define-char
+  '((=>ucs		. #x6BFB)	; 毻
+    (morohashi-daikanwa	16899 0 0)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (chinese-cns11643-2 . #x4424)	; ø»“¿½
+    ))
+(define-char
   '((ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (chinese-cns11643-2 . #x4425)	; ø»“¿¾
+    (chinese-big5	. #xDDFE)	; ý¢€·¾
     (ideograph-daikanwa . 16900)	; ø¸„ˆ„
     (ucs		. #x6BFC)	; 毼
     ))
 (define-char
-  '((ideographic-radical . 82)	; ⽑
+  '((=>ucs		. #x6BFD)	; 毽
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (chinese-big5	. #xB7B7)	; ý¢€‹ž·
+    (ideograph-daikanwa . 16909)	; ø¸„ˆ
+    ))
+(define-char
+  '((morohashi-daikanwa	16909 0 0)
+    (ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (chinese-gb2312	. #x6B26)	; ø»…²µ
     (chinese-isoir165	. #x6B26)	; ø»Ž›…
     (chinese-cns11643-1 . #x645D)	; ø»’¥²
-    (ideograph-daikanwa . 16909)	; ø¸„ˆ
     (ucs		. #x6BFD)	; 毽
     ))
 (define-char
@@ -1477,11 +1570,19 @@
     (ucs		. #x23BC2)	; 𣯂
     ))
 (define-char
-  '((ideographic-radical . 82)	; ⽑
+  '((=>ucs		. #x6BFE)	; 毾
+    (ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (chinese-cns11643-2 . #x4B33)	; ø»”Šž
+    (chinese-big5	. #xE26B)	; ý¢€Ž‰«
     (ideograph-daikanwa . 16921)	; ø¸„ˆ™
+    ))
+(define-char
+  '((morohashi-daikanwa	16921 0 2)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (chinese-cns11643-2 . #x4B33)	; ø»”Šž
     (ucs		. #x6BFE)	; 毾
     ))
 (define-char
@@ -1696,6 +1797,7 @@
     (chinese-cns11643-2		. #x5140)	; ø»”“Ÿ
     (japanese-jisx0213-1	. #x764D)	; ø»¤ž
     (chinese-gb12345		. #x6B27)	; 毿
+    (chinese-big5		. #xE5F7)	; ý¢€Ž—·
     (ideograph-daikanwa		. 16942)	; ø¸„ˆ®
     (china3-jef			. #x54FE)	; øº…“¾
     (ucs			. #x6BFF)	; 毿
@@ -1704,16 +1806,46 @@
   '((ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (chinese-cns11643-2 . #x513F)	; ø»”“ž
+    (chinese-big5	. #xE5F6)	; ý¢€Ž—¶
     (ideograph-daikanwa . 16949)	; ø¸„ˆµ
     (ucs		. #x6C00)	; 氀
     ))
 (define-char
-  '((ideographic-radical . 82)	; ⽑
+  '((=>ucs		. #x6C00)	; 氀
+    (morohashi-daikanwa	16949 0 0)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (chinese-cns11643-2 . #x513F)	; ø»”“ž
+    ))
+(define-char
+  '((=>ucs		. #x6C01)	; 氁
+    (ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (chinese-cns11643-2 . #x513E)	; ø»”“
     (ideograph-daikanwa . 16951)	; ø¸„ˆ·
+    ))
+(define-char
+  '((=>ucs		. #x6C01)	; 氁
+    (morohashi-daikanwa	16951 0 0)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (chinese-cns11643-2 . #x513E)	; ø»”“
+    ))
+(define-char
+  '((=>ucs		. #x6C01)	; 氁
+    (morohashi-daikanwa	16951 0 1)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (chinese-big5	. #xE5F5)	; ý¢€Ž—µ
+    ))
+(define-char
+  '((morohashi-daikanwa	16951 0 2)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
     (ucs		. #x6C01)	; 氁
     ))
 (define-char
@@ -1723,6 +1855,7 @@
     (japanese-jisx0212		. #x4643)	; ø»‹›ˆ
     (chinese-cns11643-2		. #x5141)	; ø»”“ 
     (japanese-jisx0213-2	. #x6E2E)	; ø»¦Ž“
+    (chinese-big5		. #xE5F8)	; ý¢€Ž—¸
     (ideograph-daikanwa		. 16952)	; ø¸„ˆ¸
     (china3-jef			. #x54FD)	; øº…“½
     (ucs			. #x6C02)	; 氂
@@ -1847,11 +1980,19 @@
     (ucs		. #x23C09)	; 𣰉
     ))
 (define-char
-  '((ideographic-radical . 82)	; ⽑
+  '((=>ucs		. #x6C03)	; 氃
+    (ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (chinese-cns11643-2 . #x5772)	; ø»”…
+    (chinese-big5	. #xE9E7)	; ý¢€Ž§§
     (ideograph-daikanwa . 16964)	; ø¸„‰„
+    ))
+(define-char
+  '((morohashi-daikanwa	16964 0 0)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (chinese-cns11643-2 . #x5772)	; ø»”…
     (ucs		. #x6C03)	; 氃
     ))
 (define-char
@@ -1860,20 +2001,29 @@
     (total-strokes	 . 16)
     (japanese-jisx0212	. #x4644)	; ø»‹›‰
     (chinese-cns11643-2 . #x5771)	; ø»”„
+    (chinese-big5	. #xE9E6)	; ý¢€Ž§¦
     (ideograph-daikanwa . 16970)	; ø¸„‰Š
     (ucs		. #x6C04)	; 氄
     ))
 (define-char
-  '((ideographic-radical . 82)	; ⽑
+  '((=>ucs		. #x6C05)	; 氅
+    (ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (chinese-gb2312		. #x6B29)	; ø»…²¸
     (japanese-jisx0212		. #x4645)	; ø»‹›Š
-    (chinese-isoir165		. #x6B29)	; ø»Ž›ˆ
-    (chinese-cns11643-1		. #x7126)	; ø»’¸
     (japanese-jisx0213-1	. #x764E)	; ø»¤Ÿ
+    (chinese-big5		. #xBEFB)	; ý¢€‹»»
     (ideograph-daikanwa		. 16973)	; ø¸„‰
-    (ucs			. #x6C05)	; 氅
+    ))
+(define-char
+  '((morohashi-daikanwa	16973 0 2)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (chinese-gb2312	. #x6B29)	; ø»…²¸
+    (chinese-isoir165	. #x6B29)	; ø»Ž›ˆ
+    (chinese-cns11643-1 . #x7126)	; ø»’¸
+    (ucs		. #x6C05)	; 氅
     ))
 (define-char
   '((ideographic-radical . 82)	; ⽑
@@ -1882,6 +2032,7 @@
     (chinese-gb2312	. #x6B2B)	; ø»…²º
     (chinese-isoir165	. #x6B2B)	; ø»Ž›Š
     (chinese-cns11643-2 . #x5773)	; ø»”†
+    (chinese-big5	. #xE9E8)	; ý¢€Ž§¨
     (ideograph-daikanwa . 16974)	; ø¸„‰Ž
     (ucs		. #x6C06)	; 氆
     ))
@@ -1977,14 +2128,23 @@
     (ucs		. #x23C06)	; 𣰆
     ))
 (define-char
-  '((ideographic-radical . 82)	; ⽑
+  '((=>ucs		. #x6C08)	; 氈
+    (ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (chinese-cns11643-1		. #x7421)	; ø»’¼–
     (japanese-jisx0208-1990	. #x5D61)	; ø½‹„
-    (chinese-gb12345		. #x5531)	; 氈
+    (chinese-big5		. #xC0D6)	; ý¢€Œƒ–
     (ideograph-daikanwa		. 16982)	; ø¸„‰–
-    (ucs			. #x6C08)	; 氈
+    (ucs-jis			. #x6C08)	; ø½‹„
+    ))
+(define-char
+  '((morohashi-daikanwa	16982 0 0)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 13)
+    (total-strokes	 . 17)
+    (chinese-cns11643-1 . #x7421)	; ø»’¼–
+    (chinese-gb12345	. #x5531)	; 氈
+    (ucs		. #x6C08)	; 氈
     ))
 (define-char
   '((=>ucs		. #x6C08)	; 氈
@@ -2018,11 +2178,19 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (japanese-jisx0212	. #x4646)	; ø»‹›‹
-    (chinese-cns11643-2 . #x5D39)	; ø»”¥€
+    (chinese-big5	. #xED4D)	; ý¢€Žµ
     (ideograph-daikanwa . 16984)	; ø¸„‰˜
     (ucs		. #x6C09)	; 氉
     ))
 (define-char
+  '((=>ucs		. #x6C09)	; 氉
+    (morohashi-daikanwa	16984 0 0)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 13)
+    (total-strokes	 . 17)
+    (chinese-cns11643-2 . #x5D39)	; ø»”¥€
+    ))
+(define-char
   '((ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
@@ -2079,11 +2247,19 @@
     (ucs		. #x23C16)	; 𣰖
     ))
 (define-char
-  '((ideographic-radical . 82)	; ⽑
+  '((=>ucs		. #x6C0B)	; 氋
+    (ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
     (chinese-cns11643-2 . #x6176)	; ø»”«µ
     (ideograph-daikanwa . 16993)	; ø¸„‰¡
+    ))
+(define-char
+  '((morohashi-daikanwa	16993 0 1)
+    (ideographic-radical . 82)	; ⽑
+    (ideographic-strokes . 13)
+    (total-strokes	 . 17)
+    (chinese-big5	. #xEFEA)	; ý¢€Ž¿ª
     (ucs		. #x6C0B)	; 氋
     ))
 (define-char
@@ -2169,6 +2345,7 @@
     (total-strokes	 . 19)
     (chinese-cns11643-2 . #x6566)	; ø»”±
     (chinese-gb12345	. #x6B2A)	; 氌
+    (chinese-big5	. #xF25B)	; ý¢€‰›
     (ideograph-daikanwa . 17009)	; ø¸„‰±
     (ucs		. #x6C0C)	; 氌
     ))
@@ -2262,6 +2439,7 @@
     (ideographic-strokes . 18)
     (total-strokes	 . 22)
     (japanese-jisx0212	. #x4647)	; ø»‹›Œ
+    (chinese-big5	. #xF6E7)	; ý¢€›§
     (ideograph-daikanwa . 17020)	; ø¸„‰¼
     (china3-jef		. #x80C5)	; øºˆƒ…
     ))
diff --git a/lisp/utf-2000/Ideograph-R083-Clan.el b/lisp/utf-2000/Ideograph-R083-Clan.el
index 799fe09..cba5062 100644
--- a/lisp/utf-2000/Ideograph-R083-Clan.el
+++ b/lisp/utf-2000/Ideograph-R083-Clan.el
@@ -10,6 +10,7 @@
     (chinese-isoir165		. #x4A4F)	; ø»«
     (chinese-cns11643-1		. #x4554)	; ø»‘¸‡
     (japanese-jisx0208-1990	. #x3B61)	; ø½Šˆ
+    (chinese-big5		. #xA4F3)	; ý¢€Š“³
     (ideograph-daikanwa		. 17026)	; ø¸„Š‚
     (ucs			. #x6C0F)	; 氏
     ))
@@ -21,6 +22,7 @@
     (japanese-jisx0212		. #x4649)	; ø»‹›Ž
     (chinese-cns11643-1		. #x4662)	; ø»‘¹³
     (japanese-jisx0213-1	. #x764F)	; ø»¤ 
+    (chinese-big5		. #xA5C2)	; ý¢€Š—‚
     (ideograph-daikanwa		. 17027)	; ø¸„Šƒ
     (china3-jef			. #x55A8)	; øº…–¨
     ))
@@ -45,6 +47,7 @@
     (chinese-isoir165		. #x4371)	; ø»¡ 
     (chinese-cns11643-1		. #x4661)	; ø»‘¹²
     (japanese-jisx0208-1990	. #x4C31)	; ø½Šµ–
+    (chinese-big5		. #xA5C1)	; ý¢€Š—
     (ideograph-daikanwa		. 17028)	; ø¸„Š„
     (ucs			. #x6C11)	; 民
     ))
@@ -63,10 +66,18 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (shinjigen-2	. 4040)
-    (chinese-cns11643-1		. #x4E40)	; ø»’…
     (japanese-jisx0208-1990	. #x5D62)	; ø½‹…
+    (chinese-big5		. #xAA5D)	; ý¢€Š©
     (ideograph-daikanwa		. 17030)	; ø¸„Š†
-    (ucs-jis			. #x6C13)	; ø»’…
+    (ucs-jis			. #x6C13)	; ø½‹…
+    ))
+(define-char
+  '((=>ucs		. #x6C13)	; 氓
+    (morohashi-daikanwa	17030 0 0)
+    (ideographic-radical . 83)	; ⽒
+    (ideographic-strokes . 4)
+    (total-strokes	 . 8)
+    (chinese-cns11643-1 . #x4E40)	; ø»’…
     ))
 (define-char
   '((=>ucs		. #x6C13)	; 氓
diff --git a/lisp/utf-2000/Ideograph-R084-Steam.el b/lisp/utf-2000/Ideograph-R084-Steam.el
index 65f22ba..1fc60d0 100644
--- a/lisp/utf-2000/Ideograph-R084-Steam.el
+++ b/lisp/utf-2000/Ideograph-R084-Steam.el
@@ -9,6 +9,7 @@
     (chinese-isoir165		. #x4678)	; ø»¦
     (chinese-cns11643-2		. #x2141)	; ø»“€
     (japanese-jisx0208-1990	. #x5D63)	; ø½‹†
+    (chinese-big5		. #xC961)	; ý¢€Œ¥¡
     (ideograph-daikanwa		. 17043)	; ø¸„Š“
     (ucs			. #x6C14)	; 气
     ))
@@ -19,6 +20,7 @@
     (chinese-gb2312	. #x6B2D)	; ø»…²¼
     (chinese-isoir165	. #x6B2D)	; ø»Ž›Œ
     (chinese-cns11643-2 . #x215F)	; ø»“ž
+    (chinese-big5	. #xC97E)	; ý¢€Œ¥¾
     (ucs		. #x6C15)	; 氕
     ))
 (define-char
@@ -36,6 +38,7 @@
     (chinese-gb2312	. #x444A)	; ø»„º‡
     (chinese-isoir165	. #x444A)	; ø»¢—
     (chinese-cns11643-1 . #x483C)	; ø»‘¼‰
+    (chinese-big5	. #xA6BB)	; ý¢€Šš»
     (ideograph-daikanwa . 17045)	; ø¸„Š•
     (ucs		. #x6C16)	; 氖
     ))
@@ -55,6 +58,7 @@
     (chinese-gb2312	. #x6B2E)	; ø»…²½
     (chinese-isoir165	. #x6B2E)	; ø»Ž›
     (chinese-cns11643-2 . #x2258)	; ø»“Žµ
+    (chinese-big5	. #xC9F7)	; ý¢€Œ§·
     (ucs		. #x6C18)	; 氘
     ))
 (define-char
@@ -74,6 +78,7 @@
     (japanese-jisx0212	. #x464B)	; ø»‹›
     (chinese-isoir165	. #x6B2F)	; ø»Ž›Ž
     (chinese-cns11643-2 . #x2449)	; ø»“‘¢
+    (chinese-big5	. #xCB49)	; ý¢€Œ­‰
     (ideograph-daikanwa . 17047)	; ø¸„Š—
     (ucs		. #x6C19)	; 氙
     ))
@@ -84,6 +89,7 @@
     (chinese-gb2312	. #x6B30)	; ø»…²¿
     (chinese-isoir165	. #x6B30)	; ø»Ž›
     (chinese-cns11643-2 . #x244A)	; ø»“‘£
+    (chinese-big5	. #xCB4A)	; ý¢€Œ­Š
     (ucs		. #x6C1A)	; 氚
     ))
 (define-char
@@ -95,6 +101,7 @@
     (japanese-jisx0208-1978	. #x5D64)	; ø»ƒ•‹
     (japanese-jisx0208		. #x5D64)	; ø»‡©“
     (japanese-jisx0208-1990	. #x5D64)	; ø½‹‡
+    (chinese-big5		. #xAA5E)	; ý¢€Š©ž
     (ideograph-daikanwa		. 17048)	; ø¸„Š˜
     (ucs-jis			. #x6C1B)	; ø»ƒ•‹
     ))
@@ -122,6 +129,7 @@
     (ideographic-radical . 84)	; ⽓
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (chinese-big5	. #xCCED)	; ý¢€Œ³­
     (ideograph-daikanwa . 17054)	; ø¸„Šž
     ))
 (define-char
@@ -206,6 +214,7 @@
     (japanese-jisx0212	. #x464C)	; ø»‹›‘
     (chinese-isoir165	. #x377A)	; ø»
     (chinese-cns11643-1 . #x5177)	; ø»’Š’
+    (chinese-big5	. #xAC74)	; ý¢€Š±´
     (ideograph-daikanwa . 17058)	; ø¸„Š¢
     (ucs		. #x6C1F)	; 氟
     ))
@@ -214,6 +223,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B4D)	; ø»“›¸
+    (chinese-big5	. #xCF6B)	; ý¢€Œ½«
     (ucs		. #x6C20)	; æ° 
     ))
 (define-char
@@ -226,6 +236,13 @@
     (ucs		. #x6C21)	; æ°¡
     ))
 (define-char
+  '((=>ucs		. #x6C21)	; æ°¡
+    (ideographic-radical . 84)	; ⽓
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (chinese-big5	. #xCF6C)	; ý¢€Œ½¬
+    ))
+(define-char
   '((ideographic-radical . 84)	; ⽓
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
@@ -243,6 +260,7 @@
     (korean-ksc5601		. #x5128)	; ø»‰ ³
     (japanese-jisx0208-1990	. #x5D66)	; ø½‹‰
     (chinese-gb12345		. #x4678)	; æ°£
+    (chinese-big5		. #xAEF0)	; ý¢€Š»°
     (ideograph-daikanwa		. 17059)	; ø¸„Š£
     (ucs			. #x6C23)	; æ°£
     ))
@@ -265,6 +283,7 @@
     (chinese-isoir165		. #x6B33)	; ø»Ž›’
     (chinese-cns11643-1		. #x5638)	; ø»’©
     (japanese-jisx0208-1990	. #x5D65)	; ø½‹ˆ
+    (chinese-big5		. #xAEF4)	; ý¢€Š»´
     (ideograph-daikanwa		. 17060)	; ø¸„Š¤
     (ucs			. #x6C24)	; æ°¤
     ))
@@ -282,6 +301,7 @@
     (total-strokes	 . 10)
     (chinese-isoir165	. #x2D73)	; ø»Ž
     (chinese-cns11643-2 . #x3027)	; ø»“¢¨
+    (chinese-big5	. #xD244)	; ý¢€‰„
     (ideograph-daikanwa . 17062)	; ø¸„Š¦
     (ucs		. #x6C25)	; æ°¥
     ))
@@ -290,6 +310,7 @@
     (ideographic-radical . 84)	; ⽓
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (japanese-jisx0212	. #x464D)	; ø»‹›’
     (ideograph-daikanwa . 17063)	; ø¸„Š§
     ))
 (define-char
@@ -307,7 +328,7 @@
     (ideographic-radical . 84)	; ⽓
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (japanese-jisx0212	. #x464D)	; ø»‹›’
+    (chinese-big5	. #xAEF3)	; ý¢€Š»³
     ))
 (define-char
   '((ideographic-radical . 84)	; ⽓
@@ -317,6 +338,7 @@
     (japanese-jisx0212	. #x464E)	; ø»‹›“
     (chinese-isoir165	. #x5175)	; ø»¶ˆ
     (chinese-cns11643-1 . #x5635)	; ø»’¦
+    (chinese-big5	. #xAEF1)	; ý¢€Š»±
     (ideograph-daikanwa . 17064)	; ø¸„Š¨
     (ucs		. #x6C27)	; æ°§
     ))
@@ -326,6 +348,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (japanese-jisx0212	. #x464F)	; ø»‹›”
+    (chinese-big5	. #xAEF2)	; ý¢€Š»²
     (ideograph-daikanwa . 17065)	; ø¸„Š©
     ))
 (define-char
@@ -375,6 +398,7 @@
     (chinese-gb2312	. #x6B34)	; ø»…³ƒ
     (chinese-isoir165	. #x6B34)	; ø»Ž›“
     (chinese-cns11643-2 . #x3643)	; ø»“«¸
+    (chinese-big5	. #xD5DF)	; ý¢€—Ÿ
     (ideograph-daikanwa . 17067)	; ø¸„Š«
     (ucs		. #x6C2A)	; æ°ª
     ))
@@ -384,6 +408,7 @@
     (total-strokes	 . 11)
     (chinese-cns11643-1 . #x5B47)	; ø»’˜Ž
     (chinese-gb12345	. #x4762)	; æ°«
+    (chinese-big5	. #xB242)	; ý¢€‹‰‚
     (ideograph-daikanwa . 17068)	; ø¸„Š¬
     (ucs		. #x6C2B)	; æ°«
     ))
@@ -394,6 +419,7 @@
     (japanese-jisx0212	. #x4650)	; ø»‹›•
     (chinese-cns11643-1 . #x602A)	; ø»’Ÿ‡
     (chinese-gb12345	. #x6B32)	; æ°¬
+    (chinese-big5	. #xB4E3)	; ý¢€‹“£
     (ideograph-daikanwa . 17069)	; ø¸„Š­
     (ucs		. #x6C2C)	; æ°¬
     ))
@@ -412,16 +438,25 @@
     (chinese-gb2312	. #x352A)	; ø»„£¥
     (japanese-jisx0212	. #x4651)	; ø»‹›–
     (chinese-isoir165	. #x352A)	; ø»‹µ
-    (chinese-cns11643-1 . #x6028)	; ø»’Ÿ…
+    (chinese-big5	. #xB4E1)	; ý¢€‹“¡
     (ideograph-daikanwa . 17071)	; ø¸„Š¯
     (ucs		. #x6C2E)	; æ°®
     ))
 (define-char
+  '((=>ucs		. #x6C2E)	; æ°®
+    (morohashi-daikanwa	17071 0 0)
+    (ideographic-radical . 84)	; ⽓
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (chinese-cns11643-1 . #x6028)	; ø»’Ÿ…
+    ))
+(define-char
   '((=>ucs		. #x6C2F)	; æ°¯
     (ideographic-radical . 84)	; ⽓
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (chinese-cns11643-1 . #x6029)	; ø»’Ÿ†
+    (chinese-big5	. #xB4E2)	; ý¢€‹“¢
     (ideograph-daikanwa . 17072)	; ø¸„Š°
     ))
 (define-char
@@ -439,6 +474,7 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (ideograph-gt-pj-4	. #x493C)	; ý¡€…•¦
+    (chinese-big5	. #xD9E6)	; ý¢€§¦
     (ideograph-gt	. 21862)	; ý¡€…•¦
     ))
 (define-char
@@ -505,6 +541,7 @@
     (japanese-jisx0212		. #x4652)	; ø»‹›—
     (chinese-cns11643-1		. #x693B)	; ø»’¬¦
     (japanese-jisx0213-1	. #x7650)	; ø»¤¡
+    (chinese-big5		. #xBA72)	; ý¢€‹©²
     (ideograph-daikanwa		. 17075)	; ø¸„Š³
     (china3-jef			. #x55AD)	; øº…–­
     (ucs			. #x6C33)	; æ°³
diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el
index 229beff..294aa7f 100644
--- a/lisp/utf-2000/Ideograph-R085-Water.el
+++ b/lisp/utf-2000/Ideograph-R085-Water.el
@@ -11,6 +11,7 @@
     (chinese-isoir165		. #x4B2E)	; ø»¬
     (chinese-cns11643-1		. #x4555)	; ø»‘¸ˆ
     (japanese-jisx0208-1990	. #x3F65)	; ø½Š£„
+    (chinese-big5		. #xA4F4)	; ý¢€Š“´
     (ideograph-daikanwa		. 17083)	; ø¸„Š»
     (ucs			. #x6C34)	; æ°´
     ))
@@ -39,6 +40,7 @@
     (japanese-jisx0212		. #x4654)	; ø»‹›™
     (chinese-cns11643-2		. #x2160)	; ø»“Ÿ
     (japanese-jisx0213-2	. #x6E32)	; ø»¦Ž—
+    (chinese-big5		. #xC9A1)	; ý¢€Œ¦¡
     (ideograph-daikanwa		. 17086)	; ø¸„Š¾
     (ucs			. #x6C36)	; æ°¶
     ))
@@ -69,6 +71,7 @@
     (chinese-isoir165		. #x5340)	; ø»¸
     (chinese-cns11643-1		. #x4663)	; ø»‘¹´
     (japanese-jisx0208-1990	. #x314A)	; ø½ŠŽ…
+    (chinese-big5		. #xA5C3)	; ý¢€Š—ƒ
     (ideograph-daikanwa		. 17088)	; ø¸„‹€
     (ucs			. #x6C38)	; æ°¸
     ))
@@ -119,6 +122,7 @@
     (total-strokes	 . 5)
     (japanese-jisx0212	. #x4656)	; ø»‹››
     (chinese-cns11643-2 . #x2163)	; ø»“¢
+    (chinese-big5	. #xC9A4)	; ý¢€Œ¦¤
     (ideograph-daikanwa . 17094)	; ø¸„‹†
     (ucs		. #x6C3B)	; æ°»
     ))
@@ -141,6 +145,14 @@
     (ucs		. #x6C3D)	; æ°½
     ))
 (define-char
+  '((=>ucs		. #x6C46)	; 汆
+    (morohashi-daikanwa	17100 0 7)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 2)
+    (total-strokes	 . 6)
+    (chinese-big5	. #xC9F8)	; ý¢€Œ§¸
+    ))
+(define-char
   '((morohashi-daikanwa	17100 0 8)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 2)
@@ -161,6 +173,7 @@
     (chinese-isoir165		. #x2F6A)	; ø»„
     (chinese-cns11643-1		. #x4666)	; ø»‘¹·
     (japanese-jisx0208-1990	. #x4845)	; ø½Š¯²
+    (chinese-big5		. #xA5C6)	; ý¢€Š—†
     (ideograph-daikanwa		. 17101)	; ø¸„‹
     (ucs			. #x6C3E)	; æ°¾
     ))
@@ -172,6 +185,7 @@
     (chinese-isoir165		. #x7C6B)	; ø»Žµˆ
     (chinese-cns11643-2		. #x2162)	; ø»“¡
     (japanese-jisx0213-2	. #x6E35)	; ø»¦Žš
+    (chinese-big5		. #xC9A3)	; ý¢€Œ¦£
     (ideograph-daikanwa		. 17102)	; ø¸„‹Ž
     (china3-jef			. #x55B5)	; øº…–µ
     (ucs			. #x6C3F)	; æ°¿
@@ -188,6 +202,7 @@
     (chinese-isoir165		. #x4D21)	; ø»®¼
     (chinese-cns11643-1		. #x4665)	; ø»‘¹¶
     (japanese-jisx0208-1990	. #x4475)	; ø½Šªª
+    (chinese-big5		. #xA5C5)	; ý¢€Š—…
     (ideograph-daikanwa		. 17103)	; ø¸„‹
     (ucs			. #x6C40)	; 汀
     ))
@@ -203,6 +218,7 @@
     (chinese-isoir165		. #x562D)	; ø»¼–
     (chinese-cns11643-1		. #x4664)	; ø»‘¹µ
     (japanese-jisx0208-1990	. #x3D41)	; ø½ŠŸ¤
+    (chinese-big5		. #xA5C4)	; ý¢€Š—„
     (ideograph-daikanwa		. 17104)	; ø¸„‹
     (ucs			. #x6C41)	; 汁
     ))
@@ -218,15 +234,24 @@
     (chinese-isoir165		. #x4773)	; ø»§š
     (chinese-cns11643-1		. #x4A65)	; ø»‘¿®
     (japanese-jisx0208-1990	. #x3561)	; ø½Š””
+    (chinese-big5		. #xA844)	; ý¢€Š¡„
     (ideograph-daikanwa		. 17105)	; ø¸„‹‘
     (ucs			. #x6C42)	; 求
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6C43)	; 汃
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (chinese-cns11643-2 . #x2161)	; ø»“ 
+    (chinese-big5	. #xC9A2)	; ý¢€Œ¦¢
     (ideograph-daikanwa . 17106)	; ø¸„‹’
+    ))
+(define-char
+  '((morohashi-daikanwa	17106 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 2)
+    (total-strokes	 . 5)
+    (chinese-cns11643-2 . #x2161)	; ø»“ 
     (ucs		. #x6C43)	; 汃
     ))
 (define-char
@@ -308,14 +333,22 @@
     (ucs		. #x23C76)	; 𣱶
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6C4A)	; 汊
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (chinese-gb2312	. #x6362)	; ø»…¨
     (japanese-jisx0212	. #x4658)	; ø»‹›
+    (chinese-big5	. #xC9FC)	; ý¢€Œ§¼
+    (ideograph-daikanwa . 17115)	; ø¸„‹›
+    ))
+(define-char
+  '((morohashi-daikanwa	17115 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
+    (chinese-gb2312	. #x6362)	; ø»…¨
     (chinese-isoir165	. #x6362)	; ø»Ž‘
     (chinese-cns11643-2 . #x225D)	; ø»“Žº
-    (ideograph-daikanwa . 17115)	; ø¸„‹›
     (ucs		. #x6C4A)	; 汊
     ))
 (define-char
@@ -324,6 +357,7 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (japanese-jisx0212	. #x4659)	; ø»‹›ž
+    (chinese-big5	. #xC9FE)	; ý¢€Œ§¾
     (ideograph-daikanwa . 17116)	; ø¸„‹œ
     (china3-jef		. #x55B6)	; øº…–¶
     ))
@@ -340,6 +374,7 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (chinese-cns11643-2 . #x2260)	; ø»“Ž½
+    (chinese-big5	. #xCA40)	; ý¢€Œ©€
     (ideograph-daikanwa . 17117)	; ø¸„‹
     (ucs		. #x6C4C)	; 汌
     ))
@@ -360,6 +395,7 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (chinese-cns11643-1 . #x4846)	; ø»‘¼“
+    (chinese-big5	. #xA6C5)	; ý¢€Š›…
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -370,6 +406,7 @@
     (korean-ksc5601		. #x5B71)	; ø»‰°¨
     (chinese-cns11643-1		. #x4847)	; ø»‘¼”
     (japanese-jisx0208-1990	. #x4846)	; ø½Š¯³
+    (chinese-big5		. #xA6C6)	; ý¢€Š›†
     (ideograph-daikanwa		. 17120)	; ø¸„‹ 
     (ucs			. #x6C4E)	; 汎
     ))
@@ -379,6 +416,7 @@
     (total-strokes	 . 6)
     (japanese-jisx0212	. #x465B)	; ø»‹› 
     (chinese-cns11643-2 . #x225C)	; ø»“Ž¹
+    (chinese-big5	. #xC9FB)	; ý¢€Œ§»
     (ideograph-daikanwa . 17121)	; ø¸„‹¡
     (china3-jef		. #x55B8)	; øº…–¸
     (ucs		. #x6C4F)	; 汏
@@ -395,6 +433,7 @@
     (chinese-isoir165		. #x4F2B)	; ø»²‚
     (chinese-cns11643-1		. #x4842)	; ø»‘¼
     (japanese-jisx0208-1990	. #x3C2E)	; ø½Š³
+    (chinese-big5		. #xA6C1)	; ý¢€Š›
     (ideograph-daikanwa		. 17122)	; ø¸„‹¢
     (ucs			. #x6C50)	; 汐
     ))
@@ -412,6 +451,7 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (japanese-jisx0212	. #x465C)	; ø»‹›¡
+    (chinese-big5	. #xC9F9)	; ý¢€Œ§¹
     (ideograph-daikanwa . 17125)	; ø¸„‹¥
     (china3-jef		. #x55B9)	; øº…–¹
     ))
@@ -446,6 +486,7 @@
     (japanese-jisx0212	. #x465D)	; ø»‹›¢
     (chinese-isoir165	. #x6360)	; ø»Ž
     (chinese-cns11643-2 . #x225E)	; ø»“Ž»
+    (chinese-big5	. #xC9FD)	; ý¢€Œ§½
     (ideograph-daikanwa . 17127)	; ø¸„‹§
     (china3-jef		. #x55BA)	; øº…–º
     (ucs		. #x6C54)	; 汔
@@ -462,6 +503,7 @@
     (chinese-isoir165		. #x4947)	; ø»©ª
     (chinese-cns11643-1		. #x4843)	; ø»‘¼
     (japanese-jisx0208-1990	. #x5D68)	; ø½‹‹
+    (chinese-big5		. #xA6C2)	; ý¢€Š›‚
     (ideograph-daikanwa		. 17128)	; ø¸„‹¨
     (ucs			. #x6C55)	; 汕
     ))
@@ -485,6 +527,7 @@
     (chinese-isoir165		. #x3A39)	; ø»“š
     (chinese-cns11643-1		. #x483E)	; ø»‘¼‹
     (japanese-jisx0208-1990	. #x3440)	; ø½Š’•
+    (chinese-big5		. #xA6BD)	; ý¢€Šš½
     (ideograph-daikanwa		. 17130)	; ø¸„‹ª
     (ucs			. #x6C57)	; 汗
     ))
@@ -503,6 +546,7 @@
     (japanese-jisx0212		. #x465E)	; ø»‹›£
     (chinese-cns11643-1		. #x483F)	; ø»‘¼Œ
     (japanese-jisx0213-1	. #x7651)	; ø»¤¢
+    (chinese-big5		. #xA6BE)	; ý¢€Šš¾
     (ideograph-daikanwa		. 17132)	; ø¸„‹¬
     (china3-jef			. #x55BB)	; øº…–»
     (ucs			. #x6C59)	; 汙
@@ -527,18 +571,27 @@
     (chinese-gb2312	. #x4E5B)	; ø»…‰„
     (chinese-isoir165	. #x4E5B)	; ø»±”
     (chinese-cns11643-1 . #x4844)	; ø»‘¼‘
+    (chinese-big5	. #xA6C3)	; ý¢€Š›ƒ
     (ideograph-daikanwa . 17134)	; ø¸„‹®
     (ucs		. #x6C61)	; 污
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6C5B)	; 汛
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (chinese-gb2312	. #x5134)	; ø»…Œ·
     (japanese-jisx0212	. #x465F)	; ø»‹›¤
+    (chinese-big5	. #xA6C4)	; ý¢€Š›„
+    (ideograph-daikanwa . 17135)	; ø¸„‹¯
+    ))
+(define-char
+  '((morohashi-daikanwa	17135 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
+    (chinese-gb2312	. #x5134)	; ø»…Œ·
     (chinese-isoir165	. #x5134)	; ø»µ‡
     (chinese-cns11643-1 . #x4845)	; ø»‘¼’
-    (ideograph-daikanwa . 17135)	; ø¸„‹¯
     (china3-jef		. #x55BC)	; øº…–¼
     (ucs		. #x6C5B)	; 汛
     ))
@@ -551,6 +604,7 @@
     (chinese-isoir165		. #x6361)	; ø»Ž
     (chinese-cns11643-2		. #x225B)	; ø»“Ž¸
     (japanese-jisx0213-1	. #x7652)	; ø»¤£
+    (chinese-big5		. #xC9FA)	; ý¢€Œ§º
     (ideograph-daikanwa		. 17136)	; ø¸„‹°
     (china3-jef			. #x55BD)	; øº…–½
     (ucs			. #x6C5C)	; 汜
@@ -565,12 +619,20 @@
     (japanese-jisx0208		. #x4672)	; ø»‡‡¯
     (korean-ksc5601		. #x6623)	; ø»‰¿¤
     (chinese-isoir165		. #x486A)	; ø»¨¯
-    (chinese-cns11643-1		. #x483D)	; ø»‘¼Š
     (japanese-jisx0208-1990	. #x4672)	; ø½Š­£
+    (chinese-big5		. #xA6BC)	; ý¢€Šš¼
     (ideograph-daikanwa		. 17138)	; ø¸„‹²
     (ucs			. #x6C5D)	; 汝
     ))
 (define-char
+  '((=>ucs		. #x6C5D)	; 汝
+    (morohashi-daikanwa	17138 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
+    (chinese-cns11643-1 . #x483D)	; ø»‘¼Š
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
@@ -582,6 +644,7 @@
     (chinese-isoir165		. #x392F)	; ø»‘²
     (chinese-cns11643-1		. #x4A66)	; ø»‘¿¯
     (japanese-jisx0208-1990	. #x5D67)	; ø½‹Š
+    (chinese-big5		. #xA845)	; ý¢€Š¡…
     (ideograph-daikanwa		. 17139)	; ø¸„‹³
     (ucs			. #x6C5E)	; 汞
     ))
@@ -597,6 +660,7 @@
     (chinese-isoir165		. #x3D2D)	; ø»—¨
     (chinese-cns11643-1		. #x4840)	; ø»‘¼
     (japanese-jisx0208-1990	. #x393E)	; ø½Š™©
+    (chinese-big5		. #xA6BF)	; ý¢€Šš¿
     (ideograph-daikanwa		. 17140)	; ø¸„‹´
     (ucs			. #x6C5F)	; 江
     ))
@@ -610,12 +674,20 @@
     (japanese-jisx0208		. #x4353)	; ø»‡‚¶
     (korean-ksc5601		. #x722E)	; ø»Š‘—
     (chinese-isoir165		. #x3358)	; ø»‰§
-    (chinese-cns11643-1		. #x4841)	; ø»‘¼Ž
     (japanese-jisx0208-1990	. #x4353)	; ø½Š¨ª
+    (chinese-big5		. #xA6C0)	; ý¢€Š›€
     (ideograph-daikanwa		. 17141)	; ø¸„‹µ
     (ucs			. #x6C60)	; æ± 
     ))
 (define-char
+  '((=>ucs		. #x6C60)	; æ± 
+    (morohashi-daikanwa	17141 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
+    (chinese-cns11643-1 . #x4841)	; ø»‘¼Ž
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
@@ -733,18 +805,12 @@
     (ucs		. #x23C86)	; 𣲆
     ))
 (define-char
-  '((=>ucs		. #x6C65)	; æ±¥
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (ideograph-daikanwa . 17149)	; ø¸„‹½
-    ))
-(define-char
-  '((morohashi-daikanwa	17149 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (chinese-cns11643-2 . #x245B)	; ø»“‘´
+    (chinese-big5	. #xCB5B)	; ý¢€Œ­›
+    (ideograph-daikanwa . 17149)	; ø¸„‹½
     (ucs		. #x6C65)	; æ±¥
     ))
 (define-char
@@ -752,6 +818,7 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (chinese-cns11643-2 . #x2459)	; ø»“‘²
+    (chinese-big5	. #xCB59)	; ý¢€Œ­™
     (ideograph-daikanwa . 17150)	; ø¸„‹¾
     (ucs		. #x6C66)	; 汦
     ))
@@ -761,6 +828,7 @@
     (total-strokes	 . 7)
     (chinese-isoir165	. #x7C6C)	; ø»Žµ‰
     (chinese-cns11643-2 . #x244C)	; ø»“‘¥
+    (chinese-big5	. #xCB4C)	; ý¢€Œ­Œ
     (ideograph-daikanwa . 17151)	; ø¸„‹¿
     (ucs		. #x6C67)	; 汧
     ))
@@ -776,6 +844,7 @@
     (chinese-isoir165		. #x6368)	; ø»Ž—
     (chinese-cns11643-1		. #x4A72)	; ø»‘¿»
     (japanese-jisx0208-1990	. #x5D71)	; ø½‹”
+    (chinese-big5		. #xA851)	; ý¢€Š¡‘
     (ideograph-daikanwa		. 17152)	; ø¸„Œ€
     (ucs			. #x6C68)	; 汨
     ))
@@ -786,6 +855,7 @@
     (chinese-gb2312	. #x6369)	; ø»…¨ˆ
     (chinese-isoir165	. #x6369)	; ø»Ž˜
     (chinese-cns11643-2 . #x2453)	; ø»“‘¬
+    (chinese-big5	. #xCB53)	; ý¢€Œ­“
     (ideograph-daikanwa . 17153)	; ø¸„Œ
     (ucs		. #x6C69)	; 汩
     ))
@@ -801,6 +871,7 @@
     (chinese-isoir165		. #x4D74)	; ø»°
     (chinese-cns11643-1		. #x4A6D)	; ø»‘¿¶
     (japanese-jisx0208-1990	. #x5D6A)	; ø½‹
+    (chinese-big5		. #xA84C)	; ý¢€Š¡Œ
     (ideograph-daikanwa		. 17154)	; ø¸„Œ‚
     (ucs			. #x6C6A)	; 汪
     ))
@@ -810,6 +881,7 @@
     (total-strokes	 . 7)
     (japanese-jisx0212	. #x4661)	; ø»‹›¦
     (chinese-cns11643-2 . #x244D)	; ø»“‘¦
+    (chinese-big5	. #xCB4D)	; ý¢€Œ­
     (ideograph-daikanwa . 17155)	; ø¸„Œƒ
     (ucs		. #x6C6B)	; 汫
     ))
@@ -829,6 +901,7 @@
     (korean-ksc5601		. #x6757)	; ø»Š¶
     (japanese-jisx0212		. #x4662)	; ø»‹›§
     (japanese-jisx0213-2	. #x6E38)	; ø»¦Ž
+    (chinese-big5		. #xCB55)	; ý¢€Œ­•
     (ideograph-daikanwa		. 17157)	; ø¸„Œ…
     (china3-jef			. #x55BE)	; øº…–¾
     ))
@@ -862,6 +935,7 @@
     (total-strokes	 . 7)
     (japanese-jisx0212	. #x4663)	; ø»‹›¨
     (chinese-cns11643-2 . #x2452)	; ø»“‘«
+    (chinese-big5	. #xCB52)	; ý¢€Œ­’
     (ideograph-daikanwa . 17159)	; ø¸„Œ‡
     (china3-jef		. #x55BF)	; øº…–¿
     (ucs		. #x6C6F)	; 汯
@@ -878,6 +952,7 @@
     (chinese-isoir165		. #x4C2D)	; ø»­ª
     (chinese-cns11643-1		. #x4A70)	; ø»‘¿¹
     (japanese-jisx0208-1990	. #x4241)	; ø½Š¦º
+    (chinese-big5		. #xA84F)	; ý¢€Š¡
     (ideograph-daikanwa		. 17160)	; ø¸„Œˆ
     (ucs			. #x6C70)	; æ±°
     ))
@@ -886,6 +961,7 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (chinese-cns11643-2 . #x2451)	; ø»“‘ª
+    (chinese-big5	. #xCB51)	; ý¢€Œ­‘
     (ideograph-daikanwa . 17161)	; ø¸„Œ‰
     (ucs		. #x6C71)	; æ±±
     ))
@@ -896,6 +972,7 @@
     (total-strokes	 . 7)
     (korean-ksc5601	. #x5063)	; ø»‰ 
     (chinese-cns11643-1 . #x4A77)	; ø»’€€
+    (chinese-big5	. #xA856)	; ý¢€Š¡–
     (ideograph-daikanwa . 17163)	; ø¸„Œ‹
     ))
 (define-char
@@ -912,7 +989,8 @@
     (ucs			. #x6C72)	; æ±²
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6C73)	; æ±³
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (shinjigen-2	. 4103)
@@ -920,8 +998,15 @@
     (japanese-jisx0208		. #x5D72)	; ø»‡©¡
     (chinese-cns11643-2		. #x245A)	; ø»“‘³
     (japanese-jisx0208-1990	. #x5D72)	; ø½‹•
+    (chinese-big5		. #xCB5A)	; ý¢€Œ­š
     (ideograph-daikanwa		. 17164)	; ø¸„ŒŒ
-    (ucs			. #x6C73)	; æ±³
+    ))
+(define-char
+  '((morohashi-daikanwa	17164 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (ucs		. #x6C73)	; æ±³
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -931,6 +1016,7 @@
     (japanese-jisx0212	. #x4664)	; ø»‹›©
     (chinese-isoir165	. #x636A)	; ø»Ž™
     (chinese-cns11643-1 . #x4A79)	; ø»’€‚
+    (chinese-big5	. #xA858)	; ý¢€Š¡˜
     (ideograph-daikanwa . 17165)	; ø¸„Œ
     (china3-jef		. #x91EE)	; øº‰‡®
     (ucs		. #x6C74)	; æ±´
@@ -959,6 +1045,7 @@
     (korean-ksc5601		. #x5A21)	; ø»‰­º
     (japanese-jisx0212		. #x4665)	; ø»‹›ª
     (japanese-jisx0213-1	. #x7655)	; ø»¤¦
+    (chinese-big5		. #xA85A)	; ý¢€Š¡š
     (ideograph-daikanwa		. 17168)	; ø¸„Œ
     ))
 (define-char
@@ -993,6 +1080,7 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (japanese-jisx0212	. #x4666)	; ø»‹›«
+    (chinese-big5	. #xCB4B)	; ý¢€Œ­‹
     (ideograph-daikanwa . 17171)	; ø¸„Œ“
     (china3-jef		. #x55C1)	; øº…—
     ))
@@ -1024,17 +1112,26 @@
     (japanese-jisx0208-1978	. #x3768)	; ø»‚›
     (japanese-jisx0208		. #x3768)	; ø»†±£
     (korean-ksc5601		. #x4C3D)	; ø»‰™²
-    (chinese-cns11643-1		. #x4A6E)	; ø»‘¿·
     (japanese-jisx0208-1990	. #x3768)	; ø½Š——
+    (chinese-big5		. #xA84D)	; ý¢€Š¡
     (ideograph-daikanwa		. 17174)	; ø¸„Œ–
     (ucs			. #x6C7A)	; 決
     ))
 (define-char
+  '((=>ucs		. #x6C7A)	; 決
+    (morohashi-daikanwa	17174 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (chinese-cns11643-1 . #x4A6E)	; ø»‘¿·
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (japanese-jisx0212	. #x4668)	; ø»‹›­
     (chinese-cns11643-2 . #x245C)	; ø»“‘µ
+    (chinese-big5	. #xCB5C)	; ý¢€Œ­œ
     (ideograph-daikanwa . 17175)	; ø¸„Œ—
     (ucs		. #x6C7B)	; æ±»
     ))
@@ -1058,23 +1155,39 @@
     (chinese-isoir165		. #x467B)	; ø»¦„
     (chinese-cns11643-1		. #x4A75)	; ø»‘¿¾
     (japanese-jisx0208-1990	. #x3525)	; ø½Š“˜
+    (chinese-big5		. #xA854)	; ý¢€Š¡”
     (ideograph-daikanwa		. 17177)	; ø¸„Œ™
     (ucs			. #x6C7D)	; æ±½
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6C7E)	; æ±¾
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (shinjigen-2	. 4099)
     (japanese-jisx0208-1978	. #x5D70)	; ø»ƒ•—
-    (chinese-gb2312		. #x375A)	; ø»„§‘
     (japanese-jisx0208		. #x5D70)	; ø»‡©Ÿ
     (korean-ksc5601		. #x5D4C)	; ø»‰²¿
-    (chinese-isoir165		. #x375A)	; ø»¡
-    (chinese-cns11643-1		. #x4A78)	; ø»’€
     (japanese-jisx0208-1990	. #x5D70)	; ø½‹“
+    (chinese-big5		. #xA857)	; ý¢€Š¡—
     (ideograph-daikanwa		. 17178)	; ø¸„Œš
-    (ucs			. #x6C7E)	; æ±¾
+    ))
+(define-char
+  '((=>ucs		. #x6C7E)	; æ±¾
+    (morohashi-daikanwa	17178 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (chinese-cns11643-1 . #x4A78)	; ø»’€
+    ))
+(define-char
+  '((morohashi-daikanwa	17178 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (chinese-gb2312	. #x375A)	; ø»„§‘
+    (chinese-isoir165	. #x375A)	; ø»¡
+    (ucs		. #x6C7E)	; æ±¾
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -1089,6 +1202,7 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (chinese-cns11643-2 . #x2765)	; ø»“–˜
+    (chinese-big5	. #xCD45)	; ý¢€Œµ…
     (ideograph-daikanwa . 17181)	; ø¸„Œ
     (ucs		. #x6C80)	; 沀
     ))
@@ -1104,6 +1218,7 @@
     (chinese-isoir165		. #x475F)	; ø»§†
     (chinese-cns11643-1		. #x4A68)	; ø»‘¿±
     (japanese-jisx0208-1990	. #x5D6E)	; ø½‹‘
+    (chinese-big5		. #xA847)	; ý¢€Š¡‡
     (ideograph-daikanwa		. 17182)	; ø¸„Œž
     (ucs			. #x6C81)	; 沁
     ))
@@ -1119,6 +1234,7 @@
     (chinese-isoir165		. #x524A)	; ø»¶»
     (chinese-cns11643-1		. #x4B21)	; ø»’€ˆ
     (japanese-jisx0208-1990	. #x5D6B)	; ø½‹Ž
+    (chinese-big5		. #xA85E)	; ý¢€Š¡ž
     (ideograph-daikanwa		. 17183)	; ø¸„ŒŸ
     (ucs			. #x6C82)	; 沂
     ))
@@ -1134,6 +1250,7 @@
     (chinese-isoir165		. #x4E56)	; ø»±
     (chinese-cns11643-1		. #x4A76)	; ø»‘¿¿
     (japanese-jisx0208-1990	. #x4D60)	; ø½Š·£
+    (chinese-big5		. #xA855)	; ý¢€Š¡•
     (ideograph-daikanwa		. 17184)	; ø¸„Œ 
     (ucs			. #x6C83)	; 沃
     ))
@@ -1144,6 +1261,7 @@
     (chinese-isoir165		. #x7C6D)	; ø»ŽµŠ
     (chinese-cns11643-2		. #x244E)	; ø»“‘§
     (japanese-jisx0213-2	. #x6E39)	; ø»¦Žž
+    (chinese-big5		. #xCB4E)	; ý¢€Œ­Ž
     (ideograph-daikanwa		. 17185)	; ø¸„Œ¡
     (china3-jef			. #x95B7)	; øº‰–·
     (ucs			. #x6C84)	; 沄
@@ -1158,6 +1276,7 @@
     (chinese-isoir165		. #x6364)	; ø»Ž“
     (chinese-cns11643-1		. #x4A6B)	; ø»‘¿´
     (japanese-jisx0213-1	. #x7656)	; ø»¤§
+    (chinese-big5		. #xA84A)	; ý¢€Š¡Š
     (ideograph-daikanwa		. 17186)	; ø¸„Œ¢
     (china3-jef			. #x55C2)	; øº…—‚
     (ucs			. #x6C85)	; 沅
@@ -1170,6 +1289,7 @@
     (korean-ksc5601		. #x797A)	; ø»Šœµ
     (japanese-jisx0212		. #x466A)	; ø»‹›¯
     (japanese-jisx0213-1	. #x7657)	; ø»¤¨
+    (chinese-big5		. #xA859)	; ý¢€Š¡™
     (ideograph-daikanwa		. 17187)	; ø¸„Œ£
     (china3-jef			. #x55C3)	; øº…—ƒ
     ))
@@ -1191,6 +1311,7 @@
     (japanese-jisx0212	. #x466B)	; ø»‹›°
     (chinese-isoir165	. #x2E5B)	; ø»‚”
     (chinese-cns11643-2 . #x2456)	; ø»“‘¯
+    (chinese-big5	. #xCB56)	; ý¢€Œ­–
     (ideograph-daikanwa . 17188)	; ø¸„Œ¤
     (ucs		. #x6C87)	; 沇
     ))
@@ -1206,6 +1327,7 @@
     (chinese-isoir165		. #x4972)	; ø»ª•
     (chinese-cns11643-1		. #x4A69)	; ø»‘¿²
     (japanese-jisx0208-1990	. #x4440)	; ø½Š©µ
+    (chinese-big5		. #xA848)	; ý¢€Š¡ˆ
     (ideograph-daikanwa		. 17189)	; ø¸„Œ¥
     (ucs			. #x6C88)	; 沈
     ))
@@ -1217,6 +1339,7 @@
     (japanese-jisx0212		. #x466C)	; ø»‹›±
     (chinese-isoir165		. #x3341)	; ø»‰
     (japanese-jisx0213-2	. #x6E3A)	; ø»¦ŽŸ
+    (chinese-big5		. #xA849)	; ý¢€Š¡‰
     (ideograph-daikanwa		. 17190)	; ø¸„Œ¦
     (china3-jef			. #x55C4)	; øº…—„
     (ucs			. #x6C89)	; 沉
@@ -1234,6 +1357,7 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (chinese-cns11643-2 . #x2763)	; ø»“––
+    (chinese-big5	. #xCD43)	; ý¢€Œµƒ
     (ideograph-daikanwa . 17191)	; ø¸„Œ§
     (ucs		. #x6C8A)	; 沊
     ))
@@ -1242,23 +1366,32 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (chinese-cns11643-2 . #x244F)	; ø»“‘¨
+    (chinese-big5	. #xCB4F)	; ý¢€Œ­
     (ideograph-daikanwa . 17192)	; ø¸„Œ¨
     (ucs		. #x6C8B)	; 沋
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6C8C)	; 沌
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (shinjigen-2	. 4096)
     (japanese-jisx0208-1978	. #x4659)	; ø»‚³Ž
-    (chinese-gb2312		. #x6367)	; ø»…¨†
     (japanese-jisx0208		. #x4659)	; ø»‡‡–
     (korean-ksc5601		. #x5447)	; ø»‰¥¬
-    (chinese-isoir165		. #x6367)	; ø»Ž–
-    (chinese-cns11643-1		. #x4A71)	; ø»‘¿º
     (japanese-jisx0208-1990	. #x4659)	; ø½Š­Š
+    (chinese-big5		. #xA850)	; ý¢€Š¡
     (ideograph-daikanwa		. 17193)	; ø¸„Œ©
-    (ucs			. #x6C8C)	; 沌
+    ))
+(define-char
+  '((morohashi-daikanwa	17193 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (chinese-gb2312	. #x6367)	; ø»…¨†
+    (chinese-isoir165	. #x6367)	; ø»Ž–
+    (chinese-cns11643-1 . #x4A71)	; ø»‘¿º
+    (ucs		. #x6C8C)	; 沌
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -1269,6 +1402,7 @@
     (japanese-jisx0208		. #x5D6C)	; ø»‡©›
     (chinese-cns11643-1		. #x4A7C)	; ø»’€…
     (japanese-jisx0208-1990	. #x5D6C)	; ø½‹
+    (chinese-big5		. #xA85B)	; ý¢€Š¡›
     (ideograph-daikanwa		. 17194)	; ø¸„Œª
     (ucs			. #x6C8D)	; 沍
     ))
@@ -1276,11 +1410,19 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (chinese-cns11643-2 . #x245D)	; ø»“‘¶
+    (chinese-big5	. #xCB5D)	; ý¢€Œ­
     (ideograph-daikanwa . 17197)	; ø¸„Œ­
     (ucs		. #x6C8E)	; 沎
     ))
 (define-char
+  '((=>ucs		. #x6C8E)	; 沎
+    (morohashi-daikanwa	17197 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (chinese-cns11643-2 . #x245D)	; ø»“‘¶
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
@@ -1290,13 +1432,21 @@
     (ucs			. #x3CC3)	; 㳃
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6C8F)	; 沏
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (chinese-big5	. #xCB50)	; ý¢€Œ­
+    (ideograph-daikanwa . 17199)	; ø¸„Œ¯
+    ))
+(define-char
+  '((morohashi-daikanwa	17199 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (chinese-gb2312	. #x4663)	; ø»„½œ
     (chinese-isoir165	. #x4663)	; ø»¥¬
     (chinese-cns11643-2 . #x2450)	; ø»“‘©
-    (ideograph-daikanwa . 17199)	; ø¸„Œ¯
     (ucs		. #x6C8F)	; 沏
     ))
 (define-char
@@ -1311,6 +1461,7 @@
     (chinese-isoir165		. #x6365)	; ø»Ž”
     (chinese-cns11643-1		. #x4A6F)	; ø»‘¿¸
     (japanese-jisx0208-1990	. #x5D74)	; ø½‹—
+    (chinese-big5		. #xA84E)	; ý¢€Š¡Ž
     (ideograph-daikanwa		. 17201)	; ø¸„Œ±
     (ucs			. #x6C90)	; 沐
     ))
@@ -1332,6 +1483,7 @@
     (korean-ksc5601		. #x5952)	; ø»‰­
     (chinese-cns11643-1		. #x4A74)	; ø»‘¿½
     (japanese-jisx0208-1990	. #x5D73)	; ø½‹–
+    (chinese-big5		. #xA853)	; ý¢€Š¡“
     (ideograph-daikanwa		. 17204)	; ø¸„Œ´
     (ucs			. #x6C92)	; 沒
     ))
@@ -1347,6 +1499,7 @@
     (chinese-isoir165		. #x6D33)	; ø»ŽžŽ
     (chinese-cns11643-2		. #x274F)	; ø»“–‚
     (japanese-jisx0208-1990	. #x3723)	; ø½Š–’
+    (chinese-big5		. #xCCEE)	; ý¢€Œ³®
     (ideograph-daikanwa		. 17206)	; ø¸„Œ¶
     (ucs			. #x6C93)	; 沓
     ))
@@ -1360,6 +1513,7 @@
     (chinese-isoir165		. #x6366)	; ø»Ž•
     (chinese-cns11643-1		. #x4A7D)	; ø»’€†
     (japanese-jisx0213-2	. #x6E3C)	; ø»¦Ž¡
+    (chinese-big5		. #xA85C)	; ý¢€Š¡œ
     (ideograph-daikanwa		. 17207)	; ø¸„Œ·
     (china3-jef			. #x55C5)	; øº…—…
     (ucs			. #x6C94)	; 沔
@@ -1372,6 +1526,7 @@
     (japanese-jisx0212		. #x466E)	; ø»‹›³
     (chinese-cns11643-2		. #x2457)	; ø»“‘°
     (japanese-jisx0213-2	. #x6E3D)	; ø»¦Ž¢
+    (chinese-big5		. #xCB57)	; ý¢€Œ­—
     (ideograph-daikanwa		. 17208)	; ø¸„Œ¸
     (china3-jef			. #x55C6)	; øº…—†
     (ucs			. #x6C95)	; 沕
@@ -1388,6 +1543,7 @@
     (chinese-isoir165		. #x2D54)	; ø»€¯
     (chinese-cns11643-1		. #x4A73)	; ø»‘¿¼
     (japanese-jisx0208-1990	. #x322D)	; ø½Š†
+    (chinese-big5		. #xA852)	; ý¢€Š¡’
     (ideograph-daikanwa		. 17209)	; ø¸„Œ¹
     (ucs			. #x6C96)	; 沖
     ))
@@ -1434,21 +1590,30 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (chinese-cns11643-1 . #x4A7E)	; ø»’€‡
+    (chinese-big5	. #xA85D)	; ý¢€Š¡
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6C99)	; 沙
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (shinjigen-2	. 4085)
     (japanese-jisx0208-1978	. #x3A3B)	; ø»‚¡ˆ
-    (chinese-gb2312		. #x4933)	; ø»…†
     (japanese-jisx0208		. #x3A3B)	; ø»†µ
     (korean-ksc5601		. #x5E5E)	; ø»‰´¯
-    (chinese-isoir165		. #x4933)	; ø»©–
-    (chinese-cns11643-1		. #x4A67)	; ø»‘¿°
     (japanese-jisx0208-1990	. #x3A3B)	; ø½Š›„
+    (chinese-big5		. #xA846)	; ý¢€Š¡†
     (ideograph-daikanwa		. 17212)	; ø¸„Œ¼
-    (ucs			. #x6C99)	; 沙
+    ))
+(define-char
+  '((morohashi-daikanwa	17212 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (chinese-gb2312	. #x4933)	; ø»…†
+    (chinese-isoir165	. #x4933)	; ø»©–
+    (chinese-cns11643-1 . #x4A67)	; ø»‘¿°
+    (ucs		. #x6C99)	; 沙
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -1461,6 +1626,7 @@
     (chinese-isoir165		. #x7C6E)	; ø»Žµ‹
     (chinese-cns11643-2		. #x2454)	; ø»“‘­
     (japanese-jisx0208-1990	. #x5D6D)	; ø½‹
+    (chinese-big5		. #xCB54)	; ý¢€Œ­”
     (ideograph-daikanwa		. 17213)	; ø¸„Œ½
     (ucs			. #x6C9A)	; 沚
     ))
@@ -1499,6 +1665,7 @@
     (chinese-isoir165		. #x4566)	; ø»¤‘
     (chinese-cns11643-1		. #x4A6C)	; ø»‘¿µ
     (japanese-jisx0208-1990	. #x5D6F)	; ø½‹’
+    (chinese-big5		. #xA84B)	; ý¢€Š¡‹
     (ideograph-daikanwa		. 17216)	; ø¸„€
     (ucs			. #x6C9B)	; 沛
     ))
@@ -1524,6 +1691,7 @@
     (total-strokes	 . 7)
     (japanese-jisx0212		. #x4671)	; ø»‹›¶
     (japanese-jisx0213-1	. #x7659)	; ø»¤ª
+    (chinese-big5		. #xCB58)	; ý¢€Œ­˜
     (ideograph-daikanwa		. 17218)	; ø¸„‚
     (china3-jef			. #x8BEA)	; øºˆ¯ª
     ))
@@ -1540,6 +1708,7 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (chinese-cns11643-2 . #x2764)	; ø»“–—
+    (chinese-big5	. #xCD44)	; ý¢€Œµ„
     (ideograph-daikanwa . 17219)	; ø¸„ƒ
     (ucs		. #x6C9D)	; 沝
     ))
@@ -1825,6 +1994,7 @@
     (chinese-isoir165		. #x442D)	; ø»¡º
     (chinese-cns11643-1		. #x4E4D)	; ø»’…Ž
     (japanese-jisx0208-1990	. #x4B77)	; ø½Š´¾
+    (chinese-big5		. #xAA6A)	; ý¢€Š©ª
     (ideograph-daikanwa		. 17235)	; ø¸„“
     (ucs			. #x6CAB)	; 沫
     ))
@@ -1833,6 +2003,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (chinese-cns11643-1 . #x4E5D)	; ø»’…ž
+    (chinese-big5	. #xAA7A)	; ý¢€Š©º
     (ideograph-daikanwa . 17236)	; ø¸„”
     (china3-jef		. #x55C7)	; øº…—‡
     (ucs		. #x6CAC)	; 沬
@@ -1842,12 +2013,20 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (chinese-cns11643-2		. #x2756)	; ø»“–‰
     (japanese-jisx0213-2	. #x6E3F)	; ø»¦Ž¤
+    (chinese-big5		. #xCCF5)	; ý¢€Œ³µ
     (ideograph-daikanwa		. 17237)	; ø¸„•
     (china3-jef			. #x91EF)	; øº‰‡¯
     ))
 (define-char
+  '((=>ucs		. #x6CAD)	; æ²­
+    (morohashi-daikanwa	17237 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (chinese-cns11643-2 . #x2756)	; ø»“–‰
+    ))
+(define-char
   '((morohashi-daikanwa	17237 0 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
@@ -1868,6 +2047,7 @@
     (chinese-isoir165		. #x3E5A)	; ø»™³
     (chinese-cns11643-1		. #x4E54)	; ø»’…•
     (japanese-jisx0208-1990	. #x5D7C)	; ø½‹Ÿ
+    (chinese-big5		. #xAA71)	; ý¢€Š©±
     (ideograph-daikanwa		. 17238)	; ø¸„–
     (ucs			. #x6CAE)	; æ²®
     ))
@@ -1885,22 +2065,31 @@
     (total-strokes	 . 8)
     (japanese-jisx0212	. #x4673)	; ø»‹›¸
     (chinese-cns11643-2 . #x276B)	; ø»“–ž
+    (chinese-big5	. #xCD4B)	; ý¢€Œµ‹
     (ideograph-daikanwa . 17242)	; ø¸„š
     (ucs		. #x6CB0)	; æ²°
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6CB1)	; æ²±
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (shinjigen-2	. 4133)
     (japanese-jisx0208-1978	. #x5D7D)	; ø»ƒ•¤
-    (chinese-gb2312		. #x637B)	; ø»…¨š
     (japanese-jisx0208		. #x5D7D)	; ø»‡©¬
-    (chinese-isoir165		. #x637B)	; ø»Žª
-    (chinese-cns11643-1		. #x4E45)	; ø»’…†
     (japanese-jisx0208-1990	. #x5D7D)	; ø½‹ 
+    (chinese-big5		. #xAA62)	; ý¢€Š©¢
     (ideograph-daikanwa		. 17243)	; ø¸„›
-    (ucs			. #x6CB1)	; æ²±
+    ))
+(define-char
+  '((morohashi-daikanwa	17243 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (chinese-gb2312	. #x637B)	; ø»…¨š
+    (chinese-isoir165	. #x637B)	; ø»Žª
+    (chinese-cns11643-1 . #x4E45)	; ø»’…†
+    (ucs		. #x6CB1)	; æ²±
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -1933,6 +2122,7 @@
     (chinese-isoir165		. #x3A53)	; ø»“´
     (chinese-cns11643-1		. #x4E48)	; ø»’…‰
     (japanese-jisx0208-1990	. #x324F)	; ø½Š¨
+    (chinese-big5		. #xAA65)	; ý¢€Š©¥
     (ideograph-daikanwa		. 17245)	; ø¸„
     (ucs			. #x6CB3)	; æ²³
     ))
@@ -1942,6 +2132,7 @@
     (total-strokes	 . 8)
     (japanese-jisx0212	. #x4675)	; ø»‹›º
     (chinese-cns11643-2 . #x2762)	; ø»“–•
+    (chinese-big5	. #xCD42)	; ý¢€Œµ‚
     (ideograph-daikanwa . 17246)	; ø¸„ž
     (china3-jef		. #x55C9)	; øº…—‰
     (ucs		. #x6CB4)	; æ²´
@@ -1956,19 +2147,35 @@
     (ucs		. #x6CB5)	; æ²µ
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6CB6)	; 沶
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (chinese-cns11643-2 . #x2754)	; ø»“–‡
     (ideograph-daikanwa . 17248)	; ø¸„ 
+    ))
+(define-char
+  '((morohashi-daikanwa	17248 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (chinese-big5	. #xCCF3)	; ý¢€Œ³³
     (ucs		. #x6CB6)	; 沶
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6CB7)	; æ²·
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (chinese-cns11643-2 . #x2758)	; ø»“–‹
+    (chinese-big5	. #xCCF7)	; ý¢€Œ³·
     (ideograph-daikanwa . 17250)	; ø¸„¢
+    ))
+(define-char
+  '((morohashi-daikanwa	17250 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
     (ucs		. #x6CB7)	; æ²·
     ))
 (define-char
@@ -1983,6 +2190,7 @@
     (chinese-isoir165		. #x3750)	; ø»—
     (chinese-cns11643-1		. #x4E50)	; ø»’…‘
     (japanese-jisx0208-1990	. #x4A28)	; ø½Š²‘
+    (chinese-big5		. #xAA6D)	; ý¢€Š©­
     (ideograph-daikanwa		. 17251)	; ø¸„£
     (ucs			. #x6CB8)	; 沸
     ))
@@ -1998,6 +2206,7 @@
     (chinese-isoir165		. #x534D)	; ø»¸œ
     (chinese-cns11643-1		. #x4E52)	; ø»’…“
     (japanese-jisx0208-1990	. #x4C7D)	; ø½Š¶¢
+    (chinese-big5		. #xAA6F)	; ý¢€Š©¯
     (ideograph-daikanwa		. 17253)	; ø¸„¥
     (ucs			. #x6CB9)	; æ²¹
     ))
@@ -2009,6 +2218,7 @@
     (japanese-jisx0208		. #x5E21)	; ø»‡©®
     (chinese-cns11643-2		. #x275B)	; ø»“–Ž
     (japanese-jisx0208-1990	. #x5E21)	; ø½‹¢
+    (chinese-big5		. #xCCFA)	; ý¢€Œ³º
     (ideograph-daikanwa		. 17254)	; ø¸„¦
     (ucs			. #x6CBA)	; 沺
     ))
@@ -2024,6 +2234,7 @@
     (chinese-isoir165		. #x564E)	; ø»¼·
     (chinese-cns11643-1		. #x4E59)	; ø»’…š
     (japanese-jisx0208-1990	. #x3C23)	; ø½Š¨
+    (chinese-big5		. #xAA76)	; ý¢€Š©¶
     (ideograph-daikanwa		. 17256)	; ø¸„¨
     (ucs			. #x6CBB)	; æ²»
     ))
@@ -2039,6 +2250,7 @@
     (chinese-isoir165		. #x5553)	; ø»»ž
     (chinese-cns11643-1		. #x4E4B)	; ø»’…Œ
     (japanese-jisx0208-1990	. #x3E42)	; ø½Š¡ƒ
+    (chinese-big5		. #xAA68)	; ý¢€Š©¨
     (ideograph-daikanwa		. 17257)	; ø¸„©
     (ucs			. #x6CBC)	; æ²¼
     ))
@@ -2054,6 +2266,7 @@
     (chinese-isoir165		. #x3941)	; ø»’„
     (chinese-cns11643-1		. #x4E49)	; ø»’…Š
     (japanese-jisx0208-1990	. #x5D78)	; ø½‹›
+    (chinese-big5		. #xAA66)	; ý¢€Š©¦
     (ideograph-daikanwa		. 17258)	; ø¸„ª
     (ucs			. #x6CBD)	; æ²½
     ))
@@ -2069,6 +2282,7 @@
     (chinese-isoir165		. #x5534)	; ø»º¿
     (chinese-cns11643-1		. #x4E4A)	; ø»’…‹
     (japanese-jisx0208-1990	. #x5D7E)	; ø½‹¡
+    (chinese-big5		. #xAA67)	; ý¢€Š©§
     (ideograph-daikanwa		. 17259)	; ø¸„«
     (ucs			. #x6CBE)	; æ²¾
     ))
@@ -2080,6 +2294,7 @@
     (shinjigen-2	. 4115)
     (japanese-jisx0208-1978	. #x3168)	; ø»‚”§
     (japanese-jisx0208		. #x3168)	; ø»†¨¯
+    (chinese-big5		. #xAA75)	; ý¢€Š©µ
     (ideograph-daikanwa		. 17260)	; ø¸„¬
     ))
 (define-char
@@ -2088,9 +2303,16 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (chinese-cns11643-1		. #x4E58)	; ø»’…™
     (japanese-jisx0208-1990	. #x3168)	; ø½ŠŽ£
-    (ucs-jis			. #x6CBF)	; ø»’…™
+    (ucs-jis			. #x6CBF)	; ø½ŠŽ£
+    ))
+(define-char
+  '((=>ucs		. #x6CBF)	; 沿
+    (morohashi-daikanwa	17260 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (chinese-cns11643-1 . #x4E58)	; ø»’…™
     ))
 (define-char
   '((morohashi-daikanwa	17260 0 3)
@@ -2109,6 +2331,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (chinese-cns11643-2 . #x2767)	; ø»“–š
+    (chinese-big5	. #xCD47)	; ý¢€Œµ‡
     (ideograph-daikanwa . 17262)	; ø¸„®
     (ucs		. #x6CC0)	; 泀
     ))
@@ -2123,6 +2346,7 @@
     (korean-ksc5601		. #x7C4F)	; ø»Š ¤
     (chinese-cns11643-1		. #x4E53)	; ø»’…”
     (japanese-jisx0208-1990	. #x3637)	; ø½Š•ˆ
+    (chinese-big5		. #xAA70)	; ý¢€Š©°
     (ideograph-daikanwa		. 17264)	; ø¸„°
     (ucs			. #x6CC1)	; 況
     ))
@@ -2134,6 +2358,7 @@
     (japanese-jisx0212		. #x4676)	; ø»‹›»
     (chinese-cns11643-2		. #x275A)	; ø»“–
     (japanese-jisx0213-2	. #x6E40)	; ø»¦Ž¥
+    (chinese-big5		. #xCCF9)	; ý¢€Œ³¹
     (ideograph-daikanwa		. 17265)	; ø¸„±
     (china3-jef			. #x55CB)	; øº…—‹
     (ucs			. #x6CC2)	; 泂
@@ -2144,6 +2369,7 @@
     (total-strokes	 . 8)
     (chinese-isoir165	. #x2C29)	; ø»Œ¾¦
     (chinese-cns11643-2 . #x275C)	; ø»“–
+    (chinese-big5	. #xCCFB)	; ý¢€Œ³»
     (ideograph-daikanwa . 17266)	; ø¸„²
     (ucs		. #x6CC3)	; 泃
     ))
@@ -2159,6 +2385,7 @@
     (chinese-isoir165		. #x5039)	; ø»³®
     (chinese-cns11643-1		. #x4E51)	; ø»’…’
     (japanese-jisx0208-1990	. #x5D75)	; ø½‹˜
+    (chinese-big5		. #xAA6E)	; ý¢€Š©®
     (ideograph-daikanwa		. 17267)	; ø¸„³
     (ucs			. #x6CC4)	; 泄
     ))
@@ -2173,6 +2400,7 @@
     (chinese-isoir165		. #x4776)	; ø»§
     (chinese-cns11643-1		. #x4E56)	; ø»’…—
     (japanese-jisx0208-1990	. #x5D7A)	; ø½‹
+    (chinese-big5		. #xAA73)	; ý¢€Š©³
     (ideograph-daikanwa		. 17270)	; ø¸„¶
     (ucs			. #x6CC5)	; 泅
     ))
@@ -2184,6 +2412,7 @@
     (chinese-isoir165		. #x7C71)	; ø»ŽµŽ
     (chinese-cns11643-2		. #x275D)	; ø»“–
     (japanese-jisx0213-1	. #x765B)	; ø»¤¬
+    (chinese-big5		. #xCCFC)	; ý¢€Œ³¼
     (ideograph-daikanwa		. 17271)	; ø¸„·
     (china3-jef			. #x55CC)	; øº…—Œ
     (ucs			. #x6CC6)	; 泆
@@ -2193,6 +2422,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (chinese-cns11643-2 . #x276A)	; ø»“–
+    (chinese-big5	. #xCD4A)	; ý¢€ŒµŠ
     (ideograph-daikanwa . 17272)	; ø¸„¸
     (china3-jef		. #x98A9)	; øº‰¢©
     (ucs		. #x6CC7)	; 泇
@@ -2217,6 +2447,7 @@
     (chinese-isoir165		. #x482A)	; ø»§¯
     (chinese-cns11643-1		. #x5178)	; ø»’Š“
     (japanese-jisx0208-1990	. #x4074)	; ø½Š¤±
+    (chinese-big5		. #xAC75)	; ý¢€Š±µ
     (ideograph-daikanwa		. 17274)	; ø¸„º
     (ucs			. #x6CC9)	; 泉
     ))
@@ -2232,6 +2463,7 @@
     (chinese-isoir165		. #x3234)	; ø»‡¥
     (chinese-cns11643-1		. #x4E5C)	; ø»’…
     (japanese-jisx0208-1990	. #x4771)	; ø½Š¯€
+    (chinese-big5		. #xAA79)	; ý¢€Š©¹
     (ideograph-daikanwa		. 17275)	; ø¸„»
     (ucs			. #x6CCA)	; 泊
     ))
@@ -2255,6 +2487,7 @@
     (chinese-isoir165		. #x435A)	; ø»¡‰
     (chinese-cns11643-1		. #x4E46)	; ø»’…‡
     (japanese-jisx0208-1990	. #x4867)	; ø½Š°”
+    (chinese-big5		. #xAA63)	; ý¢€Š©£
     (ideograph-daikanwa		. 17279)	; ø¸„¿
     (ucs			. #x6CCC)	; 泌
     ))
@@ -2264,6 +2497,7 @@
     (total-strokes	 . 8)
     (japanese-jisx0212	. #x4678)	; ø»‹›½
     (chinese-cns11643-2 . #x2769)	; ø»“–œ
+    (chinese-big5	. #xCD49)	; ý¢€Œµ‰
     (ideograph-daikanwa . 17280)	; ø¸„Ž€
     (ucs		. #x6CCD)	; 泍
     ))
@@ -2282,6 +2516,7 @@
     (total-strokes	 . 8)
     (japanese-jisx0212	. #x4679)	; ø»‹›¾
     (chinese-cns11643-2 . #x276D)	; ø»“– 
+    (chinese-big5	. #xCD4D)	; ý¢€Œµ
     (ideograph-daikanwa . 17282)	; ø¸„Ž‚
     (china3-jef		. #x55CE)	; øº…—Ž
     (ucs		. #x6CCF)	; 泏
@@ -2295,6 +2530,7 @@
     (chinese-isoir165		. #x636E)	; ø»Ž
     (chinese-cns11643-2		. #x2759)	; ø»“–Œ
     (japanese-jisx0213-2	. #x6E41)	; ø»¦Ž¦
+    (chinese-big5		. #xCCF8)	; ý¢€Œ³¸
     (ideograph-daikanwa		. 17283)	; ø¸„Žƒ
     (china3-jef			. #x98AA)	; øº‰¢ª
     (ucs			. #x6CD0)	; 泐
@@ -2305,6 +2541,7 @@
     (total-strokes	 . 8)
     (japanese-jisx0212	. #x467B)	; ø»‹œ€
     (chinese-cns11643-2 . #x276F)	; ø»“–¢
+    (chinese-big5	. #xCD4F)	; ý¢€Œµ
     (ideograph-daikanwa . 17284)	; ø¸„Ž„
     (china3-jef		. #x55CF)	; øº…—
     (ucs		. #x6CD1)	; 泑
@@ -2323,6 +2560,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
+    (chinese-big5	. #xCD40)	; ý¢€Œµ€
     (ucs		. #x6CD2)	; 泒
     ))
 (define-char
@@ -2345,6 +2583,7 @@
     (chinese-isoir165		. #x637C)	; ø»Ž«
     (chinese-cns11643-1		. #x4E4F)	; ø»’…
     (japanese-jisx0208-1990	. #x5D77)	; ø½‹š
+    (chinese-big5		. #xAA6C)	; ý¢€Š©¬
     (ideograph-daikanwa		. 17288)	; ø¸„Žˆ
     (ucs			. #x6CD3)	; 泓
     ))
@@ -2357,6 +2596,7 @@
     (chinese-isoir165		. #x636F)	; ø»Žž
     (chinese-cns11643-2		. #x2755)	; ø»“–ˆ
     (japanese-jisx0213-1	. #x765C)	; ø»¤­
+    (chinese-big5		. #xCCF4)	; ý¢€Œ³´
     (ideograph-daikanwa		. 17289)	; ø¸„Ž‰
     (china3-jef			. #x55D1)	; øº…—‘
     (ucs			. #x6CD4)	; 泔
@@ -2373,6 +2613,7 @@
     (chinese-isoir165		. #x3728)	; ø»Ž¯
     (chinese-cns11643-1		. #x4E4E)	; ø»’…
     (japanese-jisx0208-1990	. #x4B21)	; ø½Š³¨
+    (chinese-big5		. #xAA6B)	; ý¢€Š©«
     (ideograph-daikanwa		. 17290)	; ø¸„ŽŠ
     (ucs			. #x6CD5)	; 法
     ))
@@ -2394,6 +2635,7 @@
     (chinese-isoir165		. #x6377)	; ø»Ž¦
     (chinese-cns11643-1		. #x4E60)	; ø»’…¡
     (japanese-jisx0213-2	. #x6E43)	; ø»¦Ž¨
+    (chinese-big5		. #xAA7D)	; ý¢€Š©½
     (ideograph-daikanwa		. 17293)	; ø¸„Ž
     (china3-jef			. #x55D2)	; øº…—’
     (ucs			. #x6CD6)	; 泖
@@ -2410,6 +2652,7 @@
     (chinese-isoir165		. #x6374)	; ø»Ž£
     (chinese-cns11643-1		. #x4E55)	; ø»’…–
     (japanese-jisx0208-1990	. #x5D79)	; ø½‹œ
+    (chinese-big5		. #xAA72)	; ý¢€Š©²
     (ideograph-daikanwa		. 17294)	; ø¸„ŽŽ
     (ucs			. #x6CD7)	; 泗
     ))
@@ -2430,6 +2673,7 @@
     (japanese-jisx0208-1978	. #x5E24)	; ø»ƒ•©
     (japanese-jisx0208		. #x5E24)	; ø»‡©±
     (japanese-jisx0208-1990	. #x5E24)	; ø½‹¥
+    (chinese-big5		. #xCCF2)	; ý¢€Œ³²
     (ideograph-daikanwa		. 17296)	; ø¸„Ž
     (ucs-jis			. #x6CD9)	; ø»ƒ•©
     ))
@@ -2443,22 +2687,23 @@
     (ucs		. #x6CD9)	; 泙
     ))
 (define-char
-  '((=>ucs		. #x6CDA)	; 泚
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (japanese-jisx0212		. #x4721)	; ø»‹œ„
     (japanese-jisx0213-2	. #x6E44)	; ø»¦Ž©
     (ideograph-daikanwa		. 17297)	; ø¸„Ž‘
     (china3-jef			. #x55D3)	; øº…—“
+    (ucs			. #x6CDA)	; 泚
     ))
 (define-char
-  '((morohashi-daikanwa	17297 0 0)
+  '((=>ucs		. #x6CDA)	; 泚
+    (morohashi-daikanwa	17297 0 0)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B57)	; ø»“œ‚
-    (ucs		. #x6CDA)	; 泚
+    (chinese-big5	. #xCF75)	; ý¢€Œ½µ
     ))
 (define-char
   '((=>ucs		. #x6CDB)	; 泛
@@ -2470,6 +2715,7 @@
     (japanese-jisx0208		. #x5E22)	; ø»‡©¯
     (korean-ksc5601		. #x5B72)	; ø»‰°©
     (japanese-jisx0208-1990	. #x5E22)	; ø½‹£
+    (chinese-big5		. #xAA78)	; ý¢€Š©¸
     (ideograph-daikanwa		. 17298)	; ø¸„Ž’
     (ucs-jis			. #x6CDB)	; ø»ƒ•§
     ))
@@ -2491,6 +2737,7 @@
     (japanese-jisx0212		. #x4722)	; ø»‹œ…
     (chinese-cns11643-1		. #x4E5F)	; ø»’… 
     (japanese-jisx0213-2	. #x6E45)	; ø»¦Žª
+    (chinese-big5		. #xAA7C)	; ý¢€Š©¼
     (ideograph-daikanwa		. 17299)	; ø¸„Ž“
     (china3-jef			. #x55D4)	; øº…—”
     ))
@@ -2509,16 +2756,25 @@
     (shinjigen-2	. 4384)
     (japanese-jisx0208-1978	. #x5D7B)	; ø»ƒ•¢
     (japanese-jisx0208		. #x5D7B)	; ø»‡©ª
-    (chinese-cns11643-2		. #x2761)	; ø»“–”
     (japanese-jisx0208-1990	. #x5D7B)	; ø½‹ž
+    (chinese-big5		. #xCD41)	; ý¢€Œµ
     (ideograph-daikanwa		. 17300)	; ø¸„Ž”
     (ucs			. #x6CDD)	; 泝
     ))
 (define-char
+  '((=>ucs		. #x6CDD)	; 泝
+    (morohashi-daikanwa	17300 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (chinese-cns11643-2 . #x2761)	; ø»“–”
+    ))
+(define-char
   '((=>ucs		. #x6CDE)	; 泞
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
+    (chinese-big5	. #xCD46)	; ý¢€Œµ†
     (ideograph-daikanwa . 17303)	; ø¸„Ž—
     ))
 (define-char
@@ -2547,6 +2803,7 @@
     (total-strokes	 . 8)
     (japanese-jisx0212		. #x4723)	; ø»‹œ†
     (japanese-jisx0213-1	. #x765D)	; ø»¤®
+    (chinese-big5		. #xAA7E)	; ý¢€Š©¾
     (ideograph-daikanwa		. 17306)	; ø¸„Žš
     (china3-jef			. #x55D6)	; øº…—–
     ))
@@ -2576,6 +2833,7 @@
     (korean-ksc5601		. #x785C)	; ø»Šš¹
     (chinese-isoir165		. #x455D)	; ø»¤ˆ
     (chinese-cns11643-1		. #x4E5A)	; ø»’…›
+    (chinese-big5		. #xAA77)	; ý¢€Š©·
     (ideograph-daikanwa		. 17307)	; ø¸„Ž›
     (ucs			. #x6CE1)	; 泡
     ))
@@ -2602,23 +2860,32 @@
     (chinese-isoir165		. #x3228)	; ø»‡™
     (chinese-cns11643-1		. #x4E4C)	; ø»’…
     (japanese-jisx0208-1990	. #x4748)	; ø½Š®—
+    (chinese-big5		. #xAA69)	; ý¢€Š©©
     (ideograph-daikanwa		. 17308)	; ø¸„Žœ
     (ucs			. #x6CE2)	; æ³¢
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6CE3)	; æ³£
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (shinjigen-2	. 4121)
     (japanese-jisx0208-1978	. #x3563)	; ø»‚šš
-    (chinese-gb2312		. #x467C)	; ø»„½µ
     (japanese-jisx0208		. #x3563)	; ø»†®¢
     (korean-ksc5601		. #x6B68)	; ø»Š‡¿
-    (chinese-isoir165		. #x467C)	; ø»¦…
-    (chinese-cns11643-1		. #x4E42)	; ø»’…ƒ
     (japanese-jisx0208-1990	. #x3563)	; ø½Š”–
+    (chinese-big5		. #xAA5F)	; ý¢€Š©Ÿ
     (ideograph-daikanwa		. 17309)	; ø¸„Ž
-    (ucs			. #x6CE3)	; æ³£
+    ))
+(define-char
+  '((morohashi-daikanwa	17309 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (chinese-gb2312	. #x467C)	; ø»„½µ
+    (chinese-isoir165	. #x467C)	; ø»¦…
+    (chinese-cns11643-1 . #x4E42)	; ø»’…ƒ
+    (ucs		. #x6CE3)	; æ³£
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -2638,12 +2905,20 @@
     (japanese-jisx0208		. #x4525)	; ø»‡…„
     (korean-ksc5601		. #x527A)	; ø»‰££
     (chinese-isoir165		. #x4460)	; ø»¢­
-    (chinese-cns11643-1		. #x4E47)	; ø»’…ˆ
     (japanese-jisx0208-1990	. #x4525)	; ø½Šª¸
+    (chinese-big5		. #xAA64)	; ý¢€Š©¤
     (ideograph-daikanwa		. 17311)	; ø¸„ŽŸ
     (ucs			. #x6CE5)	; æ³¥
     ))
 (define-char
+  '((=>ucs		. #x6CE5)	; æ³¥
+    (morohashi-daikanwa	17311 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (chinese-cns11643-1 . #x4E47)	; ø»’…ˆ
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
@@ -2658,6 +2933,7 @@
     (total-strokes	 . 8)
     (japanese-jisx0212	. #x4724)	; ø»‹œ‡
     (chinese-cns11643-2 . #x2757)	; ø»“–Š
+    (chinese-big5	. #xCCF6)	; ý¢€Œ³¶
     (ideograph-daikanwa . 17315)	; ø¸„Ž£
     (china3-jef		. #x55D8)	; øº…—˜
     (ucs		. #x6CE7)	; 泧
@@ -2668,7 +2944,6 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (ideograph-daikanwa . 17316)	; ø¸„Ž¤
-    (china3-jef		. #x55D9)	; øº…—™
     ))
 (define-char
   '((morohashi-daikanwa	17316 0 0)
@@ -2682,6 +2957,7 @@
     (chinese-isoir165		. #x5722)	; ø»½©
     (chinese-cns11643-1		. #x4E43)	; ø»’…„
     (japanese-jisx0208-1990	. #x436D)	; ø½Š©„
+    (chinese-big5		. #xAA60)	; ý¢€Š© 
     (china3-jef			. #x55D9)	; øº…—™
     (ucs			. #x6CE8)	; 注
     ))
@@ -2692,6 +2968,7 @@
     (japanese-jisx0212		. #x4725)	; ø»‹œˆ
     (chinese-cns11643-2		. #x276E)	; ø»“–¡
     (japanese-jisx0213-2	. #x6E46)	; ø»¦Ž«
+    (chinese-big5		. #xCD4E)	; ý¢€ŒµŽ
     (ideograph-daikanwa		. 17317)	; ø¸„Ž¥
     (china3-jef			. #x55DA)	; øº…—š
     (ucs			. #x6CE9)	; 泩
@@ -2718,6 +2995,7 @@
     (korean-ksc5601		. #x7A5A)	; ø»Š³
     (japanese-jisx0212		. #x4726)	; ø»‹œ‰
     (japanese-jisx0213-1	. #x765E)	; ø»¤¯
+    (chinese-big5		. #xCCF0)	; ý¢€Œ³°
     (ideograph-daikanwa		. 17319)	; ø¸„Ž§
     ))
 (define-char
@@ -2732,14 +3010,22 @@
     (ucs		. #x6CEB)	; 泫
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6CEC)	; 泬
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (japanese-jisx0212		. #x4727)	; ø»‹œŠ
-    (chinese-cns11643-2		. #x2750)	; ø»“–ƒ
     (japanese-jisx0213-2	. #x6E47)	; ø»¦Ž¬
+    (chinese-big5		. #xCCEF)	; ý¢€Œ³¯
     (ideograph-daikanwa		. 17320)	; ø¸„Ž¨
-    (ucs			. #x6CEC)	; 泬
+    ))
+(define-char
+  '((morohashi-daikanwa	17320 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (chinese-cns11643-2 . #x2750)	; ø»“–ƒ
+    (ucs		. #x6CEC)	; 泬
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -2747,6 +3033,7 @@
     (total-strokes	 . 8)
     (chinese-cns11643-2		. #x275E)	; ø»“–‘
     (japanese-jisx0213-2	. #x6E48)	; ø»¦Ž­
+    (chinese-big5		. #xCCFD)	; ý¢€Œ³½
     (ideograph-daikanwa		. 17321)	; ø¸„Ž©
     (ucs			. #x6CED)	; æ³­
     ))
@@ -2758,6 +3045,7 @@
     (korean-ksc5601		. #x5A6A)	; ø»‰¯ƒ
     (japanese-jisx0212		. #x4728)	; ø»‹œ‹
     (japanese-jisx0213-1	. #x765F)	; ø»¤°
+    (chinese-big5		. #xCCF1)	; ý¢€Œ³±
     (ideograph-daikanwa		. 17323)	; ø¸„Ž«
     (china3-jef			. #x55DC)	; øº…—œ
     ))
@@ -2783,6 +3071,7 @@
     (chinese-isoir165		. #x637D)	; ø»Ž¬
     (chinese-cns11643-1		. #x4E5E)	; ø»’…Ÿ
     (japanese-jisx0208-1990	. #x5E23)	; ø½‹¤
+    (chinese-big5		. #xAA7B)	; ý¢€Š©»
     (ideograph-daikanwa		. 17324)	; ø¸„Ž¬
     (ucs			. #x6CEF)	; 泯
     ))
@@ -2798,6 +3087,7 @@
     (chinese-isoir165		. #x4C29)	; ø»­¦
     (chinese-cns11643-1		. #x5639)	; ø»’ª
     (japanese-jisx0208-1990	. #x4259)	; ø½Š§’
+    (chinese-big5		. #xAEF5)	; ý¢€Š»µ
     (ideograph-daikanwa		. 17325)	; ø¸„Ž­
     (ucs			. #x6CF0)	; æ³°
     ))
@@ -2810,18 +3100,27 @@
     (chinese-gb2312		. #x6373)	; ø»…¨’
     (japanese-jisx0208		. #x5D76)	; ø»‡©¥
     (chinese-isoir165		. #x6373)	; ø»Ž¢
-    (chinese-cns11643-1		. #x4E57)	; ø»’…˜
     (japanese-jisx0208-1990	. #x5D76)	; ø½‹™
+    (chinese-big5		. #xAA74)	; ý¢€Š©´
     (ideograph-daikanwa		. 17326)	; ø¸„Ž®
     (ucs			. #x6CF1)	; æ³±
     ))
 (define-char
+  '((=>ucs		. #x6CF1)	; æ³±
+    (morohashi-daikanwa	17326 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (chinese-cns11643-1 . #x4E57)	; ø»’…˜
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 5)
     (japanese-strokes	 . 4)
     (total-strokes	 . 8)
     (japanese-jisx0212	. #x4729)	; ø»‹œŒ
     (chinese-cns11643-2 . #x275F)	; ø»“–’
+    (chinese-big5	. #xCCFE)	; ý¢€Œ³¾
     (ideograph-daikanwa . 17327)	; ø¸„Ž¯
     (ucs		. #x6CF2)	; æ³²
     ))
@@ -2837,6 +3136,7 @@
     (chinese-isoir165		. #x533E)	; ø»¸
     (chinese-cns11643-1		. #x4E44)	; ø»’……
     (japanese-jisx0208-1990	. #x314B)	; ø½ŠŽ†
+    (chinese-big5		. #xAA61)	; ý¢€Š©¡
     (ideograph-daikanwa		. 17328)	; ø¸„Ž°
     (ucs			. #x6CF3)	; æ³³
     ))
@@ -2980,6 +3280,7 @@
     (chinese-gb2312	. #x3143)	; ø»„ž†
     (chinese-isoir165	. #x3143)	; ø»†–
     (chinese-cns11643-1 . #x5229)	; ø»’Š¢
+    (chinese-big5	. #xACA6)	; ý¢€Š²¦
     (ideograph-daikanwa . 17343)	; ø¸„Ž¿
     (china3-jef		. #x99F1)	; øº‰§±
     (ucs		. #x6CF5)	; æ³µ
@@ -2989,6 +3290,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (chinese-cns11643-2 . #x2768)	; ø»“–›
+    (chinese-big5	. #xCD48)	; ý¢€Œµˆ
     (ideograph-daikanwa . 17346)	; ø¸„‚
     (ucs		. #x6D30)	; æ´°
     ))
@@ -3105,6 +3407,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (chinese-cns11643-2 . #x276C)	; ø»“–Ÿ
+    (chinese-big5	. #xCD4C)	; ý¢€ŒµŒ
     (ucs		. #x6CF9)	; æ³¹
     ))
 (define-char
@@ -3262,6 +3565,7 @@
     (total-strokes	 . 9)
     (chinese-cns11643-2		. #x2B5E)	; ø»“œ‰
     (japanese-jisx0213-2	. #x6E4A)	; ø»¦Ž¯
+    (chinese-big5		. #xCF7C)	; ý¢€Œ½¼
     (ideograph-daikanwa		. 17349)	; ø¸„…
     (china3-jef			. #x8DC6)	; øºˆ·†
     (ucs			. #x6D00)	; 洀
@@ -3273,6 +3577,7 @@
     (chinese-gb2312	. #x3D60)	; ø»„°‹
     (chinese-isoir165	. #x3D60)	; ø»˜›
     (chinese-cns11643-2 . #x2B61)	; ø»“œŒ
+    (chinese-big5	. #xCFA1)	; ý¢€Œ¾¡
     (ideograph-daikanwa . 17350)	; ø¸„†
     (ucs		. #x6D01)	; 洁
     ))
@@ -3285,19 +3590,20 @@
     (ucs		. #x6D02)	; 洂
     ))
 (define-char
-  '((=>ucs		. #x6D03)	; 洃
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (chinese-big5	. #xCFA4)	; ý¢€Œ¾¤
     (ideograph-daikanwa . 17352)	; ø¸„ˆ
+    (ucs		. #x6D03)	; 洃
     ))
 (define-char
-  '((morohashi-daikanwa	17352 0 0)
+  '((=>ucs		. #x6D03)	; 洃
+    (morohashi-daikanwa	17352 0 0)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B64)	; ø»“œ
-    (ucs		. #x6D03)	; 洃
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -3308,6 +3614,7 @@
     (chinese-isoir165		. #x6427)	; ø»Ž´
     (chinese-cns11643-2		. #x2B59)	; ø»“œ„
     (japanese-jisx0213-1	. #x7661)	; ø»¤²
+    (chinese-big5		. #xCF77)	; ý¢€Œ½·
     (ideograph-daikanwa		. 17353)	; ø¸„‰
     (china3-jef			. #x55DE)	; øº…—ž
     (ucs			. #x6D04)	; 洄
@@ -3351,6 +3658,7 @@
     (japanese-jisx0212	. #x472C)	; ø»‹œ
     (chinese-isoir165	. #x6426)	; ø»Ž³
     (chinese-cns11643-2 . #x2B67)	; ø»“œ’
+    (chinese-big5	. #xCFA7)	; ý¢€Œ¾§
     (ideograph-daikanwa . 17358)	; ø¸„Ž
     (china3-jef		. #x55DF)	; øº…—Ÿ
     (ucs		. #x6D07)	; 洇
@@ -3360,6 +3668,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B6A)	; ø»“œ•
+    (chinese-big5	. #xCFAA)	; ý¢€Œ¾ª
     (ideograph-daikanwa . 17360)	; ø¸„
     (ucs		. #x6D08)	; 洈
     ))
@@ -3368,6 +3677,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B6C)	; ø»“œ—
+    (chinese-big5	. #xCFAC)	; ý¢€Œ¾¬
     (ideograph-daikanwa . 17361)	; ø¸„‘
     (ucs		. #x6D09)	; 洉
     ))
@@ -3378,6 +3688,7 @@
     (japanese-jisx0212		. #x472D)	; ø»‹œ
     (chinese-cns11643-2		. #x2B56)	; ø»“œ
     (japanese-jisx0213-2	. #x6E4B)	; ø»¦Ž°
+    (chinese-big5		. #xCF74)	; ý¢€Œ½´
     (ideograph-daikanwa		. 17362)	; ø¸„’
     (china3-jef			. #x55E1)	; øº…—¡
     (ucs			. #x6D0A)	; 洊
@@ -3394,6 +3705,7 @@
     (chinese-isoir165		. #x5173)	; ø»¶†
     (chinese-cns11643-1		. #x5179)	; ø»’Š”
     (japanese-jisx0208-1990	. #x4D4E)	; ø½Š·‘
+    (chinese-big5		. #xAC76)	; ý¢€Š±¶
     (ideograph-daikanwa		. 17363)	; ø¸„“
     (ucs			. #x6D0B)	; 洋
     ))
@@ -3409,6 +3721,7 @@
     (chinese-isoir165		. #x6423)	; ø»Ž°
     (chinese-cns11643-1		. #x517E)	; ø»’Š™
     (japanese-jisx0208-1990	. #x5E30)	; ø½‹±
+    (chinese-big5		. #xAC7B)	; ý¢€Š±»
     (ideograph-daikanwa		. 17364)	; ø¸„”
     (ucs			. #x6D0C)	; 洌
     ))
@@ -3425,6 +3738,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (chinese-cns11643-2 . #x302C)	; ø»“¢­
+    (chinese-big5	. #xD249)	; ý¢€‰‰
     (ucs		. #x6D0D)	; 洍
     ))
 (define-char
@@ -3436,6 +3750,7 @@
     (chinese-isoir165		. #x6429)	; ø»Ž¶
     (chinese-cns11643-1		. #x5230)	; ø»’Š©
     (japanese-jisx0213-1	. #x7662)	; ø»¤³
+    (chinese-big5		. #xACAD)	; ý¢€Š²­
     (ideograph-daikanwa		. 17369)	; ø¸„™
     (china3-jef			. #x55E2)	; øº…—¢
     (ucs			. #x6D0E)	; 洎
@@ -3446,6 +3761,7 @@
     (total-strokes	 . 9)
     (japanese-jisx0212	. #x472F)	; ø»‹œ’
     (chinese-cns11643-2 . #x2B65)	; ø»“œ
+    (chinese-big5	. #xCFA5)	; ý¢€Œ¾¥
     (ideograph-daikanwa . 17370)	; ø¸„š
     (china3-jef		. #x55E3)	; øº…—£
     (ucs		. #x6D0F)	; 洏
@@ -3455,6 +3771,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B6D)	; ø»“œ˜
+    (chinese-big5	. #xCFAD)	; ý¢€Œ¾­
     (ideograph-daikanwa . 17371)	; ø¸„›
     (ucs		. #x6D10)	; 洐
     ))
@@ -3481,6 +3798,7 @@
     (japanese-jisx0212	. #x4730)	; ø»‹œ“
     (chinese-isoir165	. #x7C75)	; ø»Žµ’
     (chinese-cns11643-2 . #x2B5D)	; ø»“œˆ
+    (chinese-big5	. #xCF7B)	; ý¢€Œ½»
     (ideograph-daikanwa . 17373)	; ø¸„
     (china3-jef		. #x55E4)	; øº…—¤
     (ucs		. #x6D11)	; 洑
@@ -3496,6 +3814,7 @@
     (chinese-isoir165		. #x4877)	; ø»¨¼
     (chinese-cns11643-2		. #x2B55)	; ø»“œ€
     (japanese-jisx0208-1990	. #x5E2F)	; ø½‹°
+    (chinese-big5		. #xCF73)	; ý¢€Œ½³
     (ideograph-daikanwa		. 17374)	; ø¸„ž
     (ucs			. #x6D12)	; 洒
     ))
@@ -3551,6 +3870,7 @@
     (chinese-isoir165		. #x4F34)	; ø»²‹
     (chinese-cns11643-1		. #x5223)	; ø»’Šœ
     (japanese-jisx0208-1990	. #x4076)	; ø½Š¤³
+    (chinese-big5		. #xAC7E)	; ý¢€Š±¾
     (ideograph-daikanwa		. 17379)	; ø¸„£
     (ucs			. #x6D17)	; 洗
     ))
@@ -3559,6 +3879,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B62)	; ø»“œ
+    (chinese-big5	. #xCFA2)	; ý¢€Œ¾¢
     (ideograph-daikanwa . 17380)	; ø¸„¤
     (ucs		. #x6D18)	; 洘
     ))
@@ -3574,6 +3895,7 @@
     (chinese-isoir165		. #x6428)	; ø»Žµ
     (chinese-cns11643-2		. #x2B5A)	; ø»“œ…
     (japanese-jisx0208-1990	. #x5E2C)	; ø½‹­
+    (chinese-big5		. #xCF78)	; ý¢€Œ½¸
     (ideograph-daikanwa		. 17381)	; ø¸„¥
     (ucs			. #x6D19)	; 洙
     ))
@@ -3584,11 +3906,26 @@
     (chinese-gb2312	. #x642E)	; ø»…¨«
     (japanese-jisx0212	. #x4732)	; ø»‹œ•
     (chinese-isoir165	. #x642E)	; ø»Ž»
-    (chinese-cns11643-2 . #x2B5C)	; ø»“œ‡
     (ideograph-daikanwa . 17382)	; ø¸„¦
     (ucs		. #x6D1A)	; 洚
     ))
 (define-char
+  '((=>ucs		. #x6D1A)	; 洚
+    (morohashi-daikanwa	17382 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (chinese-cns11643-2 . #x2B5C)	; ø»“œ‡
+    ))
+(define-char
+  '((=>ucs		. #x6D1A)	; 洚
+    (morohashi-daikanwa	17382 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-big5	. #xCF7A)	; ý¢€Œ½º
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
@@ -3600,6 +3937,7 @@
     (chinese-isoir165		. #x4265)	; ø»Ÿ¶
     (chinese-cns11643-1		. #x5228)	; ø»’Š¡
     (japanese-jisx0208-1990	. #x4D6C)	; ø½Š·¯
+    (chinese-big5		. #xACA5)	; ý¢€Š²¥
     (ideograph-daikanwa		. 17383)	; ø¸„§
     (ucs			. #x6D1B)	; 洛
     ))
@@ -3612,11 +3950,19 @@
     (ucs		. #x6D1C)	; 洜
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6D1D)	; 洝
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (chinese-big5	. #xCF7D)	; ý¢€Œ½½
     (ideograph-daikanwa . 17385)	; ø¸„©
     (china3-jef		. #x55E7)	; øº…—§
+    ))
+(define-char
+  '((morohashi-daikanwa	17385 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
     (ucs		. #x6D1D)	; 洝
     ))
 (define-char
@@ -3639,6 +3985,7 @@
     (chinese-isoir165		. #x3634)	; ø»
     (chinese-cns11643-1		. #x5222)	; ø»’Š›
     (japanese-jisx0208-1990	. #x4636)	; ø½Š¬§
+    (chinese-big5		. #xAC7D)	; ý¢€Š±½
     (ideograph-daikanwa		. 17386)	; ø¸„ª
     (ucs			. #x6D1E)	; 洞
     ))
@@ -3651,6 +3998,7 @@
     (japanese-jisx0208		. #x5E26)	; ø»‡©³
     (chinese-cns11643-2		. #x2B52)	; ø»“›½
     (japanese-jisx0208-1990	. #x5E26)	; ø½‹§
+    (chinese-big5		. #xCF70)	; ý¢€Œ½°
     (ideograph-daikanwa		. 17387)	; ø¸„«
     (ucs			. #x6D1F)	; 洟
     ))
@@ -3659,6 +4007,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B68)	; ø»“œ“
+    (chinese-big5	. #xCFA8)	; ý¢€Œ¾¨
     (ideograph-daikanwa . 17389)	; ø¸„­
     (ucs		. #x6D20)	; æ´ 
     ))
@@ -3675,6 +4024,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B6B)	; ø»“œ–
+    (chinese-big5	. #xCFAB)	; ý¢€Œ¾«
     (ideograph-daikanwa . 17392)	; ø¸„°
     (ucs		. #x6D22)	; æ´¢
     ))
@@ -3708,6 +4058,7 @@
     (chinese-isoir165		. #x3D72)	; ø»˜­
     (chinese-cns11643-1		. #x517D)	; ø»’Š˜
     (japanese-jisx0208-1990	. #x4445)	; ø½Š©º
+    (chinese-big5		. #xAC7A)	; ý¢€Š±º
     (ideograph-daikanwa		. 17396)	; ø¸„´
     (ucs			. #x6D25)	; æ´¥
     ))
@@ -3731,6 +4082,7 @@
     (japanese-jisx0212		. #x4734)	; ø»‹œ—
     (chinese-isoir165		. #x6422)	; ø»Ž¯
     (japanese-jisx0213-2	. #x6E4E)	; ø»¦Ž³
+    (chinese-big5		. #xACA8)	; ý¢€Š²¨
     (ideograph-daikanwa		. 17398)	; ø¸„¶
     (china3-jef			. #x55EA)	; øº…—ª
     (ucs			. #x6D27)	; æ´§
@@ -3744,13 +4096,21 @@
     (chinese-cns11643-1 . #x522B)	; ø»’Š¤
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6D28)	; æ´¨
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (japanese-jisx0212	. #x4735)	; ø»‹œ˜
+    (chinese-big5	. #xCF6D)	; ý¢€Œ½­
+    (ideograph-daikanwa . 17399)	; ø¸„·
+    ))
+(define-char
+  '((morohashi-daikanwa	17399 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
     (chinese-isoir165	. #x7C77)	; ø»Žµ”
     (chinese-cns11643-2 . #x2B4F)	; ø»“›º
-    (ideograph-daikanwa . 17399)	; ø¸„·
     (ucs		. #x6D28)	; æ´¨
     ))
 (define-char
@@ -3781,6 +4141,7 @@
     (chinese-isoir165		. #x2F6B)	; ø»„‚
     (chinese-cns11643-1		. #x522D)	; ø»’Š¦
     (japanese-jisx0208-1990	. #x314C)	; ø½ŠŽ‡
+    (chinese-big5		. #xACAA)	; ý¢€Š²ª
     (ideograph-daikanwa		. 17401)	; ø¸„¹
     (ucs			. #x6D29)	; æ´©
     ))
@@ -3796,6 +4157,7 @@
     (chinese-isoir165		. #x3A69)	; ø»”Š
     (chinese-cns11643-1		. #x517B)	; ø»’Š–
     (japanese-jisx0208-1990	. #x393F)	; ø½Š™ª
+    (chinese-big5		. #xAC78)	; ý¢€Š±¸
     (ideograph-daikanwa		. 17402)	; ø¸„º
     (ucs			. #x6D2A)	; æ´ª
     ))
@@ -3810,6 +4172,7 @@
     (chinese-isoir165		. #x642A)	; ø»Ž·
     (chinese-cns11643-1		. #x5231)	; ø»’Šª
     (japanese-jisx0208-1990	. #x5E29)	; ø½‹ª
+    (chinese-big5		. #xACAE)	; ý¢€Š²®
     (ideograph-daikanwa		. 17403)	; ø¸„»
     (ucs			. #x6D2B)	; æ´«
     ))
@@ -3818,6 +4181,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B69)	; ø»“œ”
+    (chinese-big5	. #xCFA9)	; ý¢€Œ¾©
     (ideograph-daikanwa . 17404)	; ø¸„¼
     (ucs		. #x6D2C)	; æ´¬
     ))
@@ -3841,6 +4205,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B51)	; ø»“›¼
+    (chinese-big5	. #xCF6F)	; ý¢€Œ½¯
     (ideograph-daikanwa . 17406)	; ø¸„¾
     (ucs		. #x6D2D)	; æ´­
     ))
@@ -3861,6 +4226,7 @@
     (chinese-isoir165		. #x642C)	; ø»Ž¹
     (chinese-cns11643-1		. #x522E)	; ø»’Š§
     (japanese-jisx0213-1	. #x7663)	; ø»¤´
+    (chinese-big5		. #xACAB)	; ý¢€Š²«
     (ideograph-daikanwa		. 17408)	; ø¸„€
     (china3-jef			. #x55EB)	; øº…—«
     (ucs			. #x6D2E)	; æ´®
@@ -3871,8 +4237,8 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (japanese-jisx0212	. #x4738)	; ø»‹œ›
+    (chinese-big5	. #xD25E)	; ý¢€‰ž
     (ideograph-daikanwa . 17409)	; ø¸„
-    (china3-jef		. #x55B4)	; øº…–´
     ))
 (define-char
   '((=>ucs		. #x6D2F)	; æ´¯
@@ -3881,6 +4247,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (chinese-cns11643-2 . #x3041)	; ø»“£‚
+    (china3-jef		. #x55B4)	; øº…–´
     ))
 (define-char
   '((morohashi-daikanwa	17409 0 2)
@@ -3905,6 +4272,7 @@
     (total-strokes	 . 9)
     (japanese-jisx0212		. #x4739)	; ø»‹œœ
     (japanese-jisx0213-1	. #x7664)	; ø»¤µ
+    (chinese-big5		. #xAC7C)	; ý¢€Š±¼
     ))
 (define-char
   '((morohashi-daikanwa	17412 0 1)
@@ -3934,6 +4302,7 @@
     (korean-ksc5601		. #x713D)	; ø»Šˆ
     (chinese-isoir165		. #x565E)	; ø»½‡
     (japanese-jisx0208-1990	. #x3D27)	; ø½ŠŸŠ
+    (chinese-big5		. #xAC77)	; ý¢€Š±·
     (ideograph-daikanwa		. 17413)	; ø¸„…
     (ucs			. #x6D32)	; æ´²
     ))
@@ -3954,6 +4323,7 @@
     (japanese-jisx0208		. #x5E2E)	; ø»‡©»
     (chinese-isoir165		. #x6432)	; ø»Ž¿
     (japanese-jisx0208-1990	. #x5E2E)	; ø½‹¯
+    (chinese-big5		. #xCF76)	; ý¢€Œ½¶
     (ideograph-daikanwa		. 17414)	; ø¸„†
     (ucs			. #x6D33)	; æ´³
     ))
@@ -3971,6 +4341,7 @@
     (total-strokes	 . 9)
     (chinese-isoir165	. #x7C79)	; ø»Žµ–
     (chinese-cns11643-2 . #x2B50)	; ø»“›»
+    (chinese-big5	. #xCF6E)	; ý¢€Œ½®
     (ideograph-daikanwa . 17415)	; ø¸„‡
     (ucs		. #x6D34)	; æ´´
     ))
@@ -3986,6 +4357,7 @@
     (chinese-isoir165		. #x642D)	; ø»Žº
     (chinese-cns11643-1		. #x522F)	; ø»’Š¨
     (japanese-jisx0208-1990	. #x5E2D)	; ø½‹®
+    (chinese-big5		. #xACAC)	; ý¢€Š²¬
     (ideograph-daikanwa		. 17416)	; ø¸„ˆ
     (ucs			. #x6D35)	; æ´µ
     ))
@@ -3999,6 +4371,7 @@
     (korean-ksc5601		. #x7D57)	; ø»Š¢Š
     (chinese-cns11643-1		. #x5227)	; ø»’Š 
     (japanese-jisx0208-1990	. #x5E28)	; ø½‹©
+    (chinese-big5		. #xACA4)	; ý¢€Š²¤
     (ideograph-daikanwa		. 17417)	; ø¸„‰
     (ucs			. #x6D36)	; æ´¶
     ))
@@ -4007,6 +4380,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B63)	; ø»“œŽ
+    (chinese-big5	. #xCFA3)	; ý¢€Œ¾£
     (ideograph-daikanwa . 17418)	; ø¸„Š
     (ucs		. #x6D37)	; æ´·
     ))
@@ -4021,6 +4395,7 @@
     (chinese-isoir165		. #x7C74)	; ø»Žµ‘
     (chinese-cns11643-1		. #x522C)	; ø»’Š¥
     (japanese-jisx0208-1990	. #x5E2B)	; ø½‹¬
+    (chinese-big5		. #xACA9)	; ý¢€Š²©
     (ideograph-daikanwa		. 17419)	; ø¸„‹
     (ucs			. #x6D38)	; æ´¸
     ))
@@ -4034,6 +4409,7 @@
     (chinese-isoir165		. #x6421)	; ø»Ž®
     (chinese-cns11643-1		. #x522A)	; ø»’Š£
     (japanese-jisx0213-1	. #x7665)	; ø»¤¶
+    (chinese-big5		. #xACA7)	; ý¢€Š²§
     (ideograph-daikanwa		. 17421)	; ø¸„
     (china3-jef			. #x55ED)	; øº…—­
     (ucs			. #x6D39)	; æ´¹
@@ -4044,6 +4420,7 @@
     (total-strokes	 . 9)
     (chinese-isoir165	. #x7C76)	; ø»Žµ“
     (chinese-cns11643-2 . #x2B5B)	; ø»“œ†
+    (chinese-big5	. #xCF79)	; ý¢€Œ½¹
     (ideograph-daikanwa . 17422)	; ø¸„Ž
     (china3-jef		. #x98AC)	; øº‰¢¬
     (ucs		. #x6D3A)	; æ´º
@@ -4060,6 +4437,7 @@
     (chinese-isoir165		. #x3B6E)	; ø»•­
     (chinese-cns11643-1		. #x5224)	; ø»’Š
     (japanese-jisx0208-1990	. #x3368)	; ø½Š‘Ÿ
+    (chinese-big5		. #xACA1)	; ý¢€Š²¡
     (ideograph-daikanwa		. 17423)	; ø¸„
     (ucs			. #x6D3B)	; æ´»
     ))
@@ -4072,6 +4450,7 @@
     (chinese-isoir165		. #x4D5D)	; ø»¯¸
     (chinese-cns11643-2		. #x2B53)	; ø»“›¾
     (japanese-jisx0213-2	. #x6E51)	; ø»¦Ž¶
+    (chinese-big5		. #xCF71)	; ý¢€Œ½±
     (ideograph-daikanwa		. 17425)	; ø¸„‘
     (china3-jef			. #x55EE)	; øº…—®
     (ucs			. #x6D3C)	; æ´¼
@@ -4088,6 +4467,7 @@
     (chinese-isoir165		. #x4722)	; ø»¦‰
     (chinese-cns11643-1		. #x5225)	; ø»’Šž
     (japanese-jisx0208-1990	. #x5E2A)	; ø½‹«
+    (chinese-big5		. #xACA2)	; ý¢€Š²¢
     (ideograph-daikanwa		. 17426)	; ø¸„’
     (ucs			. #x6D3D)	; æ´½
     ))
@@ -4099,6 +4479,7 @@
     (chinese-gb2312	. #x4549)	; ø»„»¤
     (chinese-isoir165	. #x4549)	; ø»£´
     (chinese-cns11643-1 . #x5226)	; ø»’ŠŸ
+    (chinese-big5	. #xACA3)	; ý¢€Š²£
     (ideograph-daikanwa . 17427)	; ø¸„“
     (china3-jef		. #x55EF)	; øº…—¯
     (ucs		. #x6D3E)	; æ´¾
@@ -4151,6 +4532,7 @@
     (japanese-jisx0212		. #x473C)	; ø»‹œŸ
     (chinese-cns11643-2		. #x2B54)	; ø»“›¿
     (japanese-jisx0213-1	. #x7666)	; ø»¤·
+    (chinese-big5		. #xCF72)	; ý¢€Œ½²
     (ideograph-daikanwa		. 17429)	; ø¸„•
     (china3-jef			. #x55F0)	; øº…—°
     (ucs			. #x6D3F)	; æ´¿
@@ -4160,6 +4542,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (chinese-cns11643-2 . #x2B66)	; ø»“œ‘
+    (chinese-big5	. #xCFA6)	; ý¢€Œ¾¦
     (ideograph-daikanwa . 17430)	; ø¸„–
     (ucs		. #x6D40)	; 浀
     ))
@@ -4239,6 +4622,7 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (chinese-big5	. #xCF7E)	; ý¢€Œ½¾
     (ideograph-daikanwa . 17441)	; ø¸„¡
     (china3-jef		. #x55F1)	; øº…—±
     (ucs		. #x6D42)	; 浂
@@ -4632,11 +5016,26 @@
     (ucs		. #x6D57)	; 浗
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6D16)	; 洖
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (chinese-cns11643-2 . #x3047)	; ø»“£ˆ
+    (chinese-big5	. #xD264)	; ý¢€‰¤
     (ideograph-daikanwa . 17456)	; ø¸„°
+    ))
+(define-char
+  '((=>ucs		. #x6D16)	; 洖
+    (morohashi-daikanwa	17456 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-cns11643-2 . #x3047)	; ø»“£ˆ
+    ))
+(define-char
+  '((morohashi-daikanwa	17456 0 4)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
     (ucs		. #x6D16)	; 洖
     ))
 (define-char
@@ -4645,6 +5044,7 @@
     (total-strokes	 . 10)
     (chinese-cns11643-2		. #x302F)	; ø»“¢°
     (japanese-jisx0213-1	. #x7667)	; ø»¤¸
+    (chinese-big5		. #xD24C)	; ý¢€‰Œ
     (ideograph-daikanwa		. 17457)	; ø¸„±
     (ucs			. #x6D58)	; 浘
     ))
@@ -4660,23 +5060,46 @@
     (chinese-isoir165		. #x5563)	; ø»»®
     (chinese-cns11643-1		. #x5641)	; ø»’²
     (japanese-jisx0208-1990	. #x5E36)	; ø½‹·
+    (chinese-big5		. #xAEFD)	; ý¢€Š»½
     (ideograph-daikanwa		. 17458)	; ø¸„²
     (ucs			. #x6D59)	; 浙
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6D5A)	; 浚
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (ideograph-daikanwa . 17460)	; ø¸„´
+    ))
+(define-char
+  '((=>ucs		. #x6D5A)	; 浚
+    (morohashi-daikanwa	17460 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-cns11643-1 . #x5646)	; ø»’·
+    ))
+(define-char
+  '((=>ucs		. #x6D5A)	; 浚
+    (morohashi-daikanwa	17460 0 1)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (shinjigen-2	. 4213)
     (japanese-jisx0208-1978	. #x5E34)	; ø»ƒ•¹
-    (chinese-gb2312		. #x3F23)	; ø»„²Š
     (japanese-jisx0208		. #x5E34)	; ø»‡ª
     (korean-ksc5601		. #x715D)	; ø»Š¨
-    (chinese-isoir165		. #x3F23)	; ø»šš
-    (chinese-cns11643-1		. #x5646)	; ø»’·
     (japanese-jisx0208-1990	. #x5E34)	; ø½‹µ
-    (ideograph-daikanwa		. 17460)	; ø¸„´
-    (ucs			. #x6D5A)	; 浚
+    (chinese-big5		. #xAF43)	; ý¢€Š½ƒ
+    ))
+(define-char
+  '((morohashi-daikanwa	17460 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-gb2312	. #x3F23)	; ø»„²Š
+    (chinese-isoir165	. #x3F23)	; ø»šš
+    (ucs		. #x6D5A)	; 浚
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -4720,6 +5143,7 @@
     (chinese-isoir165		. #x6437)	; ø»Ž‘„
     (chinese-cns11643-2		. #x3038)	; ø»“¢¹
     (japanese-jisx0213-2	. #x6E53)	; ø»¦Ž¸
+    (chinese-big5		. #xD255)	; ý¢€‰•
     (ideograph-daikanwa		. 17464)	; ø¸„¸
     (china3-jef			. #x55F3)	; øº…—³
     (ucs			. #x6D5E)	; 浞
@@ -4730,6 +5154,7 @@
     (total-strokes	 . 10)
     (japanese-jisx0212	. #x473F)	; ø»‹œ¢
     (chinese-cns11643-2 . #x303E)	; ø»“¢¿
+    (chinese-big5	. #xD25B)	; ý¢€‰›
     (ideograph-daikanwa . 17465)	; ø¸„¹
     (china3-jef		. #x55F4)	; øº…—´
     (ucs		. #x6D5F)	; 浟
@@ -4742,6 +5167,7 @@
     (chinese-isoir165		. #x643B)	; ø»Ž‘ˆ
     (chinese-cns11643-2		. #x303A)	; ø»“¢»
     (japanese-jisx0213-2	. #x6E54)	; ø»¦Ž¹
+    (chinese-big5		. #xD257)	; ý¢€‰—
     (ideograph-daikanwa		. 17466)	; ø¸„º
     (china3-jef			. #x91F1)	; øº‰‡±
     (ucs			. #x6D60)	; æµ 
@@ -4753,6 +5179,7 @@
     (japanese-jisx0212	. #x4740)	; ø»‹œ£
     (chinese-isoir165	. #x7C7B)	; ø»Žµ˜
     (chinese-cns11643-2 . #x302D)	; ø»“¢®
+    (chinese-big5	. #xD24A)	; ý¢€‰Š
     (ideograph-daikanwa . 17467)	; ø¸„»
     (china3-jef		. #x55F5)	; øº…—µ
     (ucs		. #x6D61)	; 浡
@@ -4762,44 +5189,62 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (chinese-cns11643-2 . #x3030)	; ø»“¢±
+    (chinese-big5	. #xD24D)	; ý¢€‰
     (ideograph-daikanwa . 17468)	; ø¸„¼
     (ucs		. #x6D62)	; æµ¢
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6D63)	; æµ£
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (shinjigen-2	. 4203)
     (japanese-jisx0208-1978	. #x5E31)	; ø»ƒ•¶
-    (chinese-gb2312		. #x643D)	; ø»…¨º
     (japanese-jisx0208		. #x5E31)	; ø»‡©¾
     (korean-ksc5601		. #x684B)	; ø»Šƒˆ
-    (chinese-isoir165		. #x643D)	; ø»Ž‘Š
-    (chinese-cns11643-2		. #x3029)	; ø»“¢ª
     (japanese-jisx0208-1990	. #x5E31)	; ø½‹²
+    (chinese-big5		. #xD246)	; ý¢€‰†
     (ideograph-daikanwa		. 17470)	; ø¸„¾
-    (ucs			. #x6D63)	; æµ£
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	17470 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-gb2312	. #x643D)	; ø»…¨º
+    (chinese-isoir165	. #x643D)	; ø»Ž‘Š
+    (chinese-cns11643-2 . #x3029)	; ø»“¢ª
+    (ucs		. #x6D63)	; æµ£
+    ))
+(define-char
+  '((=>ucs		. #x6D64)	; 浤
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (japanese-jisx0208-1978	. #x5E33)	; ø»ƒ•¸
     (japanese-jisx0208		. #x5E33)	; ø»‡ª€
-    (chinese-isoir165		. #x7D21)	; ø»Žµœ
-    (chinese-cns11643-2		. #x302A)	; ø»“¢«
     (japanese-jisx0208-1990	. #x5E33)	; ø½‹´
+    (chinese-big5		. #xD247)	; ý¢€‰‡
     (ideograph-daikanwa		. 17471)	; ø¸„¿
-    (ucs			. #x6D64)	; 浤
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	17471 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (japanese-jisx0212		. #x4741)	; ø»‹œ¤
-    (chinese-isoir165		. #x7C7D)	; ø»Žµš
+    (chinese-isoir165	. #x7D21)	; ø»Žµœ
+    (chinese-cns11643-2 . #x302A)	; ø»“¢«
+    (ucs		. #x6D64)	; 浤
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (japanese-jisx0212		. #x4741)	; ø»‹œ¤
+    (chinese-isoir165		. #x7C7D)	; ø»Žµš
     (chinese-cns11643-1		. #x564D)	; ø»’¾
     (japanese-jisx0213-1	. #x7668)	; ø»¤¹
+    (chinese-big5		. #xAF4A)	; ý¢€Š½Š
     (ideograph-daikanwa		. 17474)	; ø¸„‘‚
     (china3-jef			. #x55F6)	; øº…—¶
     (ucs			. #x6D65)	; æµ¥
@@ -4816,6 +5261,7 @@
     (chinese-isoir165		. #x4656)	; ø»¥Ÿ
     (chinese-cns11643-1		. #x563E)	; ø»’¯
     (japanese-jisx0208-1990	. #x313A)	; ø½Šµ
+    (chinese-big5		. #xAEFA)	; ý¢€Š»º
     (ideograph-daikanwa		. 17475)	; ø¸„‘ƒ
     (ucs			. #x6D66)	; 浦
     ))
@@ -4825,16 +5271,25 @@
     (total-strokes	 . 10)
     (japanese-jisx0212	. #x4742)	; ø»‹œ¥
     (chinese-cns11643-2 . #x3039)	; ø»“¢º
+    (chinese-big5	. #xD256)	; ý¢€‰–
     (ideograph-daikanwa . 17476)	; ø¸„‘„
     (china3-jef		. #x55F7)	; øº…—·
     (ucs		. #x6D67)	; 浧
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6D68)	; 浨
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (chinese-cns11643-2 . #x3042)	; ø»“£ƒ
+    (chinese-big5	. #xD25F)	; ý¢€‰Ÿ
     (ideograph-daikanwa . 17477)	; ø¸„‘…
+    ))
+(define-char
+  '((morohashi-daikanwa	17477 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-cns11643-2 . #x3042)	; ø»“£ƒ
     (ucs		. #x6D68)	; 浨
     ))
 (define-char
@@ -4866,6 +5321,7 @@
     (chinese-isoir165		. #x3A46)	; ø»“§
     (chinese-cns11643-1		. #x5648)	; ø»’¹
     (japanese-jisx0208-1990	. #x3940)	; ø½Š™«
+    (chinese-big5		. #xAF45)	; ý¢€Š½…
     (ucs			. #x6D69)	; 浩
     ))
 (define-char
@@ -4892,19 +5348,27 @@
     (ucs		. #x3CE6)	; 㳦
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6D6A)	; 浪
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (shinjigen-2	. 4254)
     (japanese-jisx0208-1978	. #x4F32)	; ø»‚¿µ
-    (chinese-gb2312		. #x404B)	; ø»„´
     (japanese-jisx0208		. #x4F32)	; ø»‡“½
     (korean-ksc5601		. #x5548)	; ø»‰§‹
-    (chinese-isoir165		. #x404B)	; ø»œ 
-    (chinese-cns11643-1		. #x563A)	; ø»’«
     (japanese-jisx0208-1990	. #x4F32)	; ø½Š¹±
+    (chinese-big5		. #xAEF6)	; ý¢€Š»¶
     (ideograph-daikanwa		. 17482)	; ø¸„‘Š
-    (ucs			. #x6D6A)	; 浪
+    ))
+(define-char
+  '((morohashi-daikanwa	17482 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-gb2312	. #x404B)	; ø»„´
+    (chinese-isoir165	. #x404B)	; ø»œ 
+    (chinese-cns11643-1 . #x563A)	; ø»’«
+    (ucs		. #x6D6A)	; 浪
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -4924,15 +5388,24 @@
     (korean-ksc5601		. #x575F)	; ø»‰ªž
     (chinese-cns11643-1		. #x5643)	; ø»’´
     (japanese-jisx0208-1990	. #x333D)	; ø½Š´
+    (chinese-big5		. #xAF40)	; ý¢€Š½€
     (ideograph-daikanwa		. 17485)	; ø¸„‘
     (ucs			. #x6D6C)	; 浬
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6D6D)	; æµ­
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (chinese-cns11643-2 . #x3031)	; ø»“¢²
+    (chinese-big5	. #xD24E)	; ý¢€‰Ž
     (ideograph-daikanwa . 17486)	; ø¸„‘Ž
+    ))
+(define-char
+  '((morohashi-daikanwa	17486 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-cns11643-2 . #x3031)	; ø»“¢²
     (ucs		. #x6D6D)	; æµ­
     ))
 (define-char
@@ -4941,6 +5414,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (korean-ksc5601	. #x5D29)	; ø»‰²œ
+    (chinese-big5	. #xAF42)	; ý¢€Š½‚
     (ideograph-daikanwa . 17487)	; ø¸„‘
     (china3-jef		. #x55F9)	; øº…—¹
     ))
@@ -4965,6 +5439,7 @@
     (japanese-jisx0212	. #x4743)	; ø»‹œ¦
     (chinese-isoir165	. #x6434)	; ø»Ž‘
     (chinese-cns11643-2 . #x3032)	; ø»“¢³
+    (chinese-big5	. #xD24F)	; ý¢€‰
     (ideograph-daikanwa . 17488)	; ø¸„‘
     (china3-jef		. #x9DF6)	; øº‰·¶
     (ucs		. #x6D6F)	; 浯
@@ -4976,6 +5451,7 @@
     (japanese-jisx0212		. #x4744)	; ø»‹œ§
     (chinese-cns11643-2		. #x303C)	; ø»“¢½
     (japanese-jisx0213-2	. #x6E55)	; ø»¦Žº
+    (chinese-big5		. #xD259)	; ý¢€‰™
     (ideograph-daikanwa		. 17489)	; ø¸„‘‘
     (china3-jef			. #x55FA)	; øº…—º
     (ucs			. #x6D70)	; æµ°
@@ -5016,6 +5492,7 @@
     (chinese-isoir165		. #x5421)	; ø»¹Ž
     (chinese-cns11643-1		. #x5647)	; ø»’¸
     (japanese-jisx0208-1990	. #x4D61)	; ø½Š·¤
+    (chinese-big5		. #xAF44)	; ý¢€Š½„
     (ideograph-daikanwa		. 17496)	; ø¸„‘˜
     (ucs			. #x6D74)	; æµ´
     ))
@@ -5028,7 +5505,15 @@
     (china3-jef		. #x97FC)	; øº‰Ÿ¼
     ))
 (define-char
-  '((morohashi-daikanwa	17501 0 0)
+  '((=>ucs		. #x6D75)	; æµµ
+    (morohashi-daikanwa	17501 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-big5	. #xD268)	; ý¢€‰¨
+    ))
+(define-char
+  '((morohashi-daikanwa	17501 0 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
@@ -5036,11 +5521,19 @@
     (ucs		. #x6D75)	; æµµ
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6D76)	; 浶
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (chinese-cns11643-2 . #x302B)	; ø»“¢¬
+    (chinese-big5	. #xD248)	; ý¢€‰ˆ
     (ideograph-daikanwa . 17502)	; ø¸„‘ž
+    ))
+(define-char
+  '((morohashi-daikanwa	17502 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-cns11643-2 . #x302B)	; ø»“¢¬
     (ucs		. #x6D76)	; 浶
     ))
 (define-char
@@ -5052,6 +5545,7 @@
     (chinese-isoir165		. #x3A23)	; ø»“„
     (chinese-cns11643-1		. #x5640)	; ø»’±
     (japanese-jisx0213-1	. #x7669)	; ø»¤º
+    (chinese-big5		. #xAEFC)	; ý¢€Š»¼
     (ideograph-daikanwa		. 17503)	; ø¸„‘Ÿ
     (china3-jef			. #x55FB)	; øº…—»
     (ucs			. #x6D77)	; æµ·
@@ -5071,6 +5565,7 @@
     (total-strokes	 . 10)
     (korean-ksc5601	. #x7659)	; ø»Š—º
     (chinese-cns11643-1 . #x563F)	; ø»’°
+    (chinese-big5	. #xAEFB)	; ý¢€Š»»
     (ideograph-daikanwa . 17505)	; ø¸„‘¡
     (china3-jef		. #x55FC)	; øº…—¼
     ))
@@ -5097,6 +5592,7 @@
     (chinese-cns11643-1		. #x564B)	; ø»’¼
     (japanese-jisx0208-1990	. #x5E35)	; ø½‹¶
     (chinese-gb12345		. #x6424)	; æµ¹
+    (chinese-big5		. #xAF48)	; ý¢€Š½ˆ
     (ideograph-daikanwa		. 17506)	; ø¸„‘¢
     (ucs			. #x6D79)	; æµ¹
     ))
@@ -5105,6 +5601,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (chinese-cns11643-2 . #x3028)	; ø»“¢©
+    (chinese-big5	. #xD245)	; ý¢€‰…
     (ideograph-daikanwa . 17507)	; ø¸„‘£
     (ucs		. #x6D7A)	; 浺
     ))
@@ -5113,6 +5610,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (chinese-cns11643-2 . #x3049)	; ø»“£Š
+    (chinese-big5	. #xD266)	; ý¢€‰¦
     (ideograph-daikanwa . 17509)	; ø¸„‘¥
     (ucs		. #x6D7B)	; æµ»
     ))
@@ -5124,6 +5622,7 @@
     (japanese-jisx0212	. #x4745)	; ø»‹œ¨
     (chinese-isoir165	. #x643C)	; ø»Ž‘‰
     (chinese-cns11643-2 . #x303D)	; ø»“¢¾
+    (chinese-big5	. #xD25A)	; ý¢€‰š
     (ideograph-daikanwa . 17510)	; ø¸„‘¦
     (china3-jef		. #x55FD)	; øº…—½
     (ucs		. #x6D7C)	; æµ¼
@@ -5133,6 +5632,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (chinese-big5	. #xD267)	; ý¢€‰§
     (ideograph-daikanwa . 17511)	; ø¸„‘§
     (china3-jef		. #x55FE)	; øº…—¾
     ))
@@ -5141,14 +5641,22 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (chinese-cns11643-2 . #x304A)	; ø»“£‹
     (ucs		. #x6D7D)	; æµ½
     ))
 (define-char
+  '((=>ucs		. #x6D7D)	; æµ½
+    (morohashi-daikanwa	17511 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-cns11643-2 . #x304A)	; ø»“£‹
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (chinese-cns11643-2 . #x3044)	; ø»“£…
+    (chinese-big5	. #xD261)	; ý¢€‰¡
     (ideograph-daikanwa . 17512)	; ø¸„‘¨
     (ucs		. #x6D7E)	; æµ¾
     ))
@@ -5158,6 +5666,7 @@
     (total-strokes	 . 10)
     (korean-ksc5601	. #x782A)	; ø»Šš‡
     (chinese-cns11643-2 . #x3036)	; ø»“¢·
+    (chinese-big5	. #xD253)	; ý¢€‰“
     (ideograph-daikanwa . 17513)	; ø¸„‘©
     (china3-jef		. #x9FCB)	; øº‰¿‹
     (ucs		. #x6D7F)	; 浿
@@ -5168,6 +5677,7 @@
     (total-strokes	 . 10)
     (chinese-cns11643-2		. #x3045)	; ø»“£†
     (japanese-jisx0213-2	. #x6E56)	; ø»¦Ž»
+    (chinese-big5		. #xD262)	; ý¢€‰¢
     (ideograph-daikanwa		. 17514)	; ø¸„‘ª
     (ucs			. #x6D80)	; 涀
     ))
@@ -5190,6 +5700,7 @@
     (chinese-isoir165		. #x4D3F)	; ø»¯š
     (chinese-cns11643-2		. #x303F)	; ø»“£€
     (japanese-jisx0213-1	. #x766A)	; ø»¤»
+    (chinese-big5		. #xD25C)	; ý¢€‰œ
     (ideograph-daikanwa		. 17518)	; ø¸„‘®
     (china3-jef			. #x56A2)	; øº…š¢
     (ucs			. #x6D82)	; 涂
@@ -5199,6 +5710,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (chinese-cns11643-2 . #x3048)	; ø»“£‰
+    (chinese-big5	. #xD265)	; ý¢€‰¥
     (ideograph-daikanwa . 17519)	; ø¸„‘¯
     (ucs		. #x6D83)	; 涃
     ))
@@ -5207,6 +5719,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (chinese-cns11643-2 . #x3046)	; ø»“£‡
+    (chinese-big5	. #xD263)	; ý¢€‰£
     (ideograph-daikanwa . 17520)	; ø¸„‘°
     (ucs		. #x6D84)	; 涄
     ))
@@ -5222,6 +5735,7 @@
     (chinese-isoir165		. #x4479)	; ø»£†
     (chinese-cns11643-1		. #x564C)	; ø»’½
     (japanese-jisx0208-1990	. #x5E3A)	; ø½‹»
+    (chinese-big5		. #xAF49)	; ý¢€Š½‰
     (ideograph-daikanwa		. 17521)	; ø¸„‘±
     (ucs			. #x6D85)	; 涅
     ))
@@ -5230,6 +5744,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (chinese-cns11643-2 . #x3037)	; ø»“¢¸
+    (chinese-big5	. #xD254)	; ý¢€‰”
     (ideograph-daikanwa . 17522)	; ø¸„‘²
     (ucs		. #x6D86)	; 涆
     ))
@@ -5242,6 +5757,7 @@
     (chinese-cns11643-1		. #x563D)	; ø»’®
     (japanese-jisx0213-1	. #x766B)	; ø»¤¼
     (chinese-gb12345		. #x637E)	; 涇
+    (chinese-big5		. #xAEF9)	; ý¢€Š»¹
     (ideograph-daikanwa		. 17526)	; ø¸„‘¶
     (china3-jef			. #x56A3)	; øº…š£
     (ucs			. #x6D87)	; 涇
@@ -5252,6 +5768,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (korean-ksc5601	. #x613C)	; ø»‰¸§
+    (chinese-big5	. #xAEF8)	; ý¢€Š»¸
     (ideograph-daikanwa . 17529)	; ø¸„‘¹
     (china3-jef		. #x56A4)	; øº…š¤
     ))
@@ -5276,16 +5793,24 @@
     (chinese-cns11643-1 . #x563C)	; ø»’­
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6D89)	; 涉
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (chinese-gb2312		. #x4966)	; ø»…¹
     (korean-ksc5601		. #x606F)	; ø»‰·¼
-    (chinese-isoir165		. #x4966)	; ø»ª‰
-    (chinese-cns11643-1		. #x5644)	; ø»’µ
     (japanese-jisx0213-1	. #x766C)	; ø»¤½
+    (chinese-big5		. #xAF41)	; ý¢€Š½
     (ideograph-daikanwa		. 17530)	; ø¸„‘º
-    (ucs			. #x6D89)	; 涉
+    ))
+(define-char
+  '((morohashi-daikanwa	17530 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-gb2312	. #x4966)	; ø»…¹
+    (chinese-isoir165	. #x4966)	; ø»ª‰
+    (chinese-cns11643-1 . #x5644)	; ø»’µ
+    (ucs		. #x6D89)	; 涉
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -5303,13 +5828,22 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (chinese-cns11643-1 . #x564A)	; ø»’»
+    (chinese-big5	. #xAF47)	; ý¢€Š½‡
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6D8B)	; 涋
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (chinese-cns11643-2 . #x3043)	; ø»“£„
+    (chinese-big5	. #xD260)	; ý¢€‰ 
     (ideograph-daikanwa . 17533)	; ø¸„‘½
+    ))
+(define-char
+  '((morohashi-daikanwa	17533 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-cns11643-2 . #x3043)	; ø»“£„
     (ucs		. #x6D8B)	; 涋
     ))
 (define-char
@@ -5324,6 +5858,7 @@
     (chinese-isoir165		. #x533F)	; ø»¸Ž
     (chinese-cns11643-1		. #x5649)	; ø»’º
     (japanese-jisx0208-1990	. #x4D30)	; ø½Š¶³
+    (chinese-big5		. #xAF46)	; ý¢€Š½†
     (ideograph-daikanwa		. 17534)	; ø¸„‘¾
     (ucs			. #x6D8C)	; 涌
     ))
@@ -5334,25 +5869,39 @@
     (korean-ksc5601		. #x7C7D)	; ø»Š¡’
     (chinese-cns11643-2		. #x3034)	; ø»“¢µ
     (japanese-jisx0213-2	. #x6E59)	; ø»¦Ž¾
+    (chinese-big5		. #xD251)	; ý¢€‰‘
     (ideograph-daikanwa		. 17535)	; ø¸„‘¿
     (ucs			. #x6D8D)	; 涍
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6D8E)	; 涎
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (daikanwa-radical	. 85)
-    (daikanwa-strokes	. 7)
+    (total-strokes	 . 10)
     (shinjigen-2	. 4225)
     (japanese-jisx0208-1978	. #x5E37)	; ø»ƒ•¼
-    (chinese-gb2312		. #x4F51)	; ø»…Š˜
     (japanese-jisx0208		. #x5E37)	; ø»‡ª„
     (korean-ksc5601		. #x664E)	; ø»Š€
-    (chinese-isoir165		. #x4F51)	; ø»²¨
-    (chinese-cns11643-1		. #x5B48)	; ø»’˜
     (japanese-jisx0208-1990	. #x5E37)	; ø½‹¸
+    (chinese-big5		. #xB243)	; ý¢€‹‰ƒ
     (ideograph-daikanwa		. 17536)	; ø¸„’€
-    (ucs			. #x6D8E)	; 涎
+    ))
+(define-char
+  '((morohashi-daikanwa	17536 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-gb2312	. #x4F51)	; ø»…Š˜
+    (chinese-isoir165	. #x4F51)	; ø»²¨
+    (ucs		. #x6D8E)	; 涎
+    ))
+(define-char
+  '((=>ucs		. #x6D8E)	; 涎
+    (morohashi-daikanwa	17536 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-1 . #x5B48)	; ø»’˜
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -5367,6 +5916,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (chinese-cns11643-2 . #x304C)	; ø»“£
+    (chinese-big5	. #xD269)	; ý¢€‰©
     (ideograph-daikanwa . 17538)	; ø¸„’‚
     (ucs		. #x6D90)	; 涐
     ))
@@ -5380,6 +5930,7 @@
     (chinese-isoir165		. #x6433)	; ø»Ž‘€
     (chinese-cns11643-2		. #x3033)	; ø»“¢´
     (japanese-jisx0213-2	. #x6E5A)	; ø»¦Ž¿
+    (chinese-big5		. #xD250)	; ý¢€‰
     (ideograph-daikanwa		. 17539)	; ø¸„’ƒ
     (ucs			. #x6D91)	; 涑
     ))
@@ -5389,6 +5940,7 @@
     (total-strokes	 . 10)
     (japanese-jisx0212	. #x4749)	; ø»‹œ¬
     (chinese-cns11643-2 . #x302E)	; ø»“¢¯
+    (chinese-big5	. #xD24B)	; ý¢€‰‹
     (ideograph-daikanwa . 17540)	; ø¸„’„
     (china3-jef		. #x8FD2)	; øºˆ¿’
     (ucs		. #x6D92)	; 涒
@@ -5403,12 +5955,20 @@
     (japanese-jisx0208		. #x5E32)	; ø»‡©¿
     (korean-ksc5601		. #x664F)	; ø»Š€
     (chinese-isoir165		. #x6438)	; ø»Ž‘…
-    (chinese-cns11643-1		. #x5642)	; ø»’³
     (japanese-jisx0208-1990	. #x5E32)	; ø½‹³
+    (chinese-big5		. #xAEFE)	; ý¢€Š»¾
     (ideograph-daikanwa		. 17541)	; ø¸„’…
     (ucs			. #x6D93)	; 涓
     ))
 (define-char
+  '((=>ucs		. #x6D93)	; 涓
+    (morohashi-daikanwa	17541 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-cns11643-1 . #x5642)	; ø»’³
+    ))
+(define-char
   '((=>ucs		. #x6D94)	; 涔
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
@@ -5416,6 +5976,7 @@
     (japanese-jisx0212		. #x474A)	; ø»‹œ­
     (chinese-cns11643-1		. #x564E)	; ø»’¿
     (japanese-jisx0213-1	. #x766D)	; ø»¤¾
+    (chinese-big5		. #xAF4B)	; ý¢€Š½‹
     (ideograph-daikanwa		. 17542)	; ø¸„’†
     (china3-jef			. #x56A6)	; øº…š¦
     ))
@@ -5440,6 +6001,7 @@
     (chinese-isoir165		. #x4C69)	; ø»®¦
     (chinese-cns11643-1		. #x563B)	; ø»’¬
     (japanese-jisx0208-1990	. #x5E38)	; ø½‹¹
+    (chinese-big5		. #xAEF7)	; ý¢€Š»·
     (ideograph-daikanwa		. 17543)	; ø¸„’‡
     (ucs			. #x6D95)	; 涕
     ))
@@ -5466,6 +6028,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (japanese-jisx0212	. #x474C)	; ø»‹œ¯
+    (chinese-big5	. #xD258)	; ý¢€‰˜
     (ideograph-daikanwa . 17545)	; ø¸„’‰
     (china3-jef		. #x56A8)	; øº…š¨
     ))
@@ -5491,6 +6054,7 @@
     (total-strokes	 . 10)
     (japanese-jisx0212		. #x474D)	; ø»‹œ°
     (japanese-jisx0213-2	. #x6E5B)	; ø»¦€
+    (chinese-big5		. #xD25D)	; ý¢€‰
     (ideograph-daikanwa		. 17546)	; ø¸„’Š
     (china3-jef			. #x56A9)	; øº…š©
     (ucs			. #x6D98)	; 涘
@@ -5712,18 +6276,26 @@
     (ucs		. #x23D5E)	; 𣵞
     ))
 (define-char
-  '((morohashi-daikanwa	17572 1)
+  '((=>ucs		. #x6D41)	; 流
+    (morohashi-daikanwa	17572 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (japanese-jisx0208-1978	. #x4E2E)	; ø»‚¾“
-    (chinese-gb2312		. #x4177)	; ø»„¶š
     (japanese-jisx0208		. #x4E2E)	; ø»‡’›
     (korean-ksc5601		. #x5735)	; ø»‰©´
-    (chinese-isoir165		. #x4177)	; ø»žª
-    (chinese-cns11643-4		. #x2D70)	; ø»—³Ÿ
     (japanese-jisx0208-1990	. #x4E2E)	; ø½Š¸
-    (ucs			. #x6D41)	; 流
+    (chinese-big5		. #xAC79)	; ý¢€Š±¹
+    ))
+(define-char
+  '((morohashi-daikanwa	17572 1 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-gb2312	. #x4177)	; ø»„¶š
+    (chinese-isoir165	. #x4177)	; ø»žª
+    (chinese-cns11643-4 . #x2D70)	; ø»—³Ÿ
+    (ucs		. #x6D41)	; 流
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -6088,6 +6660,7 @@
     (total-strokes	 . 11)
     (japanese-jisx0212		. #x474E)	; ø»‹œ±
     (japanese-jisx0213-1	. #x766E)	; ø»¤¿
+    (chinese-big5		. #xB265)	; ý¢€‹‰¥
     (ideograph-daikanwa		. 17575)	; ø¸„’§
     (china3-jef			. #x91F2)	; øº‰‡²
     ))
@@ -6102,26 +6675,49 @@
     (ucs		. #x6DAA)	; 涪
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DAB)	; 涫
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (chinese-gb2312		. #x644A)	; ø»…©‡
-    (chinese-isoir165		. #x644A)	; ø»Ž‘—
-    (chinese-cns11643-2		. #x3645)	; ø»“«º
     (japanese-jisx0213-2	. #x6E61)	; ø»¦†
+    (chinese-big5		. #xD5E1)	; ý¢€—¡
     (ideograph-daikanwa		. 17577)	; ø¸„’©
-    (ucs			. #x6DAB)	; 涫
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	17577 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-gb2312	. #x644A)	; ø»…©‡
+    (chinese-isoir165	. #x644A)	; ø»Ž‘—
+    (chinese-cns11643-2 . #x3645)	; ø»“«º
+    (ucs		. #x6DAB)	; 涫
+    ))
+(define-char
+  '((=>ucs		. #x6DAC)	; 涬
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (ideograph-daikanwa . 17578)	; ø¸„’ª
+    ))
+(define-char
+  '((=>ucs		. #x6DAC)	; 涬
+    (morohashi-daikanwa	17578 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (japanese-jisx0212		. #x474F)	; ø»‹œ²
-    (chinese-cns11643-2		. #x3649)	; ø»“«¾
     (japanese-jisx0213-1	. #x766F)	; ø»¤‘€
-    (ideograph-daikanwa		. 17578)	; ø¸„’ª
-    (china3-jef			. #x56AD)	; øº…š­
-    (ucs			. #x6DAC)	; 涬
+    (chinese-big5		. #xD5E5)	; ý¢€—¥
+    ))
+(define-char
+  '((morohashi-daikanwa	17578 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-2 . #x3649)	; ø»“«¾
+    (china3-jef		. #x56AD)	; øº…š­
+    (ucs		. #x6DAC)	; 涬
     ))
 (define-char
   '((=>ucs		. #x6DAD)	; 涭
@@ -6147,6 +6743,7 @@
     (chinese-isoir165		. #x644C)	; ø»Ž‘™
     (chinese-cns11643-1		. #x5B57)	; ø»’˜ž
     (japanese-jisx0213-2	. #x6E62)	; ø»¦‡
+    (chinese-big5		. #xB252)	; ý¢€‹‰’
     (ideograph-daikanwa		. 17580)	; ø¸„’¬
     (ucs			. #x6DAE)	; 涮
     ))
@@ -6170,6 +6767,7 @@
     (chinese-isoir165		. #x5144)	; ø»µ—
     (chinese-cns11643-1		. #x5B55)	; ø»’˜œ
     (japanese-jisx0208-1990	. #x3336)	; ø½Š­
+    (chinese-big5		. #xB250)	; ý¢€‹‰
     (ideograph-daikanwa		. 17582)	; ø¸„’®
     (ucs			. #x6DAF)	; 涯
     ))
@@ -6205,19 +6803,27 @@
     (ideograph-daikanwa . 17586)	; ø¸„’²
     ))
 (define-char
-  '((morohashi-daikanwa	17586 0 2)
+  '((=>ucs		. #x6DB2)	; 液
+    (morohashi-daikanwa	17586 0 2)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (shinjigen-2	. 4256)
     (japanese-jisx0208-1978	. #x3155)	; ø»‚””
-    (chinese-gb2312		. #x523A)	; ø»…Ž›
     (japanese-jisx0208		. #x3155)	; ø»†¨œ
     (korean-ksc5601		. #x647B)	; ø»‰¾€
-    (chinese-isoir165		. #x523A)	; ø»¶«
-    (chinese-cns11643-1		. #x5B4C)	; ø»’˜“
     (japanese-jisx0208-1990	. #x3155)	; ø½ŠŽ
-    (ucs			. #x6DB2)	; 液
+    (chinese-big5		. #xB247)	; ý¢€‹‰‡
+    ))
+(define-char
+  '((morohashi-daikanwa	17586 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-gb2312	. #x523A)	; ø»…Ž›
+    (chinese-isoir165	. #x523A)	; ø»¶«
+    (chinese-cns11643-1 . #x5B4C)	; ø»’˜“
+    (ucs		. #x6DB2)	; 液
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -6228,11 +6834,26 @@
     (ucs		. #x23D79)	; 𣵹
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DB3)	; 涳
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (chinese-cns11643-2 . #x3647)	; ø»“«¼
+    (chinese-big5	. #xD5E3)	; ý¢€—£
     (ideograph-daikanwa . 17589)	; ø¸„’µ
+    ))
+(define-char
+  '((=>ucs		. #x6DB3)	; 涳
+    (morohashi-daikanwa	17589 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-2 . #x3647)	; ø»“«¼
+    ))
+(define-char
+  '((morohashi-daikanwa	17589 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
     (ucs		. #x6DB3)	; 涳
     ))
 (define-char
@@ -6280,6 +6901,7 @@
     (total-strokes	 . 11)
     (japanese-jisx0212		. #x4750)	; ø»‹œ³
     (japanese-jisx0213-2	. #x6E63)	; ø»¦ˆ
+    (chinese-big5		. #xD5E2)	; ý¢€—¢
     (ideograph-daikanwa		. 17593)	; ø¸„’¹
     (china3-jef			. #x98AD)	; øº‰¢­
     ))
@@ -6304,17 +6926,25 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (chinese-gb2312	. #x3A2D)	; ø»„ª¾
+    (chinese-isoir165	. #x3A2D)	; ø»“Ž
+    (chinese-cns11643-1 . #x5B60)	; ø»’˜§
+    (ideograph-daikanwa . 17595)	; ø¸„’»
+    (china3-jef		. #x56AE)	; øº…š®
+    (ucs		. #x6DB5)	; 涵
+    ))
+(define-char
+  '((=>ucs		. #x6DB5)	; 涵
+    (morohashi-daikanwa	17595 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
     (shinjigen-2	. 4265)
     (japanese-jisx0208-1978	. #x5E3E)	; ø»ƒ–ƒ
-    (chinese-gb2312		. #x3A2D)	; ø»„ª¾
     (japanese-jisx0208		. #x5E3E)	; ø»‡ª‹
     (korean-ksc5601		. #x7964)	; ø»ŠœŸ
-    (chinese-isoir165		. #x3A2D)	; ø»“Ž
-    (chinese-cns11643-1		. #x5B60)	; ø»’˜§
     (japanese-jisx0208-1990	. #x5E3E)	; ø½‹¿
-    (ideograph-daikanwa		. 17595)	; ø¸„’»
-    (china3-jef			. #x56AE)	; øº…š®
-    (ucs			. #x6DB5)	; 涵
+    (chinese-big5		. #xB25B)	; ý¢€‹‰›
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -6375,6 +7005,7 @@
     (total-strokes	 . 11)
     (japanese-jisx0212	. #x4751)	; ø»‹œ´
     (chinese-cns11643-2 . #x364C)	; ø»“¬
+    (chinese-big5	. #xD5E8)	; ý¢€—¨
     (ideograph-daikanwa . 17600)	; ø¸„“€
     (ucs		. #x6DB7)	; 涷
     ))
@@ -6389,6 +7020,7 @@
     (chinese-isoir165		. #x3A54)	; ø»“µ
     (chinese-cns11643-1		. #x5B5A)	; ø»’˜¡
     (japanese-jisx0208-1990	. #x5E41)	; ø½‹‚
+    (chinese-big5		. #xB255)	; ý¢€‹‰•
     (ideograph-daikanwa		. 17601)	; ø¸„“
     (ucs			. #x6DB8)	; 涸
     ))
@@ -6413,6 +7045,7 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (chinese-cns11643-2 . #x365E)	; ø»“¬“
+    (chinese-big5	. #xD5FA)	; ý¢€—º
     (ideograph-daikanwa . 17603)	; ø¸„“ƒ
     (ucs		. #x6DBA)	; 涺
     ))
@@ -6421,21 +7054,30 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (chinese-cns11643-2 . #x366A)	; ø»“¬Ÿ
+    (chinese-big5	. #xD647)	; ý¢€™‡
     (ideograph-daikanwa . 17605)	; ø¸„“…
     (ucs		. #x6DBB)	; 涻
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DBC)	; 涼
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (shinjigen-1	. 4308)
     (shinjigen-2	. 4309)
     (japanese-jisx0208-1978	. #x4E43)	; ø»‚¾¨
     (japanese-jisx0208		. #x4E43)	; ø»‡’°
-    (chinese-cns11643-1		. #x5B49)	; ø»’˜
     (japanese-jisx0208-1990	. #x4E43)	; ø½Š¸¤
+    (chinese-big5		. #xB244)	; ý¢€‹‰„
     (ideograph-daikanwa		. 17606)	; ø¸„“†
-    (ucs			. #x6DBC)	; 涼
+    ))
+(define-char
+  '((morohashi-daikanwa	17606 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-1 . #x5B49)	; ø»’˜
+    (ucs		. #x6DBC)	; 涼
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -6443,6 +7085,7 @@
     (total-strokes	 . 11)
     (japanese-jisx0212	. #x4753)	; ø»‹œ¶
     (chinese-cns11643-2 . #x365B)	; ø»“¬
+    (chinese-big5	. #xD5F7)	; ý¢€—·
     (ideograph-daikanwa . 17607)	; ø¸„“‡
     (china3-jef		. #x56AF)	; øº…š¯
     (ucs		. #x6DBD)	; 涽
@@ -6452,6 +7095,7 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (chinese-cns11643-2 . #x3654)	; ø»“¬‰
+    (chinese-big5	. #xD5F0)	; ý¢€—°
     (ideograph-daikanwa . 17608)	; ø¸„“ˆ
     (ucs		. #x6DBE)	; 涾
     ))
@@ -6464,24 +7108,33 @@
     (chinese-isoir165		. #x6443)	; ø»Ž‘
     (chinese-cns11643-1		. #x5B6C)	; ø»’˜³
     (japanese-jisx0213-1	. #x7670)	; ø»¤‘
+    (chinese-big5		. #xB267)	; ý¢€‹‰§
     (ideograph-daikanwa		. 17609)	; ø¸„“‰
     (china3-jef			. #x56B0)	; øº…š°
     (ucs			. #x6DBF)	; 涿
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DC0)	; 淀
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (shinjigen-2	. 4300)
     (japanese-jisx0208-1978	. #x4D64)	; ø»‚½«
-    (chinese-gb2312		. #x356D)	; ø»„¤¨
     (japanese-jisx0208		. #x4D64)	; ø»‡‘³
     (korean-ksc5601		. #x6F63)	; ø»Š²
-    (chinese-isoir165		. #x356D)	; ø»Œ¸
-    (chinese-cns11643-2		. #x3644)	; ø»“«¹
     (japanese-jisx0208-1990	. #x4D64)	; ø½Š·§
+    (chinese-big5		. #xD5E0)	; ý¢€— 
     (ideograph-daikanwa		. 17610)	; ø¸„“Š
-    (ucs			. #x6DC0)	; 淀
+    ))
+(define-char
+  '((morohashi-daikanwa	17610 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-gb2312	. #x356D)	; ø»„¤¨
+    (chinese-isoir165	. #x356D)	; ø»Œ¸
+    (chinese-cns11643-2 . #x3644)	; ø»“«¹
+    (ucs		. #x6DC0)	; 淀
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -6504,6 +7157,7 @@
     (total-strokes	 . 11)
     (chinese-cns11643-2		. #x3660)	; ø»“¬•
     (japanese-jisx0213-2	. #x6E64)	; ø»¦‰
+    (chinese-big5		. #xD5FC)	; ý¢€—¼
     (ideograph-daikanwa		. 17613)	; ø¸„“
     (ucs			. #x6DC2)	; 淂
     ))
@@ -6533,6 +7187,7 @@
     (chinese-isoir165		. #x574D)	; ø»¾”
     (chinese-cns11643-1		. #x5B69)	; ø»’˜°
     (japanese-jisx0213-1	. #x7671)	; ø»¤‘‚
+    (chinese-big5		. #xB264)	; ý¢€‹‰¤
     (ideograph-daikanwa		. 17616)	; ø¸„“
     (china3-jef			. #x56B1)	; øº…š±
     (ucs			. #x6DC4)	; 淄
@@ -6549,6 +7204,7 @@
     (chinese-isoir165		. #x6440)	; ø»Ž‘
     (chinese-cns11643-1		. #x5B5D)	; ø»’˜¤
     (japanese-jisx0208-1990	. #x5E48)	; ø½‹‰
+    (chinese-big5		. #xB258)	; ý¢€‹‰˜
     (ideograph-daikanwa		. 17617)	; ø¸„“‘
     (ucs			. #x6DC5)	; 淅
     ))
@@ -6562,12 +7218,20 @@
     (japanese-jisx0208		. #x5E42)	; ø»‡ª
     (korean-ksc5601		. #x7C7E)	; ø»Š¡“
     (chinese-isoir165		. #x4F7D)	; ø»³”
-    (chinese-cns11643-1		. #x5B68)	; ø»’˜¯
     (japanese-jisx0208-1990	. #x5E42)	; ø½‹ƒ
+    (chinese-big5		. #xB263)	; ý¢€‹‰£
     (ideograph-daikanwa		. 17619)	; ø¸„““
     (ucs			. #x6DC6)	; 淆
     ))
 (define-char
+  '((=>ucs		. #x6DC6)	; 淆
+    (morohashi-daikanwa	17619 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-1 . #x5B68)	; ø»’˜¯
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
@@ -6579,6 +7243,7 @@
     (chinese-isoir165		. #x643F)	; ø»Ž‘Œ
     (chinese-cns11643-1		. #x5B53)	; ø»’˜š
     (japanese-jisx0208-1990	. #x5E3F)	; ø½‹€
+    (chinese-big5		. #xB24E)	; ý¢€‹‰Ž
     (ideograph-daikanwa		. 17620)	; ø¸„“”
     (ucs			. #x6DC7)	; 淇
     ))
@@ -6598,6 +7263,7 @@
     (japanese-jisx0212		. #x4756)	; ø»‹œ¹
     (chinese-cns11643-2		. #x3650)	; ø»“¬…
     (japanese-jisx0213-2	. #x6E66)	; ø»¦‹
+    (chinese-big5		. #xD5EC)	; ý¢€—¬
     (ideograph-daikanwa		. 17622)	; ø¸„“–
     (ucs			. #x6DC8)	; 淈
     ))
@@ -6606,16 +7272,25 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (chinese-cns11643-2 . #x3662)	; ø»“¬—
+    (chinese-big5	. #xD5FE)	; ý¢€—¾
     (ideograph-daikanwa . 17623)	; ø¸„“—
     (ucs		. #x6DC9)	; 淉
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DCA)	; 淊
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (japanese-jisx0212	. #x4757)	; ø»‹œº
-    (chinese-cns11643-2 . #x365A)	; ø»“¬
+    (chinese-big5	. #xD5F6)	; ý¢€—¶
     (ideograph-daikanwa . 17624)	; ø¸„“˜
+    ))
+(define-char
+  '((morohashi-daikanwa	17624 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-2 . #x365A)	; ø»“¬
     (ucs		. #x6DCA)	; 淊
     ))
 (define-char
@@ -6630,6 +7305,7 @@
     (chinese-isoir165		. #x415C)	; ø»ž
     (chinese-cns11643-1		. #x5B54)	; ø»’˜›
     (japanese-jisx0208-1990	. #x4E54)	; ø½Š¸µ
+    (chinese-big5		. #xB24F)	; ý¢€‹‰
     (ideograph-daikanwa		. 17626)	; ø¸„“š
     (ucs			. #x6DCB)	; 淋
     ))
@@ -6641,6 +7317,7 @@
     (japanese-jisx0208-1978	. #x5E45)	; ø»ƒ–Š
     (japanese-jisx0208		. #x5E45)	; ø»‡ª’
     (japanese-jisx0208-1990	. #x5E45)	; ø½‹†
+    (chinese-big5		. #xB249)	; ý¢€‹‰‰
     (ideograph-daikanwa		. 17629)	; ø¸„“
     (ucs-jis			. #x6DCC)	; ø»ƒ–Š
     ))
@@ -6655,11 +7332,19 @@
     (ucs		. #x6DCC)	; 淌
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DCD)	; 淍
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (chinese-cns11643-2 . #x3668)	; ø»“¬
     (ideograph-daikanwa . 17630)	; ø¸„“ž
+    ))
+(define-char
+  '((morohashi-daikanwa	17630 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-2 . #x3668)	; ø»“¬
+    (chinese-big5	. #xD645)	; ý¢€™…
     (ucs		. #x6DCD)	; 淍
     ))
 (define-char
@@ -6679,6 +7364,7 @@
     (japanese-jisx0212		. #x4759)	; ø»‹œ¼
     (chinese-cns11643-2		. #x3661)	; ø»“¬–
     (japanese-jisx0213-2	. #x6E68)	; ø»¦
+    (chinese-big5		. #xD5FD)	; ý¢€—½
     (ideograph-daikanwa		. 17632)	; ø¸„“ 
     (ucs			. #x6DCF)	; 淏
     ))
@@ -6697,6 +7383,7 @@
     (total-strokes	 . 11)
     (chinese-cns11643-2		. #x3663)	; ø»“¬˜
     (japanese-jisx0213-2	. #x6E69)	; ø»¦Ž
+    (chinese-big5		. #xD640)	; ý¢€™€
     (ideograph-daikanwa		. 17633)	; ø¸„“¡
     (ucs			. #x6DD0)	; 淐
     ))
@@ -6712,6 +7399,7 @@
     (chinese-isoir165		. #x4A67)	; ø»«¨
     (chinese-cns11643-1		. #x5B56)	; ø»’˜
     (japanese-jisx0208-1990	. #x3D4A)	; ø½ŠŸ­
+    (chinese-big5		. #xB251)	; ý¢€‹‰‘
     (ideograph-daikanwa		. 17634)	; ø¸„“¢
     (ucs			. #x6DD1)	; 淑
     ))
@@ -6723,6 +7411,7 @@
     (japanese-jisx0208-1978	. #x5E47)	; ø»ƒ–Œ
     (japanese-jisx0208		. #x5E47)	; ø»‡ª”
     (japanese-jisx0208-1990	. #x5E47)	; ø½‹ˆ
+    (chinese-big5		. #xB259)	; ý¢€‹‰™
     (ideograph-daikanwa		. 17635)	; ø¸„“£
     (ucs			. #x6DD2)	; 淒
     ))
@@ -6735,11 +7424,33 @@
     (chinese-cns11643-1 . #x5B5E)	; ø»’˜¥
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DD3)	; 淓
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (chinese-cns11643-2 . #x3665)	; ø»“¬š
     (ideograph-daikanwa . 17636)	; ø¸„“¤
+    ))
+(define-char
+  '((=>ucs		. #x6DD3)	; 淓
+    (morohashi-daikanwa	17636 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-2 . #x3665)	; ø»“¬š
+    ))
+(define-char
+  '((=>ucs		. #x6DD3)	; 淓
+    (morohashi-daikanwa	17636 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-big5	. #xD642)	; ý¢€™‚
+    ))
+(define-char
+  '((morohashi-daikanwa	17636 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
     (ucs		. #x6DD3)	; 淓
     ))
 (define-char
@@ -6747,6 +7458,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (chinese-big5	. #xD5EA)	; ý¢€—ª
     (ideograph-daikanwa . 17637)	; ø¸„“¥
     ))
 (define-char
@@ -6758,15 +7470,30 @@
     (ucs		. #x6DD4)	; 淔
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DD5)	; 淕
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (japanese-jisx0208-1978	. #x5E4C)	; ø»ƒ–‘
     (japanese-jisx0208		. #x5E4C)	; ø»‡ª™
-    (chinese-cns11643-2		. #x365F)	; ø»“¬”
     (japanese-jisx0208-1990	. #x5E4C)	; ø½‹
+    (chinese-big5		. #xD5FB)	; ý¢€—»
     (ideograph-daikanwa		. 17638)	; ø¸„“¦
-    (ucs			. #x6DD5)	; 淕
+    ))
+(define-char
+  '((=>ucs		. #x6DD5)	; 淕
+    (morohashi-daikanwa	17638 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-2 . #x365F)	; ø»“¬”
+    ))
+(define-char
+  '((morohashi-daikanwa	17638 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (ucs		. #x6DD5)	; 淕
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -6777,6 +7504,7 @@
     (chinese-isoir165		. #x4457)	; ø»¢¤
     (chinese-cns11643-2		. #x3653)	; ø»“¬ˆ
     (japanese-jisx0213-1	. #x7672)	; ø»¤‘ƒ
+    (chinese-big5		. #xD5EF)	; ý¢€—¯
     (ideograph-daikanwa		. 17639)	; ø¸„“§
     (china3-jef			. #x91F3)	; øº‰‡³
     (ucs			. #x6DD6)	; 淖
@@ -6785,12 +7513,20 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (chinese-cns11643-2 . #x3667)	; ø»“¬œ
+    (chinese-big5	. #xD644)	; ý¢€™„
     (ideograph-daikanwa . 17641)	; ø¸„“©
     (china3-jef		. #x56B3)	; øº…š³
     (ucs		. #x6DD7)	; 淗
     ))
 (define-char
+  '((=>ucs		. #x6DD7)	; 淗
+    (morohashi-daikanwa	17641 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-2 . #x3667)	; ø»“¬œ
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
@@ -6802,34 +7538,65 @@
     (chinese-isoir165		. #x4C54)	; ø»®‘
     (chinese-cns11643-1		. #x5B63)	; ø»’˜ª
     (japanese-jisx0208-1990	. #x4571)	; ø½Š¬„
+    (chinese-big5		. #xB25E)	; ý¢€‹‰ž
     (ideograph-daikanwa		. 17642)	; ø¸„“ª
     (ucs			. #x6DD8)	; 淘
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DD9)	; 淙
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (ideograph-daikanwa . 17643)	; ø¸„“«
+    ))
+(define-char
+  '((=>ucs		. #x6DD9)	; 淙
+    (morohashi-daikanwa	17643 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-1 . #x5B4B)	; ø»’˜’
+    ))
+(define-char
+  '((=>ucs		. #x6DD9)	; 淙
+    (morohashi-daikanwa	17643 0 1)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (shinjigen-2	. 4296)
     (japanese-jisx0208-1978	. #x5E4A)	; ø»ƒ–
-    (chinese-gb2312		. #x6448)	; ø»…©…
     (japanese-jisx0208		. #x5E4A)	; ø»‡ª—
     (korean-ksc5601		. #x7078)	; ø»Š¥
-    (chinese-isoir165		. #x6448)	; ø»Ž‘•
-    (chinese-cns11643-1		. #x5B4B)	; ø»’˜’
     (japanese-jisx0208-1990	. #x5E4A)	; ø½‹‹
-    (ideograph-daikanwa		. 17643)	; ø¸„“«
-    (ucs			. #x6DD9)	; 淙
+    (chinese-big5		. #xB246)	; ý¢€‹‰†
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	17643 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-gb2312	. #x6448)	; ø»…©…
+    (chinese-isoir165	. #x6448)	; ø»Ž‘•
+    (ucs		. #x6DD9)	; 淙
+    ))
+(define-char
+  '((=>ucs		. #x6DDA)	; 淚
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (korean-ksc5601		. #x5728)	; ø»‰©§
     (chinese-cns11643-1		. #x5B61)	; ø»’˜¨
     (japanese-jisx0213-1	. #x7673)	; ø»¤‘„
+    (chinese-big5		. #xB25C)	; ý¢€‹‰œ
     (ideograph-daikanwa		. 17644)	; ø¸„“¬
     (china3-jef			. #x56B4)	; øº…š´
-    (ucs			. #x6DDA)	; 淚
+    ))
+(define-char
+  '((morohashi-daikanwa	17644 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (ucs		. #x6DDA)	; 淚
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -6846,6 +7613,7 @@
     (japanese-jisx0212		. #x475B)	; ø»‹œ¾
     (chinese-cns11643-2		. #x3658)	; ø»“¬
     (japanese-jisx0213-1	. #x7674)	; ø»¤‘…
+    (chinese-big5		. #xD5F4)	; ý¢€—´
     (ideograph-daikanwa		. 17646)	; ø¸„“®
     (china3-jef			. #x91F4)	; øº‰‡´
     (ucs			. #x6DDB)	; 淛
@@ -6863,6 +7631,7 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (chinese-cns11643-2 . #x3656)	; ø»“¬‹
+    (chinese-big5	. #xD5F2)	; ý¢€—²
     (ucs		. #x6DDC)	; 淜
     ))
 (define-char
@@ -6872,25 +7641,48 @@
     (chinese-gb2312		. #x6447)	; ø»…©„
     (japanese-jisx0212		. #x475C)	; ø»‹œ¿
     (chinese-isoir165		. #x6447)	; ø»Ž‘”
-    (chinese-cns11643-2		. #x3657)	; ø»“¬Œ
     (japanese-jisx0213-1	. #x7675)	; ø»¤‘†
+    (chinese-big5		. #xD5F3)	; ý¢€—³
     (ideograph-daikanwa		. 17649)	; ø¸„“±
     (ucs			. #x6DDD)	; 淝
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DDD)	; 淝
+    (morohashi-daikanwa	17649 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-2 . #x3657)	; ø»“¬Œ
+    ))
+(define-char
+  '((=>ucs		. #x6DDE)	; 淞
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (shinjigen-2	. 4287)
     (japanese-jisx0208-1978	. #x5E44)	; ø»ƒ–‰
-    (chinese-gb2312		. #x6441)	; ø»…¨¾
     (japanese-jisx0208		. #x5E44)	; ø»‡ª‘
     (korean-ksc5601		. #x6167)	; ø»‰¹’
-    (chinese-isoir165		. #x6441)	; ø»Ž‘Ž
-    (chinese-cns11643-1		. #x5B58)	; ø»’˜Ÿ
     (japanese-jisx0208-1990	. #x5E44)	; ø½‹…
+    (chinese-big5		. #xB253)	; ý¢€‹‰“
     (ideograph-daikanwa		. 17651)	; ø¸„“³
-    (ucs			. #x6DDE)	; 淞
+    ))
+(define-char
+  '((=>ucs		. #x6DDE)	; 淞
+    (morohashi-daikanwa	17651 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-1 . #x5B58)	; ø»’˜Ÿ
+    ))
+(define-char
+  '((morohashi-daikanwa	17651 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-gb2312	. #x6441)	; ø»…¨¾
+    (chinese-isoir165	. #x6441)	; ø»Ž‘Ž
+    (ucs		. #x6DDE)	; 淞
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -6899,6 +7691,7 @@
     (japanese-jisx0212		. #x475D)	; ø»‹€
     (chinese-cns11643-2		. #x3652)	; ø»“¬‡
     (japanese-jisx0213-2	. #x6E6A)	; ø»¦
+    (chinese-big5		. #xD5EE)	; ý¢€—®
     (ideograph-daikanwa		. 17654)	; ø¸„“¶
     (ucs			. #x6DDF)	; 淟
     ))
@@ -6910,6 +7703,7 @@
     (japanese-jisx0212	. #x475E)	; ø»‹
     (chinese-isoir165	. #x6444)	; ø»Ž‘‘
     (chinese-cns11643-2 . #x3651)	; ø»“¬†
+    (chinese-big5	. #xD5ED)	; ý¢€—­
     (ideograph-daikanwa . 17655)	; ø¸„“·
     (china3-jef		. #x91F6)	; øº‰‡¶
     (ucs		. #x6DE0)	; æ· 
@@ -6924,17 +7718,26 @@
     (japanese-jisx0208		. #x4338)	; ø»‡‚›
     (korean-ksc5601		. #x533F)	; ø»‰¤†
     (chinese-isoir165		. #x352D)	; ø»‹¸
-    (chinese-cns11643-1		. #x5B4D)	; ø»’˜”
     (japanese-jisx0208-1990	. #x4338)	; ø½Š¨
+    (chinese-big5		. #xB248)	; ý¢€‹‰ˆ
     (ideograph-daikanwa		. 17660)	; ø¸„“¼
     (ucs			. #x6DE1)	; æ·¡
     ))
 (define-char
+  '((=>ucs		. #x6DE1)	; æ·¡
+    (morohashi-daikanwa	17660 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-1 . #x5B4D)	; ø»’˜”
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (japanese-jisx0212	. #x475F)	; ø»‹‚
     (chinese-cns11643-2 . #x364B)	; ø»“¬€
+    (chinese-big5	. #xD5E7)	; ý¢€—§
     (ideograph-daikanwa . 17662)	; ø¸„“¾
     (china3-jef		. #x98AE)	; øº‰¢®
     (ucs		. #x6DE2)	; æ·¢
@@ -6944,22 +7747,31 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (chinese-cns11643-2 . #x3669)	; ø»“¬ž
+    (chinese-big5	. #xD646)	; ý¢€™†
     (ideograph-daikanwa . 17664)	; ø¸„”€
     (ucs		. #x6DE3)	; æ·£
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DE4)	; æ·¤
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (shinjigen-2	. 4308)
     (japanese-jisx0208-1978	. #x5E4B)	; ø»ƒ–
-    (chinese-gb2312		. #x5359)	; ø»…˜
     (japanese-jisx0208		. #x5E4B)	; ø»‡ª˜
-    (chinese-isoir165		. #x5359)	; ø»¸¨
-    (chinese-cns11643-1		. #x5B4F)	; ø»’˜–
     (japanese-jisx0208-1990	. #x5E4B)	; ø½‹Œ
+    (chinese-big5		. #xB24A)	; ý¢€‹‰Š
     (ideograph-daikanwa		. 17665)	; ø¸„”
-    (ucs			. #x6DE4)	; æ·¤
+    ))
+(define-char
+  '((morohashi-daikanwa	17665 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-gb2312	. #x5359)	; ø»…˜
+    (chinese-isoir165	. #x5359)	; ø»¸¨
+    (chinese-cns11643-1 . #x5B4F)	; ø»’˜–
+    (ucs		. #x6DE4)	; æ·¤
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -6967,6 +7779,7 @@
     (total-strokes	 . 11)
     (japanese-jisx0212	. #x4760)	; ø»‹ƒ
     (chinese-cns11643-2 . #x3655)	; ø»“¬Š
+    (chinese-big5	. #xD5F1)	; ý¢€—±
     (ideograph-daikanwa . 17666)	; ø¸„”‚
     (china3-jef		. #x56B6)	; øº…š¶
     (ucs		. #x6DE5)	; æ·¥
@@ -6981,6 +7794,7 @@
     (chinese-isoir165		. #x6446)	; ø»Ž‘“
     (chinese-cns11643-1		. #x5B6D)	; ø»’˜´
     (japanese-jisx0208-1990	. #x5E40)	; ø½‹
+    (chinese-big5		. #xB268)	; ý¢€‹‰¨
     (ideograph-daikanwa		. 17667)	; ø¸„”ƒ
     (ucs			. #x6DE6)	; æ·¦
     ))
@@ -7002,6 +7816,7 @@
     (japanese-jisx0208		. #x5E46)	; ø»‡ª“
     (korean-ksc5601		. #x6F64)	; ø»Š³
     (japanese-jisx0208-1990	. #x5E46)	; ø½‹‡
+    (chinese-big5		. #xB262)	; ý¢€‹‰¢
     (ideograph-daikanwa		. 17669)	; ø¸„”…
     (ucs-jis			. #x6DE8)	; ø»ƒ–‹
     ))
@@ -7037,6 +7852,7 @@
     (total-strokes	 . 11)
     (japanese-jisx0212		. #x4761)	; ø»‹„
     (japanese-jisx0213-2	. #x6E6B)	; ø»¦
+    (chinese-big5		. #xD5E6)	; ý¢€—¦
     (china3-jef			. #x56B7)	; øº…š·
     ))
 (define-char
@@ -7057,6 +7873,7 @@
     (chinese-cns11643-1		. #x5B64)	; ø»’˜«
     (japanese-jisx0208-1990	. #x5E4D)	; ø½‹Ž
     (chinese-gb12345		. #x4259)	; æ·ª
+    (chinese-big5		. #xB25F)	; ý¢€‹‰Ÿ
     (ideograph-daikanwa		. 17675)	; ø¸„”‹
     (ucs			. #x6DEA)	; æ·ª
     ))
@@ -7067,6 +7884,7 @@
     (total-strokes	 . 11)
     (japanese-jisx0208-1978	. #x307C)	; ø»‚“
     (korean-ksc5601		. #x6B62)	; ø»Š‡¹
+    (chinese-big5		. #xB25D)	; ý¢€‹‰
     (ideograph-daikanwa		. 17678)	; ø¸„”Ž
     ))
 (define-char
@@ -7083,35 +7901,52 @@
     (ucs			. #x6DEB)	; æ·«
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DEC)	; æ·¬
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (shinjigen-2	. 4275)
     (japanese-jisx0208-1978	. #x5E43)	; ø»ƒ–ˆ
-    (chinese-gb2312		. #x3463)	; ø»„£€
     (japanese-jisx0208		. #x5E43)	; ø»‡ª
-    (chinese-isoir165		. #x3463)	; ø»‹
-    (chinese-cns11643-1		. #x5B6B)	; ø»’˜²
     (japanese-jisx0208-1990	. #x5E43)	; ø½‹„
+    (chinese-big5		. #xB266)	; ý¢€‹‰¦
     (ideograph-daikanwa		. 17679)	; ø¸„”
-    (ucs			. #x6DEC)	; æ·¬
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	17679 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (shinjigen-2	. 4275)
+    (chinese-gb2312	. #x3463)	; ø»„£€
+    (chinese-isoir165	. #x3463)	; ø»‹
+    (chinese-cns11643-1 . #x5B6B)	; ø»’˜²
+    (ucs		. #x6DEC)	; æ·¬
+    ))
+(define-char
+  '((=>ucs		. #x6DED)	; æ·­
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-big5	. #xD5F8)	; ý¢€—¸
     (ideograph-daikanwa . 17680)	; ø¸„”
-    (ucs		. #x6DED)	; æ·­
     ))
 (define-char
   '((=>ucs		. #x6DED)	; æ·­
-    (morohashi-daikanwa	17680 0 1)
+    (morohashi-daikanwa	17680 0 0)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (chinese-cns11643-2 . #x365C)	; ø»“¬‘
     ))
 (define-char
+  '((morohashi-daikanwa	17680 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (ucs		. #x6DED)	; æ·­
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
@@ -7136,6 +7971,7 @@
     (japanese-jisx0208		. #x5E4E)	; ø»‡ª›
     (korean-ksc5601		. #x7C67)	; ø»Š ¼
     (japanese-jisx0208-1990	. #x5E4E)	; ø½‹
+    (chinese-big5		. #xB261)	; ý¢€‹‰¡
     (ideograph-daikanwa		. 17682)	; ø¸„”’
     (ucs-jis			. #x6DEE)	; ø»ƒ–“
     ))
@@ -7151,18 +7987,26 @@
     (ucs		. #x6DEE)	; æ·®
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DEF)	; æ·¯
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
-    (total-strokes	 . 10)
+    (total-strokes	 . 11)
     (japanese-jisx0212	. #x4762)	; ø»‹…
+    (chinese-big5	. #xD252)	; ý¢€‰’
     (ideograph-daikanwa . 17683)	; ø¸„”“
+    ))
+(define-char
+  '((morohashi-daikanwa	17683 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
     (ucs		. #x6DEF)	; æ·¯
     ))
 (define-char
   '((=>ucs		. #x6DEF)	; æ·¯
-    (morohashi-daikanwa	17683 0 0)
+    (morohashi-daikanwa	17683 0 1)
     (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 8)
+    (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (chinese-cns11643-2 . #x3035)	; ø»“¢¶
     ))
@@ -7180,6 +8024,7 @@
     (total-strokes	 . 11)
     (japanese-jisx0212	. #x4763)	; ø»‹†
     (chinese-cns11643-2 . #x365D)	; ø»“¬’
+    (chinese-big5	. #xD5F9)	; ý¢€—¹
     (ideograph-daikanwa . 17685)	; ø¸„”•
     (ucs		. #x6DF0)	; æ·°
     ))
@@ -7192,18 +8037,26 @@
     (ucs		. #x3D09)	; 㴉
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DF1)	; æ·±
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (shinjigen-2	. 4288)
     (japanese-jisx0208-1978	. #x3F3C)	; ø»‚¨Ÿ
-    (chinese-gb2312		. #x496E)	; ø»…‚
     (japanese-jisx0208		. #x3F3C)	; ø»†¼§
     (korean-ksc5601		. #x6422)	; ø»‰¼§
-    (chinese-isoir165		. #x496E)	; ø»ª‘
     (japanese-jisx0208-1990	. #x3F3C)	; ø½Š¢›
+    (chinese-big5		. #xB260)	; ý¢€‹‰ 
     (ideograph-daikanwa		. 17687)	; ø¸„”—
-    (ucs			. #x6DF1)	; æ·±
+    ))
+(define-char
+  '((morohashi-daikanwa	17687 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-gb2312	. #x496E)	; ø»…‚
+    (chinese-isoir165	. #x496E)	; ø»ª‘
+    (ucs		. #x6DF1)	; æ·±
     ))
 (define-char
   '((=>ucs		. #x6DF1)	; æ·±
@@ -7229,27 +8082,43 @@
     (ucs		. #x23D91)	; 𣶑
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DF2)	; æ·²
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (chinese-cns11643-2 . #x3664)	; ø»“¬™
+    (chinese-big5	. #xD641)	; ý¢€™
     (ideograph-daikanwa . 17689)	; ø¸„”™
+    ))
+(define-char
+  '((morohashi-daikanwa	17689 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
     (ucs		. #x6DF2)	; æ·²
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DF3)	; æ·³
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (shinjigen-2	. 4281)
     (japanese-jisx0208-1978	. #x3D5F)	; ø»‚¦†
-    (chinese-gb2312		. #x343E)	; ø»„¢›
     (japanese-jisx0208		. #x3D5F)	; ø»†ºŽ
     (korean-ksc5601		. #x6268)	; ø»‰º±
-    (chinese-isoir165		. #x343E)	; ø»Š«
-    (chinese-cns11643-1		. #x5B4A)	; ø»’˜‘
     (japanese-jisx0208-1990	. #x3D5F)	; ø½Š ‚
+    (chinese-big5		. #xB245)	; ý¢€‹‰…
     (ideograph-daikanwa		. 17690)	; ø¸„”š
-    (ucs			. #x6DF3)	; æ·³
+    ))
+(define-char
+  '((morohashi-daikanwa	17690 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-gb2312	. #x343E)	; ø»„¢›
+    (chinese-isoir165	. #x343E)	; ø»Š«
+    (chinese-cns11643-1 . #x5B4A)	; ø»’˜‘
+    (ucs		. #x6DF3)	; æ·³
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -7257,6 +8126,7 @@
     (total-strokes	 . 11)
     (japanese-jisx0212	. #x4764)	; ø»‹‡
     (chinese-cns11643-2 . #x3659)	; ø»“¬Ž
+    (chinese-big5	. #xD5F5)	; ý¢€—µ
     (ideograph-daikanwa . 17691)	; ø¸„”›
     (ucs		. #x6DF4)	; æ·´
     ))
@@ -7271,6 +8141,7 @@
     (chinese-cns11643-1		. #x5B5C)	; ø»’˜£
     (japanese-jisx0208-1990	. #x4A25)	; ø½Š²Ž
     (chinese-gb12345		. #x5428)	; æ·µ
+    (chinese-big5		. #xB257)	; ý¢€‹‰—
     (ideograph-daikanwa		. 17692)	; ø¸„”œ
     (ucs			. #x6DF5)	; æ·µ
     ))
@@ -7282,6 +8153,7 @@
     (chinese-cns11643-2		. #x364D)	; ø»“¬‚
     (japanese-jisx0213-2	. #x6E6C)	; ø»¦‘
     (chinese-gb12345		. #x6435)	; æ·¶
+    (chinese-big5		. #xD5E9)	; ý¢€—©
     (ideograph-daikanwa		. 17693)	; ø¸„”
     (china3-jef			. #x95EF)	; øº‰—¯
     (ucs			. #x6DF6)	; æ·¶
@@ -7296,12 +8168,20 @@
     (japanese-jisx0208		. #x3A2E)	; ø»†µƒ
     (korean-ksc5601		. #x7B68)	; ø»ŠŸŸ
     (chinese-isoir165		. #x3B6C)	; ø»•«
-    (chinese-cns11643-1		. #x5B5B)	; ø»’˜¢
     (japanese-jisx0208-1990	. #x3A2E)	; ø½Šš·
+    (chinese-big5		. #xB256)	; ý¢€‹‰–
     (ideograph-daikanwa		. 17694)	; ø¸„”ž
     (ucs			. #x6DF7)	; æ··
     ))
 (define-char
+  '((=>ucs		. #x6DF7)	; æ··
+    (morohashi-daikanwa	17694 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-1 . #x5B5B)	; ø»’˜¢
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
@@ -7328,6 +8208,7 @@
     (japanese-jisx0208		. #x4036)	; ø»†½¿
     (chinese-isoir165		. #x4765)	; ø»§Œ
     (japanese-jisx0208-1990	. #x4036)	; ø½Š£³
+    (chinese-big5		. #xB24D)	; ý¢€‹‰
     (ucs			. #x6E05)	; 清
     ))
 (define-char
@@ -7348,12 +8229,20 @@
     (japanese-jisx0208		. #x5E3B)	; ø»‡ªˆ
     (korean-ksc5601		. #x6574)	; ø»‰¿—
     (chinese-isoir165		. #x514D)	; ø»µ 
-    (chinese-cns11643-1		. #x5B59)	; ø»’˜ 
     (japanese-jisx0208-1990	. #x5E3B)	; ø½‹¼
+    (chinese-big5		. #xB254)	; ý¢€‹‰”
     (ideograph-daikanwa		. 17696)	; ø¸„” 
     (ucs			. #x6DF9)	; æ·¹
     ))
 (define-char
+  '((=>ucs		. #x6DF9)	; æ·¹
+    (morohashi-daikanwa	17696 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-1 . #x5B59)	; ø»’˜ 
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
@@ -7364,6 +8253,7 @@
     (chinese-cns11643-1		. #x5B51)	; ø»’˜˜
     (japanese-jisx0208-1990	. #x5E49)	; ø½‹Š
     (chinese-gb12345		. #x4733)	; æ·º
+    (chinese-big5		. #xB24C)	; ý¢€‹‰Œ
     (ideograph-daikanwa		. 17697)	; ø¸„”¡
     (ucs			. #x6DFA)	; æ·º
     ))
@@ -7377,6 +8267,7 @@
     (japanese-jisx0208		. #x453A)	; ø»‡…™
     (korean-ksc5601		. #x7455)	; ø»Š”º
     (japanese-jisx0208-1990	. #x453A)	; ø½Š«
+    (chinese-big5		. #xB24B)	; ý¢€‹‰‹
     (ideograph-daikanwa		. 17698)	; ø¸„”¢
     (ucs-jis			. #x6DFB)	; ø»‚±‘
     ))
@@ -7400,16 +8291,25 @@
     (chinese-isoir165		. #x6D35)	; ø»Žž
     (chinese-cns11643-2		. #x3D2C)	; ø»“µ³
     (japanese-jisx0213-1	. #x7676)	; ø»¤‘‡
+    (chinese-big5		. #xD9E7)	; ý¢€§§
     (ideograph-daikanwa		. 17699)	; ø¸„”£
     (china3-jef			. #x55B1)	; øº…–±
     (ucs			. #x6DFC)	; æ·¼
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6DFD)	; æ·½
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (chinese-cns11643-2 . #x3666)	; ø»“¬›
     (ideograph-daikanwa . 17701)	; ø¸„”¥
+    ))
+(define-char
+  '((morohashi-daikanwa	17701 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-big5	. #xD643)	; ý¢€™ƒ
     (ucs		. #x6DFD)	; æ·½
     ))
 (define-char
@@ -7473,6 +8373,7 @@
     (total-strokes	 . 11)
     (japanese-jisx0212	. #x4767)	; ø»‹Š
     (chinese-cns11643-2 . #x364F)	; ø»“¬„
+    (chinese-big5	. #xD5EB)	; ý¢€—«
     (ideograph-daikanwa . 17714)	; ø¸„”²
     (china3-jef		. #x56BB)	; øº…š»
     (ucs		. #x6E00)	; 渀
@@ -8164,11 +9065,19 @@
     (ucs		. #x23D8A)	; 𣶊
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E03)	; 渃
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D41)	; ø»“¶ˆ
     (ideograph-daikanwa . 17753)	; ø¸„•™
+    ))
+(define-char
+  '((morohashi-daikanwa	17753 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-big5	. #xD9FC)	; ý¢€§¼
     (ucs		. #x6E03)	; 渃
     ))
 (define-char
@@ -8219,11 +9128,12 @@
     (japanese-jisx0208		. #x5E52)	; ø»‡ªŸ
     (korean-ksc5601		. #x7C39)	; ø»Š Ž
     (japanese-jisx0208-1990	. #x5E52)	; ø½‹“
+    (chinese-big5		. #xB541)	; ý¢€‹•
     (ideograph-daikanwa		. 17757)	; ø¸„•
     (ucs-jis			. #x6E19)	; ø»ƒ–—
     ))
 (define-char
-  '((morohashi-daikanwa	17757 0 4)
+  '((morohashi-daikanwa	17757 0 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -8232,7 +9142,7 @@
     ))
 (define-char
   '((=>ucs		. #x6E19)	; 渙
-    (morohashi-daikanwa	17757 0 5)
+    (morohashi-daikanwa	17757 0 2)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -8246,6 +9156,7 @@
     (japanese-jisx0208-1978	. #x3D6D)	; ø»‚¦”
     (korean-ksc5601		. #x6E42)	; ø»Š‹³
     (japanese-jisx0213-1	. #x7677)	; ø»¤‘ˆ
+    (chinese-big5		. #xB25A)	; ý¢€‹‰š
     (ideograph-daikanwa		. 17758)	; ø¸„•ž
     ))
 (define-char
@@ -8272,6 +9183,7 @@
     (chinese-isoir165		. #x2D56)	; ø»€±
     (chinese-cns11643-1		. #x6035)	; ø»’Ÿ’
     (japanese-jisx0208-1990	. #x383A)	; ø½Š˜‡
+    (chinese-big5		. #xB4EE)	; ý¢€‹“®
     (ideograph-daikanwa		. 17759)	; ø¸„•Ÿ
     (ucs			. #x6E1B)	; 減
     ))
@@ -8279,11 +9191,19 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (chinese-cns11643-2 . #x3D3B)	; ø»“¶‚
+    (chinese-big5	. #xD9F6)	; ý¢€§¶
     (ideograph-daikanwa . 17760)	; ø¸„• 
     (ucs		. #x6E1C)	; 渜
     ))
 (define-char
+  '((=>ucs		. #x6E1C)	; 渜
+    (morohashi-daikanwa	17760 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-2 . #x3D3B)	; ø»“¶‚
+    ))
+(define-char
   '((=>ucs		. #x6E1D)	; 渝
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
@@ -8296,16 +9216,31 @@
     (ucs-jis			. #x6E1D)	; ø»ƒ–¦
     ))
 (define-char
+  '((=>ucs		. #x6E1D)	; 渝
+    (morohashi-daikanwa	17761 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-big5	. #xB4FC)	; ý¢€‹“¼
+    ))
+(define-char
   '((morohashi-daikanwa	17761 0 2)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-gb2312	. #x5365)	; ø»…¤
     (chinese-isoir165	. #x5365)	; ø»¸´
-    (chinese-cns11643-1 . #x6043)	; ø»’Ÿ 
     (ucs		. #x6E1D)	; 渝
     ))
 (define-char
+  '((=>ucs		. #x6E1D)	; 渝
+    (morohashi-daikanwa	17761 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-1 . #x6043)	; ø»’Ÿ 
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -8316,17 +9251,25 @@
     (ucs			. #x6E1E)	; 渞
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E1F)	; 渟
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (shinjigen-2	. 4347)
     (japanese-jisx0208-1978	. #x5E5B)	; ø»ƒ– 
     (japanese-jisx0208		. #x5E5B)	; ø»‡ª¨
     (korean-ksc5601		. #x6F65)	; ø»Š´
-    (chinese-cns11643-2		. #x3D2F)	; ø»“µ¶
     (japanese-jisx0208-1990	. #x5E5B)	; ø½‹œ
+    (chinese-big5		. #xD9EA)	; ý¢€§ª
     (ideograph-daikanwa		. 17763)	; ø¸„•£
-    (ucs			. #x6E1F)	; 渟
+    ))
+(define-char
+  '((morohashi-daikanwa	17763 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-2 . #x3D2F)	; ø»“µ¶
+    (ucs		. #x6E1F)	; 渟
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -8338,6 +9281,7 @@
     (korean-ksc5601		. #x4B62)	; ø»‰˜¹
     (chinese-isoir165		. #x477E)	; ø»§¥
     (japanese-jisx0208-1990	. #x3574)	; ø½Š”§
+    (chinese-big5		. #xB4EB)	; ý¢€‹“«
     (ideograph-daikanwa		. 17764)	; ø¸„•¤
     (china3-jef			. #x54C6)	; øº…“†
     (ucs			. #x6E20)	; 渠
@@ -8351,19 +9295,27 @@
     (chinese-cns11643-1 . #x6032)	; ø»’Ÿ
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E21)	; 渡
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (shinjigen-2	. 4348)
     (japanese-jisx0208-1978	. #x454F)	; ø»‚±¦
-    (chinese-gb2312		. #x3649)	; ø»„¥¢
     (japanese-jisx0208		. #x454F)	; ø»‡…®
     (korean-ksc5601		. #x5424)	; ø»‰¥‰
-    (chinese-isoir165		. #x3649)	; ø»²
-    (chinese-cns11643-1		. #x602E)	; ø»’Ÿ‹
     (japanese-jisx0208-1990	. #x454F)	; ø½Š«¢
+    (chinese-big5		. #xB4E7)	; ý¢€‹“§
     (ideograph-daikanwa		. 17765)	; ø¸„•¥
-    (ucs			. #x6E21)	; 渡
+    ))
+(define-char
+  '((morohashi-daikanwa	17765 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-gb2312	. #x3649)	; ø»„¥¢
+    (chinese-isoir165	. #x3649)	; ø»²
+    (chinese-cns11643-1 . #x602E)	; ø»’Ÿ‹
+    (ucs		. #x6E21)	; 渡
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -8382,6 +9334,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D4D)	; ø»“¶”
+    (chinese-big5	. #xDA49)	; ý¢€©‰
     ))
 (define-char
   '((=>ucs		. #x6E23)	; 渣
@@ -8403,6 +9356,7 @@
     (japanese-jisx0208		. #x5E56)	; ø»‡ª£
     (chinese-isoir165		. #x547C)	; ø»º©
     (chinese-cns11643-1		. #x6034)	; ø»’Ÿ‘
+    (chinese-big5		. #xB4ED)	; ý¢€‹“­
     (ucs			. #x6E23)	; 渣
     ))
 (define-char
@@ -8432,6 +9386,7 @@
     (chinese-isoir165		. #x3233)	; ø»‡¤
     (chinese-cns11643-1		. #x6038)	; ø»’Ÿ•
     (japanese-jisx0208-1990	. #x5E5F)	; ø½‹ 
+    (chinese-big5		. #xB4F1)	; ý¢€‹“±
     (ideograph-daikanwa		. 17769)	; ø¸„•©
     (ucs			. #x6E24)	; 渤
     ))
@@ -8448,6 +9403,7 @@
     (chinese-isoir165		. #x6457)	; ø»Ž‘¤
     (chinese-cns11643-1		. #x6033)	; ø»’Ÿ
     (japanese-jisx0208-1990	. #x302F)	; ø½ŠŒŒ
+    (chinese-big5		. #xB4EC)	; ý¢€‹“¬
     (ideograph-daikanwa		. 17770)	; ø¸„•ª
     (ucs			. #x6E25)	; 渥
     ))
@@ -8462,6 +9418,7 @@
     (korean-ksc5601		. #x683E)	; ø»Š‚»
     (chinese-cns11643-1		. #x603C)	; ø»’Ÿ™
     (japanese-jisx0208-1990	. #x3132)	; ø½Š­
+    (chinese-big5		. #xB4F5)	; ý¢€‹“µ
     (ideograph-daikanwa		. 17771)	; ø¸„•«
     (ucs-jis			. #x6E26)	; ø»‚“±
     ))
@@ -8480,6 +9437,7 @@
     (total-strokes	 . 12)
     (japanese-jisx0212		. #x476B)	; ø»‹Ž
     (japanese-jisx0213-2	. #x6E70)	; ø»¦•
+    (chinese-big5		. #xDA4D)	; ý¢€©
     (ideograph-daikanwa		. 17772)	; ø¸„•¬
     ))
 (define-char
@@ -8496,6 +9454,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D48)	; ø»“¶
+    (chinese-big5	. #xDA44)	; ý¢€©„
     (ideograph-daikanwa . 17773)	; ø¸„•­
     (ucs		. #x6E28)	; 渨
     ))
@@ -8555,6 +9514,7 @@
     (korean-ksc5601		. #x605E)	; ø»‰·«
     (chinese-isoir165		. #x644D)	; ø»Ž‘š
     (japanese-jisx0208-1990	. #x5E58)	; ø½‹™
+    (chinese-big5		. #xD9F1)	; ý¢€§±
     (ideograph-daikanwa		. 17778)	; ø¸„•²
     (ucs			. #x6E2B)	; 渫
     ))
@@ -8577,6 +9537,7 @@
     (chinese-cns11643-1		. #x6041)	; ø»’Ÿž
     (japanese-jisx0208-1990	. #x422C)	; ø½Š¦¥
     (chinese-gb12345		. #x3262)	; 測
+    (chinese-big5		. #xB4FA)	; ý¢€‹“º
     (ideograph-daikanwa		. 17780)	; ø¸„•´
     (ucs			. #x6E2C)	; 測
     ))
@@ -8591,6 +9552,7 @@
     (korean-ksc5601		. #x6A52)	; ø»Š†‹
     (chinese-isoir165		. #x4E3C)	; ø»°µ
     (japanese-jisx0208-1990	. #x5E4F)	; ø½‹
+    (chinese-big5		. #xB4F4)	; ý¢€‹“´
     (ideograph-daikanwa		. 17781)	; ø¸„•µ
     (ucs			. #x6E2D)	; 渭
     ))
@@ -8618,6 +9580,7 @@
     (japanese-jisx0208-1978	. #x5E51)	; ø»ƒ––
     (japanese-jisx0208		. #x5E51)	; ø»‡ªž
     (japanese-jisx0208-1990	. #x5E51)	; ø½‹’
+    (chinese-big5		. #xD9FD)	; ý¢€§½
     (ucs			. #x6E2E)	; 渮
     ))
 (define-char
@@ -8628,6 +9591,7 @@
     (korean-ksc5601	. #x797B)	; ø»Šœ¶
     (chinese-isoir165	. #x385B)	; ø»‘€
     (chinese-cns11643-1 . #x602B)	; ø»’Ÿˆ
+    (chinese-big5	. #xB4E4)	; ý¢€‹“¤
     (ideograph-daikanwa . 17783)	; ø¸„•·
     (china3-jef		. #x56BF)	; øº…š¿
     (ucs		. #x6E2F)	; 港
@@ -8649,6 +9613,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D4E)	; ø»“¶•
+    (chinese-big5	. #xDA4A)	; ý¢€©Š
     (ideograph-daikanwa . 17784)	; ø¸„•¸
     (ucs		. #x6E30)	; 渰
     ))
@@ -8657,6 +9622,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D47)	; ø»“¶Ž
+    (chinese-big5	. #xDA43)	; ý¢€©ƒ
     (ideograph-daikanwa . 17785)	; ø¸„•¹
     (ucs		. #x6E31)	; 渱
     ))
@@ -8668,6 +9634,7 @@
     (korean-ksc5601		. #x6042)	; ø»‰·
     (japanese-jisx0212		. #x476C)	; ø»‹
     (japanese-jisx0213-2	. #x6E72)	; ø»¦—
+    (chinese-big5		. #xB4E8)	; ý¢€‹“¨
     (ideograph-daikanwa		. 17786)	; ø¸„•º
     (china3-jef			. #x9BE0)	; øº‰¯ 
     ))
@@ -8682,11 +9649,19 @@
     (ucs		. #x6E32)	; 渲
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E33)	; 渳
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (chinese-cns11643-2 . #x3D3C)	; ø»“¶ƒ
+    (chinese-big5	. #xD9F7)	; ý¢€§·
     (ideograph-daikanwa . 17787)	; ø¸„•»
+    ))
+(define-char
+  '((morohashi-daikanwa	17787 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-2 . #x3D3C)	; ø»“¶ƒ
     (ucs		. #x6E33)	; 渳
     ))
 (define-char
@@ -8698,16 +9673,25 @@
     (chinese-isoir165		. #x3F4A)	; ø»›
     (chinese-cns11643-1		. #x603E)	; ø»’Ÿ›
     (japanese-jisx0213-1	. #x7678)	; ø»¤‘‰
+    (chinese-big5		. #xB4F7)	; ý¢€‹“·
     (ideograph-daikanwa		. 17788)	; ø¸„•¼
     (china3-jef			. #x56C0)	; øº…›€
     (ucs			. #x6E34)	; 渴
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E35)	; 渵
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D59)	; ø»“¶ 
     (ideograph-daikanwa . 17789)	; ø¸„•½
+    ))
+(define-char
+  '((morohashi-daikanwa	17789 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-big5	. #xDA55)	; ý¢€©•
     (ucs		. #x6E35)	; 渵
     ))
 (define-char
@@ -8732,6 +9716,7 @@
     (total-strokes	 . 11)
     (korean-ksc5601	. #x6737)	; ø»Š–
     (japanese-jisx0212	. #x476D)	; ø»‹
+    (chinese-big5	. #xDA56)	; ý¢€©–
     (china3-jef		. #x56C1)	; øº…›
     (ucs		. #x6E36)	; 渶
     ))
@@ -8744,19 +9729,27 @@
     (ucs		. #x6E37)	; 渷
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E38)	; 游
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (shinjigen-2	. 4359)
     (japanese-jisx0208-1978	. #x5E62)	; ø»ƒ–§
-    (chinese-gb2312		. #x534E)	; ø»…
     (japanese-jisx0208		. #x5E62)	; ø»‡ª¯
     (korean-ksc5601		. #x6A7D)	; ø»Š†¶
-    (chinese-isoir165		. #x534E)	; ø»¸
-    (chinese-cns11643-1		. #x602C)	; ø»’Ÿ‰
     (japanese-jisx0208-1990	. #x5E62)	; ø½‹£
+    (chinese-big5		. #xB4E5)	; ý¢€‹“¥
     (ideograph-daikanwa		. 17792)	; ø¸„–€
-    (ucs			. #x6E38)	; 游
+    ))
+(define-char
+  '((morohashi-daikanwa	17792 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-gb2312	. #x534E)	; ø»…
+    (chinese-isoir165	. #x534E)	; ø»¸
+    (chinese-cns11643-1 . #x602C)	; ø»’Ÿ‰
+    (ucs		. #x6E38)	; 游
     ))
 (define-char
   '((=>ucs		. #x6E39)	; 渹
@@ -8764,6 +9757,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (japanese-jisx0212	. #x476E)	; ø»‹‘
+    (chinese-big5	. #xDA48)	; ý¢€©ˆ
     (ideograph-daikanwa . 17793)	; ø¸„–
     (china3-jef		. #x56C2)	; øº…›‚
     ))
@@ -8776,27 +9770,43 @@
     (ucs		. #x6E39)	; 渹
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E3A)	; 渺
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (shinjigen-2	. 4351)
     (japanese-jisx0208-1978	. #x5E5D)	; ø»ƒ–¢
-    (chinese-gb2312		. #x436C)	; ø»„¹‹
     (japanese-jisx0208		. #x5E5D)	; ø»‡ªª
     (korean-ksc5601		. #x595D)	; ø»‰­˜
-    (chinese-isoir165		. #x436C)	; ø»¡›
-    (chinese-cns11643-1		. #x6040)	; ø»’Ÿ
     (japanese-jisx0208-1990	. #x5E5D)	; ø½‹ž
+    (chinese-big5		. #xB4F9)	; ý¢€‹“¹
     (ideograph-daikanwa		. 17794)	; ø¸„–‚
-    (ucs			. #x6E3A)	; 渺
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	17794 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-gb2312	. #x436C)	; ø»„¹‹
+    (chinese-isoir165	. #x436C)	; ø»¡›
+    (chinese-cns11643-1 . #x6040)	; ø»’Ÿ
+    (ucs		. #x6E3A)	; 渺
+    ))
+(define-char
+  '((=>ucs		. #x6E3B)	; 渻
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (japanese-jisx0212	. #x476F)	; ø»‹’
-    (chinese-cns11643-2 . #x3D40)	; ø»“¶‡
+    (chinese-big5	. #xD9FB)	; ý¢€§»
     (ideograph-daikanwa . 17795)	; ø¸„–ƒ
+    ))
+(define-char
+  '((morohashi-daikanwa	17795 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-2 . #x3D40)	; ø»“¶‡
     (ucs		. #x6E3B)	; 渻
     ))
 (define-char
@@ -8806,6 +9816,7 @@
     (korean-ksc5601		. #x5A34)	; ø»‰®
     (japanese-jisx0212		. #x4770)	; ø»‹“
     (japanese-jisx0213-2	. #x6E73)	; ø»¦˜
+    (chinese-big5		. #xD9ED)	; ý¢€§­
     (ideograph-daikanwa		. 17796)	; ø¸„–„
     (china3-jef			. #x56C3)	; øº…›ƒ
     (ucs			. #x6E3C)	; 渼
@@ -8824,6 +9835,7 @@
     (total-strokes	 . 12)
     (korean-ksc5601	. #x6E2A)	; ø»Š‹›
     (chinese-cns11643-2 . #x3D33)	; ø»“µº
+    (chinese-big5	. #xD9EE)	; ý¢€§®
     (ideograph-daikanwa . 17797)	; ø¸„–…
     (ucs		. #x6E3D)	; 渽
     ))
@@ -8853,6 +9865,7 @@
     (chinese-cns11643-1		. #x6044)	; ø»’Ÿ¡
     (japanese-jisx0208-1990	. #x5E55)	; ø½‹–
     (chinese-gb12345		. #x3B6B)	; 渾
+    (chinese-big5		. #xB4FD)	; ý¢€‹“½
     (ideograph-daikanwa		. 17800)	; ø¸„–ˆ
     (ucs			. #x6E3E)	; 渾
     ))
@@ -8865,19 +9878,28 @@
     (ucs		. #x3D13)	; 㴓
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E3F)	; 渿
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D37)	; ø»“µ¾
     (ideograph-daikanwa . 17802)	; ø¸„–Š
+    ))
+(define-char
+  '((morohashi-daikanwa	17802 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-big5	. #xD9F2)	; ý¢€§²
     (ucs		. #x6E3F)	; 渿
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (chinese-cns11643-2 . #x3D3E)	; ø»“¶…
+    (chinese-big5	. #xD9F9)	; ý¢€§¹
     (ideograph-daikanwa . 17803)	; ø¸„–‹
-    (china3-jef		. #x56C4)	; øº…›„
     (ucs		. #x6E40)	; 湀
     ))
 (define-char
@@ -8886,13 +9908,14 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (chinese-cns11643-2 . #x3D3E)	; ø»“¶…
+    (china3-jef		. #x56C4)	; øº…›„
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D38)	; ø»“µ¿
+    (chinese-big5	. #xD9F3)	; ý¢€§³
     (ideograph-daikanwa . 17804)	; ø¸„–Œ
     (china3-jef		. #x56C5)	; øº…›…
     (ucs		. #x6E41)	; 湁
@@ -8939,6 +9962,7 @@
     (chinese-isoir165		. #x4548)	; ø»£³
     (chinese-cns11643-1		. #x6042)	; ø»’ŸŸ
     (japanese-jisx0208-1990	. #x5E5C)	; ø½‹
+    (chinese-big5		. #xB4FB)	; ý¢€‹“»
     (ideograph-daikanwa		. 17808)	; ø¸„–
     (ucs			. #x6E43)	; 湃
     ))
@@ -8952,6 +9976,7 @@
     (chinese-isoir165		. #x6458)	; ø»Ž‘¥
     (chinese-cns11643-1		. #x604A)	; ø»’Ÿ§
     (japanese-jisx0213-1	. #x7679)	; ø»¤‘Š
+    (chinese-big5		. #xB544)	; ý¢€‹•„
     (ideograph-daikanwa		. 17809)	; ø¸„–‘
     (china3-jef			. #x56C6)	; øº…›†
     (ucs			. #x6E44)	; 湄
@@ -8962,28 +9987,45 @@
     (total-strokes	 . 12)
     (japanese-jisx0212	. #x4772)	; ø»‹•
     (chinese-cns11643-2 . #x3D34)	; ø»“µ»
+    (chinese-big5	. #xD9EF)	; ý¢€§¯
     (ideograph-daikanwa . 17810)	; ø¸„–’
     (china3-jef		. #x56C7)	; øº…›‡
     (ucs		. #x6E45)	; 湅
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E46)	; 湆
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (chinese-cns11643-2 . #x3D2D)	; ø»“µ´
+    (chinese-big5	. #xD9E8)	; ý¢€§¨
     (ideograph-daikanwa . 17811)	; ø¸„–“
+    ))
+(define-char
+  '((morohashi-daikanwa	17811 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-2 . #x3D2D)	; ø»“µ´
     (ucs		. #x6E46)	; 湆
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E47)	; 湇
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (chinese-big5	. #xD9E9)	; ý¢€§©
     (ideograph-daikanwa . 17812)	; ø¸„–”
+    ))
+(define-char
+  '((morohashi-daikanwa	17812 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
     (ucs		. #x6E47)	; 湇
     ))
 (define-char
   '((=>ucs		. #x6E47)	; 湇
-    (morohashi-daikanwa	17812 0 0)
+    (morohashi-daikanwa	17812 0 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -9090,6 +10132,7 @@
     (total-strokes	 . 12)
     (japanese-jisx0212		. #x4774)	; ø»‹—
     (japanese-jisx0213-2	. #x6E75)	; ø»¦š
+    (chinese-big5		. #xD9EB)	; ý¢€§«
     (ideograph-daikanwa		. 17821)	; ø¸„–
     (china3-jef			. #x91F7)	; øº‰‡·
     (ucs			. #x6E49)	; 湉
@@ -9119,6 +10162,7 @@
     (korean-ksc5601		. #x713E)	; ø»Š‰
     (chinese-cns11643-1		. #x6031)	; ø»’ŸŽ
     (japanese-jisx0208-1990	. #x4C2B)	; ø½Šµ
+    (chinese-big5		. #xB4EA)	; ý¢€‹“ª
     (ucs			. #x6E4A)	; 湊
     ))
 (define-char
@@ -9140,6 +10184,14 @@
     (chinese-cns11643-2 . #x3D3D)	; ø»“¶„
     ))
 (define-char
+  '((=>ucs		. #x6E4B)	; 湋
+    (morohashi-daikanwa	17823 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-big5	. #xD9F8)	; ý¢€§¸
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -9160,6 +10212,7 @@
     (chinese-isoir165		. #x4D44)	; ø»¯Ÿ
     (chinese-cns11643-1		. #x603F)	; ø»’Ÿœ
     (japanese-jisx0208-1990	. #x5E5A)	; ø½‹›
+    (chinese-big5		. #xB4F8)	; ý¢€‹“¸
     (ideograph-daikanwa		. 17825)	; ø¸„–¡
     (ucs			. #x6E4D)	; 湍
     ))
@@ -9174,6 +10227,7 @@
     (chinese-isoir165		. #x644F)	; ø»Ž‘œ
     (chinese-cns11643-1		. #x6048)	; ø»’Ÿ¥
     (japanese-jisx0208-1990	. #x5E5E)	; ø½‹Ÿ
+    (chinese-big5		. #xB542)	; ý¢€‹•‚
     (ideograph-daikanwa		. 17826)	; ø¸„–¢
     (ucs			. #x6E4E)	; 湎
     ))
@@ -9202,6 +10256,7 @@
     (total-strokes	 . 12)
     (japanese-jisx0212		. #x4777)	; ø»‹š
     (japanese-jisx0213-2	. #x6E79)	; ø»¦ž
+    (chinese-big5		. #xD9FA)	; ý¢€§º
     (ideograph-daikanwa		. 17829)	; ø¸„–¥
     (china3-jef			. #x56CA)	; øº…›Š
     (ucs			. #x6E51)	; 湑
@@ -9215,12 +10270,27 @@
     (chinese-cns11643-2 . #x3D3F)	; ø»“¶†
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E52)	; 湒
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-big5	. #xDA53)	; ý¢€©“
+    (ideograph-daikanwa . 17831)	; ø¸„–§
+    ))
+(define-char
+  '((=>ucs		. #x6E52)	; 湒
+    (morohashi-daikanwa	17831 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (japanese-jisx0212	. #x4778)	; ø»‹›
+    ))
+(define-char
+  '((morohashi-daikanwa	17831 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D57)	; ø»“¶ž
-    (ideograph-daikanwa . 17831)	; ø¸„–§
     (ucs		. #x6E52)	; 湒
     ))
 (define-char
@@ -9230,6 +10300,7 @@
     (total-strokes	 . 12)
     (japanese-jisx0212		. #x4779)	; ø»‹œ
     (japanese-jisx0213-2	. #x6E7A)	; ø»¦Ÿ
+    (chinese-big5		. #xDA4B)	; ý¢€©‹
     (ideograph-daikanwa		. 17832)	; ø¸„–¨
     (china3-jef			. #x56CB)	; øº…›‹
     ))
@@ -9260,6 +10331,7 @@
     (total-strokes	 . 12)
     (chinese-gb2312	. #x6455)	; ø»…©’
     (chinese-isoir165	. #x6455)	; ø»Ž‘¢
+    (chinese-big5	. #xB4E6)	; ý¢€‹“¦
     (ucs		. #x6E54)	; 湔
     ))
 (define-char
@@ -9290,6 +10362,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (chinese-big5	. #xDA51)	; ý¢€©‘
     (ideograph-daikanwa . 17835)	; ø¸„–«
     (china3-jef		. #x56CD)	; øº…›
     ))
@@ -9311,12 +10384,20 @@
     (japanese-jisx0208		. #x3850)	; ø»†²©
     (korean-ksc5601		. #x7B49)	; ø»ŠŸ€
     (chinese-isoir165		. #x3A7E)	; ø»”Ÿ
-    (chinese-cns11643-1		. #x6039)	; ø»’Ÿ–
     (japanese-jisx0208-1990	. #x3850)	; ø½Š˜
+    (chinese-big5		. #xB4F2)	; ý¢€‹“²
     (ideograph-daikanwa		. 17836)	; ø¸„–¬
     (ucs			. #x6E56)	; 湖
     ))
 (define-char
+  '((=>ucs		. #x6E56)	; 湖
+    (morohashi-daikanwa	17836 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-1 . #x6039)	; ø»’Ÿ–
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -9385,6 +10466,7 @@
     (chinese-isoir165		. #x4F66)	; ø»²½
     (chinese-cns11643-1		. #x6037)	; ø»’Ÿ”
     (japanese-jisx0208-1990	. #x3E45)	; ø½Š¡†
+    (chinese-big5		. #xB4F0)	; ý¢€‹“°
     (ideograph-daikanwa		. 17842)	; ø¸„–²
     (ucs			. #x6E58)	; 湘
     ))
@@ -9408,24 +10490,47 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (chinese-cns11643-2 . #x3D5B)	; ø»“¶¢
+    (chinese-big5	. #xDA57)	; ý¢€©—
     (ideograph-daikanwa . 17845)	; ø¸„–µ
     (ucs		. #x6E5A)	; 湚
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E5A)	; 湚
+    (morohashi-daikanwa	17845 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-2 . #x3D5B)	; ø»“¶¢
+    ))
+(define-char
+  '((=>ucs		. #x6E5B)	; 湛
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (shinjigen-2	. 4345)
     (japanese-jisx0208-1978	. #x4339)	; ø»‚®”
-    (chinese-gb2312		. #x553F)	; ø»…’º
     (japanese-jisx0208		. #x4339)	; ø»‡‚œ
     (korean-ksc5601		. #x5340)	; ø»‰¤‡
-    (chinese-isoir165		. #x553F)	; ø»»Š
-    (chinese-cns11643-1		. #x6036)	; ø»’Ÿ“
     (japanese-jisx0208-1990	. #x4339)	; ø½Š¨
+    (chinese-big5		. #xB4EF)	; ý¢€‹“¯
     (ideograph-daikanwa		. 17846)	; ø¸„–¶
-    (ucs			. #x6E5B)	; 湛
+    ))
+(define-char
+  '((morohashi-daikanwa	17846 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-gb2312	. #x553F)	; ø»…’º
+    (chinese-isoir165	. #x553F)	; ø»»Š
+    (ucs		. #x6E5B)	; 湛
+    ))
+(define-char
+  '((=>ucs		. #x6E5B)	; 湛
+    (morohashi-daikanwa	17846 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-1 . #x6036)	; ø»’Ÿ“
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -9436,6 +10541,7 @@
     (chinese-isoir165		. #x7D24)	; ø»ŽµŸ
     (chinese-cns11643-2		. #x3D45)	; ø»“¶Œ
     (japanese-jisx0213-1	. #x767A)	; ø»¤‘‹
+    (chinese-big5		. #xDA41)	; ý¢€©
     (ideograph-daikanwa		. 17847)	; ø¸„–·
     (china3-jef			. #x56CF)	; øº…›
     (ucs			. #x6E5C)	; 湜
@@ -9446,11 +10552,19 @@
     (total-strokes	 . 12)
     (japanese-jisx0212	. #x477D)	; ø»‹ 
     (chinese-isoir165	. #x2C2A)	; ø»Œ¾§
-    (chinese-cns11643-2 . #x3D39)	; ø»“¶€
+    (chinese-big5	. #xD9F4)	; ý¢€§´
     (ideograph-daikanwa . 17848)	; ø¸„–¸
     (ucs		. #x6E5D)	; 湝
     ))
 (define-char
+  '((=>ucs		. #x6E5D)	; 湝
+    (morohashi-daikanwa	17848 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-2 . #x3D39)	; ø»“¶€
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -9459,6 +10573,7 @@
     (chinese-cns11643-2		. #x3D43)	; ø»“¶Š
     (japanese-jisx0213-1	. #x767B)	; ø»¤‘Œ
     (chinese-gb12345		. #x6425)	; 湞
+    (chinese-big5		. #xD9FE)	; ý¢€§¾
     (ideograph-daikanwa		. 17849)	; ø¸„–¹
     (china3-jef			. #x56D0)	; øº…›
     (ucs			. #x6E5E)	; 湞
@@ -9474,6 +10589,7 @@
     (chinese-isoir165		. #x6452)	; ø»Ž‘Ÿ
     (chinese-cns11643-1		. #x604D)	; ø»’Ÿª
     (japanese-jisx0208-1990	. #x5E54)	; ø½‹•
+    (chinese-big5		. #xB547)	; ý¢€‹•‡
     (ideograph-daikanwa		. 17850)	; ø¸„–º
     (ucs			. #x6E5F)	; 湟
     ))
@@ -9481,15 +10597,24 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (chinese-cns11643-2 . #x3D49)	; ø»“¶
+    (chinese-big5	. #xDA45)	; ý¢€©…
     (ideograph-daikanwa . 17851)	; ø¸„–»
     (ucs		. #x6E60)	; æ¹ 
     ))
 (define-char
+  '((=>ucs		. #x6E60)	; æ¹ 
+    (morohashi-daikanwa	17851 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-2 . #x3D49)	; ø»“¶
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D46)	; ø»“¶
+    (chinese-big5	. #xDA42)	; ý¢€©‚
     (ideograph-daikanwa . 17852)	; ø¸„–¼
     (ucs		. #x6E61)	; 湡
     ))
@@ -9499,6 +10624,7 @@
     (total-strokes	 . 12)
     (japanese-jisx0212	. #x4821)	; ø»‹¢
     (chinese-cns11643-2 . #x3D35)	; ø»“µ¼
+    (chinese-big5	. #xD9F0)	; ý¢€§°
     (ideograph-daikanwa . 17853)	; ø¸„–½
     (china3-jef		. #x56D1)	; øº…›‘
     (ucs		. #x6E62)	; æ¹¢
@@ -9510,6 +10636,7 @@
     (japanese-jisx0212		. #x4822)	; ø»‹£
     (chinese-cns11643-1		. #x6049)	; ø»’Ÿ¦
     (japanese-jisx0213-2	. #x6E7D)	; ø»¦¢
+    (chinese-big5		. #xB543)	; ý¢€‹•ƒ
     (ideograph-daikanwa		. 17854)	; ø¸„–¾
     (china3-jef			. #x56D2)	; øº…›’
     (ucs			. #x6E63)	; æ¹£
@@ -9519,6 +10646,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (chinese-big5	. #xDA4F)	; ý¢€©
     (ideograph-daikanwa . 17855)	; ø¸„–¿
     (china3-jef		. #x91FB)	; øº‰‡»
     ))
@@ -9538,22 +10666,37 @@
     (chinese-cns11643-2 . #x3D53)	; ø»“¶š
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E65)	; æ¹¥
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (chinese-cns11643-2 . #x3D50)	; ø»“¶—
+    (chinese-big5	. #xDA4C)	; ý¢€©Œ
     (ideograph-daikanwa . 17856)	; ø¸„—€
-    (ucs		. #x6E65)	; æ¹¥
     ))
 (define-char
-  '((=>ucs		. #x23E0C)	; 𣸌
+  '((=>ucs		. #x6E65)	; æ¹¥
+    (morohashi-daikanwa	17856 0 0)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (ideograph-daikanwa . 17857)	; ø¸„—
+    (chinese-cns11643-2 . #x3D50)	; ø»“¶—
     ))
 (define-char
-  '((morohashi-daikanwa	17857 0 1)
+  '((morohashi-daikanwa	17856 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (ucs		. #x6E65)	; æ¹¥
+    ))
+(define-char
+  '((=>ucs		. #x23E0C)	; 𣸌
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (ideograph-daikanwa . 17857)	; ø¸„—
+    ))
+(define-char
+  '((morohashi-daikanwa	17857 0 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -9595,6 +10738,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D58)	; ø»“¶Ÿ
+    (chinese-big5	. #xDA54)	; ý¢€©”
     (ideograph-daikanwa . 17860)	; ø¸„—„
     (ucs		. #x6E66)	; 湦
     ))
@@ -9624,6 +10768,7 @@
     (korean-ksc5601		. #x6940)	; ø»Š„›
     (chinese-isoir165		. #x2D57)	; ø»€²
     (japanese-jisx0208-1990	. #x4D2F)	; ø½Š¶²
+    (chinese-big5		. #xB4E9)	; ý¢€‹“©
     (ucs			. #x6E67)	; 湧
     ))
 (define-char
@@ -9631,6 +10776,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (japanese-jisx0212	. #x4823)	; ø»‹¤
+    (chinese-big5	. #xDA40)	; ý¢€©€
     (ideograph-daikanwa . 17863)	; ø¸„—‡
     (china3-jef		. #x56D3)	; øº…›“
     (ucs		. #x6E68)	; 湨
@@ -9648,6 +10794,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-cns11643-1 . #x604C)	; ø»’Ÿ©
+    (chinese-big5	. #xB546)	; ý¢€‹•†
     (ideograph-daikanwa . 17864)	; ø¸„—ˆ
     (ucs		. #x6E69)	; 湩
     ))
@@ -9677,12 +10824,20 @@
     (japanese-jisx0208		. #x5E57)	; ø»‡ª¤
     (korean-ksc5601		. #x7553)	; ø»Š––
     (chinese-isoir165		. #x6450)	; ø»Ž‘
-    (chinese-cns11643-2		. #x3D4B)	; ø»“¶’
     (japanese-jisx0208-1990	. #x5E57)	; ø½‹˜
+    (chinese-big5		. #xDA47)	; ý¢€©‡
     (ideograph-daikanwa		. 17867)	; ø¸„—‹
     (ucs			. #x6E6B)	; 湫
     ))
 (define-char
+  '((=>ucs		. #x6E6B)	; 湫
+    (morohashi-daikanwa	17867 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-2 . #x3D4B)	; ø»“¶’
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
@@ -9764,6 +10919,7 @@
     (chinese-cns11643-1		. #x603D)	; ø»’Ÿš
     (japanese-jisx0208-1990	. #x4572)	; ø½Š¬…
     (chinese-gb12345		. #x4C40)	; 湯
+    (chinese-big5		. #xB4F6)	; ý¢€‹“¶
     (ideograph-daikanwa		. 17874)	; ø¸„—’
     (ucs			. #x6E6F)	; 湯
     ))
@@ -9783,11 +10939,19 @@
     (ideograph-daikanwa . 17876)	; ø¸„—”
     ))
 (define-char
-  '((morohashi-daikanwa	17876 0 1)
+  '((=>ucs		. #x6E71)	; æ¹±
+    (morohashi-daikanwa	17876 0 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D4A)	; ø»“¶‘
+    (chinese-big5	. #xDA46)	; ý¢€©†
+    ))
+(define-char
+  '((morohashi-daikanwa	17876 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
     (ucs		. #x6E71)	; æ¹±
     ))
 (define-char
@@ -9799,6 +10963,7 @@
     (japanese-jisx0208		. #x5E53)	; ø»‡ª 
     (korean-ksc5601		. #x6A38)	; ø»Š…±
     (japanese-jisx0208-1990	. #x5E53)	; ø½‹”
+    (chinese-big5		. #xB545)	; ý¢€‹•…
     (ideograph-daikanwa		. 17877)	; ø¸„—•
     (ucs-jis			. #x6E72)	; ø»ƒ–˜
     ))
@@ -9818,6 +10983,7 @@
     (korean-ksc5601	. #x5179)	; ø»‰¢„
     (japanese-jisx0212	. #x4824)	; ø»‹¥
     (chinese-cns11643-2 . #x3D3A)	; ø»“¶
+    (chinese-big5	. #xD9F5)	; ý¢€§µ
     (ideograph-daikanwa . 17878)	; ø¸„—–
     (china3-jef		. #x56D4)	; øº…›”
     (ucs		. #x6E73)	; æ¹³
@@ -9827,6 +10993,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (chinese-big5	. #xD5E4)	; ý¢€—¤
     (ideograph-daikanwa . 17879)	; ø¸„——
     (china3-jef		. #x56D5)	; øº…›•
     ))
@@ -10067,6 +11234,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D54)	; ø»“¶›
+    (chinese-big5	. #xDA50)	; ý¢€©
     (ideograph-daikanwa . 17899)	; ø¸„—«
     (ucs		. #x6E77)	; æ¹·
     ))
@@ -10117,11 +11285,26 @@
     (chinese-cns11643-6 . #x4A61)	; ø»œ±¾
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E78)	; 湸
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (chinese-cns11643-2 . #x3D52)	; ø»“¶™
+    (chinese-big5	. #xDA4E)	; ý¢€©Ž
     (ideograph-daikanwa . 17906)	; ø¸„—²
+    ))
+(define-char
+  '((=>ucs		. #x6E78)	; 湸
+    (morohashi-daikanwa	17906 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-2 . #x3D52)	; ø»“¶™
+    ))
+(define-char
+  '((morohashi-daikanwa	17906 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
     (ucs		. #x6E78)	; 湸
     ))
 (define-char
@@ -10137,6 +11320,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (chinese-cns11643-2 . #x3D56)	; ø»“¶
+    (chinese-big5	. #xDA52)	; ý¢€©’
     (ideograph-daikanwa . 17908)	; ø¸„—´
     (ucs		. #x6E79)	; æ¹¹
     ))
@@ -10193,6 +11377,14 @@
     (ucs			. #x6E6E)	; æ¹®
     ))
 (define-char
+  '((=>ucs		. #x6E6E)	; æ¹®
+    (morohashi-daikanwa	17914 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-big5	. #xB4F3)	; ý¢€‹“³
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -10237,6 +11429,7 @@
     (chinese-isoir165		. #x574C)	; ø»¾“
     (chinese-cns11643-1		. #x6045)	; ø»’Ÿ¢
     (japanese-jisx0208-1990	. #x3C22)	; ø½Š§
+    (chinese-big5		. #xB4FE)	; ý¢€‹“¾
     (ucs			. #x6ECB)	; 滋
     ))
 (define-char
@@ -10373,6 +11566,7 @@
     (chinese-gb2312	. #x3848)	; ø»„¨
     (chinese-isoir165	. #x3848)	; ø»­
     (chinese-cns11643-1 . #x6046)	; ø»’Ÿ£
+    (chinese-big5	. #xB540)	; ý¢€‹•€
     (ucs		. #x6E89)	; 溉
     ))
 (define-char
@@ -10420,6 +11614,7 @@
     (total-strokes	 . 13)
     (japanese-jisx0212	. #x4827)	; ø»‹¨
     (chinese-cns11643-2 . #x4447)	; ø»”€ 
+    (chinese-big5	. #xDE61)	; ý¢€¹¡
     (ideograph-daikanwa . 17922)	; ø¸„˜‚
     (china3-jef		. #x56D7)	; øº…›—
     (ucs		. #x6E8D)	; 溍
@@ -10430,6 +11625,7 @@
     (total-strokes	 . 13)
     (chinese-isoir165	. #x7D28)	; ø»Žµ£
     (chinese-cns11643-2 . #x4446)	; ø»”€Ÿ
+    (chinese-big5	. #xDE60)	; ý¢€¹ 
     (ideograph-daikanwa . 17923)	; ø¸„˜ƒ
     (ucs		. #x6E8E)	; 溎
     ))
@@ -10456,17 +11652,25 @@
     (chinese-cns11643-6 . #x5441)	; ø»€Š
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E8F)	; 溏
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (japanese-jisx0208-1978	. #x5E6F)	; ø»ƒ–´
-    (chinese-gb2312		. #x6467)	; ø»…©¤
     (japanese-jisx0208		. #x5E6F)	; ø»‡ª¼
-    (chinese-isoir165		. #x6467)	; ø»Ž‘´
-    (chinese-cns11643-2		. #x442C)	; ø»”€…
     (japanese-jisx0208-1990	. #x5E6F)	; ø½‹°
+    (chinese-big5		. #xDE46)	; ý¢€¹†
     (ideograph-daikanwa		. 17925)	; ø¸„˜…
-    (ucs			. #x6E8F)	; 溏
+    ))
+(define-char
+  '((morohashi-daikanwa	17925 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-gb2312	. #x6467)	; ø»…©¤
+    (chinese-isoir165	. #x6467)	; ø»Ž‘´
+    (chinese-cns11643-2 . #x442C)	; ø»”€…
+    (ucs		. #x6E8F)	; 溏
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -10480,6 +11684,7 @@
     (chinese-isoir165		. #x5434)	; ø»¹¡
     (chinese-cns11643-1		. #x6463)	; ø»’¥¸
     (japanese-jisx0208-1990	. #x383B)	; ø½Š˜ˆ
+    (chinese-big5		. #xB7BD)	; ý¢€‹ž½
     (ideograph-daikanwa		. 17926)	; ø¸„˜†
     (ucs			. #x6E90)	; 源
     ))
@@ -10503,6 +11708,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (chinese-cns11643-2 . #x4445)	; ø»”€ž
+    (chinese-big5	. #xDE5F)	; ý¢€¹Ÿ
     (ideograph-daikanwa . 17928)	; ø¸„˜ˆ
     (ucs		. #x6E92)	; 溒
     ))
@@ -10513,6 +11719,7 @@
     (total-strokes	 . 13)
     (japanese-jisx0212		. #x4828)	; ø»‹©
     (japanese-jisx0213-2	. #x6F21)	; ø»¦¤
+    (chinese-big5		. #xDE49)	; ý¢€¹‰
     (ideograph-daikanwa		. 17929)	; ø¸„˜‰
     (china3-jef			. #x56D8)	; øº…›˜
     ))
@@ -10529,6 +11736,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (chinese-cns11643-2 . #x4430)	; ø»”€‰
+    (chinese-big5	. #xDE4A)	; ý¢€¹Š
     (ideograph-daikanwa . 17930)	; ø¸„˜Š
     (china3-jef		. #x56D9)	; øº…›™
     (ucs		. #x6E94)	; 溔
@@ -10575,6 +11783,7 @@
     (japanese-jisx0208		. #x3D60)	; ø»†º
     (korean-ksc5601		. #x715E)	; ø»Š©
     (japanese-jisx0208-1990	. #x3D60)	; ø½Š ƒ
+    (chinese-big5		. #xB7C7)	; ý¢€‹Ÿ‡
     (ideograph-daikanwa		. 17934)	; ø¸„˜Ž
     (ucs-jis			. #x6E96)	; ø»‚¦‡
     ))
@@ -10594,6 +11803,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (chinese-cns11643-2 . #x444E)	; ø»”€§
+    (chinese-big5	. #xDE68)	; ý¢€¹¨
     (ideograph-daikanwa . 17935)	; ø¸„˜
     (ucs		. #x6E97)	; 溗
     ))
@@ -10608,6 +11818,7 @@
     (chinese-isoir165		. #x645B)	; ø»Ž‘¨
     (chinese-cns11643-1		. #x6468)	; ø»’¥½
     (japanese-jisx0208-1990	. #x5E65)	; ø½‹¦
+    (chinese-big5		. #xB7C2)	; ý¢€‹Ÿ‚
     (ideograph-daikanwa		. 17936)	; ø¸„˜
     (ucs			. #x6E98)	; 溘
     ))
@@ -10617,6 +11828,7 @@
     (total-strokes	 . 13)
     (japanese-jisx0212	. #x4829)	; ø»‹ª
     (chinese-cns11643-2 . #x4444)	; ø»”€
+    (chinese-big5	. #xDE5E)	; ý¢€¹ž
     (ideograph-daikanwa . 17937)	; ø¸„˜‘
     (china3-jef		. #x56DA)	; øº…›š
     (ucs		. #x6E99)	; 溙
@@ -10669,14 +11881,29 @@
     (ucs		. #x6E9A)	; 溚
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E9B)	; 溛
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (chinese-cns11643-2 . #x4429)	; ø»”€‚
+    (chinese-big5	. #xDE43)	; ý¢€¹ƒ
     (ideograph-daikanwa . 17942)	; ø¸„˜–
+    ))
+(define-char
+  '((morohashi-daikanwa	17942 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
     (ucs		. #x6E9B)	; 溛
     ))
 (define-char
+  '((=>ucs		. #x6E9B)	; 溛
+    (morohashi-daikanwa	17942 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-cns11643-2 . #x4429)	; ø»”€‚
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
@@ -10688,6 +11915,7 @@
     (chinese-isoir165		. #x416F)	; ø»ž¢
     (chinese-cns11643-1		. #x646E)	; ø»’¦ƒ
     (japanese-jisx0208-1990	. #x4E2F)	; ø½Š¸
+    (chinese-big5		. #xB7C8)	; ý¢€‹Ÿˆ
     (ideograph-daikanwa		. 17943)	; ø¸„˜—
     (ucs			. #x6E9C)	; 溜
     ))
@@ -10698,6 +11926,7 @@
     (total-strokes	 . 13)
     (japanese-jisx0208-1978	. #x3942)	; ø»‚Ÿ±
     (korean-ksc5601		. #x4F35)	; ø»‰ž„
+    (chinese-big5		. #xB7BE)	; ý¢€‹ž¾
     (ideograph-daikanwa		. 17944)	; ø¸„˜˜
     ))
 (define-char
@@ -10717,6 +11946,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (chinese-cns11643-2 . #x4438)	; ø»”€‘
+    (chinese-big5	. #xDE52)	; ý¢€¹’
     (ideograph-daikanwa . 17945)	; ø¸„˜™
     (ucs		. #x6E9E)	; 溞
     ))
@@ -10736,39 +11966,63 @@
     (chinese-cns11643-4 . #x3E34)	; ø»˜‹¡
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6E9F)	; 溟
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (shinjigen-2	. 4403)
     (japanese-jisx0208-1978	. #x5E72)	; ø»ƒ–·
-    (chinese-gb2312		. #x6469)	; ø»…©¦
     (japanese-jisx0208		. #x5E72)	; ø»‡ª¿
     (korean-ksc5601		. #x5928)	; ø»‰¬£
-    (chinese-isoir165		. #x6469)	; ø»Ž‘¶
-    (chinese-cns11643-2		. #x442E)	; ø»”€‡
     (japanese-jisx0208-1990	. #x5E72)	; ø½‹³
+    (chinese-big5		. #xDE48)	; ý¢€¹ˆ
     (ideograph-daikanwa		. 17947)	; ø¸„˜›
-    (ucs			. #x6E9F)	; 溟
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	17947 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-gb2312	. #x6469)	; ø»…©¦
+    (chinese-isoir165	. #x6469)	; ø»Ž‘¶
+    (chinese-cns11643-2 . #x442E)	; ø»”€‡
+    (ucs		. #x6E9F)	; 溟
+    ))
+(define-char
+  '((=>ucs		. #x6EA0)	; 溠
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (japanese-jisx0212	. #x482A)	; ø»‹«
-    (chinese-isoir165	. #x7D26)	; ø»Žµ¡
     (chinese-cns11643-2 . #x4431)	; ø»”€Š
+    (chinese-big5	. #xDE4B)	; ý¢€¹‹
     (ideograph-daikanwa . 17948)	; ø¸„˜œ
+    ))
+(define-char
+  '((morohashi-daikanwa	17948 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-isoir165	. #x7D26)	; ø»Žµ¡
     (ucs		. #x6EA0)	; 溠
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (chinese-cns11643-2 . #x4449)	; ø»”€¢
+    (chinese-big5	. #xDE63)	; ý¢€¹£
     (ideograph-daikanwa . 17949)	; ø¸„˜
     (ucs		. #x6EA1)	; 溡
     ))
 (define-char
+  '((=>ucs		. #x6EA1)	; 溡
+    (morohashi-daikanwa	17949 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-cns11643-2 . #x4449)	; ø»”€¢
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
@@ -10783,6 +12037,7 @@
     (total-strokes	 . 13)
     (japanese-jisx0208-1978	. #x306E)	; ø»‚“
     (korean-ksc5601		. #x6C6E)	; ø»Š‰£
+    (chinese-big5		. #xB7B8)	; ý¢€‹ž¸
     (ideograph-daikanwa		. 17951)	; ø¸„˜Ÿ
     ))
 (define-char
@@ -10834,6 +12089,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (chinese-cns11643-2 . #x4450)	; ø»”€©
+    (chinese-big5	. #xDE6A)	; ý¢€¹ª
     (ideograph-daikanwa . 17955)	; ø¸„˜£
     (ucs		. #x6EA3)	; 溣
     ))
@@ -10842,6 +12098,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (chinese-cns11643-2 . #x4448)	; ø»”€¡
+    (chinese-big5	. #xDE62)	; ý¢€¹¢
     (ideograph-daikanwa . 17956)	; ø¸„˜¤
     (ucs		. #x6EA4)	; 溤
     ))
@@ -10855,12 +12112,20 @@
     (japanese-jisx0208		. #x5E70)	; ø»‡ª½
     (korean-ksc5601		. #x5D2A)	; ø»‰²
     (chinese-isoir165		. #x645F)	; ø»Ž‘¬
-    (chinese-cns11643-1		. #x6467)	; ø»’¥¼
     (japanese-jisx0208-1990	. #x5E70)	; ø½‹±
+    (chinese-big5		. #xB7C1)	; ý¢€‹Ÿ
     (ideograph-daikanwa		. 17957)	; ø¸„˜¥
     (ucs			. #x6EA5)	; 溥
     ))
 (define-char
+  '((=>ucs		. #x6EA5)	; 溥
+    (morohashi-daikanwa	17957 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-cns11643-1 . #x6467)	; ø»’¥¼
+    ))
+(define-char
   '((=>ucs		. #x3D28)	; ã´¨
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
@@ -10881,6 +12146,7 @@
     (total-strokes	 . 13)
     (chinese-isoir165	. #x2C2B)	; ø»Œ¾¨
     (chinese-cns11643-2 . #x443D)	; ø»”€–
+    (chinese-big5	. #xDE57)	; ý¢€¹—
     (ideograph-daikanwa . 17959)	; ø¸„˜§
     (ucs		. #x6EA6)	; 溦
     ))
@@ -10892,6 +12158,7 @@
     (japanese-jisx0212		. #x482B)	; ø»‹¬
     (chinese-isoir165		. #x6460)	; ø»Ž‘­
     (japanese-jisx0213-2	. #x6F22)	; ø»¦¥
+    (chinese-big5		. #xB7CC)	; ý¢€‹ŸŒ
     (ideograph-daikanwa		. 17960)	; ø¸„˜¨
     (china3-jef			. #x91F8)	; øº‰‡¸
     (ucs			. #x6EA7)	; 溧
@@ -10984,6 +12251,7 @@
     (japanese-jisx0208		. #x5E64)	; ø»‡ª±
     (korean-ksc5601		. #x4D22)	; ø»‰šµ
     (japanese-jisx0208-1990	. #x5E64)	; ø½‹¥
+    (chinese-big5		. #xB7CB)	; ý¢€‹Ÿ‹
     (ideograph-daikanwa		. 17967)	; ø¸„˜¯
     (ucs-jis			. #x6EAA)	; ø»ƒ–©
     ))
@@ -10994,10 +12262,17 @@
     (total-strokes	 . 13)
     (chinese-gb2312	. #x4F2A)	; ø»…‰±
     (chinese-isoir165	. #x4F2A)	; ø»²
-    (chinese-cns11643-1 . #x6471)	; ø»’¦†
     (ucs		. #x6EAA)	; 溪
     ))
 (define-char
+  '((=>ucs		. #x6EAA)	; 溪
+    (morohashi-daikanwa	17967 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-cns11643-1 . #x6471)	; ø»’¦†
+    ))
+(define-char
   '((morohashi-daikanwa	17967 0 8)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
@@ -11014,6 +12289,7 @@
     (korean-ksc5601		. #x682E)	; ø»Š‚«
     (chinese-cns11643-1		. #x646B)	; ø»’¦€
     (japanese-jisx0213-1	. #x767C)	; ø»¤‘
+    (chinese-big5		. #xB7C5)	; ý¢€‹Ÿ…
     (ideograph-daikanwa		. 17968)	; ø¸„˜°
     (china3-jef			. #x56DB)	; øº…››
     (ucs			. #x6EAB)	; 溫
@@ -11056,6 +12332,7 @@
     (total-strokes	 . 13)
     (japanese-jisx0212	. #x482D)	; ø»‹®
     (chinese-cns11643-2 . #x444F)	; ø»”€¨
+    (chinese-big5	. #xDE69)	; ý¢€¹©
     (ideograph-daikanwa . 17972)	; ø¸„˜´
     (china3-jef		. #x8CCD)	; øºˆ³
     (ucs		. #x6EAE)	; 溮
@@ -11095,6 +12372,7 @@
     (chinese-isoir165		. #x4B5D)	; ø»¬¼
     (chinese-cns11643-1		. #x645F)	; ø»’¥´
     (japanese-jisx0208-1990	. #x5E6A)	; ø½‹«
+    (chinese-big5		. #xB7B9)	; ý¢€‹ž¹
     (ideograph-daikanwa		. 17975)	; ø¸„˜·
     (ucs			. #x6EAF)	; 溯
     ))
@@ -11103,6 +12381,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (chinese-cns11643-2 . #x443B)	; ø»”€”
+    (chinese-big5	. #xDE55)	; ý¢€¹•
     (ideograph-daikanwa . 17976)	; ø¸„˜¸
     (china3-jef		. #x56DC)	; øº…›œ
     (ucs		. #x6EB0)	; 溰
@@ -11116,6 +12395,7 @@
     (japanese-jisx0212		. #x482E)	; ø»‹¯
     (chinese-isoir165		. #x645A)	; ø»Ž‘§
     (japanese-jisx0213-1	. #x767D)	; ø»¤‘Ž
+    (chinese-big5		. #xDE4C)	; ý¢€¹Œ
     (ideograph-daikanwa		. 17978)	; ø¸„˜º
     (china3-jef			. #x56DD)	; øº…›
     (ucs			. #x6EB1)	; 溱
@@ -11139,6 +12419,7 @@
     (chinese-isoir165		. #x6451)	; ø»Ž‘ž
     (chinese-cns11643-2		. #x443F)	; ø»”€˜
     (japanese-jisx0208-1990	. #x5E6C)	; ø½‹­
+    (chinese-big5		. #xDE59)	; ý¢€¹™
     (ideograph-daikanwa		. 17979)	; ø¸„˜»
     (ucs			. #x6EB2)	; 溲
     ))
@@ -11148,6 +12429,7 @@
     (total-strokes	 . 13)
     (japanese-jisx0212	. #x482F)	; ø»‹°
     (chinese-cns11643-2 . #x444B)	; ø»”€¤
+    (chinese-big5	. #xDE65)	; ý¢€¹¥
     (ideograph-daikanwa . 17980)	; ø¸„˜¼
     (ucs		. #x6EB3)	; 溳
     ))
@@ -11157,12 +12439,20 @@
     (total-strokes	 . 13)
     (chinese-gb2312		. #x6465)	; ø»…©¢
     (chinese-isoir165		. #x6465)	; ø»Ž‘²
-    (chinese-cns11643-1		. #x6473)	; ø»’¦ˆ
     (japanese-jisx0213-2	. #x6F23)	; ø»¦¦
+    (chinese-big5		. #xB7CD)	; ý¢€‹Ÿ
     (ideograph-daikanwa		. 17981)	; ø¸„˜½
     (ucs			. #x6EB4)	; 溴
     ))
 (define-char
+  '((=>ucs		. #x6EB4)	; 溴
+    (morohashi-daikanwa	17981 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-cns11643-1 . #x6473)	; ø»’¦ˆ
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
@@ -11172,19 +12462,27 @@
     (ucs		. #x6EB5)	; 溵
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6EB6)	; 溶
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (shinjigen-2	. 4405)
     (japanese-jisx0208-1978	. #x4D4F)	; ø»‚½–
-    (chinese-gb2312		. #x485C)	; ø»…€‘
     (japanese-jisx0208		. #x4D4F)	; ø»‡‘ž
     (korean-ksc5601		. #x6941)	; ø»Š„œ
-    (chinese-isoir165		. #x485C)	; ø»¨¡
-    (chinese-cns11643-1		. #x6461)	; ø»’¥¶
     (japanese-jisx0208-1990	. #x4D4F)	; ø½Š·’
+    (chinese-big5		. #xB7BB)	; ý¢€‹ž»
     (ideograph-daikanwa		. 17983)	; ø¸„˜¿
-    (ucs			. #x6EB6)	; 溶
+    ))
+(define-char
+  '((morohashi-daikanwa	17983 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-gb2312	. #x485C)	; ø»…€‘
+    (chinese-isoir165	. #x485C)	; ø»¨¡
+    (chinese-cns11643-1 . #x6461)	; ø»’¥¶
+    (ucs		. #x6EB6)	; 溶
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -11227,6 +12525,7 @@
     (chinese-isoir165		. #x6463)	; ø»Ž‘°
     (chinese-cns11643-2		. #x443A)	; ø»”€“
     (japanese-jisx0208-1990	. #x5E67)	; ø½‹¨
+    (chinese-big5		. #xDE54)	; ý¢€¹”
     (ideograph-daikanwa		. 17986)	; ø¸„™‚
     (ucs			. #x6EB7)	; 溷
     ))
@@ -11254,11 +12553,19 @@
     (ucs		. #x3D2D)	; ã´­
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6EB9)	; 溹
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (chinese-cns11643-2 . #x4433)	; ø»”€Œ
+    (chinese-big5	. #xDE4D)	; ý¢€¹
     (ideograph-daikanwa . 17989)	; ø¸„™…
+    ))
+(define-char
+  '((morohashi-daikanwa	17989 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
     (ucs		. #x6EB9)	; 溹
     ))
 (define-char
@@ -11268,6 +12575,7 @@
     (total-strokes	 . 13)
     (japanese-jisx0208-1978	. #x452E)	; ø»‚±…
     (korean-ksc5601		. #x527C)	; ø»‰£¥
+    (chinese-big5		. #xB7C4)	; ý¢€‹Ÿ„
     (ideograph-daikanwa		. 17990)	; ø¸„™†
     ))
 (define-char
@@ -11306,6 +12614,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (chinese-cns11643-1 . #x6469)	; ø»’¥¾
+    (chinese-big5	. #xB7C3)	; ý¢€‹Ÿƒ
     (ideograph-daikanwa . 17992)	; ø¸„™ˆ
     (china3-jef		. #x56DE)	; øº…›ž
     (ucs		. #x6EBC)	; 溼
@@ -11366,15 +12675,24 @@
     (chinese-isoir165		. #x6461)	; ø»Ž‘®
     (chinese-cns11643-2		. #x4436)	; ø»”€
     (japanese-jisx0208-1990	. #x5E69)	; ø½‹ª
+    (chinese-big5		. #xDE50)	; ý¢€¹
     (ideograph-daikanwa		. 17996)	; ø¸„™Œ
     (ucs			. #x6EBD)	; 溽
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6EBE)	; 溾
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (chinese-cns11643-2 . #x4440)	; ø»”€™
+    (chinese-big5	. #xDE5A)	; ý¢€¹š
     (ideograph-daikanwa . 17997)	; ø¸„™
+    ))
+(define-char
+  '((morohashi-daikanwa	17997 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
     (ucs		. #x6EBE)	; 溾
     ))
 (define-char
@@ -11384,6 +12702,7 @@
     (total-strokes	 . 13)
     (japanese-jisx0212		. #x4831)	; ø»‹²
     (japanese-jisx0213-2	. #x6F24)	; ø»¦§
+    (chinese-big5		. #xDE64)	; ý¢€¹¤
     (ideograph-daikanwa		. 17998)	; ø¸„™Ž
     (china3-jef			. #x56DF)	; øº…›Ÿ
     ))
@@ -11396,12 +12715,20 @@
     (ucs		. #x6EBF)	; 溿
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6EC0)	; 滀
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (japanese-jisx0212	. #x4832)	; ø»‹³
-    (chinese-cns11643-2 . #x442D)	; ø»”€†
+    (chinese-big5	. #xDE47)	; ý¢€¹‡
     (ideograph-daikanwa . 17999)	; ø¸„™
+    ))
+(define-char
+  '((morohashi-daikanwa	17999 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-cns11643-2 . #x442D)	; ø»”€†
     (ucs		. #x6EC0)	; 滀
     ))
 (define-char
@@ -11436,23 +12763,32 @@
     (chinese-isoir165		. #x337C)	; ø»Š‹
     (chinese-cns11643-2		. #x4437)	; ø»”€
     (japanese-jisx0213-1	. #x767E)	; ø»¤‘
+    (chinese-big5		. #xDE51)	; ý¢€¹‘
     (ideograph-daikanwa		. 18002)	; ø¸„™’
     (ucs			. #x6EC1)	; 滁
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6EC2)	; 滂
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (shinjigen-2	. 4401)
     (japanese-jisx0208-1978	. #x5E71)	; ø»ƒ–¶
-    (chinese-gb2312		. #x6468)	; ø»…©¥
     (japanese-jisx0208		. #x5E71)	; ø»‡ª¾
     (korean-ksc5601		. #x5B35)	; ø»‰¯¬
-    (chinese-isoir165		. #x6468)	; ø»Ž‘µ
-    (chinese-cns11643-1		. #x6462)	; ø»’¥·
     (japanese-jisx0208-1990	. #x5E71)	; ø½‹²
+    (chinese-big5		. #xB7BC)	; ý¢€‹ž¼
     (ideograph-daikanwa		. 18003)	; ø¸„™“
-    (ucs			. #x6EC2)	; 滂
+    ))
+(define-char
+  '((morohashi-daikanwa	18003 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-gb2312	. #x6468)	; ø»…©¥
+    (chinese-isoir165	. #x6468)	; ø»Ž‘µ
+    (chinese-cns11643-1 . #x6462)	; ø»’¥·
+    (ucs		. #x6EC2)	; 滂
     ))
 (define-char
   '((=>ucs		. #x6EC3)	; 滃
@@ -11461,6 +12797,7 @@
     (total-strokes	 . 13)
     (japanese-jisx0212		. #x4834)	; ø»‹µ
     (japanese-jisx0213-2	. #x6F25)	; ø»¦¨
+    (chinese-big5		. #xDE5B)	; ý¢€¹›
     (ideograph-daikanwa		. 18004)	; ø¸„™”
     (china3-jef			. #x56E0)	; øº…› 
     ))
@@ -11521,6 +12858,7 @@
     (korean-ksc5601		. #x7367)	; ø»Š“®
     (chinese-cns11643-1		. #x646F)	; ø»’¦„
     (japanese-jisx0208-1990	. #x5E6B)	; ø½‹¬
+    (chinese-big5		. #xB7C9)	; ý¢€‹Ÿ‰
     (ideograph-daikanwa		. 18007)	; ø¸„™—
     (ucs-jis			. #x6EC4)	; ø»ƒ–°
     ))
@@ -11543,6 +12881,7 @@
     (chinese-cns11643-1		. #x6466)	; ø»’¥»
     (japanese-jisx0208-1990	. #x4C47)	; ø½Šµ¬
     (chinese-gb12345		. #x4370)	; 滅
+    (chinese-big5		. #xB7C0)	; ý¢€‹Ÿ€
     (ideograph-daikanwa		. 18008)	; ø¸„™˜
     (ucs			. #x6EC5)	; 滅
     ))
@@ -11551,6 +12890,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
+    (chinese-big5	. #xDE4E)	; ý¢€¹Ž
     (ideograph-daikanwa . 18009)	; ø¸„™™
     (china3-jef		. #x80C9)	; øºˆƒ‰
     ))
@@ -11569,6 +12909,7 @@
     (total-strokes	 . 13)
     (japanese-jisx0212		. #x4835)	; ø»‹¶
     (japanese-jisx0213-1	. #x7721)	; ø»¤‘
+    (chinese-big5		. #xB7BF)	; ý¢€‹ž¿
     (ideograph-daikanwa		. 18010)	; ø¸„™š
     (china3-jef			. #x56E1)	; øº…›¡
     ))
@@ -11640,6 +12981,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (japanese-jisx0212	. #x4836)	; ø»‹·
+    (chinese-big5	. #xDE45)	; ý¢€¹…
     (ideograph-daikanwa . 18015)	; ø¸„™Ÿ
     (china3-jef		. #x56E2)	; øº…›¢
     ))
@@ -11677,6 +13019,7 @@
     (chinese-isoir165		. #x7D29)	; ø»Žµ¤
     (chinese-cns11643-2		. #x4439)	; ø»”€’
     (japanese-jisx0208-1990	. #x5E66)	; ø½‹§
+    (chinese-big5		. #xDE53)	; ý¢€¹“
     (ideograph-daikanwa		. 18017)	; ø¸„™¡
     (ucs			. #x6EC9)	; 滉
     ))
@@ -11685,13 +13028,21 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (japanese-jisx0212		. #x4837)	; ø»‹¸
-    (chinese-cns11643-2		. #x444D)	; ø»”€¦
     (japanese-jisx0213-2	. #x6F26)	; ø»¦©
+    (chinese-big5		. #xDE67)	; ý¢€¹§
     (ideograph-daikanwa		. 18019)	; ø¸„™£
     (china3-jef			. #x56E3)	; øº…›£
     (ucs			. #x6ECA)	; 滊
     ))
 (define-char
+  '((=>ucs		. #x6ECA)	; 滊
+    (morohashi-daikanwa	18019 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-cns11643-2 . #x444D)	; ø»”€¦
+    ))
+(define-char
   '((=>ucs		. #x3D34)	; ã´´
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
@@ -11745,12 +13096,20 @@
     (ucs		. #x3D36)	; ã´¶
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6ECD)	; 滍
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (japanese-jisx0212	. #x4838)	; ø»‹¹
-    (chinese-cns11643-2 . #x443C)	; ø»”€•
+    (chinese-big5	. #xDE56)	; ý¢€¹–
     (ideograph-daikanwa . 18025)	; ø¸„™©
+    ))
+(define-char
+  '((morohashi-daikanwa	18025 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-cns11643-2 . #x443C)	; ø»”€•
     (ucs		. #x6ECD)	; 滍
     ))
 (define-char
@@ -11759,25 +13118,41 @@
     (total-strokes	 . 14)
     (korean-ksc5601		. #x7B23)	; ø»Šžš
     (japanese-jisx0212		. #x4839)	; ø»‹º
-    (chinese-cns11643-2		. #x4B34)	; ø»”ŠŸ
     (japanese-jisx0213-1	. #x7722)	; ø»¤‘‘
     (chinese-gb12345		. #x5C7E)	; 滎
+    (chinese-big5		. #xE26C)	; ý¢€Ž‰¬
     (ideograph-daikanwa		. 18026)	; ø¸„™ª
     (china3-jef			. #x91FA)	; øº‰‡º
     (ucs			. #x6ECE)	; 滎
     ))
 (define-char
+  '((=>ucs		. #x6ECE)	; 滎
+    (morohashi-daikanwa	18026 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (chinese-cns11643-2 . #x4B34)	; ø»”ŠŸ
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (chinese-gb2312	. #x6466)	; ø»…©£
-    (japanese-jisx0212	. #x483A)	; ø»‹»
     (chinese-isoir165	. #x6466)	; ø»Ž‘³
     (chinese-cns11643-2 . #x443E)	; ø»”€—
     (ideograph-daikanwa . 18027)	; ø¸„™«
     (ucs		. #x6ECF)	; 滏
     ))
 (define-char
+  '((=>ucs		. #x6ECF)	; 滏
+    (morohashi-daikanwa	18027 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (japanese-jisx0212	. #x483A)	; ø»‹»
+    (chinese-big5	. #xDE58)	; ý¢€¹˜
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
@@ -11794,6 +13169,14 @@
     ))
 (define-char
   '((=>ucs		. #x6ED0)	; 滐
+    (morohashi-daikanwa	18029 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-big5	. #xDE66)	; ý¢€¹¦
+    ))
+(define-char
+  '((=>ucs		. #x6ED0)	; 滐
     (morohashi-daikanwa	18029 0 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
@@ -11833,6 +13216,7 @@
     (japanese-jisx0208		. #x336A)	; ø»†«­
     (korean-ksc5601		. #x7C41)	; ø»Š –
     (japanese-jisx0208-1990	. #x336A)	; ø½Š‘¡
+    (chinese-big5		. #xB7C6)	; ý¢€‹Ÿ†
     (ideograph-daikanwa		. 18032)	; ø¸„™°
     (ucs-jis			. #x6ED1)	; ø»‚—¥
     ))
@@ -11859,23 +13243,32 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (chinese-cns11643-2 . #x4435)	; ø»”€Ž
+    (chinese-big5	. #xDE4F)	; ý¢€¹
     (ideograph-daikanwa . 18033)	; ø¸„™±
     (ucs		. #x6ED2)	; 滒
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6ED3)	; 滓
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (shinjigen-2	. 4377)
     (japanese-jisx0208-1978	. #x5E68)	; ø»ƒ–­
-    (chinese-gb2312		. #x5752)	; ø»…–‰
     (japanese-jisx0208		. #x5E68)	; ø»‡ªµ
     (korean-ksc5601		. #x6E2B)	; ø»Š‹œ
-    (chinese-isoir165		. #x5752)	; ø»¾™
-    (chinese-cns11643-1		. #x6460)	; ø»’¥µ
     (japanese-jisx0208-1990	. #x5E68)	; ø½‹©
+    (chinese-big5		. #xB7BA)	; ý¢€‹žº
     (ideograph-daikanwa		. 18034)	; ø¸„™²
-    (ucs			. #x6ED3)	; 滓
+    ))
+(define-char
+  '((morohashi-daikanwa	18034 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-gb2312	. #x5752)	; ø»…–‰
+    (chinese-isoir165	. #x5752)	; ø»¾™
+    (chinese-cns11643-1 . #x6460)	; ø»’¥µ
+    (ucs		. #x6ED3)	; 滓
     ))
 (define-char
   '((=>ucs		. #x6ED4)	; 滔
@@ -11887,6 +13280,7 @@
     (japanese-jisx0208		. #x5E6D)	; ø»‡ªº
     (korean-ksc5601		. #x5425)	; ø»‰¥Š
     (japanese-jisx0208-1990	. #x5E6D)	; ø½‹®
+    (chinese-big5		. #xB7CA)	; ý¢€‹ŸŠ
     (ideograph-daikanwa		. 18035)	; ø¸„™³
     (ucs-jis			. #x6ED4)	; ø»ƒ–²
     ))
@@ -11908,6 +13302,7 @@
     (japanese-jisx0208-1978	. #x5E6E)	; ø»ƒ–³
     (japanese-jisx0208		. #x5E6E)	; ø»‡ª»
     (japanese-jisx0208-1990	. #x5E6E)	; ø½‹¯
+    (chinese-big5		. #xBCF0)	; ý¢€‹³°
     (ideograph-daikanwa		. 18036)	; ø¸„™´
     (ucs-jis			. #x6ED5)	; ø»ƒ–³
     ))
@@ -11999,11 +13394,19 @@
     (ucs		. #x23E7A)	; 𣹺
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6ED6)	; 滖
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (chinese-cns11643-2 . #x442A)	; ø»”€ƒ
+    (chinese-big5	. #xDE44)	; ý¢€¹„
     (ideograph-daikanwa . 18045)	; ø¸„™½
+    ))
+(define-char
+  '((morohashi-daikanwa	18045 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-cns11643-2 . #x442A)	; ø»”€ƒ
     (ucs		. #x6ED6)	; 滖
     ))
 (define-char
@@ -12139,12 +13542,27 @@
     (ucs		. #x23EAC)	; 𣺬
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6ED8)	; 滘
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (chinese-isoir165	. #x7D2C)	; ø»Žµ§
-    (chinese-cns11643-2 . #x4443)	; ø»”€œ
+    (chinese-big5	. #xDE5D)	; ý¢€¹
     (ideograph-daikanwa . 18059)	; ø¸„š‹
+    ))
+(define-char
+  '((=>ucs		. #x6ED8)	; 滘
+    (morohashi-daikanwa	18059 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-cns11643-2 . #x4443)	; ø»”€œ
+    ))
+(define-char
+  '((morohashi-daikanwa	18059 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-isoir165	. #x7D2C)	; ø»Žµ§
     (ucs		. #x6ED8)	; 滘
     ))
 (define-char
@@ -12219,6 +13637,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (chinese-cns11643-2 . #x4442)	; ø»”€›
+    (chinese-big5	. #xDE5C)	; ý¢€¹œ
     (ideograph-daikanwa . 18066)	; ø¸„š’
     (ucs		. #x6EDC)	; 滜
     ))
@@ -12465,6 +13884,7 @@
     (japanese-jisx0208		. #x5E7E)	; ø»‡«‹
     (korean-ksc5601		. #x742F)	; ø»Š””
     (japanese-jisx0208-1990	. #x5E7E)	; ø½‹¿
+    (chinese-big5		. #xBAB0)	; ý¢€‹ª°
     (ideograph-daikanwa		. 18069)	; ø¸„š•
     (ucs-jis			. #x6ECC)	; ø»ƒ—ƒ
     ))
@@ -12506,6 +13926,7 @@
     (japanese-jisx0212		. #x483B)	; ø»‹¼
     (chinese-isoir165		. #x2C2C)	; ø»Œ¾©
     (japanese-jisx0213-2	. #x6F29)	; ø»¦¬
+    (chinese-big5		. #xE2AA)	; ý¢€ŽŠª
     (ideograph-daikanwa		. 18071)	; ø¸„š—
     (ucs			. #x6EEB)	; 滫
     ))
@@ -12523,6 +13944,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-1 . #x6954)	; ø»’¬¿
+    (chinese-big5	. #xBAAD)	; ý¢€‹ª­
     (ideograph-daikanwa . 18072)	; ø¸„š˜
     ))
 (define-char
@@ -12558,6 +13980,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (japanese-jisx0212	. #x483C)	; ø»‹½
+    (chinese-big5	. #xE27D)	; ý¢€Ž‰½
     (china3-jef		. #x56E7)	; øº…›§
     (ucs		. #x6EED)	; æ»­
     ))
@@ -12567,6 +13990,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (japanese-jisx0212	. #x483D)	; ø»‹¾
+    (chinese-big5	. #xE2A4)	; ý¢€ŽŠ¤
     (ideograph-daikanwa . 18074)	; ø¸„šš
     (china3-jef		. #x56E8)	; øº…›¨
     ))
@@ -12596,6 +14020,7 @@
     (chinese-cns11643-1		. #x6949)	; ø»’¬´
     (japanese-jisx0208-1990	. #x5E7C)	; ø½‹½
     (chinese-gb12345		. #x564D)	; 滯
+    (chinese-big5		. #xBAA2)	; ý¢€‹ª¢
     (ideograph-daikanwa		. 18075)	; ø¸„š›
     (ucs			. #x6EEF)	; 滯
     ))
@@ -12612,6 +14037,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (chinese-big5	. #xE26E)	; ý¢€Ž‰®
     (ideograph-daikanwa . 18078)	; ø¸„šž
     ))
 (define-char
@@ -12629,6 +14055,7 @@
     (shinjigen-2	. 4430)
     (chinese-cns11643-1 . #x6956)	; ø»’­
     (chinese-gb12345	. #x4978)	; 滲
+    (chinese-big5	. #xBAAF)	; ý¢€‹ª¯
     (ideograph-daikanwa . 18081)	; ø¸„š¡
     (ucs		. #x6EF2)	; 滲
     ))
@@ -12661,6 +14088,7 @@
     (japanese-jisx0208		. #x4529)	; ø»‡…ˆ
     (korean-ksc5601		. #x6E59)	; ø»ŠŒŠ
     (japanese-jisx0208-1990	. #x4529)	; ø½Šª¼
+    (chinese-big5		. #xBA77)	; ý¢€‹©·
     (ideograph-daikanwa		. 18084)	; ø¸„š¤
     (ucs-jis			. #x6EF4)	; ø»‚±€
     ))
@@ -12687,6 +14115,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (chinese-big5	. #xE26D)	; ý¢€Ž‰­
     (ideograph-daikanwa . 18085)	; ø¸„š¥
     ))
 (define-char
@@ -12713,11 +14142,26 @@
     (ucs		. #x3D3C)	; ã´¼
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6EF6)	; 滶
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (chinese-cns11643-2 . #x4B56)	; ø»”‹
+    (chinese-big5	. #xE2B0)	; ý¢€ŽŠ°
     (ideograph-daikanwa . 18087)	; ø¸„š§
+    ))
+(define-char
+  '((=>ucs		. #x6EF6)	; 滶
+    (morohashi-daikanwa	18087 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-2 . #x4B56)	; ø»”‹
+    ))
+(define-char
+  '((morohashi-daikanwa	18087 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
     (ucs		. #x6EF6)	; 滶
     ))
 (define-char
@@ -12729,22 +14173,31 @@
     (chinese-cns11643-1		. #x6958)	; ø»’­ƒ
     (japanese-jisx0208-1990	. #x5F23)	; ø½‹‘‚
     (chinese-gb12345		. #x4231)	; æ»·
+    (chinese-big5		. #xBAB1)	; ý¢€‹ª±
     (ideograph-daikanwa		. 18088)	; ø¸„š¨
     (ucs			. #x6EF7)	; æ»·
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6EF8)	; 滸
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (shinjigen-2	. 4419)
     (japanese-jisx0208-1978	. #x5E77)	; ø»ƒ–¼
     (japanese-jisx0208		. #x5E77)	; ø»‡«„
     (korean-ksc5601		. #x7B4A)	; ø»ŠŸ
-    (chinese-cns11643-2		. #x4B39)	; ø»”Š¤
     (japanese-jisx0208-1990	. #x5E77)	; ø½‹¸
-    (chinese-gb12345		. #x6430)	; 滸
+    (chinese-big5		. #xE271)	; ý¢€Ž‰±
     (ideograph-daikanwa		. 18089)	; ø¸„š©
-    (ucs			. #x6EF8)	; 滸
+    ))
+(define-char
+  '((morohashi-daikanwa	18089 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-2 . #x4B39)	; ø»”Š¤
+    (chinese-gb12345	. #x6430)	; 滸
+    (ucs		. #x6EF8)	; 滸
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -12754,6 +14207,7 @@
     (japanese-jisx0212		. #x483E)	; ø»‹¿
     (chinese-isoir165		. #x646F)	; ø»Ž‘¼
     (japanese-jisx0213-2	. #x6F2A)	; ø»¦­
+    (chinese-big5		. #xE2A3)	; ý¢€ŽŠ£
     (ideograph-daikanwa		. 18092)	; ø¸„š¬
     (china3-jef			. #x56EA)	; øº…›ª
     (ucs			. #x6EF9)	; 滹
@@ -12775,20 +14229,36 @@
     (ucs		. #x6EFA)	; 滺
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6EFB)	; æ»»
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (japanese-jisx0212		. #x483F)	; ø»‹ž€
-    (chinese-cns11643-2		. #x4B3B)	; ø»”Š¦
     (japanese-jisx0213-2	. #x6F2B)	; ø»¦®
+    (chinese-big5		. #xE273)	; ý¢€Ž‰³
     (ideograph-daikanwa		. 18095)	; ø¸„š¯
-    (ucs			. #x6EFB)	; æ»»
+    ))
+(define-char
+  '((=>ucs		. #x6EFB)	; æ»»
+    (morohashi-daikanwa	18095 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-2 . #x4B3B)	; ø»”Š¦
+    ))
+(define-char
+  '((morohashi-daikanwa	18095 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (ucs		. #x6EFB)	; æ»»
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x4B59)	; ø»”‹„
+    (chinese-big5	. #xE2B3)	; ý¢€ŽŠ³
     (ideograph-daikanwa . 18096)	; ø¸„š°
     (ucs		. #x6EFC)	; 滼
     ))
@@ -12798,6 +14268,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (japanese-jisx0212	. #x4840)	; ø»‹ž
+    (chinese-big5	. #xE2AF)	; ý¢€ŽŠ¯
     (ideograph-daikanwa . 18097)	; ø¸„š±
     ))
 (define-char
@@ -12819,42 +14290,59 @@
     (ucs-jis			. #x6EFE)	; ø½‹¹
     ))
 (define-char
-  '((morohashi-daikanwa	18098 0 0)
+  '((=>ucs		. #x6EFE)	; 滾
+    (morohashi-daikanwa	18098 0 0)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (japanese-jisx0208-1978	. #x5E78)	; ø»ƒ–½
     (japanese-jisx0208		. #x5E78)	; ø»‡«…
     (korean-ksc5601		. #x4D63)	; ø»‰›¶
-    (ucs			. #x6EFE)	; 滾
+    (chinese-big5		. #xBA75)	; ý¢€‹©µ
+    ))
+(define-char
+  '((morohashi-daikanwa	18098 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (ucs		. #x6EFE)	; 滾
     ))
 (define-char
   '((=>ucs		. #x6EFE)	; 滾
-    (morohashi-daikanwa	18098 0 1)
+    (morohashi-daikanwa	18098 0 2)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-1 . #x693E)	; ø»’¬©
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6EFF)	; 滿
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (shinjigen-2	. 4356)
     (japanese-jisx0208-1978	. #x5E60)	; ø»ƒ–¥
     (japanese-jisx0208		. #x5E60)	; ø»‡ª­
     (korean-ksc5601		. #x583B)	; ø»‰«˜
-    (chinese-cns11643-1		. #x6948)	; ø»’¬³
     (japanese-jisx0208-1990	. #x5E60)	; ø½‹¡
-    (chinese-gb12345		. #x427A)	; 滿
+    (chinese-big5		. #xBAA1)	; ý¢€‹ª¡
     (ideograph-daikanwa		. 18099)	; ø¸„š³
-    (ucs			. #x6EFF)	; 滿
+    ))
+(define-char
+  '((morohashi-daikanwa	18099 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-1 . #x6948)	; ø»’¬³
+    (chinese-gb12345	. #x427A)	; 滿
+    (ucs		. #x6EFF)	; 滿
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (chinese-cns11643-2 . #x515B)	; ø»”“º
+    (chinese-big5	. #xE653)	; ý¢€Ž™“
     (ideograph-daikanwa . 18100)	; ø¸„š´
     (ucs		. #x6F00)	; 漀
     ))
@@ -12869,11 +14357,21 @@
     (chinese-cns11643-1		. #x6955)	; ø»’­€
     (japanese-jisx0208-1990	. #x3579)	; ø½Š”¬
     (chinese-gb12345		. #x5366)	; 漁
+    (chinese-big5		. #xBAAE)	; ý¢€‹ª®
     (ideograph-daikanwa		. 18101)	; ø¸„šµ
     (ucs			. #x6F01)	; 漁
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F02)	; 漂
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-1 . #x6946)	; ø»’¬±
+    (ideograph-daikanwa . 18102)	; ø¸„š¶
+    ))
+(define-char
+  '((morohashi-daikanwa	18102 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (shinjigen-2	. 4439)
@@ -12882,9 +14380,8 @@
     (japanese-jisx0208		. #x493A)	; ø»‡‹‘
     (korean-ksc5601		. #x7877)	; ø»Š›”
     (chinese-isoir165		. #x462F)	; ø»¤¸
-    (chinese-cns11643-1		. #x6946)	; ø»’¬±
     (japanese-jisx0208-1990	. #x493A)	; ø½Š±…
-    (ideograph-daikanwa		. 18102)	; ø¸„š¶
+    (chinese-big5		. #xBA7D)	; ý¢€‹©½
     (ucs			. #x6F02)	; 漂
     ))
 (define-char
@@ -12892,6 +14389,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (chinese-big5	. #xE26F)	; ý¢€Ž‰¯
     (ideograph-daikanwa . 18104)	; ø¸„š¸
     ))
 (define-char
@@ -12932,6 +14430,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x4B54)	; ø»”Š¿
+    (chinese-big5	. #xE2AE)	; ý¢€ŽŠ®
     (ideograph-daikanwa . 18107)	; ø¸„š»
     (ucs		. #x6F05)	; 漅
     ))
@@ -12947,6 +14446,7 @@
     (chinese-isoir165		. #x4661)	; ø»¥ª
     (chinese-cns11643-1		. #x694A)	; ø»’¬µ
     (japanese-jisx0208-1990	. #x3C3F)	; ø½Šž„
+    (chinese-big5		. #xBAA3)	; ý¢€‹ª£
     (ideograph-daikanwa		. 18108)	; ø¸„š¼
     (ucs			. #x6F06)	; 漆
     ))
@@ -12970,17 +14470,16 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x4B51)	; ø»”Š¼
+    (chinese-big5	. #xE2AB)	; ý¢€ŽŠ«
     (ideograph-daikanwa . 18110)	; ø¸„š¾
     (ucs		. #x6F07)	; 漇
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F08)	; 漈
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (japanese-jisx0212	. #x4842)	; ø»‹žƒ
     (ideograph-daikanwa . 18111)	; ø¸„š¿
-    (china3-jef		. #x56EC)	; øº…›¬
-    (ucs		. #x6F08)	; 漈
     ))
 (define-char
   '((=>ucs		. #x6F08)	; 漈
@@ -12991,18 +14490,43 @@
     (chinese-cns11643-2 . #x4B5E)	; ø»”‹‰
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	18111 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (japanese-jisx0212	. #x4842)	; ø»‹žƒ
+    (chinese-big5	. #xE2B8)	; ý¢€ŽŠ¸
+    (china3-jef		. #x56EC)	; øº…›¬
+    (ucs		. #x6F08)	; 漈
+    ))
+(define-char
+  '((=>ucs		. #x6F09)	; 漉
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (shinjigen-2	. 4448)
     (japanese-jisx0208-1978	. #x3977)	; ø»‚ ¦
-    (chinese-gb2312		. #x6475)	; ø»…©²
     (japanese-jisx0208		. #x3977)	; ø»†´®
-    (chinese-isoir165		. #x6475)	; ø»Ž’‚
-    (chinese-cns11643-2		. #x4B3D)	; ø»”Š¨
     (japanese-jisx0208-1990	. #x3977)	; ø½Šš¢
+    (chinese-big5		. #xE275)	; ý¢€Ž‰µ
     (ideograph-daikanwa		. 18112)	; ø¸„›€
-    (ucs			. #x6F09)	; 漉
+    ))
+(define-char
+  '((morohashi-daikanwa	18112 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-gb2312	. #x6475)	; ø»…©²
+    (chinese-isoir165	. #x6475)	; ø»Ž’‚
+    (ucs		. #x6F09)	; 漉
+    ))
+(define-char
+  '((=>ucs		. #x6F09)	; 漉
+    (morohashi-daikanwa	18112 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-2 . #x4B3D)	; ø»”Š¨
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -13010,6 +14534,7 @@
     (total-strokes	 . 14)
     (japanese-jisx0212		. #x4843)	; ø»‹ž„
     (japanese-jisx0213-2	. #x6F2C)	; ø»¦¯
+    (chinese-big5		. #xE27E)	; ý¢€Ž‰¾
     (ideograph-daikanwa		. 18113)	; ø¸„›
     (ucs			. #x6F0A)	; 漊
     ))
@@ -13038,6 +14563,7 @@
     (total-strokes	 . 14)
     (japanese-jisx0212	. #x4845)	; ø»‹ž†
     (chinese-cns11643-2 . #x4B5C)	; ø»”‹‡
+    (chinese-big5	. #xE2B6)	; ý¢€ŽŠ¶
     (ideograph-daikanwa . 18116)	; ø¸„›„
     (china3-jef		. #x56EE)	; øº…›®
     (ucs		. #x6F0D)	; 漍
@@ -13063,6 +14589,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x4B52)	; ø»”Š½
+    (chinese-big5	. #xE2AC)	; ý¢€ŽŠ¬
     (ideograph-daikanwa . 18119)	; ø¸„›‡
     (ucs		. #x6F0E)	; 漎
     ))
@@ -13076,12 +14603,20 @@
     (japanese-jisx0208		. #x4F33)	; ø»‡“¾
     (korean-ksc5601		. #x5729)	; ø»‰©¨
     (chinese-isoir165		. #x4229)	; ø»žº
-    (chinese-cns11643-1		. #x6945)	; ø»’¬°
     (japanese-jisx0208-1990	. #x4F33)	; ø½Š¹²
+    (chinese-big5		. #xBA7C)	; ý¢€‹©¼
     (ideograph-daikanwa		. 18120)	; ø¸„›ˆ
     (ucs			. #x6F0F)	; 漏
     ))
 (define-char
+  '((=>ucs		. #x6F0F)	; 漏
+    (morohashi-daikanwa	18120 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-1 . #x6945)	; ø»’¬°
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
@@ -13126,44 +14661,72 @@
     (korean-ksc5601		. #x4B49)	; ø»‰˜ 
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F12)	; 漒
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x4B44)	; ø»”Š¯
+    (chinese-big5	. #xE27C)	; ý¢€Ž‰¼
     (ideograph-daikanwa . 18124)	; ø¸„›Œ
     (china3-jef		. #x8EF7)	; øºˆ»·
+    ))
+(define-char
+  '((morohashi-daikanwa	18124 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
     (ucs		. #x6F12)	; 漒
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F13)	; 漓
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
-    (kangxi-strokes	 . 10)
     (total-strokes	 . 14)
-    (daikanwa-radical	. 85)
-    (daikanwa-strokes	. 11)
     (japanese-jisx0208-1978	. #x5F22)	; ø»ƒ—…
-    (chinese-gb2312		. #x406C)	; ø»„´±
     (japanese-jisx0208		. #x5F22)	; ø»‡«
-    (chinese-isoir165		. #x406C)	; ø»
-    (chinese-cns11643-1		. #x693F)	; ø»’¬ª
     (japanese-jisx0208-1990	. #x5F22)	; ø½‹‘
+    (chinese-big5		. #xBA76)	; ý¢€‹©¶
     (ideograph-daikanwa		. 18127)	; ø¸„›
-    (ucs			. #x6F13)	; 漓
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	18127 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-gb2312	. #x406C)	; ø»„´±
+    (chinese-isoir165	. #x406C)	; ø»
+    (ucs		. #x6F13)	; 漓
+    ))
+(define-char
+  '((=>ucs		. #x6F13)	; 漓
+    (morohashi-daikanwa	18127 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-1 . #x693F)	; ø»’¬ª
+    ))
+(define-char
+  '((=>ucs		. #x6F14)	; 演
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (shinjigen-2	. 4414)
     (japanese-jisx0208-1978	. #x3169)	; ø»‚”¨
-    (chinese-gb2312		. #x515D)	; ø»… 
     (japanese-jisx0208		. #x3169)	; ø»†¨°
     (korean-ksc5601		. #x6651)	; ø»Š€’
-    (chinese-isoir165		. #x515D)	; ø»µ°
-    (chinese-cns11643-1		. #x693D)	; ø»’¬¨
     (japanese-jisx0208-1990	. #x3169)	; ø½ŠŽ¤
+    (chinese-big5		. #xBA74)	; ý¢€‹©´
     (ideograph-daikanwa		. 18130)	; ø¸„›’
-    (ucs			. #x6F14)	; 演
+    ))
+(define-char
+  '((morohashi-daikanwa	18130 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-gb2312	. #x515D)	; ø»… 
+    (chinese-isoir165	. #x515D)	; ø»µ°
+    (chinese-cns11643-1 . #x693D)	; ø»’¬¨
+    (ucs		. #x6F14)	; 演
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -13177,6 +14740,7 @@
     (chinese-isoir165		. #x646E)	; ø»Ž‘»
     (chinese-cns11643-1		. #x694F)	; ø»’¬º
     (japanese-jisx0208-1990	. #x4166)	; ø½Š¦
+    (chinese-big5		. #xBAA8)	; ý¢€‹ª¨
     (ideograph-daikanwa		. 18131)	; ø¸„›“
     (ucs			. #x6F15)	; 漕
     ))
@@ -13203,6 +14767,7 @@
     (total-strokes	 . 14)
     (japanese-jisx0212		. #x4847)	; ø»‹žˆ
     (japanese-jisx0213-2	. #x6F2E)	; ø»¦±
+    (chinese-big5		. #xE27A)	; ý¢€Ž‰º
     (ideograph-daikanwa		. 18135)	; ø¸„›—
     (ucs			. #x6F18)	; 漘
     ))
@@ -13219,6 +14784,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x4B3F)	; ø»”Šª
+    (chinese-big5	. #xE277)	; ý¢€Ž‰·
     (ideograph-daikanwa . 18136)	; ø¸„›˜
     (ucs		. #x6F19)	; 漙
     ))
@@ -13259,6 +14825,7 @@
     (japanese-jisx0212		. #x4848)	; ø»‹ž‰
     (japanese-jisx0213-1	. #x7724)	; ø»¤‘“
     (chinese-gb12345		. #x453D)	; 漚
+    (chinese-big5		. #xE278)	; ý¢€Ž‰¸
     (ideograph-daikanwa		. 18139)	; ø¸„››
     (china3-jef			. #x56F0)	; øº…›°
     (ucs			. #x6F1A)	; 漚
@@ -13315,6 +14882,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x4B58)	; ø»”‹ƒ
+    (chinese-big5	. #xE2B2)	; ý¢€ŽŠ²
     (ideograph-daikanwa . 18144)	; ø¸„› 
     (ucs		. #x6F1C)	; 漜
     ))
@@ -13349,11 +14917,19 @@
     (ucs		. #x6F1D)	; 漝
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F1E)	; 漞
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (chinese-cns11643-2 . #x4B5D)	; ø»”‹ˆ
+    (chinese-big5	. #xE2B7)	; ý¢€ŽŠ·
     (ideograph-daikanwa . 18147)	; ø¸„›£
+    ))
+(define-char
+  '((morohashi-daikanwa	18147 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-2 . #x4B5D)	; ø»”‹ˆ
     (ucs		. #x6F1E)	; 漞
     ))
 (define-char
@@ -13361,21 +14937,37 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x4B5B)	; ø»”‹†
+    (chinese-big5	. #xE2B5)	; ý¢€ŽŠµ
     (ideograph-daikanwa . 18148)	; ø¸„›¤
     (ucs		. #x6F1F)	; 漟
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F20)	; æ¼ 
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (ideograph-daikanwa . 18149)	; ø¸„›¥
+    ))
+(define-char
+  '((=>ucs		. #x6F20)	; æ¼ 
+    (morohashi-daikanwa	18149 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (chinese-cns11643-1 . #x6943)	; ø»’¬®
+    ))
+(define-char
+  '((morohashi-daikanwa	18149 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
     (japanese-jisx0208-1978	. #x4779)	; ø»‚µŒ
     (chinese-gb2312		. #x442E)	; ø»„¹«
     (japanese-jisx0208		. #x4779)	; ø»‡‰”
     (korean-ksc5601		. #x582E)	; ø»‰«‹
     (chinese-isoir165		. #x442E)	; ø»¡»
-    (chinese-cns11643-1		. #x6943)	; ø»’¬®
     (japanese-jisx0208-1990	. #x4779)	; ø½Š¯ˆ
-    (ideograph-daikanwa		. 18149)	; ø¸„›¥
+    (chinese-big5		. #xBA7A)	; ý¢€‹©º
     (ucs			. #x6F20)	; æ¼ 
     ))
 (define-char
@@ -13383,29 +14975,38 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x4B5F)	; ø»”‹Š
+    (chinese-big5	. #xE2B9)	; ý¢€ŽŠ¹
     (ideograph-daikanwa . 18151)	; ø¸„›§
     (ucs		. #x6F21)	; 漡
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
-    (japanese-strokes	 . 10)
     (total-strokes	 . 14)
     (korean-ksc5601		. #x7953)	; ø»ŠœŽ
-    (chinese-cns11643-1		. #x6947)	; ø»’¬²
     (japanese-jisx0213-1	. #x7725)	; ø»¤‘”
     (chinese-gb12345		. #x3A3A)	; æ¼¢
+    (chinese-big5		. #xBA7E)	; ý¢€‹©¾
     (ideograph-daikanwa		. 18153)	; ø¸„›©
     (china3-jef			. #x56E6)	; øº…›¦
     (ucs			. #x6F22)	; æ¼¢
     ))
 (define-char
+  '((=>ucs		. #x6F22)	; æ¼¢
+    (morohashi-daikanwa	18153 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-1 . #x6947)	; ø»’¬²
+    ))
+(define-char
   '((=>ucs		. #x6F23)	; æ¼£
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (japanese-jisx0208-1978	. #x4E7A)	; ø»‚¿Ÿ
     (korean-ksc5601		. #x557E)	; ø»‰¨
+    (chinese-big5		. #xBAA7)	; ý¢€‹ª§
     (ideograph-daikanwa		. 18155)	; ø¸„›«
     ))
 (define-char
@@ -13450,15 +15051,23 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (japanese-jisx0213-2	. #x6F2F)	; ø»¦²
+    (chinese-big5		. #xE270)	; ý¢€Ž‰°
     (ideograph-daikanwa		. 18158)	; ø¸„›®
     (china3-jef			. #x56F1)	; øº…›±
     ))
 (define-char
-  '((morohashi-daikanwa	18158 0 0)
+  '((=>ucs		. #x6F25)	; æ¼¥
+    (morohashi-daikanwa	18158 0 0)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x4B38)	; ø»”Š£
+    ))
+(define-char
+  '((morohashi-daikanwa	18158 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
     (ucs		. #x6F25)	; æ¼¥
     ))
 (define-char
@@ -13467,6 +15076,7 @@
     (total-strokes	 . 15)
     (japanese-jisx0212	. #x484A)	; ø»‹ž‹
     (chinese-cns11643-2 . #x5143)	; ø»”“¢
+    (chinese-big5	. #xE5FA)	; ý¢€Ž—º
     (ideograph-daikanwa . 18160)	; ø¸„›°
     (ucs		. #x6F26)	; 漦
     ))
@@ -13475,6 +15085,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x4B41)	; ø»”Š¬
+    (chinese-big5	. #xE279)	; ý¢€Ž‰¹
     (ideograph-daikanwa . 18161)	; ø¸„›±
     (ucs		. #x6F27)	; 漧
     ))
@@ -13494,14 +15105,22 @@
     (ucs		. #x6F28)	; 漨
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F29)	; 漩
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (chinese-gb2312	. #x6476)	; ø»…©³
     (japanese-jisx0212	. #x484B)	; ø»‹žŒ
+    (chinese-big5	. #xBA78)	; ý¢€‹©¸
+    (ideograph-daikanwa . 18163)	; ø¸„›³
+    ))
+(define-char
+  '((morohashi-daikanwa	18163 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-gb2312	. #x6476)	; ø»…©³
     (chinese-isoir165	. #x6476)	; ø»Ž’ƒ
     (chinese-cns11643-1 . #x6941)	; ø»’¬¬
-    (ideograph-daikanwa . 18163)	; ø¸„›³
     (ucs		. #x6F29)	; 漩
     ))
 (define-char
@@ -13513,12 +15132,22 @@
     (chinese-isoir165		. #x6474)	; ø»Ž’
     (chinese-cns11643-1		. #x6953)	; ø»’¬¾
     (japanese-jisx0213-1	. #x7726)	; ø»¤‘•
+    (chinese-big5		. #xBAAC)	; ý¢€‹ª¬
     (ideograph-daikanwa		. 18164)	; ø¸„›´
     (china3-jef			. #x91FC)	; øº‰‡¼
     (ucs			. #x6F2A)	; 漪
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F2B)	; 漫
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-1 . #x6950)	; ø»’¬»
+    (ideograph-daikanwa . 18166)	; ø¸„›¶
+    ))
+(define-char
+  '((morohashi-daikanwa	18166 0 1)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (japanese-jisx0208-1978	. #x4C21)	; ø»‚»Š
@@ -13526,9 +15155,8 @@
     (japanese-jisx0208		. #x4C21)	; ø»‡’
     (korean-ksc5601		. #x583C)	; ø»‰«™
     (chinese-isoir165		. #x427E)	; ø» 
-    (chinese-cns11643-1		. #x6950)	; ø»’¬»
     (japanese-jisx0208-1990	. #x4C21)	; ø½Šµ†
-    (ideograph-daikanwa		. 18166)	; ø¸„›¶
+    (chinese-big5		. #xBAA9)	; ý¢€‹ª©
     (ucs			. #x6F2B)	; 漫
     ))
 (define-char
@@ -13542,15 +15170,24 @@
     (chinese-cns11643-1		. #x6944)	; ø»’¬¯
     (japanese-jisx0208-1990	. #x4452)	; ø½Šª‡
     (chinese-gb12345		. #x5755)	; 漬
+    (chinese-big5		. #xBA7B)	; ý¢€‹©»
     (ideograph-daikanwa		. 18167)	; ø¸„›·
     (ucs			. #x6F2C)	; 漬
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F2E)	; æ¼®
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (chinese-cns11643-2 . #x4B3C)	; ø»”Š§
+    (chinese-big5	. #xE274)	; ý¢€Ž‰´
     (ideograph-daikanwa . 18168)	; ø¸„›¸
+    ))
+(define-char
+  '((morohashi-daikanwa	18168 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-2 . #x4B3C)	; ø»”Š§
     (ucs		. #x6F2E)	; æ¼®
     ))
 (define-char
@@ -13561,6 +15198,7 @@
     (japanese-jisx0212		. #x484D)	; ø»‹žŽ
     (chinese-cns11643-1		. #x6951)	; ø»’¬¼
     (japanese-jisx0213-1	. #x7727)	; ø»¤‘–
+    (chinese-big5		. #xBAAA)	; ý¢€‹ªª
     (ideograph-daikanwa		. 18169)	; ø¸„›¹
     (china3-jef			. #x9FCE)	; øº‰¿Ž
     ))
@@ -13574,12 +15212,20 @@
     (ucs		. #x6F2F)	; 漯
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F30)	; æ¼°
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (japanese-jisx0212	. #x484E)	; ø»‹ž
-    (chinese-cns11643-2 . #x4B4D)	; ø»”Š¸
     (ideograph-daikanwa . 18170)	; ø¸„›º
+    ))
+(define-char
+  '((morohashi-daikanwa	18170 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-2 . #x4B4D)	; ø»”Š¸
+    (chinese-big5	. #xE2A7)	; ý¢€ŽŠ§
     (ucs		. #x6F30)	; æ¼°
     ))
 (define-char
@@ -13594,6 +15240,7 @@
     (chinese-isoir165		. #x4A7E)	; ø»«¿
     (chinese-cns11643-1		. #x694B)	; ø»’¬¶
     (japanese-jisx0208-1990	. #x5E7B)	; ø½‹¼
+    (chinese-big5		. #xBAA4)	; ý¢€‹ª¤
     (ideograph-daikanwa		. 18171)	; ø¸„›»
     (ucs			. #x6F31)	; æ¼±
     ))
@@ -13617,6 +15264,7 @@
     (chinese-cns11643-1		. #x694D)	; ø»’¬¸
     (japanese-jisx0208-1990	. #x5E7D)	; ø½‹¾
     (chinese-gb12345		. #x5547)	; æ¼²
+    (chinese-big5		. #xBAA6)	; ý¢€‹ª¦
     (ideograph-daikanwa		. 18173)	; ø¸„›½
     (ucs			. #x6F32)	; æ¼²
     ))
@@ -13627,6 +15275,7 @@
     (total-strokes	 . 14)
     (japanese-jisx0212		. #x484F)	; ø»‹ž
     (japanese-jisx0213-1	. #x7728)	; ø»¤‘—
+    (chinese-big5		. #xBA73)	; ý¢€‹©³
     (ideograph-daikanwa		. 18174)	; ø¸„›¾
     (china3-jef			. #x56F2)	; øº…›²
     ))
@@ -13653,6 +15302,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x4B4F)	; ø»”Šº
+    (chinese-big5	. #xE2A9)	; ý¢€ŽŠ©
     (ideograph-daikanwa . 18176)	; ø¸„œ€
     (ucs		. #x6F35)	; æ¼µ
     ))
@@ -13665,16 +15315,25 @@
     (chinese-isoir165		. #x6471)	; ø»Ž‘¾
     (chinese-cns11643-2		. #x4B47)	; ø»”Š²
     (japanese-jisx0213-2	. #x6F30)	; ø»¦³
+    (chinese-big5		. #xE2A1)	; ý¢€ŽŠ¡
     (ideograph-daikanwa		. 18177)	; ø¸„œ
     (ucs			. #x6F36)	; 漶
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F37)	; æ¼·
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-big5	. #xE272)	; ý¢€Ž‰²
+    (ideograph-daikanwa . 18178)	; ø¸„œ‚
+    ))
+(define-char
+  '((morohashi-daikanwa	18178 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-isoir165	. #x7D2B)	; ø»Žµ¦
     (chinese-cns11643-2 . #x4B3A)	; ø»”Š¥
-    (ideograph-daikanwa . 18178)	; ø¸„œ‚
     (ucs		. #x6F37)	; æ¼·
     ))
 (define-char
@@ -13688,6 +15347,7 @@
     (chinese-cns11643-1		. #x694C)	; ø»’¬·
     (japanese-jisx0208-1990	. #x4132)	; ø½Š¥
     (chinese-gb12345		. #x3D25)	; 漸
+    (chinese-big5		. #xBAA5)	; ý¢€‹ª¥
     (ideograph-daikanwa		. 18179)	; ø¸„œƒ
     (ucs			. #x6F38)	; 漸
     ))
@@ -13696,6 +15356,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x4B57)	; ø»”‹‚
+    (chinese-big5	. #xE2B1)	; ý¢€ŽŠ±
     (ideograph-daikanwa . 18180)	; ø¸„œ„
     (ucs		. #x6F39)	; æ¼¹
     ))
@@ -13704,6 +15365,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x4B5A)	; ø»”‹…
+    (chinese-big5	. #xE2B4)	; ý¢€ŽŠ´
     (ideograph-daikanwa . 18181)	; ø¸„œ…
     (ucs		. #x6F3A)	; 漺
     ))
@@ -13713,6 +15375,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (japanese-jisx0212	. #x4851)	; ø»‹ž’
+    (chinese-big5	. #xE27B)	; ý¢€Ž‰»
     (ideograph-daikanwa . 18182)	; ø¸„œ†
     (china3-jef		. #x56F3)	; øº…›³
     ))
@@ -13721,16 +15384,24 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (chinese-cns11643-2 . #x4B43)	; ø»”Š®
     (ucs		. #x6F3B)	; æ¼»
     ))
 (define-char
+  '((=>ucs		. #x6F3B)	; æ¼»
+    (morohashi-daikanwa	18182 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-2 . #x4B43)	; ø»”Š®
+    ))
+(define-char
   '((=>ucs		. #x6F3C)	; æ¼¼
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (japanese-jisx0212		. #x4852)	; ø»‹ž“
     (japanese-jisx0213-2	. #x6F31)	; ø»¦´
+    (chinese-big5		. #xE2A8)	; ý¢€ŽŠ¨
     (ideograph-daikanwa		. 18183)	; ø¸„œ‡
     ))
 (define-char
@@ -13750,6 +15421,7 @@
     (chinese-isoir165		. #x517A)	; ø»¶
     (chinese-cns11643-1		. #x6942)	; ø»’¬­
     (japanese-jisx0208-1990	. #x5F21)	; ø½‹‘€
+    (chinese-big5		. #xBA79)	; ý¢€‹©¹
     (ideograph-daikanwa		. 18184)	; ø¸„œˆ
     (ucs			. #x6F3E)	; æ¼¾
     ))
@@ -13772,6 +15444,7 @@
     (korean-ksc5601		. #x6D6C)	; ø»ŠŠ¿
     (japanese-jisx0208-1990	. #x5E79)	; ø½‹º
     (chinese-gb12345		. #x3D2C)	; 漿
+    (chinese-big5		. #xBCDF)	; ý¢€‹³Ÿ
     (ideograph-daikanwa		. 18185)	; ø¸„œ‰
     (ucs			. #x6F3F)	; 漿
     ))
@@ -13799,19 +15472,20 @@
     (ucs		. #x23EE4)	; 𣻤
     ))
 (define-char
-  '((=>ucs		. #x6F40)	; 潀
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (chinese-cns11643-2 . #x4B4C)	; ø»”Š·
     (ideograph-daikanwa . 18187)	; ø¸„œ‹
+    (ucs		. #x6F40)	; 潀
     ))
 (define-char
-  '((morohashi-daikanwa	18187 0 3)
+  '((=>ucs		. #x6F40)	; 潀
+    (morohashi-daikanwa	18187 0 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (chinese-cns11643-2 . #x4B4C)	; ø»”Š·
-    (ucs		. #x6F40)	; 潀
+    (chinese-big5	. #xE2A6)	; ý¢€ŽŠ¦
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -13823,6 +15497,7 @@
     (korean-ksc5601		. #x6738)	; ø»Š—
     (japanese-jisx0208-1990	. #x5E73)	; ø½‹´
     (chinese-gb12345		. #x7223)	; 潁
+    (chinese-big5		. #xE5F9)	; ý¢€Ž—¹
     (ideograph-daikanwa		. 18188)	; ø¸„œŒ
     (ucs			. #x6F41)	; 潁
     ))
@@ -13970,6 +15645,7 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (chinese-big5	. #xE2AD)	; ý¢€ŽŠ­
     (ideograph-daikanwa . 18202)	; ø¸„œš
     (ucs		. #x6F43)	; 潃
     ))
@@ -14386,6 +16062,7 @@
     (chinese-gb2312	. #x645D)	; ø»…©š
     (japanese-jisx0212	. #x4853)	; ø»‹ž”
     (chinese-isoir165	. #x645D)	; ø»Ž‘ª
+    (chinese-big5	. #xE2A5)	; ý¢€ŽŠ¥
     (ucs		. #x6F2D)	; æ¼­
     ))
 (define-char
@@ -14408,6 +16085,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
+    (chinese-big5	. #xE276)	; ý¢€Ž‰¶
     (ideograph-daikanwa . 18220)	; ø¸„œ¬
     ))
 (define-char
@@ -14425,6 +16103,7 @@
     (total-strokes	 . 15)
     (japanese-jisx0212	. #x4854)	; ø»‹ž•
     (chinese-cns11643-2 . #x514C)	; ø»”“«
+    (chinese-big5	. #xE644)	; ý¢€Ž™„
     (ideograph-daikanwa . 18221)	; ø¸„œ­
     (china3-jef		. #x8DD3)	; øºˆ·“
     ))
@@ -14436,11 +16115,19 @@
     (ucs		. #x6F4F)	; 潏
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F50)	; 潐
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (chinese-cns11643-2 . #x5156)	; ø»”“µ
+    (chinese-big5	. #xE64E)	; ý¢€Ž™Ž
     (ideograph-daikanwa . 18223)	; ø¸„œ¯
+    ))
+(define-char
+  '((morohashi-daikanwa	18223 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (chinese-cns11643-2 . #x5156)	; ø»”“µ
     (ucs		. #x6F50)	; 潐
     ))
 (define-char
@@ -14448,21 +16135,30 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (japanese-jisx0208-1978	. #x482E)	; ø»‚µŸ
-    (korean-ksc5601		. #x5A7E)	; ø»‰¯—
     (japanese-jisx0212		. #x4855)	; ø»‹ž–
-    (chinese-cns11643-1		. #x6D4C)	; ø»’²¯
     (japanese-jisx0213-1	. #x7729)	; ø»¤‘˜
     (chinese-gb12345		. #x4643)	; 潑
     (ideograph-daikanwa		. 18225)	; ø¸„œ±
     (ucs			. #x6F51)	; 潑
     ))
 (define-char
+  '((=>ucs		. #x6F51)	; 潑
+    (morohashi-daikanwa	18225 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (korean-ksc5601	. #x5A7E)	; ø»‰¯—
+    (chinese-cns11643-1 . #x6D4C)	; ø»’²¯
+    (chinese-big5	. #xBCE2)	; ý¢€‹³¢
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (japanese-jisx0212		. #x4856)	; ø»‹ž—
     (chinese-cns11643-2		. #x5155)	; ø»”“´
     (japanese-jisx0213-2	. #x6F33)	; ø»¦¶
+    (chinese-big5		. #xE64D)	; ý¢€Ž™
     (ideograph-daikanwa		. 18226)	; ø¸„œ²
     (ucs			. #x6F52)	; 潒
     ))
@@ -14472,6 +16168,7 @@
     (total-strokes	 . 15)
     (japanese-jisx0212	. #x4857)	; ø»‹ž˜
     (chinese-cns11643-2 . #x5161)	; ø»””€
+    (chinese-big5	. #xE659)	; ý¢€Ž™™
     (ideograph-daikanwa . 18228)	; ø¸„œ´
     (ucs		. #x6F53)	; 潓
     ))
@@ -14480,6 +16177,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (chinese-big5	. #xBCE4)	; ý¢€‹³¤
     (ideograph-daikanwa . 18231)	; ø¸„œ·
     (china3-jef		. #x56F4)	; øº…›´
     ))
@@ -14516,6 +16214,7 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (chinese-cns11643-2 . #x5153)	; ø»”“²
+    (chinese-big5	. #xE64B)	; ý¢€Ž™‹
     (ideograph-daikanwa . 18232)	; ø¸„œ¸
     (ucs		. #x6F55)	; 潕
     ))
@@ -14529,15 +16228,30 @@
     (ucs		. #x6F56)	; 潖
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F57)	; 潗
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (korean-ksc5601		. #x727C)	; ø»Š’¥
     (japanese-jisx0212		. #x4858)	; ø»‹ž™
-    (chinese-cns11643-2		. #x5157)	; ø»”“¶
     (japanese-jisx0213-2	. #x6F34)	; ø»¦·
+    (chinese-big5		. #xE64F)	; ý¢€Ž™
     (ideograph-daikanwa		. 18235)	; ø¸„œ»
-    (ucs			. #x6F57)	; 潗
+    ))
+(define-char
+  '((morohashi-daikanwa	18235 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (ucs		. #x6F57)	; 潗
+    ))
+(define-char
+  '((=>ucs		. #x6F57)	; 潗
+    (morohashi-daikanwa	18235 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (chinese-cns11643-2 . #x5157)	; ø»”“¶
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -14551,6 +16265,7 @@
     (chinese-isoir165		. #x454B)	; ø»£¶
     (chinese-cns11643-1		. #x6D59)	; ø»’²¼
     (japanese-jisx0208-1990	. #x5F2F)	; ø½‹‘Ž
+    (chinese-big5		. #xBCEF)	; ý¢€‹³¯
     (ideograph-daikanwa		. 18236)	; ø¸„œ¼
     (ucs			. #x6F58)	; 潘
     ))
@@ -14582,6 +16297,7 @@
     (japanese-jisx0212		. #x485A)	; ø»‹ž›
     (chinese-cns11643-2		. #x514E)	; ø»”“­
     (japanese-jisx0213-2	. #x6F35)	; ø»¦¸
+    (chinese-big5		. #xE646)	; ý¢€Ž™†
     (ideograph-daikanwa		. 18239)	; ø¸„œ¿
     (china3-jef			. #x56F5)	; øº…›µ
     (ucs			. #x6F5A)	; 潚
@@ -14606,6 +16322,7 @@
     (korean-ksc5601	. #x6D56)	; ø»ŠŠ©
     (chinese-cns11643-1 . #x6D51)	; ø»’²´
     (chinese-gb12345	. #x4731)	; 潛
+    (chinese-big5	. #xBCE7)	; ý¢€‹³§
     (ucs		. #x6F5B)	; 潛
     ))
 (define-char
@@ -14628,6 +16345,7 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (japanese-jisx0212	. #x485B)	; ø»‹žœ
+    (chinese-big5	. #xE652)	; ý¢€Ž™’
     (ideograph-daikanwa . 18242)	; ø¸„‚
     ))
 (define-char
@@ -14647,6 +16365,7 @@
     (japanese-jisx0212		. #x485C)	; ø»‹ž
     (chinese-isoir165		. #x423A)	; ø»Ÿ‹
     (japanese-jisx0213-1	. #x772B)	; ø»¤‘š
+    (chinese-big5		. #xE9F0)	; ý¢€Ž§°
     (ideograph-daikanwa		. 18243)	; ø¸„ƒ
     (china3-jef			. #x91FE)	; øº‰‡¾
     (ucs			. #x6F5E)	; 潞
@@ -14670,6 +16389,7 @@
     (chinese-isoir165		. #x7D30)	; ø»Žµ«
     (chinese-cns11643-1		. #x6D5D)	; ø»’³€
     (japanese-jisx0208-1990	. #x3363)	; ø½Š‘š
+    (chinese-big5		. #xBCF3)	; ý¢€‹³³
     (ideograph-daikanwa		. 18247)	; ø¸„‡
     (ucs			. #x6F5F)	; 潟
     ))
@@ -14679,6 +16399,7 @@
     (total-strokes	 . 15)
     (chinese-cns11643-1		. #x6D5C)	; ø»’²¿
     (japanese-jisx0213-2	. #x6F36)	; ø»¦¹
+    (chinese-big5		. #xBCF2)	; ý¢€‹³²
     (ideograph-daikanwa		. 18248)	; ø¸„ˆ
     (ucs			. #x6F60)	; æ½ 
     ))
@@ -14689,6 +16410,7 @@
     (total-strokes	 . 15)
     (japanese-jisx0212		. #x485D)	; ø»‹žž
     (japanese-jisx0213-1	. #x772C)	; ø»¤‘›
+    (chinese-big5		. #xE654)	; ý¢€Ž™”
     (ideograph-daikanwa		. 18249)	; ø¸„‰
     (china3-jef			. #x56F6)	; øº…›¶
     ))
@@ -14708,6 +16430,7 @@
     (korean-ksc5601		. #x7C52)	; ø»Š §
     (japanese-jisx0212		. #x485E)	; ø»‹žŸ
     (japanese-jisx0213-1	. #x772D)	; ø»¤‘œ
+    (chinese-big5		. #xE643)	; ý¢€Ž™ƒ
     (ideograph-daikanwa		. 18251)	; ø¸„‹
     (china3-jef			. #x56F7)	; øº…›·
     ))
@@ -14746,15 +16469,24 @@
     (chinese-cns11643-1		. #x6D58)	; ø»’²»
     (japanese-jisx0208-1990	. #x3442)	; ø½Š’—
     (chinese-gb12345		. #x3D27)	; 澗
+    (chinese-big5		. #xBCEE)	; ý¢€‹³®
     (china3-jef			. #x57A6)	; øº…ž¦
     (ucs			. #x6F97)	; 澗
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F63)	; æ½£
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (chinese-cns11643-2 . #x5166)	; ø»””…
+    (chinese-big5	. #xE65E)	; ý¢€Ž™ž
     (ideograph-daikanwa . 18254)	; ø¸„Ž
+    ))
+(define-char
+  '((morohashi-daikanwa	18254 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (chinese-cns11643-2 . #x5166)	; ø»””…
     (ucs		. #x6F63)	; æ½£
     ))
 (define-char
@@ -14777,6 +16509,7 @@
     (chinese-cns11643-1		. #x6D57)	; ø»’²º
     (japanese-jisx0208-1990	. #x3D61)	; ø½Š „
     (chinese-gb12345		. #x4873)	; 潤
+    (chinese-big5		. #xBCED)	; ý¢€‹³­
     (ucs			. #x6F64)	; 潤
     ))
 (define-char
@@ -14798,6 +16531,7 @@
     (chinese-isoir165		. #x414A)	; ø»½
     (chinese-cns11643-1		. #x6D4D)	; ø»’²°
     (japanese-jisx0208-1990	. #x5F33)	; ø½‹‘’
+    (chinese-big5		. #xBCE3)	; ý¢€‹³£
     (ideograph-daikanwa		. 18259)	; ø¸„“
     (ucs			. #x6F66)	; 潦
     ))
@@ -14806,6 +16540,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (chinese-big5	. #xE657)	; ý¢€Ž™—
     (ideograph-daikanwa . 18260)	; ø¸„”
     ))
 (define-char
@@ -14846,6 +16581,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (chinese-cns11643-2 . #x5163)	; ø»””‚
+    (chinese-big5	. #xE65B)	; ý¢€Ž™›
     (ucs		. #x6F69)	; 潩
     ))
 (define-char
@@ -14853,6 +16589,7 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (chinese-cns11643-2 . #x5168)	; ø»””‡
+    (chinese-big5	. #xE660)	; ý¢€Ž™ 
     (ideograph-daikanwa . 18267)	; ø¸„›
     (china3-jef		. #x56F8)	; øº…›¸
     (ucs		. #x6F6A)	; 潪
@@ -14862,14 +16599,22 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (chinese-big5	. #xE655)	; ý¢€Ž™•
     (ideograph-daikanwa . 18268)	; ø¸„œ
     ))
 (define-char
-  '((morohashi-daikanwa	18268 0 2)
+  '((=>ucs		. #x6F6B)	; 潫
+    (morohashi-daikanwa	18268 0 2)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (chinese-cns11643-2 . #x515D)	; ø»”“¼
+    ))
+(define-char
+  '((morohashi-daikanwa	18268 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
     (ucs		. #x6F6B)	; 潫
     ))
 (define-char
@@ -14878,6 +16623,7 @@
     (total-strokes	 . 15)
     (japanese-jisx0212	. #x4860)	; ø»‹ž¡
     (chinese-cns11643-2 . #x5151)	; ø»”“°
+    (chinese-big5	. #xE649)	; ý¢€Ž™‰
     (ideograph-daikanwa . 18270)	; ø¸„ž
     (china3-jef		. #x56F9)	; øº…›¹
     (ucs		. #x6F6C)	; 潬
@@ -14902,6 +16648,7 @@
     (chinese-isoir165		. #x4C36)	; ø»­³
     (chinese-cns11643-1		. #x6D50)	; ø»’²³
     (japanese-jisx0208-1990	. #x5F2C)	; ø½‹‘‹
+    (chinese-big5		. #xBCE6)	; ý¢€‹³¦
     (ucs			. #x6F6D)	; æ½­
     ))
 (define-char
@@ -14979,6 +16726,7 @@
     (chinese-isoir165		. #x3331)	; ø»‰€
     (chinese-cns11643-1		. #x6D53)	; ø»’²¶
     (japanese-jisx0208-1990	. #x442C)	; ø½Š©¡
+    (chinese-big5		. #xBCE9)	; ý¢€‹³©
     (ucs			. #x6F6E)	; æ½®
     ))
 (define-char
@@ -15014,6 +16762,7 @@
     (japanese-jisx0208		. #x5F29)	; ø»‡«”
     (chinese-cns11643-1		. #x6D5B)	; ø»’²¾
     (japanese-jisx0208-1990	. #x5F29)	; ø½‹‘ˆ
+    (chinese-big5		. #xBCF1)	; ý¢€‹³±
     (ideograph-daikanwa		. 18280)	; ø¸„¨
     (ucs-jis			. #x6F6F)	; ø»ƒ—Œ
     ))
@@ -15036,6 +16785,7 @@
     (chinese-cns11643-1		. #x6D56)	; ø»’²¹
     (japanese-jisx0208-1990	. #x4459)	; ø½ŠªŽ
     (chinese-gb12345		. #x4023)	; æ½°
+    (chinese-big5		. #xBCEC)	; ý¢€‹³¬
     (ideograph-daikanwa		. 18281)	; ø¸„©
     (ucs			. #x6F70)	; æ½°
     ))
@@ -15052,6 +16802,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (chinese-big5	. #xE64C)	; ý¢€Ž™Œ
     (ideograph-daikanwa . 18285)	; ø¸„­
     ))
 (define-char
@@ -15076,6 +16827,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (chinese-big5	. #xE2A2)	; ý¢€ŽŠ¢
     (ideograph-daikanwa . 18286)	; ø¸„®
     ))
 (define-char
@@ -15144,6 +16896,7 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (chinese-cns11643-2 . #x5150)	; ø»”“¯
+    (chinese-big5	. #xE648)	; ý¢€Ž™ˆ
     (ideograph-daikanwa . 18290)	; ø¸„²
     (china3-jef		. #x92A1)	; øº‰Š¡
     (ucs		. #x6F76)	; 潶
@@ -15154,6 +16907,7 @@
     (total-strokes	 . 15)
     (chinese-cns11643-2 . #x5167)	; ø»””†
     (chinese-gb12345	. #x6464)	; æ½·
+    (chinese-big5	. #xE65F)	; ý¢€Ž™Ÿ
     (ideograph-daikanwa . 18291)	; ø¸„³
     (ucs		. #x6F77)	; æ½·
     ))
@@ -15190,6 +16944,7 @@
     (japanese-jisx0208-1978	. #x5F26)	; ø»ƒ—‰
     (japanese-jisx0208		. #x5F26)	; ø»‡«‘
     (japanese-jisx0208-1990	. #x5F26)	; ø½‹‘…
+    (chinese-big5		. #xBCE8)	; ý¢€‹³¨
     (ucs-jis			. #x6F78)	; ø»ƒ—‰
     ))
 (define-char
@@ -15244,6 +16999,7 @@
     (chinese-isoir165		. #x647D)	; ø»Ž’Š
     (chinese-cns11643-1		. #x6D55)	; ø»’²¸
     (japanese-jisx0208-1990	. #x5F25)	; ø½‹‘„
+    (chinese-big5		. #xBCEB)	; ý¢€‹³«
     (ideograph-daikanwa		. 18298)	; ø¸„º
     (ucs			. #x6F7A)	; 潺
     ))
@@ -15252,23 +17008,32 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (chinese-cns11643-2 . #x5169)	; ø»””ˆ
+    (chinese-big5	. #xE661)	; ý¢€Ž™¡
     (ideograph-daikanwa . 18300)	; ø¸„¼
     (ucs		. #x6F7B)	; æ½»
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F7C)	; æ½¼
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (shinjigen-2	. 4479)
     (japanese-jisx0208-1978	. #x5F2E)	; ø»ƒ—‘
-    (chinese-gb2312		. #x647C)	; ø»…©¹
     (japanese-jisx0208		. #x5F2E)	; ø»‡«™
     (korean-ksc5601		. #x5458)	; ø»‰¥½
-    (chinese-isoir165		. #x647C)	; ø»Ž’‰
-    (chinese-cns11643-1		. #x6D4A)	; ø»’²­
     (japanese-jisx0208-1990	. #x5F2E)	; ø½‹‘
+    (chinese-big5		. #xBCE0)	; ý¢€‹³ 
     (ideograph-daikanwa		. 18302)	; ø¸„¾
-    (ucs			. #x6F7C)	; æ½¼
+    ))
+(define-char
+  '((morohashi-daikanwa	18302 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (chinese-gb2312	. #x647C)	; ø»…©¹
+    (chinese-isoir165	. #x647C)	; ø»Ž’‰
+    (chinese-cns11643-1 . #x6D4A)	; ø»’²­
+    (ucs		. #x6F7C)	; æ½¼
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -15278,6 +17043,7 @@
     (japanese-jisx0212		. #x4861)	; ø»‹ž¢
     (chinese-cns11643-2		. #x515E)	; ø»”“½
     (japanese-jisx0213-2	. #x6F39)	; ø»¦¼
+    (chinese-big5		. #xE656)	; ý¢€Ž™–
     (ideograph-daikanwa		. 18304)	; ø¸„ž€
     (china3-jef			. #x8FAB)	; øºˆ¾«
     (ucs			. #x6F7D)	; æ½½
@@ -15286,6 +17052,7 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (chinese-big5	. #xE5FB)	; ý¢€Ž—»
     (ideograph-daikanwa . 18308)	; ø¸„ž„
     (china3-jef		. #x56FD)	; øº…›½
     (ucs		. #x6F7E)	; æ½¾
@@ -15314,6 +17081,7 @@
     (total-strokes	 . 15)
     (chinese-cns11643-2 . #x5164)	; ø»””ƒ
     (chinese-gb12345	. #x6436)	; 潿
+    (chinese-big5	. #xE65C)	; ý¢€Ž™œ
     (ideograph-daikanwa . 18310)	; ø¸„ž†
     (ucs		. #x6F7F)	; 潿
     ))
@@ -15335,6 +17103,7 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
     (chinese-cns11643-1 . #x742A)	; ø»’¼Ÿ
+    (chinese-big5	. #xC0DF)	; ý¢€ŒƒŸ
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -15350,16 +17119,31 @@
     (ucs			. #x6F81)	; 澁
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F82)	; 澂
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (japanese-jisx0208-1978	. #x5F2D)	; ø»ƒ—
     (japanese-jisx0208		. #x5F2D)	; ø»‡«˜
-    (chinese-isoir165		. #x2D58)	; ø»€³
-    (chinese-cns11643-2		. #x5152)	; ø»”“±
     (japanese-jisx0208-1990	. #x5F2D)	; ø½‹‘Œ
+    (chinese-big5		. #xE64A)	; ý¢€Ž™Š
     (ideograph-daikanwa		. 18313)	; ø¸„ž‰
-    (ucs			. #x6F82)	; 澂
+    ))
+(define-char
+  '((morohashi-daikanwa	18313 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (chinese-isoir165	. #x2D58)	; ø»€³
+    (ucs		. #x6F82)	; 澂
+    ))
+(define-char
+  '((=>ucs		. #x6F82)	; 澂
+    (morohashi-daikanwa	18313 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (chinese-cns11643-2 . #x5152)	; ø»”“±
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -15382,6 +17166,7 @@
     (chinese-isoir165		. #x334E)	; ø»‰
     (chinese-cns11643-1		. #x6D4B)	; ø»’²®
     (japanese-jisx0208-1990	. #x4021)	; ø½Š£ž
+    (chinese-big5		. #xBCE1)	; ý¢€‹³¡
     (ideograph-daikanwa		. 18315)	; ø¸„ž‹
     (ucs			. #x6F84)	; 澄
     ))
@@ -15390,6 +17175,7 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (chinese-cns11643-2 . #x514D)	; ø»”“¬
+    (chinese-big5	. #xE645)	; ý¢€Ž™…
     (ideograph-daikanwa . 18316)	; ø¸„žŒ
     (ucs		. #x6F85)	; 澅
     ))
@@ -15403,6 +17189,7 @@
     (chinese-cns11643-1		. #x6D4F)	; ø»’²²
     (japanese-jisx0208-1990	. #x5F24)	; ø½‹‘ƒ
     (chinese-gb12345		. #x3D3D)	; 澆
+    (chinese-big5		. #xBCE5)	; ý¢€‹³¥
     (ideograph-daikanwa		. 18317)	; ø¸„ž
     (ucs			. #x6F86)	; 澆
     ))
@@ -15411,13 +17198,21 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (japanese-jisx0212	. #x4864)	; ø»‹ž¥
-    (chinese-cns11643-2 . #x5145)	; ø»”“¤
     (chinese-gb12345	. #x4054)	; 澇
+    (chinese-big5	. #xE5FC)	; ý¢€Ž—¼
     (ideograph-daikanwa . 18318)	; ø¸„žŽ
     (china3-jef		. #x98B1)	; øº‰¢±
     (ucs		. #x6F87)	; 澇
     ))
 (define-char
+  '((=>ucs		. #x6F87)	; 澇
+    (morohashi-daikanwa	18318 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (chinese-cns11643-2 . #x5145)	; ø»”“¤
+    ))
+(define-char
   '((=>ucs		. #x6F88)	; 澈
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
@@ -15425,6 +17220,7 @@
     (korean-ksc5601		. #x744D)	; ø»Š”²
     (japanese-jisx0212		. #x4865)	; ø»‹ž¦
     (japanese-jisx0213-1	. #x772F)	; ø»¤‘ž
+    (chinese-big5		. #xBAAB)	; ý¢€‹ª«
     (ideograph-daikanwa		. 18319)	; ø¸„ž
     (china3-jef			. #x56FE)	; øº…›¾
     ))
@@ -15451,6 +17247,7 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (chinese-cns11643-2 . #x5149)	; ø»”“¨
+    (chinese-big5	. #xE641)	; ý¢€Ž™
     (ideograph-daikanwa . 18320)	; ø¸„ž
     (china3-jef		. #x92A2)	; øº‰Š¢
     ))
@@ -15477,6 +17274,7 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (japanese-jisx0212	. #x4866)	; ø»‹ž§
+    (chinese-big5	. #xE65A)	; ý¢€Ž™š
     (ideograph-daikanwa . 18326)	; ø¸„ž–
     (china3-jef		. #x57A1)	; øº…ž¡
     ))
@@ -15497,6 +17295,7 @@
     (chinese-isoir165		. #x6479)	; ø»Ž’†
     (chinese-cns11643-2		. #x514A)	; ø»”“©
     (japanese-jisx0213-1	. #x7730)	; ø»¤‘Ÿ
+    (chinese-big5		. #xE642)	; ý¢€Ž™‚
     (ideograph-daikanwa		. 18328)	; ø¸„ž˜
     (china3-jef			. #x57A2)	; øº…ž¢
     (ucs			. #x6F8C)	; 澌
@@ -15511,6 +17310,7 @@
     (chinese-isoir165		. #x6478)	; ø»Ž’…
     (chinese-cns11643-2		. #x5148)	; ø»”“§
     (japanese-jisx0213-1	. #x7731)	; ø»¤‘ 
+    (chinese-big5		. #xE640)	; ý¢€Ž™€
     (ideograph-daikanwa		. 18329)	; ø¸„ž™
     (china3-jef			. #x57A3)	; øº…ž£
     (ucs			. #x6F8D)	; 澍
@@ -15527,6 +17327,7 @@
     (chinese-isoir165		. #x456C)	; ø»¤—
     (chinese-cns11643-1		. #x6D54)	; ø»’²·
     (japanese-jisx0208-1990	. #x5F30)	; ø½‹‘
+    (chinese-big5		. #xBCEA)	; ý¢€‹³ª
     (ideograph-daikanwa		. 18332)	; ø¸„žœ
     (ucs			. #x6F8E)	; 澎
     ))
@@ -15545,6 +17346,7 @@
     (korean-ksc5601		. #x697A)	; ø»Š…•
     (japanese-jisx0212		. #x4869)	; ø»‹žª
     (japanese-jisx0213-2	. #x6F3A)	; ø»¦½
+    (chinese-big5		. #xE658)	; ý¢€Ž™˜
     (ideograph-daikanwa		. 18334)	; ø¸„žž
     (china3-jef			. #x57A4)	; øº…ž¤
     (ucs			. #x6F90)	; 澐
@@ -15575,62 +17377,102 @@
     (total-strokes	 . 15)
     (japanese-jisx0212	. #x486A)	; ø»‹ž«
     (chinese-cns11643-2 . #x5147)	; ø»”“¦
+    (chinese-big5	. #xE5FE)	; ý¢€Ž—¾
     (ideograph-daikanwa . 18336)	; ø¸„ž 
     (china3-jef		. #x57A5)	; øº…ž¥
     (ucs		. #x6F92)	; 澒
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F93)	; 澓
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (japanese-jisx0212	. #x486B)	; ø»‹ž¬
-    (chinese-cns11643-2 . #x5159)	; ø»”“¸
     (ideograph-daikanwa . 18337)	; ø¸„ž¡
-    (ucs		. #x6F93)	; 澓
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F93)	; 澓
+    (morohashi-daikanwa	18337 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (korean-ksc5601		. #x7B4B)	; ø»ŠŸ‚
-    (japanese-jisx0212		. #x486C)	; ø»‹ž­
-    (chinese-isoir165		. #x2E5F)	; ø»‚˜
-    (chinese-cns11643-2		. #x5158)	; ø»”“·
-    (japanese-jisx0213-1	. #x7732)	; ø»¤‘¡
-    (ideograph-daikanwa		. 18338)	; ø¸„ž¢
-    (ucs			. #x6F94)	; 澔
+    (chinese-cns11643-2 . #x5159)	; ø»”“¸
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	18337 0 1)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (chinese-cns11643-2 . #x5165)	; ø»””„
-    (ideograph-daikanwa . 18347)	; ø¸„ž«
-    (ucs		. #x6F95)	; 澕
+    (japanese-jisx0212	. #x486B)	; ø»‹ž¬
+    (chinese-big5	. #xE651)	; ý¢€Ž™‘
+    (ucs		. #x6F93)	; 澓
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F94)	; 澔
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (japanese-jisx0212		. #x486D)	; ø»‹ž®
-    (chinese-cns11643-2		. #x514F)	; ø»”“®
-    (japanese-jisx0213-2	. #x6F3B)	; ø»¦¾
-    (ideograph-daikanwa		. 18349)	; ø¸„ž­
-    (ucs			. #x6F96)	; 澖
+    (korean-ksc5601		. #x7B4B)	; ø»ŠŸ‚
+    (japanese-jisx0212		. #x486C)	; ø»‹ž­
+    (japanese-jisx0213-1	. #x7732)	; ø»¤‘¡
+    (ideograph-daikanwa		. 18338)	; ø¸„ž¢
     ))
 (define-char
-  '((=>ucs		. #x23F6C)	; 𣽬
+  '((morohashi-daikanwa	18338 0 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (ideograph-daikanwa . 18350)	; ø¸„ž®
+    (chinese-isoir165	. #x2E5F)	; ø»‚˜
+    (chinese-cns11643-2 . #x5158)	; ø»”“·
+    (chinese-big5	. #xE650)	; ý¢€Ž™
+    (ucs		. #x6F94)	; 澔
     ))
 (define-char
-  '((morohashi-daikanwa	18350 0 2)
+  '((=>ucs		. #x6F95)	; 澕
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (chinese-cns11643-7 . #x2441)	; ø»žƒ®
+    (chinese-cns11643-2 . #x5165)	; ø»””„
+    (ideograph-daikanwa . 18347)	; ø¸„ž«
+    ))
+(define-char
+  '((morohashi-daikanwa	18347 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (chinese-big5	. #xE65D)	; ý¢€Ž™
+    (ucs		. #x6F95)	; 澕
+    ))
+(define-char
+  '((=>ucs		. #x6F96)	; 澖
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (ideograph-daikanwa . 18349)	; ø¸„ž­
+    ))
+(define-char
+  '((morohashi-daikanwa	18349 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (japanese-jisx0212		. #x486D)	; ø»‹ž®
+    (chinese-cns11643-2		. #x514F)	; ø»”“®
+    (japanese-jisx0213-2	. #x6F3B)	; ø»¦¾
+    (chinese-big5		. #xE647)	; ý¢€Ž™‡
+    (ucs			. #x6F96)	; 澖
+    ))
+(define-char
+  '((=>ucs		. #x23F6C)	; 𣽬
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (ideograph-daikanwa . 18350)	; ø¸„ž®
+    ))
+(define-char
+  '((morohashi-daikanwa	18350 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (chinese-cns11643-7 . #x2441)	; ø»žƒ®
     (ucs		. #x23F6C)	; 𣽬
     ))
 (define-char
@@ -15939,6 +17781,13 @@
     (ucs		. #x3D6D)	; ãµ­
     ))
 (define-char
+  '((=>ucs		. #x6E88)	; 溈
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (chinese-big5	. #xD9EC)	; ý¢€§¬
+    ))
+(define-char
   '((=>ucs		. #x6F9A)	; 澚
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
@@ -16260,11 +18109,26 @@
     (ucs		. #x23FC7)	; 𣿇
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6F9E)	; 澞
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (chinese-cns11643-2 . #x577E)	; ø»”‘
+    (chinese-big5	. #xE9F3)	; ý¢€Ž§³
     (ideograph-daikanwa . 18375)	; ø¸„Ÿ‡
+    ))
+(define-char
+  '((=>ucs		. #x6F9E)	; 澞
+    (morohashi-daikanwa	18375 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-cns11643-2 . #x577E)	; ø»”‘
+    ))
+(define-char
+  '((morohashi-daikanwa	18375 0 5)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
     (ucs		. #x6F9E)	; 澞
     ))
 (define-char
@@ -16301,6 +18165,7 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (chinese-gb12345	. #x6445)	; æ¾ 
+    (chinese-big5	. #xBF49)	; ý¢€‹½‰
     (ucs		. #x6FA0)	; æ¾ 
     ))
 (define-char
@@ -16312,16 +18177,25 @@
     (chinese-gb2312		. #x5468)	; ø»…’…
     (japanese-jisx0208		. #x5F36)	; ø»‡«¡
     (chinese-isoir165		. #x5468)	; ø»º•
-    (chinese-cns11643-1		. #x7129)	; ø»’¸„
     (japanese-jisx0208-1990	. #x5F36)	; ø½‹‘•
+    (chinese-big5		. #xBEFE)	; ý¢€‹»¾
     (ideograph-daikanwa		. 18379)	; ø¸„Ÿ‹
     (ucs			. #x6FA1)	; 澡
     ))
 (define-char
+  '((=>ucs		. #x6FA1)	; 澡
+    (morohashi-daikanwa	18379 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-cns11643-1 . #x7129)	; ø»’¸„
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (chinese-cns11643-2 . #x582C)	; ø»”
+    (chinese-big5	. #xEA40)	; ý¢€Ž©€
     (ideograph-daikanwa . 18381)	; ø¸„Ÿ
     (ucs		. #x6FA2)	; æ¾¢
     ))
@@ -16335,33 +18209,50 @@
     (korean-ksc5601		. #x7954)	; ø»Šœ
     (chinese-cns11643-2		. #x5776)	; ø»”‰
     (japanese-jisx0208-1990	. #x5F35)	; ø½‹‘”
+    (chinese-big5		. #xE9EB)	; ý¢€Ž§«
     (ideograph-daikanwa		. 18382)	; ø¸„ŸŽ
     (ucs			. #x6FA3)	; æ¾£
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FA4)	; 澤
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (shinjigen-2	. 4091)
     (japanese-jisx0208-1978	. #x5F37)	; ø»ƒ—š
     (japanese-jisx0208		. #x5F37)	; ø»‡«¢
     (korean-ksc5601		. #x774A)	; ø»Š™‰
-    (chinese-cns11643-1		. #x712B)	; ø»’¸†
     (japanese-jisx0208-1990	. #x5F37)	; ø½‹‘–
-    (chinese-gb12345		. #x5473)	; 澤
     (ideograph-daikanwa		. 18383)	; ø¸„Ÿ
-    (ucs			. #x6FA4)	; 澤
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	18383 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-cns11643-1 . #x712B)	; ø»’¸†
+    (chinese-gb12345	. #x5473)	; 澤
+    (chinese-big5	. #xBF41)	; ý¢€‹½
+    (ucs		. #x6FA4)	; 澤
+    ))
+(define-char
+  '((=>ucs		. #x6FA5)	; æ¾¥
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (japanese-jisx0212		. #x4871)	; ø»‹ž²
-    (chinese-isoir165		. #x2C2D)	; ø»Œ¾ª
     (chinese-cns11643-2		. #x5824)	; ø»”•
     (japanese-jisx0213-2	. #x6F3E)	; ø»¦
+    (chinese-big5		. #xE9F7)	; ý¢€Ž§·
     (ideograph-daikanwa		. 18387)	; ø¸„Ÿ“
-    (ucs			. #x6FA5)	; æ¾¥
+    ))
+(define-char
+  '((morohashi-daikanwa	18387 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-isoir165	. #x2C2D)	; ø»Œ¾ª
+    (ucs		. #x6FA5)	; æ¾¥
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -16369,6 +18260,7 @@
     (total-strokes	 . 16)
     (japanese-jisx0212	. #x4872)	; ø»‹ž³
     (chinese-cns11643-1 . #x7132)	; ø»’¸
+    (chinese-big5	. #xBF48)	; ý¢€‹½ˆ
     (ideograph-daikanwa . 18388)	; ø¸„Ÿ”
     (ucs		. #x6FA6)	; 澦
     ))
@@ -16382,6 +18274,7 @@
     (chinese-isoir165		. #x6522)	; ø»Ž’
     (chinese-cns11643-1		. #x712D)	; ø»’¸ˆ
     (japanese-jisx0213-1	. #x7734)	; ø»¤‘£
+    (chinese-big5		. #xBF43)	; ý¢€‹½ƒ
     (ideograph-daikanwa		. 18390)	; ø¸„Ÿ–
     (china3-jef			. #x57A7)	; øº…ž§
     (ucs			. #x6FA7)	; 澧
@@ -16392,6 +18285,7 @@
     (total-strokes	 . 16)
     (japanese-jisx0212	. #x4874)	; ø»‹žµ
     (chinese-cns11643-2 . #x5822)	; ø»”“
+    (chinese-big5	. #xE9F5)	; ý¢€Ž§µ
     (ideograph-daikanwa . 18392)	; ø¸„Ÿ˜
     (ucs		. #x6FA8)	; 澨
     ))
@@ -16401,20 +18295,36 @@
     (total-strokes	 . 17)
     (chinese-cns11643-2 . #x5D3B)	; ø»”¥‚
     (chinese-gb12345	. #x6D34)	; 澩
+    (chinese-big5	. #xED4F)	; ý¢€Žµ
     (ideograph-daikanwa . 18395)	; ø¸„Ÿ›
     (ucs		. #x6FA9)	; 澩
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FAA)	; 澪
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (shinjigen-2	. 4499)
     (japanese-jisx0208-1978	. #x5F3A)	; ø»ƒ—
     (japanese-jisx0208		. #x5F3A)	; ø»‡«¥
-    (chinese-cns11643-2		. #x5828)	; ø»”™
     (japanese-jisx0208-1990	. #x5F3A)	; ø½‹‘™
+    (chinese-big5		. #xE9FB)	; ý¢€Ž§»
     (ideograph-daikanwa		. 18398)	; ø¸„Ÿž
-    (ucs			. #x6FAA)	; 澪
+    ))
+(define-char
+  '((=>ucs		. #x6FAA)	; 澪
+    (morohashi-daikanwa	18398 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-cns11643-2 . #x5828)	; ø»”™
+    ))
+(define-char
+  '((morohashi-daikanwa	18398 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (ucs		. #x6FAA)	; 澪
     ))
 (define-char
   '((=>ucs		. #x6FAB)	; 澫
@@ -16430,14 +18340,30 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (chinese-big5	. #xEA42)	; ý¢€Ž©‚
     (ucs		. #x6FAB)	; 澫
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FAC)	; 澬
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (chinese-cns11643-2 . #x5827)	; ø»”˜
+    (chinese-big5	. #xE9FA)	; ý¢€Ž§º
     (ideograph-daikanwa . 18402)	; ø¸„Ÿ¢
+    ))
+(define-char
+  '((=>ucs		. #x6FAC)	; 澬
+    (morohashi-daikanwa	18402 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-cns11643-2 . #x5827)	; ø»”˜
+    ))
+(define-char
+  '((morohashi-daikanwa	18402 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
     (ucs		. #x6FAC)	; 澬
     ))
 (define-char
@@ -16445,6 +18371,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
+    (chinese-big5	. #xE9E9)	; ý¢€Ž§©
     (ideograph-daikanwa . 18403)	; ø¸„Ÿ£
     (china3-jef		. #x57A9)	; øº…ž©
     ))
@@ -16464,6 +18391,7 @@
     (japanese-jisx0212	. #x4875)	; ø»‹ž¶
     (chinese-cns11643-2 . #x5825)	; ø»”–
     (chinese-gb12345	. #x642B)	; æ¾®
+    (chinese-big5	. #xE9F8)	; ý¢€Ž§¸
     (ideograph-daikanwa . 18405)	; ø¸„Ÿ¥
     (china3-jef		. #x57AA)	; øº…žª
     (ucs		. #x6FAE)	; æ¾®
@@ -16474,13 +18402,21 @@
     (total-strokes	 . 16)
     (korean-ksc5601		. #x733D)	; ø»Š“„
     (japanese-jisx0212		. #x4876)	; ø»‹ž·
-    (chinese-cns11643-2		. #x5830)	; ø»”¡
     (japanese-jisx0213-2	. #x6F3F)	; ø»¦‚
+    (chinese-big5		. #xEA44)	; ý¢€Ž©„
     (ideograph-daikanwa		. 18406)	; ø¸„Ÿ¦
     (china3-jef			. #x57AB)	; øº…ž«
     (ucs			. #x6FAF)	; 澯
     ))
 (define-char
+  '((=>ucs		. #x6FAF)	; 澯
+    (morohashi-daikanwa	18406 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-cns11643-2 . #x5830)	; ø»”¡
+    ))
+(define-char
   '((=>ucs		. #x3D64)	; 㵤
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
@@ -16503,6 +18439,7 @@
     (total-strokes	 . 16)
     (japanese-jisx0212	. #x4877)	; ø»‹ž¸
     (chinese-cns11643-2 . #x5832)	; ø»”£
+    (chinese-big5	. #xEA46)	; ý¢€Ž©†
     (ideograph-daikanwa . 18409)	; ø¸„Ÿ©
     (china3-jef		. #x57AD)	; øº…ž­
     (ucs		. #x6FB0)	; æ¾°
@@ -16527,12 +18464,14 @@
     (total-strokes	 . 16)
     (chinese-cns11643-1 . #x7128)	; ø»’¸ƒ
     (chinese-gb12345	. #x356D)	; æ¾±
+    (chinese-big5	. #xBEFD)	; ý¢€‹»½
     (ucs		. #x6FB1)	; æ¾±
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
+    (chinese-big5	. #xEA45)	; ý¢€Ž©…
     (ideograph-daikanwa . 18411)	; ø¸„Ÿ«
     (ucs		. #x6FB2)	; æ¾²
     ))
@@ -16553,12 +18492,20 @@
     (japanese-jisx0208-1978	. #x5F34)	; ø»ƒ——
     (japanese-jisx0208		. #x5F34)	; ø»‡«Ÿ
     (korean-ksc5601		. #x677E)	; ø»Š‚
-    (chinese-cns11643-1		. #x712E)	; ø»’¸‰
     (japanese-jisx0208-1990	. #x5F34)	; ø½‹‘“
+    (chinese-big5		. #xBF44)	; ý¢€‹½„
     (ideograph-daikanwa		. 18412)	; ø¸„Ÿ¬
     (ucs-jis			. #x6FB3)	; ø»ƒ——
     ))
 (define-char
+  '((=>ucs		. #x6FB3)	; æ¾³
+    (morohashi-daikanwa	18412 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-cns11643-1 . #x712E)	; ø»’¸‰
+    ))
+(define-char
   '((morohashi-daikanwa	18412 0 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
@@ -16573,6 +18520,7 @@
     (total-strokes	 . 16)
     (chinese-isoir165	. #x7D31)	; ø»Žµ¬
     (chinese-cns11643-1 . #x7134)	; ø»’¸
+    (chinese-big5	. #xBF4A)	; ý¢€‹½Š
     (ideograph-daikanwa . 18414)	; ø¸„Ÿ®
     (ucs		. #x6FB4)	; æ¾´
     ))
@@ -16607,6 +18555,7 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (japanese-jisx0212	. #x4879)	; ø»‹žº
+    (chinese-big5	. #xBF47)	; ý¢€‹½‡
     (ideograph-daikanwa . 18416)	; ø¸„Ÿ°
     ))
 (define-char
@@ -16633,56 +18582,103 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (chinese-cns11643-2 . #x582B)	; ø»”œ
+    (chinese-big5	. #xE9FE)	; ý¢€Ž§¾
     (ideograph-daikanwa . 18419)	; ø¸„Ÿ³
     (ucs		. #x6FB8)	; 澸
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FB9)	; æ¾¹
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (shinjigen-2	. 4493)
     (japanese-jisx0208-1978	. #x5F38)	; ø»ƒ—›
-    (chinese-gb2312		. #x6523)	; ø»…©¾
     (japanese-jisx0208		. #x5F38)	; ø»‡«£
     (korean-ksc5601		. #x5342)	; ø»‰¤‰
-    (chinese-isoir165		. #x6523)	; ø»Ž’Ž
-    (chinese-cns11643-1		. #x7130)	; ø»’¸‹
     (japanese-jisx0208-1990	. #x5F38)	; ø½‹‘—
+    (chinese-big5		. #xBF46)	; ý¢€‹½†
     (ideograph-daikanwa		. 18421)	; ø¸„Ÿµ
-    (ucs			. #x6FB9)	; æ¾¹
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FB9)	; æ¾¹
+    (morohashi-daikanwa	18421 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (chinese-cns11643-2 . #x5826)	; ø»”—
+    (chinese-cns11643-1 . #x7130)	; ø»’¸‹
+    ))
+(define-char
+  '((morohashi-daikanwa	18421 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-gb2312	. #x6523)	; ø»…©¾
+    (chinese-isoir165	. #x6523)	; ø»Ž’Ž
+    (ucs		. #x6FB9)	; æ¾¹
+    ))
+(define-char
+  '((=>ucs		. #x6FBA)	; 澺
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-big5	. #xE9F9)	; ý¢€Ž§¹
     (ideograph-daikanwa . 18422)	; ø¸„Ÿ¶
+    ))
+(define-char
+  '((morohashi-daikanwa	18422 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-cns11643-2 . #x5826)	; ø»”—
     (ucs		. #x6FBA)	; 澺
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FBB)	; æ¾»
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (chinese-cns11643-3 . #x514D)	; ø»–°
     (ideograph-daikanwa . 18426)	; ø¸„Ÿº
+    ))
+(define-char
+  '((=>ucs		. #x6FBB)	; æ¾»
+    (morohashi-daikanwa	18426 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-cns11643-3 . #x514D)	; ø»–°
+    ))
+(define-char
+  '((morohashi-daikanwa	18426 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
     (ucs		. #x6FBB)	; æ¾»
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FBC)	; æ¾¼
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (japanese-jisx0212		. #x487A)	; ø»‹ž»
-    (chinese-isoir165		. #x7D32)	; ø»Žµ­
-    (chinese-cns11643-2		. #x5778)	; ø»”‹
     (japanese-jisx0213-1	. #x7736)	; ø»¤‘¥
+    (chinese-big5		. #xE9ED)	; ý¢€Ž§­
     (ideograph-daikanwa		. 18428)	; ø¸„Ÿ¼
-    (ucs			. #x6FBC)	; æ¾¼
+    ))
+(define-char
+  '((morohashi-daikanwa	18428 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-isoir165	. #x7D32)	; ø»Žµ­
+    (chinese-cns11643-2 . #x5778)	; ø»”‹
+    (ucs		. #x6FBC)	; æ¾¼
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (chinese-cns11643-2 . #x577D)	; ø»”
+    (chinese-big5	. #xE9F2)	; ý¢€Ž§²
     (ideograph-daikanwa . 18433)	; ø¸„ 
     (ucs		. #x6FBD)	; æ¾½
     ))
@@ -16698,27 +18694,43 @@
     (ucs			. #x6FBE)	; æ¾¾
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FBF)	; 澿
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (chinese-cns11643-2 . #x582A)	; ø»”›
     (ideograph-daikanwa . 18436)	; ø¸„ „
+    ))
+(define-char
+  '((morohashi-daikanwa	18436 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-big5	. #xE9FD)	; ý¢€Ž§½
     (ucs		. #x6FBF)	; 澿
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FC0)	; 激
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (shinjigen-2	. 4487)
     (japanese-jisx0208-1978	. #x3763)	; ø»‚–
-    (chinese-gb2312		. #x3C24)	; ø»„­±
     (japanese-jisx0208		. #x3763)	; ø»†±ž
     (korean-ksc5601		. #x4C2D)	; ø»‰™¢
-    (chinese-isoir165		. #x3C24)	; ø»–
-    (chinese-cns11643-1		. #x712F)	; ø»’¸Š
     (japanese-jisx0208-1990	. #x3763)	; ø½Š—’
+    (chinese-big5		. #xBF45)	; ý¢€‹½…
     (ideograph-daikanwa		. 18438)	; ø¸„ †
-    (ucs			. #x6FC0)	; 激
+    ))
+(define-char
+  '((morohashi-daikanwa	18438 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-gb2312	. #x3C24)	; ø»„­±
+    (chinese-isoir165	. #x3C24)	; ø»–
+    (chinese-cns11643-1 . #x712F)	; ø»’¸Š
+    (ucs		. #x6FC0)	; 激
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -16731,23 +18743,32 @@
     (chinese-cns11643-1		. #x712C)	; ø»’¸‡
     (japanese-jisx0208-1990	. #x4279)	; ø½Š§²
     (chinese-gb12345		. #x5747)	; 濁
+    (chinese-big5		. #xBF42)	; ý¢€‹½‚
     (ideograph-daikanwa		. 18440)	; ø¸„ ˆ
     (ucs			. #x6FC1)	; 濁
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FC2)	; 濂
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (shinjigen-2	. 4409)
     (japanese-jisx0208-1978	. #x5F32)	; ø»ƒ—•
-    (chinese-gb2312		. #x6525)	; ø»…ª€
     (japanese-jisx0208		. #x5F32)	; ø»‡«
     (korean-ksc5601		. #x5632)	; ø»‰¨“
-    (chinese-isoir165		. #x6525)	; ø»Ž’
-    (chinese-cns11643-1		. #x7127)	; ø»’¸‚
     (japanese-jisx0208-1990	. #x5F32)	; ø½‹‘‘
+    (chinese-big5		. #xBEFC)	; ý¢€‹»¼
     (ideograph-daikanwa		. 18441)	; ø¸„ ‰
-    (ucs			. #x6FC2)	; 濂
+    ))
+(define-char
+  '((morohashi-daikanwa	18441 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-gb2312	. #x6525)	; ø»…ª€
+    (chinese-isoir165	. #x6525)	; ø»Ž’
+    (chinese-cns11643-1 . #x7127)	; ø»’¸‚
+    (ucs		. #x6FC2)	; 濂
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -16760,15 +18781,31 @@
     (chinese-cns11643-1		. #x712A)	; ø»’¸…
     (japanese-jisx0208-1990	. #x473B)	; ø½Š®Š
     (chinese-gb12345		. #x4528)	; 濃
+    (chinese-big5		. #xBF40)	; ý¢€‹½€
     (ideograph-daikanwa		. 18442)	; ø¸„ Š
     (ucs			. #x6FC3)	; 濃
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FC4)	; 濄
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (chinese-cns11643-2 . #x577C)	; ø»”
+    (chinese-big5	. #xE9F1)	; ý¢€Ž§±
     (ideograph-daikanwa . 18443)	; ø¸„ ‹
+    ))
+(define-char
+  '((=>ucs		. #x6FC4)	; 濄
+    (morohashi-daikanwa	18443 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-cns11643-2 . #x577C)	; ø»”
+    ))
+(define-char
+  '((morohashi-daikanwa	18443 0 4)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
     (ucs		. #x6FC4)	; 濄
     ))
 (define-char
@@ -16797,6 +18834,7 @@
     (japanese-jisx0208		. #x5F39)	; ø»‡«¤
     (chinese-cns11643-2		. #x5146)	; ø»”“¥
     (japanese-jisx0208-1990	. #x5F39)	; ø½‹‘˜
+    (chinese-big5		. #xE5FD)	; ý¢€Ž—½
     (ucs			. #x6FC6)	; 濆
     ))
 (define-char
@@ -16806,30 +18844,47 @@
     (japanese-jisx0212		. #x487C)	; ø»‹ž½
     (chinese-cns11643-2		. #x5777)	; ø»”Š
     (japanese-jisx0213-1	. #x7737)	; ø»¤‘¦
+    (chinese-big5		. #xE9EC)	; ý¢€Ž§¬
     (ideograph-daikanwa		. 18448)	; ø¸„ 
     (china3-jef			. #x57B2)	; øº…ž²
     (ucs			. #x6FC7)	; 濇
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FC8)	; 濈
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (japanese-jisx0212		. #x487D)	; ø»‹ž¾
     (chinese-cns11643-2		. #x577A)	; ø»”
     (japanese-jisx0213-2	. #x6F42)	; ø»¦…
+    (chinese-big5		. #xE9EF)	; ý¢€Ž§¯
     (ideograph-daikanwa		. 18450)	; ø¸„ ’
-    (ucs			. #x6FC8)	; 濈
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	18450 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (ucs		. #x6FC8)	; 濈
+    ))
+(define-char
+  '((=>ucs		. #x6FC9)	; 濉
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (chinese-gb2312		. #x6521)	; ø»…©¼
-    (chinese-isoir165		. #x6521)	; ø»Ž’Œ
-    (chinese-cns11643-2		. #x582D)	; ø»”ž
     (japanese-jisx0213-2	. #x6F43)	; ø»¦†
+    (chinese-big5		. #xEA41)	; ý¢€Ž©
     (ideograph-daikanwa		. 18451)	; ø¸„ “
-    (ucs			. #x6FC9)	; 濉
+    ))
+(define-char
+  '((morohashi-daikanwa	18451 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-gb2312	. #x6521)	; ø»…©¼
+    (chinese-isoir165	. #x6521)	; ø»Ž’Œ
+    (chinese-cns11643-2 . #x582D)	; ø»”ž
+    (ucs		. #x6FC9)	; 濉
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -16839,6 +18894,7 @@
     (japanese-jisx0212		. #x487E)	; ø»‹ž¿
     (chinese-cns11643-2		. #x5821)	; ø»”’
     (japanese-jisx0213-1	. #x7738)	; ø»¤‘§
+    (chinese-big5		. #xE9F4)	; ý¢€Ž§´
     (ideograph-daikanwa		. 18454)	; ø¸„ –
     (ucs			. #x6FCA)	; 濊
     ))
@@ -16847,6 +18903,7 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (chinese-cns11643-2 . #x5775)	; ø»”ˆ
+    (chinese-big5	. #xE9EA)	; ý¢€Ž§ª
     (ideograph-daikanwa . 18455)	; ø¸„ —
     (ucs		. #x6FCB)	; 濋
     ))
@@ -16855,15 +18912,24 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (chinese-cns11643-2 . #x5D3A)	; ø»”¥
+    (chinese-big5	. #xED4E)	; ý¢€ŽµŽ
     (ideograph-daikanwa . 18456)	; ø¸„ ˜
     (ucs		. #x6FCC)	; 濌
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FCD)	; 濍
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (chinese-cns11643-2 . #x582F)	; ø»” 
     (ideograph-daikanwa . 18457)	; ø¸„ ™
+    ))
+(define-char
+  '((morohashi-daikanwa	18457 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (chinese-big5	. #xEA43)	; ý¢€Ž©ƒ
     (ucs		. #x6FCD)	; 濍
     ))
 (define-char
@@ -16871,15 +18937,24 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (chinese-cns11643-2 . #x5779)	; ø»”Œ
+    (chinese-big5	. #xE9EE)	; ý¢€Ž§®
     (ideograph-daikanwa . 18458)	; ø¸„ š
     (ucs		. #x6FCE)	; 濎
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FCF)	; 濏
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (chinese-cns11643-2 . #x5829)	; ø»”š
+    (chinese-big5	. #xE9FC)	; ý¢€Ž§¼
     (ideograph-daikanwa . 18472)	; ø¸„ ¨
+    ))
+(define-char
+  '((morohashi-daikanwa	18472 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
     (ucs		. #x6FCF)	; 濏
     ))
 (define-char
@@ -17412,6 +19487,7 @@
     (japanese-jisx0208		. #x5F3E)	; ø»‡«©
     (chinese-cns11643-2		. #x5D3D)	; ø»”¥„
     (japanese-jisx0208-1990	. #x5F3E)	; ø½‹‘
+    (chinese-big5		. #xED51)	; ý¢€Žµ‘
     (ideograph-daikanwa		. 18482)	; ø¸„ ²
     (ucs			. #x6FD4)	; 濔
     ))
@@ -17426,6 +19502,7 @@
     (chinese-cns11643-1		. #x742E)	; ø»’¼£
     (japanese-jisx0208-1990	. #x5F3C)	; ø½‹‘›
     (chinese-gb12345		. #x4A2A)	; 濕
+    (chinese-big5		. #xC0E3)	; ý¢€Œƒ£
     (ideograph-daikanwa		. 18483)	; ø¸„ ³
     (ucs			. #x6FD5)	; 濕
     ))
@@ -17453,17 +19530,25 @@
     (ucs		. #x6FD7)	; 濗
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FD8)	; 濘
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (shinjigen-2	. 4510)
     (japanese-jisx0208-1978	. #x5F3F)	; ø»ƒ—¢
     (japanese-jisx0208		. #x5F3F)	; ø»‡«ª
-    (chinese-cns11643-1		. #x7422)	; ø»’¼—
     (japanese-jisx0208-1990	. #x5F3F)	; ø½‹‘ž
-    (chinese-gb12345		. #x4522)	; 濘
+    (chinese-big5		. #xC0D7)	; ý¢€Œƒ—
     (ideograph-daikanwa		. 18487)	; ø¸„ ·
-    (ucs			. #x6FD8)	; 濘
+    ))
+(define-char
+  '((morohashi-daikanwa	18487 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (chinese-cns11643-1 . #x7422)	; ø»’¼—
+    (chinese-gb12345	. #x4522)	; 濘
+    (ucs		. #x6FD8)	; 濘
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -17496,11 +19581,19 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (chinese-cns11643-2 . #x5D3C)	; ø»”¥ƒ
+    (chinese-big5	. #xED50)	; ý¢€Žµ
     (ideograph-daikanwa . 18490)	; ø¸„ º
     (ucs		. #x6FF4)	; æ¿´
     ))
 (define-char
+  '((=>ucs		. #x6FF4)	; æ¿´
+    (morohashi-daikanwa	18490 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (chinese-cns11643-2 . #x5D3C)	; ø»”¥ƒ
+    ))
+(define-char
   '((=>ucs		. #x6FDB)	; 濛
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
@@ -17532,6 +19625,7 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (chinese-gb12345	. #x7855)	; 濛
+    (chinese-big5	. #xC0DB)	; ý¢€Œƒ›
     (ucs		. #x6FDB)	; 濛
     ))
 (define-char
@@ -17539,15 +19633,24 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (chinese-cns11643-2 . #x5D3F)	; ø»”¥†
+    (chinese-big5	. #xED53)	; ý¢€Žµ“
     (ideograph-daikanwa . 18492)	; ø¸„ ¼
     (ucs		. #x6FDC)	; 濜
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FDD)	; 濝
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (chinese-cns11643-2 . #x5D45)	; ø»”¥Œ
+    (chinese-big5	. #xED59)	; ý¢€Žµ™
     (ideograph-daikanwa . 18494)	; ø¸„ ¾
+    ))
+(define-char
+  '((morohashi-daikanwa	18494 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
     (china3-jef		. #x57B5)	; øº…žµ
     (ucs		. #x6FDD)	; 濝
     ))
@@ -17560,37 +19663,54 @@
     (chinese-isoir165		. #x6528)	; ø»Ž’“
     (chinese-cns11643-2		. #x5D43)	; ø»”¥Š
     (japanese-jisx0213-2	. #x6F45)	; ø»¦ˆ
+    (chinese-big5		. #xED57)	; ý¢€Žµ—
     (ideograph-daikanwa		. 18496)	; ø¸„¡€
     (ucs			. #x6FDE)	; 濞
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FDF)	; 濟
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (shinjigen-2	. 4293)
     (japanese-jisx0208-1978	. #x5F3B)	; ø»ƒ—ž
     (japanese-jisx0208		. #x5F3B)	; ø»‡«¦
     (korean-ksc5601		. #x702D)	; ø»ŠŽš
-    (chinese-cns11643-1		. #x7424)	; ø»’¼™
     (japanese-jisx0208-1990	. #x5F3B)	; ø½‹‘š
-    (chinese-gb12345		. #x3C43)	; 濟
+    (chinese-big5		. #xC0D9)	; ý¢€Œƒ™
     (ideograph-daikanwa		. 18498)	; ø¸„¡‚
-    (ucs			. #x6FDF)	; 濟
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	18498 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (chinese-cns11643-1 . #x7424)	; ø»’¼™
+    (chinese-gb12345	. #x3C43)	; 濟
+    (ucs		. #x6FDF)	; 濟
+    ))
+(define-char
+  '((=>ucs		. #x6FE0)	; æ¿ 
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (shinjigen-2	. 4504)
     (japanese-jisx0208-1978	. #x396A)	; ø»‚ ™
-    (chinese-gb2312		. #x6529)	; ø»…ª„
     (japanese-jisx0208		. #x396A)	; ø»†´¡
     (korean-ksc5601		. #x7B4C)	; ø»ŠŸƒ
-    (chinese-isoir165		. #x6529)	; ø»Ž’”
-    (chinese-cns11643-1		. #x7425)	; ø»’¼š
     (japanese-jisx0208-1990	. #x396A)	; ø½Šš•
+    (chinese-big5		. #xC0DA)	; ý¢€Œƒš
     (ideograph-daikanwa		. 18502)	; ø¸„¡†
-    (ucs			. #x6FE0)	; æ¿ 
+    ))
+(define-char
+  '((morohashi-daikanwa	18502 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (chinese-gb2312	. #x6529)	; ø»…ª„
+    (chinese-isoir165	. #x6529)	; ø»Ž’”
+    (chinese-cns11643-1 . #x7425)	; ø»’¼š
+    (ucs		. #x6FE0)	; æ¿ 
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -17602,24 +19722,48 @@
     (japanese-jisx0208		. #x4728)	; ø»‡ˆƒ
     (korean-ksc5601		. #x6B21)	; ø»Š†¸
     (chinese-isoir165		. #x6526)	; ø»Ž’‘
-    (chinese-cns11643-1		. #x742C)	; ø»’¼¡
     (japanese-jisx0208-1990	. #x4728)	; ø½Š­·
+    (chinese-big5		. #xC0E1)	; ý¢€Œƒ¡
     (ideograph-daikanwa		. 18504)	; ø¸„¡ˆ
     (ucs			. #x6FE1)	; æ¿¡
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FE1)	; æ¿¡
+    (morohashi-daikanwa	18504 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (chinese-cns11643-2 . #x5D46)	; ø»”¥
-    (ideograph-daikanwa . 18505)	; ø¸„¡‰
-    (ucs		. #x6FE2)	; æ¿¢
+    (chinese-cns11643-1 . #x742C)	; ø»’¼¡
+    ))
+(define-char
+  '((=>ucs		. #x6FE2)	; æ¿¢
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (chinese-big5	. #xED5A)	; ý¢€Žµš
+    (ideograph-daikanwa . 18505)	; ø¸„¡‰
+    ))
+(define-char
+  '((morohashi-daikanwa	18505 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (ucs		. #x6FE2)	; æ¿¢
+    ))
+(define-char
+  '((=>ucs		. #x6FE2)	; æ¿¢
+    (morohashi-daikanwa	18505 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (chinese-cns11643-2 . #x5D46)	; ø»”¥
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (chinese-cns11643-2 . #x5D3E)	; ø»”¥…
+    (chinese-big5	. #xED52)	; ý¢€Žµ’
     (ideograph-daikanwa . 18506)	; ø¸„¡Š
     (ucs		. #x6FE3)	; æ¿£
     ))
@@ -17634,6 +19778,7 @@
     (chinese-cns11643-1		. #x7427)	; ø»’¼œ
     (japanese-jisx0208-1990	. #x5E39)	; ø½‹º
     (chinese-gb12345		. #x4C4E)	; 濤
+    (chinese-big5		. #xC0DC)	; ý¢€Œƒœ
     (ideograph-daikanwa		. 18508)	; ø¸„¡Œ
     (ucs			. #x6FE4)	; 濤
     ))
@@ -17646,11 +19791,26 @@
     (ucs		. #x6FE5)	; æ¿¥
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FE6)	; 濦
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (chinese-cns11643-2 . #x5D42)	; ø»”¥‰
+    (chinese-big5	. #xED56)	; ý¢€Žµ–
     (ideograph-daikanwa . 18510)	; ø¸„¡Ž
+    ))
+(define-char
+  '((=>ucs		. #x6FE6)	; 濦
+    (morohashi-daikanwa	18510 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (chinese-cns11643-2 . #x5D42)	; ø»”¥‰
+    ))
+(define-char
+  '((morohashi-daikanwa	18510 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
     (ucs		. #x6FE6)	; 濦
     ))
 (define-char
@@ -17658,6 +19818,7 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (chinese-cns11643-2 . #x5D41)	; ø»”¥ˆ
+    (chinese-big5	. #xED55)	; ý¢€Žµ•
     (ideograph-daikanwa . 18511)	; ø¸„¡
     (ucs		. #x6FE7)	; 濧
     ))
@@ -17713,6 +19874,7 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (chinese-cns11643-2 . #x5D47)	; ø»”¥Ž
+    (chinese-big5	. #xED5B)	; ý¢€Žµ›
     (ucs		. #x6FE8)	; 濨
     ))
 (define-char
@@ -17723,6 +19885,7 @@
     (korean-ksc5601		. #x7B4D)	; ø»ŠŸ„
     (japanese-jisx0212		. #x4924)	; ø»‹Ÿƒ
     (japanese-jisx0213-2	. #x6F46)	; ø»¦‰
+    (chinese-big5		. #xC0E2)	; ý¢€Œƒ¢
     (ideograph-daikanwa		. 18517)	; ø¸„¡•
     ))
 (define-char
@@ -17811,6 +19974,7 @@
     (korean-ksc5601		. #x553D)	; ø»‰§€
     (chinese-cns11643-1		. #x7428)	; ø»’¼
     (japanese-jisx0208-1990	. #x4D74)	; ø½Š··
+    (chinese-big5		. #xC0DD)	; ý¢€Œƒ
     (ideograph-daikanwa		. 18521)	; ø¸„¡™
     (ucs-jis			. #x6FEB)	; ø»‚½»
     ))
@@ -17833,15 +19997,24 @@
     (chinese-isoir165		. #x2D59)	; ø»€´
     (chinese-cns11643-1		. #x742B)	; ø»’¼ 
     (japanese-jisx0208-1990	. #x5F3D)	; ø½‹‘œ
+    (chinese-big5		. #xC0E0)	; ý¢€Œƒ 
     (ideograph-daikanwa		. 18524)	; ø¸„¡œ
     (ucs			. #x6FEC)	; 濬
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FED)	; æ¿­
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (chinese-cns11643-2 . #x5D40)	; ø»”¥‡
     (ideograph-daikanwa . 18525)	; ø¸„¡
+    ))
+(define-char
+  '((morohashi-daikanwa	18525 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (chinese-big5	. #xED54)	; ý¢€Žµ”
     (ucs		. #x6FED)	; æ¿­
     ))
 (define-char
@@ -17853,12 +20026,20 @@
     (chinese-gb2312		. #x6527)	; ø»…ª‚
     (japanese-jisx0208		. #x5F41)	; ø»‡«¬
     (chinese-isoir165		. #x6527)	; ø»Ž’’
-    (chinese-cns11643-1		. #x742F)	; ø»’¼¤
     (japanese-jisx0208-1990	. #x5F41)	; ø½‹‘ 
+    (chinese-big5		. #xC0E4)	; ý¢€Œƒ¤
     (ideograph-daikanwa		. 18526)	; ø¸„¡ž
     (ucs			. #x6FEE)	; æ¿®
     ))
 (define-char
+  '((=>ucs		. #x6FEE)	; æ¿®
+    (morohashi-daikanwa	18526 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (chinese-cns11643-1 . #x742F)	; ø»’¼¤
+    ))
+(define-char
   '((=>ucs		. #x6FEF)	; 濯
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
@@ -17879,6 +20060,14 @@
     (ucs-jis			. #x6FEF)	; ø»‡º
     ))
 (define-char
+  '((=>ucs		. #x6FEF)	; 濯
+    (morohashi-daikanwa	18532 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (chinese-big5	. #xC0DE)	; ý¢€Œƒž
+    ))
+(define-char
   '((morohashi-daikanwa	18532 0 2)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
@@ -17895,6 +20084,7 @@
     (total-strokes	 . 17)
     (japanese-jisx0212		. #x4925)	; ø»‹Ÿ„
     (japanese-jisx0213-1	. #x773A)	; ø»¤‘©
+    (chinese-big5		. #xC0E5)	; ý¢€Œƒ¥
     (ideograph-daikanwa		. 18533)	; ø¸„¡¥
     (china3-jef			. #x92A3)	; øº‰Š£
     ))
@@ -17908,18 +20098,26 @@
     (ucs		. #x6FF0)	; æ¿°
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FF1)	; 濱
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (shinjigen-2	. 4235)
     (japanese-jisx0208-1978	. #x5F40)	; ø»ƒ—£
     (japanese-jisx0208		. #x5F40)	; ø»‡««
     (korean-ksc5601		. #x5E34)	; ø»‰´…
-    (chinese-cns11643-1		. #x7423)	; ø»’¼˜
     (japanese-jisx0208-1990	. #x5F40)	; ø½‹‘Ÿ
-    (chinese-gb12345		. #x3175)	; 濱
+    (chinese-big5		. #xC0D8)	; ý¢€Œƒ˜
     (ideograph-daikanwa		. 18537)	; ø¸„¡©
-    (ucs			. #x6FF1)	; 濱
+    ))
+(define-char
+  '((morohashi-daikanwa	18537 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (chinese-cns11643-1 . #x7423)	; ø»’¼˜
+    (chinese-gb12345	. #x3175)	; 濱
+    (ucs		. #x6FF1)	; 濱
     ))
 (define-char
   '((=>ucs		. #x6FF5)	; 濵
@@ -17944,6 +20142,7 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (chinese-cns11643-2 . #x5D44)	; ø»”¥‹
+    (chinese-big5	. #xED58)	; ý¢€Žµ˜
     (ideograph-daikanwa . 18541)	; ø¸„¡­
     (ucs		. #x6FF2)	; 濲
     ))
@@ -18286,6 +20485,7 @@
     (chinese-cns11643-1		. #x765D)	; ø»“€Ž
     (japanese-jisx0208-1990	. #x5F45)	; ø½‹‘¤
     (chinese-gb12345		. #x3D26)	; 濺
+    (chinese-big5		. #xC271)	; ý¢€Œ‰±
     (ideograph-daikanwa		. 18557)	; ø¸„¡½
     (ucs			. #x6FFA)	; 濺
     ))
@@ -18294,6 +20494,7 @@
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (chinese-cns11643-2 . #x6222)	; ø»”«¿
+    (chinese-big5	. #xEFF4)	; ý¢€Ž¿´
     (ideograph-daikanwa . 18561)	; ø¸„¢
     (ucs		. #x6FFB)	; æ¿»
     ))
@@ -18304,6 +20505,7 @@
     (japanese-jisx0212		. #x4928)	; ø»‹Ÿ‡
     (japanese-jisx0213-2	. #x6F48)	; ø»¦‹
     (chinese-gb12345		. #x6378)	; 濼
+    (chinese-big5		. #xEFF6)	; ý¢€Ž¿¶
     (ideograph-daikanwa		. 18563)	; ø¸„¢ƒ
     (china3-jef			. #x8CC9)	; øºˆ³‰
     (ucs			. #x6FFC)	; 濼
@@ -18335,6 +20537,7 @@
     (korean-ksc5601		. #x556B)	; ø»‰§®
     (japanese-jisx0208-1990	. #x5F49)	; ø½‹‘¨
     (chinese-gb12345		. #x424B)	; 濾
+    (chinese-big5		. #xC26F)	; ý¢€Œ‰¯
     (ideograph-daikanwa		. 18565)	; ø¸„¢…
     (ucs			. #x6FFE)	; 濾
     ))
@@ -18347,25 +20550,49 @@
     (chinese-cns11643-1 . #x765B)	; ø»“€Œ
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FFF)	; æ¿¿
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (chinese-cns11643-2 . #x617E)	; ø»”«½
     (ideograph-daikanwa . 18569)	; ø¸„¢‰
+    ))
+(define-char
+  '((morohashi-daikanwa	18569 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (chinese-big5	. #xEFF2)	; ý¢€Ž¿²
     (ucs		. #x6FFF)	; æ¿¿
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7000)	; 瀀
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (ideograph-daikanwa . 18571)	; ø¸„¢‹
+    ))
+(define-char
+  '((=>ucs		. #x7000)	; 瀀
+    (morohashi-daikanwa	18571 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (chinese-cns11643-2 . #x6221)	; ø»”«¾
+    ))
+(define-char
+  '((morohashi-daikanwa	18571 0 1)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (japanese-jisx0212		. #x492A)	; ø»‹Ÿ‰
-    (chinese-cns11643-2		. #x6221)	; ø»”«¾
     (japanese-jisx0213-2	. #x6F49)	; ø»¦Œ
-    (ideograph-daikanwa		. 18571)	; ø¸„¢‹
+    (chinese-big5		. #xEFF3)	; ý¢€Ž¿³
     (ucs			. #x7000)	; 瀀
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7001)	; 瀁
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (japanese-jisx0208-1978	. #x5F47)	; ø»ƒ—ª
@@ -18373,8 +20600,15 @@
     (korean-ksc5601		. #x6548)	; ø»‰¾«
     (chinese-cns11643-2		. #x617A)	; ø»”«¹
     (japanese-jisx0208-1990	. #x5F47)	; ø½‹‘¦
+    (chinese-big5		. #xEFEE)	; ý¢€Ž¿®
     (ideograph-daikanwa		. 18573)	; ø¸„¢
-    (ucs			. #x7001)	; 瀁
+    ))
+(define-char
+  '((morohashi-daikanwa	18573 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (ucs		. #x7001)	; 瀁
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -18393,11 +20627,26 @@
     (ucs		. #x7003)	; 瀃
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7004)	; 瀄
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (ideograph-daikanwa . 18583)	; ø¸„¢—
+    ))
+(define-char
+  '((=>ucs		. #x7004)	; 瀄
+    (morohashi-daikanwa	18583 0 1)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (chinese-big5	. #xE9F6)	; ý¢€Ž§¶
+    ))
+(define-char
+  '((morohashi-daikanwa	18583 0 5)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (chinese-cns11643-2 . #x5823)	; ø»””
-    (ideograph-daikanwa . 18583)	; ø¸„¢—
     (ucs		. #x7004)	; 瀄
     ))
 (define-char
@@ -18406,14 +20655,22 @@
     (total-strokes	 . 18)
     (korean-ksc5601		. #x7B24)	; ø»Šž›
     (japanese-jisx0212		. #x492B)	; ø»‹ŸŠ
-    (chinese-cns11643-2		. #x617B)	; ø»”«º
     (japanese-jisx0213-1	. #x773C)	; ø»¤‘«
     (chinese-gb12345		. #x645E)	; 瀅
+    (chinese-big5		. #xEFEF)	; ý¢€Ž¿¯
     (ideograph-daikanwa		. 18587)	; ø¸„¢›
     (china3-jef			. #x57B9)	; øº…ž¹
     (ucs			. #x7005)	; 瀅
     ))
 (define-char
+  '((=>ucs		. #x7005)	; 瀅
+    (morohashi-daikanwa	18587 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (chinese-cns11643-2 . #x617B)	; ø»”«º
+    ))
+(define-char
   '((=>ucs		. #x7006)	; 瀆
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
@@ -18422,6 +20679,7 @@
     (korean-ksc5601		. #x5439)	; ø»‰¥ž
     (japanese-jisx0212		. #x492C)	; ø»‹Ÿ‹
     (japanese-jisx0213-1	. #x773D)	; ø»¤‘¬
+    (chinese-big5		. #xC270)	; ý¢€Œ‰°
     (ideograph-daikanwa		. 18591)	; ø¸„¢Ÿ
     ))
 (define-char
@@ -18440,6 +20698,7 @@
     (total-strokes	 . 18)
     (japanese-jisx0212		. #x492D)	; ø»‹ŸŒ
     (japanese-jisx0213-2	. #x6F4A)	; ø»¦
+    (chinese-big5		. #xEFEB)	; ý¢€Ž¿«
     (ideograph-daikanwa		. 18594)	; ø¸„¢¢
     (china3-jef			. #x57BA)	; øº…žº
     ))
@@ -18474,18 +20733,26 @@
     (ucs		. #x7008)	; 瀈
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7009)	; 瀉
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (shinjigen-2	. 4513)
     (japanese-jisx0208-1978	. #x5F43)	; ø»ƒ—¦
     (japanese-jisx0208		. #x5F43)	; ø»‡«®
     (korean-ksc5601		. #x5E61)	; ø»‰´²
-    (chinese-cns11643-1		. #x7659)	; ø»“€Š
     (japanese-jisx0208-1990	. #x5F43)	; ø½‹‘¢
-    (chinese-gb12345		. #x503A)	; 瀉
+    (chinese-big5		. #xC26D)	; ý¢€Œ‰­
     (ideograph-daikanwa		. 18596)	; ø¸„¢¤
-    (ucs			. #x7009)	; 瀉
+    ))
+(define-char
+  '((morohashi-daikanwa	18596 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (chinese-cns11643-1 . #x7659)	; ø»“€Š
+    (chinese-gb12345	. #x503A)	; 瀉
+    (ucs		. #x7009)	; 瀉
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -18493,52 +20760,100 @@
     (total-strokes	 . 18)
     (chinese-cns11643-2		. #x6226)	; ø»”¬ƒ
     (japanese-jisx0213-2	. #x6F4B)	; ø»¦Ž
+    (chinese-big5		. #xEFF8)	; ý¢€Ž¿¸
     (ideograph-daikanwa		. 18597)	; ø¸„¢¥
     (ucs			. #x700A)	; 瀊
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x700B)	; 瀋
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (shinjigen-2	. 4514)
     (japanese-jisx0208-1978	. #x5F44)	; ø»ƒ—§
     (japanese-jisx0208		. #x5F44)	; ø»‡«¯
     (korean-ksc5601		. #x6423)	; ø»‰¼¨
-    (chinese-cns11643-1		. #x765A)	; ø»“€‹
     (japanese-jisx0208-1990	. #x5F44)	; ø½‹‘£
-    (chinese-gb12345		. #x6449)	; 瀋
+    (chinese-big5		. #xC26E)	; ý¢€Œ‰®
     (ideograph-daikanwa		. 18600)	; ø¸„¢¨
-    (ucs			. #x700B)	; 瀋
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	18600 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (chinese-cns11643-1 . #x765A)	; ø»“€‹
+    (chinese-gb12345	. #x6449)	; 瀋
+    (ucs		. #x700B)	; 瀋
+    ))
+(define-char
+  '((=>ucs		. #x700C)	; 瀌
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (chinese-big5	. #xEFEC)	; ý¢€Ž¿¬
+    (ideograph-daikanwa . 18601)	; ø¸„¢©
+    ))
+(define-char
+  '((morohashi-daikanwa	18601 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (chinese-isoir165	. #x7D35)	; ø»Žµ°
     (chinese-cns11643-2 . #x6178)	; ø»”«·
-    (ideograph-daikanwa . 18601)	; ø¸„¢©
     (ucs		. #x700C)	; 瀌
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x700D)	; 瀍
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (japanese-jisx0212	. #x492E)	; ø»‹Ÿ
+    (chinese-big5	. #xEFED)	; ý¢€Ž¿­
+    (ideograph-daikanwa . 18602)	; ø¸„¢ª
+    ))
+(define-char
+  '((morohashi-daikanwa	18602 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
     (chinese-isoir165	. #x7D34)	; ø»Žµ¯
     (chinese-cns11643-2 . #x6179)	; ø»”«¸
-    (ideograph-daikanwa . 18602)	; ø¸„¢ª
     (ucs		. #x700D)	; 瀍
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x700E)	; 瀎
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (chinese-cns11643-2 . #x617D)	; ø»”«¼
     (ideograph-daikanwa . 18606)	; ø¸„¢®
+    ))
+(define-char
+  '((morohashi-daikanwa	18606 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
     (ucs		. #x700E)	; 瀎
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x700E)	; 瀎
+    (morohashi-daikanwa	18606 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (chinese-big5	. #xEFF1)	; ý¢€Ž¿±
+    ))
+(define-char
+  '((=>ucs		. #x700F)	; 瀏
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (ideograph-daikanwa . 18607)	; ø¸„¢¯
+    ))
+(define-char
+  '((morohashi-daikanwa	18607 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (shinjigen-2	. 4519)
@@ -18548,7 +20863,7 @@
     (chinese-cns11643-1		. #x765F)	; ø»“€
     (japanese-jisx0208-1990	. #x5F48)	; ø½‹‘§
     (chinese-gb12345		. #x642F)	; 瀏
-    (ideograph-daikanwa		. 18607)	; ø¸„¢¯
+    (chinese-big5		. #xC273)	; ý¢€Œ‰³
     (ucs			. #x700F)	; 瀏
     ))
 (define-char
@@ -18571,6 +20886,7 @@
     (chinese-isoir165		. #x4659)	; ø»¥¢
     (chinese-cns11643-1		. #x765E)	; ø»“€
     (japanese-jisx0208-1990	. #x5F46)	; ø½‹‘¥
+    (chinese-big5		. #xC272)	; ý¢€Œ‰²
     (ideograph-daikanwa		. 18609)	; ø¸„¢±
     (ucs			. #x7011)	; 瀑
     ))
@@ -18588,6 +20904,7 @@
     (total-strokes	 . 18)
     (chinese-isoir165	. #x7D33)	; ø»Žµ®
     (chinese-cns11643-2 . #x617C)	; ø»”«»
+    (chinese-big5	. #xEFF0)	; ý¢€Ž¿°
     (ideograph-daikanwa . 18615)	; ø¸„¢·
     (ucs		. #x7014)	; 瀔
     ))
@@ -18600,14 +20917,19 @@
     (ucs		. #x7013)	; 瀓
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x6FF7)	; æ¿·
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
-    (kangxi-strokes	 . 14)
     (total-strokes	 . 18)
-    (daikanwa-radical	. 85)
-    (daikanwa-strokes	. 15)
-    (chinese-cns11643-2 . #x6225)	; ø»”¬‚
+    (chinese-big5	. #xEFF7)	; ý¢€Ž¿·
     (ideograph-daikanwa . 18628)	; ø¸„£„
+    ))
+(define-char
+  '((morohashi-daikanwa	18628 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (chinese-cns11643-2 . #x6225)	; ø»”¬‚
     (ucs		. #x6FF7)	; æ¿·
     ))
 (define-char
@@ -18983,6 +21305,7 @@
     (total-strokes	 . 19)
     (japanese-jisx0208-1978	. #x494E)	; ø»‚·
     (korean-ksc5601		. #x5E35)	; ø»‰´†
+    (chinese-big5		. #xC378)	; ý¢€Œ¸
     (ideograph-daikanwa		. 18636)	; ø¸„£Œ
     ))
 (define-char
@@ -19006,31 +21329,54 @@
     (ucs-jis			. #x7015)	; ø»‡‹¥
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7016)	; 瀖
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
+    (chinese-big5	. #xF25F)	; ý¢€‰Ÿ
     (ideograph-daikanwa . 18638)	; ø¸„£Ž
+    ))
+(define-char
+  '((morohashi-daikanwa	18638 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
     (ucs		. #x7016)	; 瀖
     ))
 (define-char
   '((=>ucs		. #x7016)	; 瀖
-    (morohashi-daikanwa	18638 0 1)
+    (morohashi-daikanwa	18638 0 2)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (chinese-cns11643-2 . #x656A)	; ø»”±¡
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7017)	; 瀗
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (japanese-jisx0212	. #x492F)	; ø»‹ŸŽ
     (ideograph-daikanwa . 18644)	; ø¸„£”
+    ))
+(define-char
+  '((morohashi-daikanwa	18644 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
     (ucs		. #x7017)	; 瀗
     ))
 (define-char
   '((=>ucs		. #x7017)	; 瀗
-    (morohashi-daikanwa	18644 0 1)
+    (morohashi-daikanwa	18644 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (chinese-big5	. #xF265)	; ý¢€‰¥
+    ))
+(define-char
+  '((=>ucs		. #x7017)	; 瀗
+    (morohashi-daikanwa	18644 0 3)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
@@ -19046,6 +21392,7 @@
     (korean-ksc5601		. #x5652)	; ø»‰¨³
     (japanese-jisx0208-1990	. #x5F4E)	; ø½‹‘­
     (chinese-gb12345		. #x6372)	; 瀘
+    (chinese-big5		. #xC379)	; ý¢€Œ¹
     (ideograph-daikanwa		. 18646)	; ø¸„£–
     (ucs			. #x7018)	; 瀘
     ))
@@ -19058,49 +21405,102 @@
     (chinese-cns11643-1 . #x7846)	; ø»“‚³
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7019)	; 瀙
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (chinese-cns11643-2 . #x6567)	; ø»”±ž
+    (chinese-big5	. #xF25C)	; ý¢€‰œ
     (ideograph-daikanwa . 18649)	; ø¸„£™
+    ))
+(define-char
+  '((=>ucs		. #x7019)	; 瀙
+    (morohashi-daikanwa	18649 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (chinese-cns11643-2 . #x6567)	; ø»”±ž
+    ))
+(define-char
+  '((morohashi-daikanwa	18649 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
     (ucs		. #x7019)	; 瀙
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x701A)	; 瀚
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (shinjigen-2	. 4522)
     (japanese-jisx0208-1978	. #x5F4B)	; ø»ƒ—®
-    (chinese-gb2312		. #x652B)	; ø»…ª†
     (japanese-jisx0208		. #x5F4B)	; ø»‡«¶
     (korean-ksc5601		. #x7955)	; ø»Šœ
-    (chinese-isoir165		. #x652B)	; ø»Ž’–
-    (chinese-cns11643-1		. #x7843)	; ø»“‚°
     (japanese-jisx0208-1990	. #x5F4B)	; ø½‹‘ª
+    (chinese-big5		. #xC376)	; ý¢€Œ¶
     (ideograph-daikanwa		. 18652)	; ø¸„£œ
-    (ucs			. #x701A)	; 瀚
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	18652 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (chinese-gb2312	. #x652B)	; ø»…ª†
+    (chinese-isoir165	. #x652B)	; ø»Ž’–
+    (chinese-cns11643-1 . #x7843)	; ø»“‚°
+    (ucs		. #x701A)	; 瀚
+    ))
+(define-char
+  '((=>ucs		. #x701B)	; 瀛
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (japanese-jisx0208-1978	. #x5F4A)	; ø»ƒ—­
-    (chinese-gb2312		. #x652D)	; ø»…ªˆ
     (japanese-jisx0208		. #x5F4A)	; ø»‡«µ
     (korean-ksc5601		. #x673A)	; ø»Š™
-    (chinese-isoir165		. #x652D)	; ø»Ž’˜
-    (chinese-cns11643-1		. #x7840)	; ø»“‚­
     (japanese-jisx0208-1990	. #x5F4A)	; ø½‹‘©
     (ideograph-daikanwa		. 18656)	; ø¸„£ 
-    (ucs			. #x701B)	; 瀛
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	18656 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (chinese-gb2312	. #x652D)	; ø»…ªˆ
+    (chinese-isoir165	. #x652D)	; ø»Ž’˜
+    (ucs		. #x701B)	; 瀛
+    ))
+(define-char
+  '((=>ucs		. #x701B)	; 瀛
+    (morohashi-daikanwa	18656 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (chinese-cns11643-1 . #x7840)	; ø»“‚­
+    ))
+(define-char
+  '((=>ucs		. #x701B)	; 瀛
+    (morohashi-daikanwa	18656 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (chinese-big5	. #xC373)	; ý¢€Œ³
+    ))
+(define-char
+  '((=>ucs		. #x701C)	; 瀜
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (korean-ksc5601	. #x6B55)	; ø»Š‡¬
-    (chinese-cns11643-2 . #x6572)	; ø»”±©
+    (chinese-big5	. #xF267)	; ý¢€‰§
     (ideograph-daikanwa . 18657)	; ø¸„£¡
+    ))
+(define-char
+  '((morohashi-daikanwa	18657 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (chinese-cns11643-2 . #x6572)	; ø»”±©
     (ucs		. #x701C)	; 瀜
     ))
 (define-char
@@ -19114,6 +21514,7 @@
     (chinese-cns11643-1		. #x7844)	; ø»“‚±
     (japanese-jisx0208-1990	. #x5F4D)	; ø½‹‘¬
     (chinese-gb12345		. #x4124)	; 瀝
+    (chinese-big5		. #xC377)	; ý¢€Œ·
     (ideograph-daikanwa		. 18658)	; ø¸„£¢
     (ucs			. #x701D)	; 瀝
     ))
@@ -19152,32 +21553,78 @@
     (korean-ksc5601		. #x613E)	; ø»‰¸©
     (japanese-jisx0208-1990	. #x5F4F)	; ø½‹‘®
     (chinese-gb12345		. #x646C)	; 瀟
+    (chinese-big5		. #xC374)	; ý¢€Œ´
     (ucs			. #x701F)	; 瀟
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7020)	; 瀠
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (japanese-jisx0212	. #x4930)	; ø»‹Ÿ
+    (chinese-big5	. #xF25E)	; ý¢€‰ž
+    (ideograph-daikanwa . 18661)	; ø¸„£¥
+    ))
+(define-char
+  '((=>ucs		. #x7020)	; 瀠
+    (morohashi-daikanwa	18661 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
     (chinese-cns11643-2 . #x6569)	; ø»”± 
+    ))
+(define-char
+  '((morohashi-daikanwa	18661 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
     (chinese-gb12345	. #x646B)	; 瀠
-    (ideograph-daikanwa . 18661)	; ø¸„£¥
     (ucs		. #x7020)	; 瀠
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7021)	; 瀡
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (chinese-cns11643-2 . #x656C)	; ø»”±£
+    (chinese-big5	. #xF261)	; ý¢€‰¡
     (ideograph-daikanwa . 18665)	; ø¸„£©
+    ))
+(define-char
+  '((=>ucs		. #x7021)	; 瀡
+    (morohashi-daikanwa	18665 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (chinese-cns11643-2 . #x656C)	; ø»”±£
+    ))
+(define-char
+  '((morohashi-daikanwa	18665 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
     (ucs		. #x7021)	; 瀡
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7022)	; 瀢
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (chinese-cns11643-2 . #x656D)	; ø»”±¤
+    (chinese-big5	. #xF262)	; ý¢€‰¢
     (ideograph-daikanwa . 18666)	; ø¸„£ª
+    ))
+(define-char
+  '((=>ucs		. #x7022)	; 瀢
+    (morohashi-daikanwa	18666 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (chinese-cns11643-2 . #x656D)	; ø»”±¤
+    ))
+(define-char
+  '((morohashi-daikanwa	18666 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
     (ucs		. #x7022)	; 瀢
     ))
 (define-char
@@ -19190,6 +21637,7 @@
     (chinese-isoir165		. #x652C)	; ø»Ž’—
     (chinese-cns11643-2		. #x656E)	; ø»”±¥
     (japanese-jisx0213-2	. #x6F4C)	; ø»¦
+    (chinese-big5		. #xF263)	; ý¢€‰£
     (ideograph-daikanwa		. 18667)	; ø¸„£«
     (china3-jef			. #x8CC7)	; øºˆ³‡
     (ucs			. #x7023)	; 瀣
@@ -19199,6 +21647,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
+    (chinese-big5	. #xF266)	; ý¢€‰¦
     (ideograph-daikanwa . 18668)	; ø¸„£¬
     ))
 (define-char
@@ -19230,6 +21679,7 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (japanese-jisx0208-1978	. #x4375)	; ø»‚¯
+    (chinese-big5		. #xEFF5)	; ý¢€Ž¿µ
     (ideograph-daikanwa		. 18670)	; ø¸„£®
     ))
 (define-char
@@ -19252,6 +21702,7 @@
     (japanese-jisx0208		. #x426D)	; ø»‡²
     (korean-ksc5601		. #x5669)	; ø»‰©Š
     (japanese-jisx0208-1990	. #x426D)	; ø½Š§¦
+    (chinese-big5		. #xF25D)	; ý¢€‰
     (ideograph-daikanwa		. 18671)	; ø¸„£¯
     (ucs-jis			. #x7027)	; ø»‚­ª
     ))
@@ -19287,6 +21738,7 @@
     (korean-ksc5601		. #x566E)	; ø»‰©
     (chinese-cns11643-1		. #x7842)	; ø»“‚¯
     (japanese-jisx0213-1	. #x773E)	; ø»¤‘­
+    (chinese-big5		. #xC375)	; ý¢€Œµ
     (ideograph-daikanwa		. 18672)	; ø¸„£°
     (china3-jef			. #x57BC)	; øº…ž¼
     ))
@@ -19310,11 +21762,19 @@
     (ucs			. #x702C)	; 瀬
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7029)	; 瀩
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (chinese-cns11643-2 . #x656F)	; ø»”±¦
+    (chinese-big5	. #xF264)	; ý¢€‰¤
     (ideograph-daikanwa . 18673)	; ø¸„£±
+    ))
+(define-char
+  '((morohashi-daikanwa	18673 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
     (ucs		. #x7029)	; 瀩
     ))
 (define-char
@@ -19322,15 +21782,24 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
     (chinese-cns11643-2 . #x6934)	; ø»”¶£
+    (chinese-big5	. #xF268)	; ý¢€‰¨
     (ideograph-daikanwa . 18675)	; ø¸„£³
     (ucs		. #x702A)	; 瀪
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x702B)	; 瀫
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (chinese-cns11643-2 . #x656B)	; ø»”±¢
+    (chinese-big5	. #xF260)	; ý¢€‰ 
     (ideograph-daikanwa . 18676)	; ø¸„£´
+    ))
+(define-char
+  '((morohashi-daikanwa	18676 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
     (ucs		. #x702B)	; 瀫
     ))
 (define-char
@@ -19568,11 +22037,19 @@
     (total-strokes	 . 20)
     (korean-ksc5601	. #x673B)	; ø»Šš
     (japanese-jisx0212	. #x4932)	; ø»‹Ÿ‘
-    (chinese-cns11643-2 . #x692B)	; ø»”¶š
+    (chinese-big5	. #xF45D)	; ý¢€‘
     (ideograph-daikanwa . 18687)	; ø¸„£¿
     (ucs		. #x702F)	; 瀯
     ))
 (define-char
+  '((=>ucs		. #x702F)	; 瀯
+    (morohashi-daikanwa	18687 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
+    (chinese-cns11643-2 . #x692B)	; ø»”¶š
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
@@ -19582,6 +22059,7 @@
     (chinese-cns11643-1		. #x7975)	; ø»“…€
     (japanese-jisx0208-1990	. #x5F50)	; ø½‹‘¯
     (chinese-gb12345		. #x7858)	; 瀰
+    (chinese-big5		. #xC46A)	; ý¢€Œ‘ª
     (ideograph-daikanwa		. 18690)	; ø¸„¤‚
     (ucs			. #x7030)	; 瀰
     ))
@@ -19589,11 +22067,19 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
-    (chinese-cns11643-2 . #x692E)	; ø»”¶
+    (chinese-big5	. #xF460)	; ý¢€‘ 
     (ideograph-daikanwa . 18691)	; ø¸„¤ƒ
     (ucs		. #x7031)	; 瀱
     ))
 (define-char
+  '((=>ucs		. #x7031)	; 瀱
+    (morohashi-daikanwa	18691 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
+    (chinese-cns11643-2 . #x692E)	; ø»”¶
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
@@ -19603,15 +22089,38 @@
     (chinese-cns11643-1		. #x7976)	; ø»“…
     (japanese-jisx0208-1990	. #x5F52)	; ø½‹‘±
     (chinese-gb12345		. #x6472)	; 瀲
+    (chinese-big5		. #xC46B)	; ý¢€Œ‘«
     (ideograph-daikanwa		. 18693)	; ø¸„¤…
     (ucs			. #x7032)	; 瀲
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7033)	; 瀳
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
-    (chinese-cns11643-2 . #x6937)	; ø»”¶¦
     (ideograph-daikanwa . 18694)	; ø¸„¤†
+    ))
+(define-char
+  '((=>ucs		. #x7033)	; 瀳
+    (morohashi-daikanwa	18694 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
+    (chinese-cns11643-2 . #x6937)	; ø»”¶¦
+    ))
+(define-char
+  '((=>ucs		. #x7033)	; 瀳
+    (morohashi-daikanwa	18694 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (chinese-big5	. #xF468)	; ý¢€‘¨
+    ))
+(define-char
+  '((morohashi-daikanwa	18694 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
     (ucs		. #x7033)	; 瀳
     ))
 (define-char
@@ -19619,17 +22128,26 @@
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (japanese-jisx0212	. #x4933)	; ø»‹Ÿ’
-    (chinese-cns11643-2 . #x692D)	; ø»”¶œ
+    (chinese-big5	. #xF45F)	; ý¢€‘Ÿ
     (ideograph-daikanwa . 18695)	; ø¸„¤‡
     (ucs		. #x7034)	; 瀴
     ))
 (define-char
+  '((=>ucs		. #x7034)	; 瀴
+    (morohashi-daikanwa	18695 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
+    (chinese-cns11643-2 . #x692D)	; ø»”¶œ
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (chinese-gb2312	. #x652F)	; ø»…ªŠ
     (chinese-isoir165	. #x652F)	; ø»Ž’š
     (chinese-cns11643-2 . #x692A)	; ø»”¶™
+    (chinese-big5	. #xF45C)	; ý¢€‘œ
     (ideograph-daikanwa . 18696)	; ø¸„¤ˆ
     (ucs		. #x7035)	; 瀵
     ))
@@ -19642,20 +22160,36 @@
     (ucs		. #x7036)	; 瀶
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7037)	; 瀷
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (korean-ksc5601	. #x6C4B)	; ø»Š‰€
     (japanese-jisx0212	. #x4934)	; ø»‹Ÿ“
-    (chinese-cns11643-2 . #x692C)	; ø»”¶›
+    (chinese-big5	. #xF45E)	; ý¢€‘ž
     (ideograph-daikanwa . 18704)	; ø¸„¤
+    ))
+(define-char
+  '((morohashi-daikanwa	18704 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
     (ucs		. #x7037)	; 瀷
     ))
 (define-char
+  '((=>ucs		. #x7037)	; 瀷
+    (morohashi-daikanwa	18704 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
+    (chinese-cns11643-2 . #x692C)	; ø»”¶›
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (chinese-cns11643-2 . #x6930)	; ø»”¶Ÿ
+    (chinese-big5	. #xF462)	; ý¢€‘¢
     (ideograph-daikanwa . 18706)	; ø¸„¤’
     (ucs		. #x7038)	; 瀸
     ))
@@ -19668,6 +22202,7 @@
     (chinese-isoir165		. #x652E)	; ø»Ž’™
     (chinese-cns11643-2		. #x6933)	; ø»”¶¢
     (japanese-jisx0213-2	. #x6F4E)	; ø»¦‘
+    (chinese-big5		. #xF465)	; ý¢€‘¥
     (ideograph-daikanwa		. 18709)	; ø¸„¤•
     (ucs			. #x7039)	; 瀹
     ))
@@ -19675,29 +22210,46 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
-    (chinese-cns11643-2		. #x6932)	; ø»”¶¡
     (japanese-jisx0213-2	. #x6F4F)	; ø»¦’
+    (chinese-big5		. #xF464)	; ý¢€‘¤
     (ideograph-daikanwa		. 18714)	; ø¸„¤š
     (ucs			. #x703A)	; 瀺
     ))
 (define-char
+  '((=>ucs		. #x703A)	; 瀺
+    (morohashi-daikanwa	18714 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
+    (chinese-cns11643-2 . #x6932)	; ø»”¶¡
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (chinese-cns11643-2 . #x6936)	; ø»”¶¥
+    (chinese-big5	. #xF467)	; ý¢€‘§
     (ideograph-daikanwa . 18715)	; ø¸„¤›
     (ucs		. #x703B)	; 瀻
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x703C)	; 瀼
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (japanese-jisx0212		. #x4936)	; ø»‹Ÿ•
-    (chinese-isoir165		. #x7D36)	; ø»Žµ±
-    (chinese-cns11643-2		. #x6929)	; ø»”¶˜
     (japanese-jisx0213-2	. #x6F50)	; ø»¦“
+    (chinese-big5		. #xF45B)	; ý¢€‘›
     (ideograph-daikanwa		. 18716)	; ø¸„¤œ
-    (ucs			. #x703C)	; 瀼
+    ))
+(define-char
+  '((morohashi-daikanwa	18716 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
+    (chinese-isoir165	. #x7D36)	; ø»Žµ±
+    (chinese-cns11643-2 . #x6929)	; ø»”¶˜
+    (ucs		. #x703C)	; 瀼
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -19726,31 +22278,41 @@
     (chinese-cns11643-1		. #x7974)	; ø»“„¿
     (japanese-jisx0208-1990	. #x5F51)	; ø½‹‘°
     (chinese-gb12345		. #x403D)	; 瀾
+    (chinese-big5		. #xC469)	; ý¢€Œ‘©
     (ucs			. #x703E)	; 瀾
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x703F)	; 瀿
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (chinese-cns11643-2 . #x6931)	; ø»”¶ 
+    (chinese-big5	. #xF463)	; ý¢€‘£
     (ideograph-daikanwa . 18723)	; ø¸„¤£
     (china3-jef		. #x57BD)	; øº…ž½
-    (ucs		. #x703F)	; 瀿
     ))
 (define-char
-  '((=>ucs		. #x7040)	; 灀
+  '((morohashi-daikanwa	18723 0 0)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
+    (ucs		. #x703F)	; 瀿
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
+    (chinese-big5	. #xF466)	; ý¢€‘¦
     (ideograph-daikanwa . 18724)	; ø¸„¤¤
+    (ucs		. #x7040)	; 灀
     ))
 (define-char
-  '((morohashi-daikanwa	18724 0 2)
+  '((=>ucs		. #x7040)	; 灀
+    (morohashi-daikanwa	18724 0 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (chinese-cns11643-2 . #x6935)	; ø»”¶¤
-    (ucs		. #x7040)	; 灀
     ))
 (define-char
   '((=>ucs		. #x7041)	; 灁
@@ -19766,6 +22328,7 @@
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (chinese-cns11643-2 . #x6938)	; ø»”¶§
+    (chinese-big5	. #xF469)	; ý¢€‘©
     (ucs		. #x7041)	; 灁
     ))
 (define-char
@@ -19986,6 +22549,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 18)
     (total-strokes	 . 21)
+    (chinese-big5	. #xF461)	; ý¢€‘¡
     (ideograph-daikanwa . 18735)	; ø¸„¤¯
     ))
 (define-char
@@ -20035,6 +22599,7 @@
     (chinese-cns11643-2		. #x6B61)	; ø»”ºŒ
     (japanese-jisx0213-2	. #x6F51)	; ø»¦”
     (chinese-gb12345		. #x6363)	; 灃
+    (chinese-big5		. #xF5D3)	; ý¢€—“
     (ideograph-daikanwa		. 18739)	; ø¸„¤³
     (ucs			. #x7043)	; 灃
     ))
@@ -20058,6 +22623,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 18)
     (total-strokes	 . 21)
+    (chinese-big5	. #xF5D4)	; ý¢€—”
     (ideograph-daikanwa . 18741)	; ø¸„¤µ
     ))
 (define-char
@@ -20069,11 +22635,18 @@
     (japanese-jisx0212	. #x4938)	; ø»‹Ÿ—
     ))
 (define-char
-  '((morohashi-daikanwa	18741 0 2)
+  '((=>ucs		. #x7044)	; 灄
+    (morohashi-daikanwa	18741 0 2)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 18)
     (total-strokes	 . 21)
     (chinese-cns11643-2 . #x6B62)	; ø»”º
+    ))
+(define-char
+  '((morohashi-daikanwa	18741 0 3)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 18)
+    (total-strokes	 . 21)
     (chinese-gb12345	. #x645C)	; 灄
     (ucs		. #x7044)	; 灄
     ))
@@ -20082,6 +22655,7 @@
     (ideographic-strokes . 18)
     (total-strokes	 . 21)
     (chinese-cns11643-2 . #x6B66)	; ø»”º‘
+    (chinese-big5	. #xF5D8)	; ý¢€—˜
     (ideograph-daikanwa . 18742)	; ø¸„¤¶
     (ucs		. #x7045)	; 灅
     ))
@@ -20094,11 +22668,26 @@
     (ucs		. #x3D93)	; 㶓
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7046)	; 灆
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 18)
     (total-strokes	 . 21)
     (chinese-cns11643-2 . #x6B67)	; ø»”º’
     (ideograph-daikanwa . 18744)	; ø¸„¤¸
+    ))
+(define-char
+  '((=>ucs		. #x7046)	; 灆
+    (morohashi-daikanwa	18744 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
+    (chinese-big5	. #xF5D9)	; ý¢€—™
+    ))
+(define-char
+  '((morohashi-daikanwa	18744 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
     (ucs		. #x7046)	; 灆
     ))
 (define-char
@@ -20116,6 +22705,7 @@
     (ideographic-strokes . 18)
     (total-strokes	 . 21)
     (japanese-jisx0212	. #x4939)	; ø»‹Ÿ˜
+    (chinese-big5	. #xF5D6)	; ý¢€—–
     (ideograph-daikanwa . 18746)	; ø¸„¤º
     (china3-jef		. #x57C0)	; øº…Ÿ€
     ))
@@ -20133,6 +22723,7 @@
     (ideographic-strokes . 18)
     (total-strokes	 . 21)
     (japanese-jisx0212	. #x493A)	; ø»‹Ÿ™
+    (chinese-big5	. #xF5D7)	; ý¢€——
     (ideograph-daikanwa . 18749)	; ø¸„¤½
     ))
 (define-char
@@ -20153,6 +22744,14 @@
     (ideograph-daikanwa		. 18750)	; ø¸„¤¾
     ))
 (define-char
+  '((=>ucs		. #x704A)	; 灊
+    (morohashi-daikanwa	18750 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 18)
+    (total-strokes	 . 21)
+    (chinese-big5	. #xF5D5)	; ý¢€—•
+    ))
+(define-char
   '((morohashi-daikanwa	18750 0 4)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 18)
@@ -20171,18 +22770,40 @@
     (ucs			. #x704B)	; 灋
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x704C)	; 灌
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 18)
+    (total-strokes	 . 21)
+    (ideograph-daikanwa . 18759)	; ø¸„¥‡
+    ))
+(define-char
+  '((=>ucs		. #x704C)	; 灌
+    (morohashi-daikanwa	18759 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 18)
     (total-strokes	 . 21)
+    (chinese-cns11643-1 . #x7A74)	; ø»“†
+    ))
+(define-char
+  '((=>ucs		. #x704C)	; 灌
+    (morohashi-daikanwa	18759 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
     (japanese-jisx0208-1978	. #x3443)	; ø»‚˜œ
-    (chinese-gb2312		. #x3960)	; ø»„ª“
     (japanese-jisx0208		. #x5E75)	; ø»‡«‚
     (korean-ksc5601		. #x4E34)	; ø»‰œ¥
-    (chinese-isoir165		. #x3960)	; ø»’£
-    (chinese-cns11643-1		. #x7A74)	; ø»“†
     (japanese-jisx0208-1990	. #x5E75)	; ø½‹¶
-    (ideograph-daikanwa		. 18759)	; ø¸„¥‡
-    (ucs			. #x704C)	; 灌
+    (chinese-big5		. #xC4E9)	; ý¢€Œ“©
+    ))
+(define-char
+  '((morohashi-daikanwa	18759 0 2)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 17)
+    (total-strokes	 . 20)
+    (chinese-gb2312	. #x3960)	; ø»„ª“
+    (chinese-isoir165	. #x3960)	; ø»’£
+    (ucs		. #x704C)	; 灌
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -20392,24 +23013,40 @@
     (ucs		. #x24138)	; 𤄸
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7051)	; 灑
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 19)
     (total-strokes	 . 22)
     (shinjigen-2	. 4538)
     (japanese-jisx0208-1978	. #x5F53)	; ø»ƒ—¶
     (japanese-jisx0208		. #x5F53)	; ø»‡«¾
     (korean-ksc5601		. #x616E)	; ø»‰¹™
-    (chinese-cns11643-1		. #x7B64)	; ø»“‡«
     (japanese-jisx0208-1990	. #x5F53)	; ø½‹‘²
-    (chinese-gb12345		. #x4877)	; 灑
+    (chinese-big5		. #xC578)	; ý¢€Œ•¸
     (ideograph-daikanwa		. 18774)	; ø¸„¥–
-    (ucs			. #x7051)	; 灑
+    ))
+(define-char
+  '((morohashi-daikanwa	18774 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 19)
+    (total-strokes	 . 22)
+    (chinese-gb12345	. #x4877)	; 灑
+    (ucs		. #x7051)	; 灑
+    ))
+(define-char
+  '((=>ucs		. #x7051)	; 灑
+    (morohashi-daikanwa	18774 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 19)
+    (total-strokes	 . 22)
+    (chinese-cns11643-1 . #x7B64)	; ø»“‡«
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 19)
     (total-strokes	 . 22)
     (chinese-cns11643-2 . #x6D59)	; ø»”½€
+    (chinese-big5	. #xF6EB)	; ý¢€›«
     (ideograph-daikanwa . 18775)	; ø¸„¥—
     (ucs		. #x7052)	; 灒
     ))
@@ -20438,6 +23075,7 @@
     (ideographic-strokes . 19)
     (total-strokes	 . 22)
     (japanese-jisx0212	. #x493E)	; ø»‹Ÿ
+    (chinese-big5	. #xF6E8)	; ý¢€›¨
     (ideograph-daikanwa . 18779)	; ø¸„¥›
     ))
 (define-char
@@ -20450,19 +23088,42 @@
     (ucs		. #x7055)	; 灕
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7056)	; 灖
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 19)
     (total-strokes	 . 22)
-    (chinese-cns11643-2 . #x6D57)	; ø»”¼¾
+    (chinese-big5	. #xF6E9)	; ý¢€›©
     (ideograph-daikanwa . 18781)	; ø¸„¥
+    ))
+(define-char
+  '((=>ucs		. #x7056)	; 灖
+    (morohashi-daikanwa	18781 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 19)
+    (total-strokes	 . 22)
+    (chinese-cns11643-2 . #x6D57)	; ø»”¼¾
+    ))
+(define-char
+  '((morohashi-daikanwa	18781 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 19)
+    (total-strokes	 . 22)
     (ucs		. #x7056)	; 灖
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7057)	; 灗
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 19)
     (total-strokes	 . 22)
-    (chinese-cns11643-2 . #x6D58)	; ø»”¼¿
+    (chinese-big5	. #xF6EA)	; ý¢€›ª
     (ideograph-daikanwa . 18783)	; ø¸„¥Ÿ
+    ))
+(define-char
+  '((morohashi-daikanwa	18783 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 19)
+    (total-strokes	 . 22)
+    (chinese-cns11643-2 . #x6D58)	; ø»”¼¿
     (ucs		. #x7057)	; 灗
     ))
 (define-char
@@ -20472,6 +23133,7 @@
     (total-strokes	 . 22)
     (japanese-jisx0208-1978	. #x4667)	; ø»‚³œ
     (korean-ksc5601		. #x7728)	; ø»Š˜§
+    (chinese-big5		. #xC579)	; ý¢€Œ•¹
     (ideograph-daikanwa		. 18784)	; ø¸„¥ 
     ))
 (define-char
@@ -20606,15 +23268,24 @@
     (ideographic-strokes . 20)
     (total-strokes	 . 23)
     (chinese-cns11643-2 . #x6F34)	; ø»”¿—
+    (chinese-big5	. #xF7E5)	; ý¢€Ÿ¥
     (ideograph-daikanwa . 18792)	; ø¸„¥¨
     (ucs		. #x705A)	; 灚
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x705B)	; 灛
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 20)
     (total-strokes	 . 23)
-    (chinese-cns11643-2 . #x6F33)	; ø»”¿–
     (ideograph-daikanwa . 18793)	; ø¸„¥©
+    ))
+(define-char
+  '((morohashi-daikanwa	18793 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 20)
+    (total-strokes	 . 23)
+    (chinese-cns11643-2 . #x6F33)	; ø»”¿–
+    (chinese-big5	. #xF7E4)	; ý¢€Ÿ¤
     (ucs		. #x705B)	; 灛
     ))
 (define-char
@@ -20707,6 +23378,7 @@
     (korean-ksc5601		. #x7B4E)	; ø»ŠŸ…
     (japanese-jisx0212		. #x493F)	; ø»‹Ÿž
     (japanese-jisx0213-1	. #x7740)	; ø»¤‘¯
+    (chinese-big5		. #xF8AF)	; ý¢€¢¯
     (ideograph-daikanwa		. 18811)	; ø¸„¥»
     (china3-jef			. #x57C2)	; øº…Ÿ‚
     ))
@@ -20726,33 +23398,72 @@
     (chinese-gb2312		. #x6531)	; ø»…ªŒ
     (japanese-jisx0212		. #x4940)	; ø»‹ŸŸ
     (chinese-isoir165		. #x6531)	; ø»Ž’œ
-    (chinese-cns11643-1		. #x7C60)	; ø»“‰…
     (japanese-jisx0213-1	. #x7741)	; ø»¤‘°
+    (chinese-big5		. #xC5F4)	; ý¢€Œ—´
     (ideograph-daikanwa		. 18814)	; ø¸„¥¾
     (ucs			. #x705E)	; 灞
     ))
 (define-char
+  '((=>ucs		. #x705E)	; 灞
+    (morohashi-daikanwa	18814 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 21)
+    (total-strokes	 . 24)
+    (chinese-cns11643-1 . #x7C60)	; ø»“‰…
+    ))
+(define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 21)
     (total-strokes	 . 24)
-    (chinese-cns11643-2 . #x703B)	; ø»•€¼
+    (chinese-big5	. #xF8AD)	; ý¢€¢­
     (ideograph-daikanwa . 18815)	; ø¸„¥¿
     (ucs		. #x705F)	; 灟
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x705F)	; 灟
+    (morohashi-daikanwa	18815 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 21)
+    (total-strokes	 . 24)
+    (chinese-cns11643-2 . #x703B)	; ø»•€¼
+    ))
+(define-char
+  '((=>ucs		. #x7060)	; 灠
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 21)
     (total-strokes	 . 24)
     (chinese-cns11643-2 . #x703E)	; ø»•€¿
+    (chinese-big5	. #xF8B0)	; ý¢€¢°
     (ideograph-daikanwa . 18816)	; ø¸„¦€
+    ))
+(define-char
+  '((morohashi-daikanwa	18816 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 21)
+    (total-strokes	 . 24)
     (ucs		. #x7060)	; 灠
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7061)	; 灡
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 21)
     (total-strokes	 . 24)
-    (chinese-cns11643-2 . #x703C)	; ø»•€½
     (ideograph-daikanwa . 18819)	; ø¸„¦ƒ
+    ))
+(define-char
+  '((=>ucs		. #x7061)	; 灡
+    (morohashi-daikanwa	18819 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 21)
+    (total-strokes	 . 24)
+    (chinese-cns11643-2 . #x703C)	; ø»•€½
+    ))
+(define-char
+  '((morohashi-daikanwa	18819 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 20)
+    (total-strokes	 . 23)
+    (chinese-big5	. #xF8AE)	; ý¢€¢®
     (ucs		. #x7061)	; 灡
     ))
 (define-char
@@ -20816,6 +23527,7 @@
     (ideographic-strokes . 22)
     (total-strokes	 . 25)
     (chinese-cns11643-2 . #x7125)	; ø»•‚„
+    (chinese-big5	. #xF8F5)	; ý¢€£µ
     (ideograph-daikanwa . 18822)	; ø¸„¦†
     (ucs		. #x7062)	; 灢
     ))
@@ -20829,6 +23541,7 @@
     (japanese-jisx0208		. #x5F54)	; ø»‡«¿
     (korean-ksc5601		. #x583D)	; ø»‰«š
     (japanese-jisx0208-1990	. #x5F54)	; ø½‹‘³
+    (chinese-big5		. #xC657)	; ý¢€Œ™—
     (ideograph-daikanwa		. 18823)	; ø¸„¦‡
     (ucs-jis			. #x7063)	; ø»ƒ—·
     ))
@@ -20908,6 +23621,7 @@
     (total-strokes	 . 26)
     (japanese-jisx0212		. #x4942)	; ø»‹Ÿ¡
     (japanese-jisx0213-1	. #x7743)	; ø»¤‘²
+    (chinese-big5		. #xC665)	; ý¢€Œ™¥
     (ideograph-daikanwa		. 18833)	; ø¸„¦‘
     (china3-jef			. #x57C4)	; øº…Ÿ„
     ))
@@ -20934,6 +23648,7 @@
     (japanese-jisx0212		. #x4943)	; ø»‹Ÿ¢
     (chinese-cns11643-2		. #x7171)	; ø»•ƒ
     (japanese-jisx0213-2	. #x6F56)	; ø»¦™
+    (chinese-big5		. #xF9A3)	; ý¢€¦£
     (ideograph-daikanwa		. 18834)	; ø¸„¦’
     (ucs			. #x7065)	; 灥
     ))
@@ -20942,6 +23657,7 @@
     (ideographic-strokes . 23)
     (total-strokes	 . 26)
     (chinese-cns11643-2 . #x715B)	; ø»•‚º
+    (chinese-big5	. #xF96C)	; ý¢€¥¬
     (ideograph-daikanwa . 18835)	; ø¸„¦“
     (ucs		. #x7066)	; 灦
     ))
@@ -20997,11 +23713,19 @@
     (ucs		. #x7067)	; 灧
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x7068)	; 灨
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 24)
     (total-strokes	 . 27)
-    (chinese-cns11643-2 . #x7170)	; ø»•ƒ
+    (chinese-big5	. #xF9A2)	; ý¢€¦¢
     (ideograph-daikanwa . 18842)	; ø¸„¦š
+    ))
+(define-char
+  '((morohashi-daikanwa	18842 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 24)
+    (total-strokes	 . 27)
+    (chinese-cns11643-2 . #x7170)	; ø»•ƒ
     (ucs		. #x7068)	; 灨
     ))
 (define-char
@@ -21060,15 +23784,24 @@
     (total-strokes	 . 31)
     (chinese-cns11643-2		. #x723E)	; ø»•ƒ»
     (japanese-jisx0213-2	. #x6F57)	; ø»¦š
+    (chinese-big5		. #xF9D0)	; ý¢€§
     (ideograph-daikanwa		. 18846)	; ø¸„¦ž
     (ucs			. #x7069)	; 灩
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x706A)	; 灪
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 29)
     (total-strokes	 . 32)
-    (chinese-cns11643-2 . #x723F)	; ø»•ƒ¼
+    (chinese-big5	. #xF9D1)	; ý¢€§‘
     (ideograph-daikanwa . 18847)	; ø¸„¦Ÿ
+    ))
+(define-char
+  '((morohashi-daikanwa	18847 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 29)
+    (total-strokes	 . 32)
+    (chinese-cns11643-2 . #x723F)	; ø»•ƒ¼
     (ucs		. #x706A)	; 灪
     ))
 (define-char
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 2f1020c..fad83ef 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.3 "Academic Rigor" is released.
+
 2001-05-10  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.2 "Developer-Friendly Unix APIs" is released.
diff --git a/man/ChangeLog b/man/ChangeLog
index eca2d09..b22f04e 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,13 @@
+2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.3 "Academic Rigor" is released.
+
+2001-05-15  Steve Youngs  <youngs@xemacs.org>
+
+	* xemacs/packages.texi (Local.rules): Update to reflect new dir tree.
+	(Creating Packages): Ditto.
+	(Available Packages): Ditto.
+
 2001-05-10  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.2 "Developer-Friendly Unix APIs" is released.
diff --git a/man/xemacs/packages.texi b/man/xemacs/packages.texi
index 7ac72f4..6776abb 100644
--- a/man/xemacs/packages.texi
+++ b/man/xemacs/packages.texi
@@ -490,7 +490,7 @@ Setting this doesn't work well with 'make bindist'
 This is where you set the normal packages that you
 want to install. eg:
 @example
-      XEMACS_PACKAGES = libs/xemacs-base comm/bbdb
+      XEMACS_PACKAGES = xemacs-packages/xemacs-base xemacs-packages/bbdb
 @end example
 
 @item XEMACS_STAGING = $@{XEMACS_PACKAGES_BASE@}/../Packages
@@ -509,7 +509,7 @@ packages.  Set this to 't' if you don't want/have Mule
 Same as for 'XEMACS_PACKAGES' except you list the Mule
 packages you want to install here. eg:
 @example
-      MULE_PACKAGES = mule/mule-base mule/skk
+      MULE_PACKAGES = mule-packages/mule-base mule-packages/skk
 @end example
 
 @item MULE_STAGING = $@{XEMACS_PACKAGES_BASE@}/../Mule-Packages
@@ -608,10 +608,8 @@ The first few @code{make} variables defined are @code{VERSION},
 @code{AUTHOR_VERSION}, @code{MAINTAINER}, @code{PACKAGE},
 @code{PKG_TYPE}, @code{REQUIRES}, and @code{CATEGORY}.  All but one were
 described in the description of @file{package-info.in}.  The last is an
-administrative grouping.  Current categories include @code{comm},
-@code{games}, @code{libs}, @code{mule}, @code{oa}, @code{os},
-@code{prog}, and @code{wp}.  @ref{Available Packages}, for a list of
-categories.
+administrative grouping.  Current categories include @code{standard},
+and @code{mule}.
 
 Next, define the variable @code{ELCS}.  This contains the list of the
 byte-compiled Lisp files used by the package.  These files and their
@@ -672,333 +670,302 @@ xemacs.org and it's mirrors.  If a particular package that you are
 looking for isn't here, please send a message to the
 @email{xemacs-beta@@xemacs.org, XEmacs Beta list}.
 
-This data is up-to-date as of January 17, 2001.
+This data is up-to-date as of May 15, 2001.
 
-@subsection Library Packages (libs)
-
-These packages are required to build and support most of the rest of
-XEmacs.  By design, xemacs-base is a `regular' package.  Use restraint 
-when adding new files there as it is required by almost everything.
+@subsection Normal Packages
+A very broad selection of elisp packages.
 
 @table @file
 @item Sun
 Support for Sparcworks.
 
+@item ada
+Ada language support.
+
 @item apel
 A Portable Emacs Library.  Used by XEmacs MIME support.
 
-@item dired
-The DIRectory EDitor is for manipulating, and running commands on
-files in a directory.
+@item auctex
+Basic TeX/LaTeX support.
 
-@item edebug
-A Lisp debugger.
+@item bbdb
+The Big Brother Data Base
 
-@item efs
-Treat files on remote systems the same as local files.
+@item build
+Build XEmacs using custom widgets.
 
-@item elib
-Portable Emacs Lisp utilities library.
+@item c-support
+Basic single-file add-ons for editing C code.
 
-@item fsf-compat
-FSF Emacs compatibility files.
+@item calc
+Emacs calculator.
 
-@item mail-lib
-Fundamental lisp files for providing email support.
+@item calendar
+Calendar and diary support.
 
-@item sounds-au
-XEmacs Sun sound files.
+@item cc-mode
+C, C++ and Java language support.
 
-@item sounds-wav
-XEmacs Microsoft sound files.
+@item cookie
+Spook and Yow (Zippy quotes).
 
-@item tooltalk
-Support for building with Tooltalk.
+@item crisp
+Crisp/Brief emulation.
 
-@item xemacs-base
-Fundamental XEmacs support.  Install this unless you wish a totally
-naked XEmacs.
+@item debug
+GUD, gdb, dbx debugging support.
 
-@item xemacs-devel
-XEmacs Lisp developer support.  This package contains utilities for
-supporting Lisp development.  It is a single-file package so it may be 
-tailored.
-@end table
+@item dired
+The DIRectory EDitor is for manipulating, and running commands on
+files in a directory.
 
-@subsection Communications Packages (comm)
+@item edebug
+A Lisp debugger.
 
-These packages provide support for various communications, primarily
-email and usenet.
+@item ediff
+Interface over patch.
 
-@table @file
-@item bbdb
-The Big Brother Data Base
+@item edit-utils
+Single file lisp packages for various XEmacs goodies.  Load this and
+weed out the junk you don't want.
+
+@item edt
+DEC EDIT/EDT emulation.
+
+@item efs
+Treat files on remote systems the same as local files.
 
 @item eicq
 ICQ Client developed and tested on Linux x86; 
 only supported on that platform
 
+@item eieio
+Enhanced Implementation of Emacs Interpreted Objects.
+
+@item elib
+Portable Emacs Lisp utilities library.
+
+@item emerge
+Another interface over patch.
+
+@item eshell
+Command shell implemented entirely in Emacs Lisp.
+
+@item eterm
+Terminal emulator.
+
 @item eudc
 Emacs Unified Directory Client (LDAP, PH).
 
 @item footnote
 Footnoting in mail message editing modes.
 
-@item gnats
-XEmacs bug reports.
+@item forms
+Forms editing support (obsolete, use the built-in Widget instead).
 
-@item gnus
-The Gnus Newsreader and Mailreader.
+@item frame-icon
+Provide a WM icon based on major mode.
 
-@item mailcrypt
-Support for messaging encryption with PGP.
+@item fsf-compat
+FSF Emacs compatibility files.
 
-@item mew
-Messaging in an Emacs World.
+@item games
+Tetris, Sokoban, and Snake.
 
-@item mh-e
-Front end support for MH.
+@item gnats
+XEmacs bug reports.
 
-@item net-utils
-Miscellaneous Networking Utilities.  This is a single-file package and 
-files may be deleted at will.
+@item gnus
+The Gnus Newsreader and Mailreader.
 
-@item rmail
-An obsolete Emacs mailer.  If you do not already use it don't start.
+@item hm--html-menus
+HTML editing.
 
-@item supercite
-An Emacs citation tool.  Useful with all Emacs Mailers and Newsreaders.
+@item idlwave
+Editing and Shell mode for the Interactive Data Language.
 
-@item tm
-Emacs MIME support. Not needed for Gnus >= 5.8.0
+@item igrep
+Enhanced front-end for Grep.
 
-@item vm
-An Emacs mailer.
+@item ilisp
+Front-end for Inferior Lisp.
 
-@item w3
-A Web browser.
+@item ispell
+Spell-checking with ispell.
 
-@item zenirc
-ZENIRC IRC Client.
-@end table
+@item jde
+Java language and development support.
 
-@subsection Games and Amusements (games)
+@item mail-lib
+Fundamental lisp files for providing email support.
 
-All work and no play...
+@item mailcrypt
+Support for messaging encryption with PGP.
 
-@table @file
-@item cookie
-Spook and Yow (Zippy quotes).
+@item mew
+Messaging in an Emacs World.
 
-@item games
-Tetris, Sokoban, and Snake.
+@item mh-e
+Front end support for MH.
 
 @item mine
 Minehunt.
 
 @item misc-games
 Other amusements and diversions.
-@end table
-
-@subsection Mule Support (mule)
-
-MULti-lingual Enhancement.  Support for world scripts such as
-Latin, Arabic, Cyrillic, Chinese, Japanese, Greek, Hebrew etc.
-To use these packages your XEmacs must be compiled with Mule
-support.
-
-@table @file
-@item edict
-Lisp Interface to EDICT, Kanji Dictionary.
-
-@item egg-its
-Wnn (4.2 and 6) support.  SJ3 support.  Must be installed prior to
-XEmacs build.
-
-@item leim
-Quail.  Used for everything other than English and Japanese.
-
-@item locale
-Used for localized menubars (French and Japanese) and localized splash
-screens (Japanese).
-
-@item lookup
-Dictionary support. (This isn't an English dictionary program)
 
-@item mule-base
-Basic Mule support.  Must be installed prior to building with Mule.
-
-@item skk
-Another Japanese Language Input Method.  Can be used without a
-separate process running as a dictionary server.
-@end table
+@item net-utils
+Miscellaneous Networking Utilities.  This is a single-file package and 
+files may be deleted at will.
 
-@subsection Productivity Packages (oa)
+@item os-utils
+Miscellaneous single-file O/S utilities, for printing, archiving,
+compression, remote shells, etc.
 
-Things to make life a little easier.
+@item pc
+PC style interface emulation.
 
-@table @file
-@item calc
-Emacs calculator.
+@item pcl-cvs
+CVS frontend.
 
-@item calendar
-Calendar and diary support.
+@item pcomplete
+Provides programmatic completion.
 
-@item edit-utils
-Single file lisp packages for various XEmacs goodies.  Load this and
-weed out the junk you don't want.
+@item prog-modes
+Miscellaneous single-file lisp files for various programming languages.
 
-@item forms
-Forms editing support (obsolete, use the built-in Widget instead).
+@item ps-print-nomule
+Old, but no-Mule safe ps-print.
 
-@item frame-icon
-Provide a WM icon based on major mode.
+@item psgml
+Validated HTML/SGML editing.
 
-@item hm--html-menus
-HTML editing.
+@item reftex
+Emacs support for LaTeX cross-references, citations.
 
-@item ispell
-Spell-checking with ispell.
+@item rmail
+An obsolete Emacs mailer.  If you do not already use it don't start.
 
-@item pc
-PC style interface emulation.
+@item scheme
+Front-end support for Inferior Scheme.
 
-@item psgml
-Validated HTML/SGML editing.
+@item semantic
+Semantic bovinator.
 
 @item sgml
 SGML/Linuxdoc-SGML editing.
 
+@item sh-script
+Support for editing shell scripts.
+
 @item slider
 User interface tool.
 
+@item sounds-au
+XEmacs Sun sound files.
+
+@item sounds-wav
+XEmacs Microsoft sound files.
+
 @item speedbar
 Provides a separate frame with convenient references.
 
 @item strokes
 Mouse enhancement utility.
 
+@item supercite
+An Emacs citation tool.  Useful with all Emacs Mailers and Newsreaders.
+
+@item texinfo
+XEmacs TeXinfo support.
+
 @item text-modes
 Various single file lisp packages for editing text files.
 
+@item textools
+Single-file TeX support.
+
 @item time
 Display time & date on the modeline.
-@end table
-
-@subsection Operating System Utilities (os)
-
-Tools for working with the operating system.
-
-@table @file
-@item eshell
-Command shell implemented entirely in Emacs Lisp.
 
-@item eterm
-Terminal emulator.
+@item tm
+Emacs MIME support. Not needed for Gnus >= 5.8.0
 
-@item igrep
-Enhanced front-end for Grep.
+@item tooltalk
+Support for building with Tooltalk.
 
-@item ilisp
-Front-end for Inferior Lisp.
+@item tpu
+DEC EDIT/TPU support.
 
-@item os-utils
-Miscellaneous single-file O/S utilities, for printing, archiving,
-compression, remote shells, etc.
+@item vc
+Version Control for Free systems.
 
-@item pcomplete
-Provides programmatic completion.
+@item vc-cc
+Version Control for ClearCase.  This package will shortly be
+replaced with clearcase.el
 
-@item ps-print-nomule
-Old, but no-Mule safe ps-print.
+@item vhdl
+Support for VHDL.
 
 @item view-process
 A Unix process browsing tool.
-@end table
-
-@subsection Program Editing Support (prog)
-
-XEmacs supports a multitude of programming languages.  These
-packages will help your coding.
-
-@table @file
-@item ada
-Ada language support.
 
-@item c-support
-Basic single-file add-ons for editing C code.
-
-@item cc-mode
-C, C++ and Java language support.
-
-@item debug
-GUD, gdb, dbx debugging support.
-
-@item ediff
-Interface over patch.
-
-@item emerge
-Another interface over patch.
-
-@item idlwave
-Editing and Shell mode for the Interactive Data Language.
-
-@item jde
-Java language and development support.
-
-@item pcl-cvs
-CVS frontend.
+@item viper
+VI emulation support.
 
-@item prog-modes
-Miscellaneous single-file lisp files for various programming languages.
+@item vm
+An Emacs mailer.
 
-@item scheme
-Front-end support for Inferior Scheme.
+@item w3
+A Web browser.
 
-@item semantic
-Semantic bovinator.
+@item xemacs-base
+Fundamental XEmacs support.  Install this unless you wish a totally
+naked XEmacs.
 
-@item sh-script
-Support for editing shell scripts.
+@item xemacs-devel
+XEmacs Lisp developer support.  This package contains utilities for
+supporting Lisp development.  It is a single-file package so it may be 
+tailored.
 
-@item vc
-Version Control for Free systems.
+@item xslt-process
+A minor mode for (X)Emacs which allows running an XSLT processor on a
+buffer.
 
-@item vc-cc
-Version Control for ClearCase.  This package will shortly be
-replaced with clearcase.el
-
-@item vhdl
-Support for VHDL.
+@item zenirc
+ZENIRC IRC Client.
 @end table
 
-@subsection Word Processing (wp)
+@subsection Mule Support (mule)
 
-Working with text.
+MULti-lingual Enhancement.  Support for world scripts such as
+Latin, Arabic, Cyrillic, Chinese, Japanese, Greek, Hebrew etc.
+To use these packages your XEmacs must be compiled with Mule
+support.
 
 @table @file
-@item auctex
-Basic TeX/LaTeX support.
-
-@item crisp
-Crisp/Brief emulation.
+@item edict
+Lisp Interface to EDICT, Kanji Dictionary.
 
-@item edt
-DEC EDIT/EDT emulation.
+@item egg-its
+Wnn (4.2 and 6) support.  SJ3 support.  Must be installed prior to
+XEmacs build.
 
-@item reftex
-Emacs support for LaTeX cross-references, citations.
+@item leim
+Quail.  Used for everything other than English and Japanese.
 
-@item texinfo
-XEmacs TeXinfo support.
+@item locale
+Used for localized menubars (French and Japanese) and localized splash
+screens (Japanese).
 
-@item textools
-Single-file TeX support.
+@item lookup
+Dictionary support. (This isn't an English dictionary program)
 
-@item tpu
-DEC EDIT/TPU support.
+@item mule-base
+Basic Mule support.  Must be installed prior to building with Mule.
 
-@item viper
-VI emulation support.
+@item skk
+Another Japanese Language Input Method.  Can be used without a
+separate process running as a dictionary server.
 @end table
 
diff --git a/netinstall/ChangeLog b/netinstall/ChangeLog
index 80296c0..dd80f06 100644
--- a/netinstall/ChangeLog
+++ b/netinstall/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.3 "Academic Rigor" is released.
+
 2001-05-10  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.2 "Developer-Friendly Unix APIs" is released.
@@ -240,5 +244,5 @@
 
 	* all: port from cygwin setup.
 
-%%% $Id: ChangeLog,v 1.2.2.7 2001/05/10 10:39:06 stephent Exp $
-$Revision: 1.2.2.7 $
+%%% $Id: ChangeLog,v 1.2.2.8 2001/05/17 14:59:49 stephent Exp $
+$Revision: 1.2.2.8 $
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 0ebccc8..b421562 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.3 "Academic Rigor" is released.
+
+2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs.mak: Use the EMACS_PATCH_LEVEL define in compiles.
+
 2001-05-10  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.2 "Developer-Friendly Unix APIs" is released.
diff --git a/nt/xemacs.mak b/nt/xemacs.mak
index a43c94c..745e063 100644
--- a/nt/xemacs.mak
+++ b/nt/xemacs.mak
@@ -862,6 +862,7 @@ TEMACS_CPP_FLAGS=-c \
  -DEMACS_MAJOR_VERSION=$(emacs_major_version) \
  -DEMACS_MINOR_VERSION=$(emacs_minor_version) \
  $(EMACS_BETA_VERSION) \
+ $(EMACS_PATCH_LEVEL) \
  -DXEMACS_CODENAME=\"$(xemacs_codename:&=and)\" \
  -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\" \
  -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\"
diff --git a/src/ChangeLog b/src/ChangeLog
index 2f7549a..b34f6ef 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4359,6 +4359,29 @@
 	(Vcharset_thai_tis620): Likewise.
 	(Vcharset_katakana_jisx0201): Likewise.
 
+2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.3 "Academic Rigor" is released.
+
+2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* regex.c: Define DECLARE_NOTHING when "lisp.h" is not included.
+
+2001-05-08  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+	* buffer.c (Vcase_fold_search): Remove obsolete
+	  comment about non ASCII case-fold-search.  This
+	  bug has been fixed by case-table changes.
+
+2001-05-11  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* event-msw.c: Restore include of events-mod.h.
+
+2001-04-22   zhaoway  <zw@debian.org>
+
+	* event-stream.c (is_scrollbar_event): Noop returning 0 if
+	!HAVE_SCROLLBARS.
+
 2001-05-10  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.2 "Developer-Friendly Unix APIs" is released.
@@ -4399,11 +4422,6 @@
 	* s/aix4.h: Fix crash with xlc -O3.
 	Improve comment explaining how -O3 works.
 
-2001-04-22   zhaoway  <zw@debian.org>
-
-	* event-stream.c (is_scrollbar_event): Noop returning 0 if
-	!HAVE_SCROLLBARS.
-
 2001-04-15  Ben Wing  <ben@xemacs.org>
 
 	* event-stream.c:
diff --git a/src/buffer.c b/src/buffer.c
index 2550c95..8d3f6cb 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2694,12 +2694,6 @@ Automatically becomes buffer-local when set in any fashion.
   DEFVAR_BUFFER_LOCAL ("case-fold-search", case_fold_search /*
 *Non-nil if searches should ignore case.
 Automatically becomes buffer-local when set in any fashion.
-
-BUG: Under XEmacs/Mule, translations to or from non-ASCII characters
- (this includes chars in the range 128 - 255) are ignored by
- the string/buffer-searching routines.  Thus, `case-fold-search'
- will not correctly conflate a-umlaut and A-umlaut even if the
- case tables call for this.
 */ );
 
   DEFVAR_BUFFER_LOCAL ("fill-column", fill_column /*
diff --git a/src/event-msw.c b/src/event-msw.c
index 49be245..38bd589 100644
--- a/src/event-msw.c
+++ b/src/event-msw.c
@@ -65,6 +65,7 @@ Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "objects-msw.h"
 
+#include "events-mod.h"
 #ifdef HAVE_MSG_SELECT
 #include "sysfile.h"
 #include "console-tty.h"
diff --git a/src/event-stream.c b/src/event-stream.c
index 00fd549..b390e52 100644
--- a/src/event-stream.c
+++ b/src/event-stream.c
@@ -3763,6 +3763,7 @@ lookup_command_event (struct command_builder *command_builder,
 static int
 is_scrollbar_event (Lisp_Object event)
 {
+#ifdef HAVE_SCROLLBARS
   Lisp_Object fun;
 
   if (XEVENT (event)->event_type != misc_user_event)
@@ -3783,6 +3784,9 @@ is_scrollbar_event (Lisp_Object event)
 	  EQ (fun, Qscrollbar_to_left) ||
 	  EQ (fun, Qscrollbar_to_right) ||
 	  EQ (fun, Qscrollbar_horizontal_drag));
+#else
+  return 0
+#endif
 }
 
 static void
diff --git a/src/input-method-motif.c b/src/input-method-motif.c
index f51e4e7..a05e055 100644
--- a/src/input-method-motif.c
+++ b/src/input-method-motif.c
@@ -94,13 +94,6 @@ XIM_init_device (struct device *d)
   /* Nothing to do */
 }
 
-/* Callback for the deleting frame. */
-static void
-XIM_delete_frame (Widget w, XtPointer client_data, XtPointer call_data)
-{
-  XmImUnregister ((Widget) client_data);
-}
-
 void
 XIM_init_frame (struct frame *f)
 {
@@ -159,8 +152,6 @@ XIM_init_frame (struct frame *f)
 		   NULL);
 
   XmFontListEntryFree (&fontlistEntry);
-
-  XtAddCallback (w, XmNdestroyCallback, XIM_delete_frame, (XtPointer) w);
 }
 
 void
diff --git a/src/regex.c b/src/regex.c
index ae2f523..f7523f5 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -132,13 +132,19 @@ char *malloc ();
 char *realloc ();
 #endif
 
-/* Other types */
+/* Types normally included via lisp.h */
 #include <stddef.h> /* for ptrdiff_t */
 
-#define charptr_emchar(str)		((Emchar) (str)[0])
+#ifdef REGEX_MALLOC
+#ifndef DECLARE_NOTHING
+#define DECLARE_NOTHING struct nosuchstruct
+#endif
+#endif
 
 typedef int Emchar;
 
+#define charptr_emchar(str)		((Emchar) (str)[0])
+
 #define INC_CHARPTR(p) ((p)++)
 #define DEC_CHARPTR(p) ((p)--)
 
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 98833c2..a5269f9 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.3 "Academic Rigor" is released.
+
 2001-05-10  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.2 "Developer-Friendly Unix APIs" is released.
diff --git a/version.sh b/version.sh
index e88c394..473848f 100644
--- a/version.sh
+++ b/version.sh
@@ -2,8 +2,8 @@
 emacs_is_beta=
 emacs_major_version=21
 emacs_minor_version=4
-emacs_beta_version=2
-xemacs_codename="Developer-Friendly Unix APIs"
+emacs_beta_version=3
+xemacs_codename="Academic Rigor"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=8